From 6099c110c971b02a0612aed766f264aea170acb5 Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Fri, 3 May 2024 13:16:25 -0400 Subject: [PATCH 01/44] guh --- .../Abilities/Dispel/DispelPowerComponent.cs | 5 ++- .../MassSleep/MassSleepPowerComponent.cs | 3 ++ .../Metapsionics/MetapsionicPowerComponent.cs | 30 ++++++++++++---- .../MindSwap/MindSwapPowerComponent.cs | 3 ++ .../NoosphericZapPowerComponent.cs | 3 ++ .../PsionicInvisibilityPowerComponent.cs | 6 ++++ .../PsionicRegenerationPowerComponent.cs | 6 ++++ .../Pyrokinesis/PyrokinesisPowerComponent.cs | 3 ++ .../Telegnosis/TelegnosisPowerComponent.cs | 5 ++- .../Abilities/Psionics/PsionicComponent.cs | 12 +++++-- .../Events/MetapsionicPowerActionEvent.cs | 3 +- Content.Shared/Nyanotrasen/Psionics/Events.cs | 36 +++++++++++++++++++ 12 files changed, 104 insertions(+), 11 deletions(-) diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Dispel/DispelPowerComponent.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Dispel/DispelPowerComponent.cs index cd887866364..837bdd96a87 100644 --- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Dispel/DispelPowerComponent.cs +++ b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Dispel/DispelPowerComponent.cs @@ -9,12 +9,15 @@ public sealed partial class DispelPowerComponent : Component { [DataField("range")] public float Range = 10f; - + [DataField("dispelActionId", customTypeSerializer: typeof(PrototypeIdSerializer))] public string? DispelActionId = "ActionDispel"; [DataField("dispelActionEntity")] public EntityUid? DispelActionEntity; + + [DataField("dispelFeedback")] + public string DispelFeedback = "dispel-feedback"; } } diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/MassSleep/MassSleepPowerComponent.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/MassSleep/MassSleepPowerComponent.cs index 7d611c63dac..c092cacd8b8 100644 --- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/MassSleep/MassSleepPowerComponent.cs +++ b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/MassSleep/MassSleepPowerComponent.cs @@ -14,5 +14,8 @@ public sealed partial class MassSleepPowerComponent : Component [DataField("massSleepActionEntity")] public EntityUid? MassSleepActionEntity; + + [DataField("massSleepFeedback")] + public string MassSleepFeedback = "mass-sleep-feedback"; } } diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Metapsionics/MetapsionicPowerComponent.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Metapsionics/MetapsionicPowerComponent.cs index c9d0130221a..0e12d05dead 100644 --- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Metapsionics/MetapsionicPowerComponent.cs +++ b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Metapsionics/MetapsionicPowerComponent.cs @@ -1,4 +1,6 @@ using Content.Shared.Actions; +using Content.Shared.DoAfter; +using Robust.Shared.Audio; using Robust.Shared.Prototypes; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; @@ -7,15 +9,31 @@ namespace Content.Shared.Abilities.Psionics [RegisterComponent] public sealed partial class MetapsionicPowerComponent : Component { + [DataField("doAfter")] + public DoAfterId? DoAfter; + + [DataField("useDelay")] + public float UseDelay = 8f; + [DataField("soundUse")] + + public SoundSpecifier SoundUse = new SoundPathSpecifier("/Audio/Nyanotrasen/heartbeat_fast.ogg"); + [DataField("range")] public float Range = 5f; - public InstantActionComponent? MetapsionicPowerAction = null; - [DataField("metapsionicActionId", - customTypeSerializer: typeof(PrototypeIdSerializer))] - public string? MetapsionicActionId = "ActionMetapsionic"; + [DataField("actionWideMetapsionic", customTypeSerializer: typeof(PrototypeIdSerializer))] + public string ActionWideMetapsionic = "ActionWideMetapsionic"; + + [DataField("actionWideMetapsionicEntity")] + public EntityUid? ActionWideMetapsionicEntity; + + [DataField("actionFocusedMetapsionic", customTypeSerializer: typeof(PrototypeIdSerializer))] + public string ActionFocusedMetapsionic = "ActionFocusedMetapsionic"; + + [DataField("actionFocusedMetapsionicEntity")] + public EntityUid? ActionFocusedMetapsionicEntity; - [DataField("metapsionicActionEntity")] - public EntityUid? MetapsionicActionEntity; + [DataField("metapsionicFeedback")] + public string MetapsionicFeedback = "metapsionic-feedback"; } } diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/MindSwap/MindSwapPowerComponent.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/MindSwap/MindSwapPowerComponent.cs index 6a3fc811c89..e617c48cf2d 100644 --- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/MindSwap/MindSwapPowerComponent.cs +++ b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/MindSwap/MindSwapPowerComponent.cs @@ -12,5 +12,8 @@ public sealed partial class MindSwapPowerComponent : Component [DataField("mindSwapActionEntity")] public EntityUid? MindSwapActionEntity; + + [DataField("mindSwapFeedback")] + public string MindSwapFeedback = "mind-swap-feedback"; } } diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/NoosphericZap/NoosphericZapPowerComponent.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/NoosphericZap/NoosphericZapPowerComponent.cs index 0e91894b1dc..24c144079e4 100644 --- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/NoosphericZap/NoosphericZapPowerComponent.cs +++ b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/NoosphericZap/NoosphericZapPowerComponent.cs @@ -13,5 +13,8 @@ public sealed partial class NoosphericZapPowerComponent : Component [DataField("noosphericZapActionEntity")] public EntityUid? NoosphericZapActionEntity; + + [DataField("noosphericZapFeedback")] + public string NoosphericZapFeedback = "noospheric-zap-feedback"; } } diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityPowerComponent.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityPowerComponent.cs index 3e198aa9303..3b29a1e4367 100644 --- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityPowerComponent.cs +++ b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityPowerComponent.cs @@ -12,5 +12,11 @@ public sealed partial class PsionicInvisibilityPowerComponent : Component [DataField("psionicInvisibilityActionEntity")] public EntityUid? PsionicInvisibilityActionEntity; + + [DataField("InvisibilityFeedback")] + public string InvisibilityFeedback = "invisibility-feedback"; + + [DataField("UseTimer")] + public float UseTimer = 30f; } } diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/PsionicRegeneration/PsionicRegenerationPowerComponent.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/PsionicRegeneration/PsionicRegenerationPowerComponent.cs index 4a62e84d191..2f86615b836 100644 --- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/PsionicRegeneration/PsionicRegenerationPowerComponent.cs +++ b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/PsionicRegeneration/PsionicRegenerationPowerComponent.cs @@ -26,6 +26,12 @@ public sealed partial class PsionicRegenerationPowerComponent : Component [DataField("psionicRegenerationActionEntity")] public EntityUid? PsionicRegenerationActionEntity; + + [DataField("regenerationFeedback")] + public string RegenerationFeedback = "regeneration-feedback"; + + [DataField("selfRevive")] + public bool SelfRevive { get; set; } = false; } } diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Pyrokinesis/PyrokinesisPowerComponent.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Pyrokinesis/PyrokinesisPowerComponent.cs index 28425afdb4c..d2af000e269 100644 --- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Pyrokinesis/PyrokinesisPowerComponent.cs +++ b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Pyrokinesis/PyrokinesisPowerComponent.cs @@ -14,5 +14,8 @@ public sealed partial class PyrokinesisPowerComponent : Component [DataField("pyrokinesisActionEntity")] public EntityUid? PyrokinesisActionEntity; + + [DataField("pyrokinesisFeedback")] + public string PyrokinesisFeedback = "pyrokinesis-feedback"; } } diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Telegnosis/TelegnosisPowerComponent.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Telegnosis/TelegnosisPowerComponent.cs index 51958822a41..cd298c3ec0f 100644 --- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Telegnosis/TelegnosisPowerComponent.cs +++ b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Telegnosis/TelegnosisPowerComponent.cs @@ -19,5 +19,8 @@ public sealed partial class TelegnosisPowerComponent : Component [DataField("telegnosisActionEntity")] public EntityUid? TelegnosisActionEntity; + + [DataField("telegnosisFeedback")] + public string TelegnosisFeedback = "telegnosis-feedback"; } -} \ No newline at end of file +} diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/PsionicComponent.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/PsionicComponent.cs index 9091e03cfc3..7c7befa33c3 100644 --- a/Content.Shared/Nyanotrasen/Abilities/Psionics/PsionicComponent.cs +++ b/Content.Shared/Nyanotrasen/Abilities/Psionics/PsionicComponent.cs @@ -1,4 +1,3 @@ -using Content.Shared.Actions; using Robust.Shared.GameStates; namespace Content.Shared.Abilities.Psionics @@ -15,6 +14,15 @@ public sealed partial class PsionicComponent : Component public bool Removable = true; [DataField("activePowers")] - public HashSet ActivePowers = new(); + public List ActivePowers = new(); + + [DataField("psychicFeedback")] + public List PsychicFeedback= new(); + + [DataField("amplification")] + public float Amplification = 1f; + + [DataField("dampening")] + public float Dampening = 1f; } } diff --git a/Content.Shared/Nyanotrasen/Actions/Events/MetapsionicPowerActionEvent.cs b/Content.Shared/Nyanotrasen/Actions/Events/MetapsionicPowerActionEvent.cs index b28801efe74..b7c3c8ad2d6 100644 --- a/Content.Shared/Nyanotrasen/Actions/Events/MetapsionicPowerActionEvent.cs +++ b/Content.Shared/Nyanotrasen/Actions/Events/MetapsionicPowerActionEvent.cs @@ -1,2 +1,3 @@ namespace Content.Shared.Actions.Events; -public sealed partial class MetapsionicPowerActionEvent : InstantActionEvent {} +public sealed partial class WideMetapsionicPowerActionEvent : InstantActionEvent { } +public sealed partial class FocusedMetapsionicPowerActionEvent : EntityTargetActionEvent { } diff --git a/Content.Shared/Nyanotrasen/Psionics/Events.cs b/Content.Shared/Nyanotrasen/Psionics/Events.cs index cf9a50c6e18..45a00b5f048 100644 --- a/Content.Shared/Nyanotrasen/Psionics/Events.cs +++ b/Content.Shared/Nyanotrasen/Psionics/Events.cs @@ -21,6 +21,42 @@ public PsionicRegenerationDoAfterEvent(TimeSpan startedAt) public override DoAfterEvent Clone() => this; } + [Serializable, NetSerializable] + public sealed partial class PsionicInvisibilityTimerEvent : DoAfterEvent + { + [DataField("startedAt", required: true)] + public TimeSpan StartedAt; + + private PsionicInvisibilityTimerEvent() + { + } + + public PsionicInvisibilityTimerEvent(TimeSpan startedAt) + { + StartedAt = startedAt; + } + + public override DoAfterEvent Clone() => this; + } + + [Serializable, NetSerializable] + public sealed partial class FocusedMetapsionicDoAfterEvent : DoAfterEvent + { + [DataField("startedAt", required: true)] + public TimeSpan StartedAt; + + private FocusedMetapsionicDoAfterEvent() + { + } + + public FocusedMetapsionicDoAfterEvent(TimeSpan startedAt) + { + StartedAt = startedAt; + } + + public override DoAfterEvent Clone() => this; + } + [Serializable, NetSerializable] public sealed partial class GlimmerWispDrainDoAfterEvent : SimpleDoAfterEvent { From 89d58eda58cc7395d7cf8b838758e57165d57dd8 Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Fri, 3 May 2024 13:59:49 -0400 Subject: [PATCH 02/44] Psionic Refactor pt 1 --- .../Psionics/Abilities/DispelPowerSystem.cs | 41 ++++---- .../Abilities/MetapsionicPowerSystem.cs | 33 +++---- .../Psionics/Abilities/MindSwapPowerSystem.cs | 93 +++++++++---------- .../Abilities/MindSwappedComponent.cs | 11 +-- .../Abilities/NoosphericZapPowerSystem.cs | 30 +++--- .../PsionicInvisibilityPowerSystem.cs | 56 ++++++----- .../PsionicRegenerationPowerSystem.cs | 36 +++---- .../Abilities/PyrokinesisPowerSystem.cs | 33 ++++--- .../Abilities/TelegnosisPowerSystem.cs | 32 +++---- .../Psionics/PsionicAbilitiesSystem.cs | 18 +--- .../Invisibility/PsionicInvisibilitySystem.cs | 20 ++-- .../Nyanotrasen/Psionics/PsionicsSystem.cs | 8 +- .../Prototypes/Nyanotrasen/Actions/types.yml | 22 ++++- 13 files changed, 195 insertions(+), 238 deletions(-) diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/DispelPowerSystem.cs b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/DispelPowerSystem.cs index d338a5a5bcb..f7d88f4cb83 100644 --- a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/DispelPowerSystem.cs +++ b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/DispelPowerSystem.cs @@ -1,4 +1,5 @@ using Content.Shared.Actions; +using Content.Shared.Actions.ActionTypes; using Content.Shared.StatusEffect; using Content.Shared.Abilities.Psionics; using Content.Shared.Damage; @@ -10,9 +11,6 @@ using Robust.Shared.Player; using Robust.Shared.Random; using Robust.Shared.Timing; -using Content.Shared.Mind; -using Content.Shared.Actions.Events; -using Robust.Shared.Audio.Systems; namespace Content.Server.Abilities.Psionics { @@ -28,7 +26,6 @@ public sealed class DispelPowerSystem : EntitySystem [Dependency] private readonly SharedAudioSystem _audioSystem = default!; [Dependency] private readonly PopupSystem _popupSystem = default!; [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly SharedMindSystem _mindSystem = default!; public override void Initialize() @@ -48,25 +45,22 @@ public override void Initialize() private void OnInit(EntityUid uid, DispelPowerComponent component, ComponentInit args) { - _actions.AddAction(uid, ref component.DispelActionEntity, component.DispelActionId ); - _actions.TryGetActionData( component.DispelActionEntity, out var actionData ); - if (actionData is { UseDelay: not null }) - _actions.StartUseDelay(component.DispelActionEntity); + if (!_prototypeManager.TryIndex("Dispel", out var action)) + return; + + component.DispelPowerAction = new EntityTargetAction(action); + if (action.UseDelay != null) + component.DispelPowerAction.Cooldown = (_gameTiming.CurTime, _gameTiming.CurTime + (TimeSpan) action.UseDelay); + _actions.AddAction(uid, component.DispelPowerAction, null); + if (TryComp(uid, out var psionic) && psionic.PsionicAbility == null) - { - psionic.PsionicAbility = component.DispelActionEntity; - psionic.ActivePowers.Add(component); - } + psionic.PsionicAbility = component.DispelPowerAction; } private void OnShutdown(EntityUid uid, DispelPowerComponent component, ComponentShutdown args) { - _actions.RemoveAction(uid, component.DispelActionEntity); - - if (TryComp(uid, out var psionic)) - { - psionic.ActivePowers.Remove(component); - } + if (_prototypeManager.TryIndex("Dispel", out var action)) + _actions.RemoveAction(uid, new EntityTargetAction(action), null); } private void OnPowerUsed(DispelPowerActionEvent args) @@ -89,7 +83,7 @@ private void OnDispelled(EntityUid uid, DispellableComponent component, Dispelle QueueDel(uid); Spawn("Ash", Transform(uid).Coordinates); _popupSystem.PopupCoordinates(Loc.GetString("psionic-burns-up", ("item", uid)), Transform(uid).Coordinates, Filter.Pvs(uid), true, Shared.Popups.PopupType.MediumCaution); - _audioSystem.PlayEntity("/Audio/Effects/lightburn.ogg", Filter.Pvs(uid), uid, true); + _audioSystem.Play("/Audio/Effects/lightburn.ogg", Filter.Pvs(uid), uid, true); args.Handled = true; } @@ -106,7 +100,7 @@ private void OnDmgDispelled(EntityUid uid, DamageOnDispelComponent component, Di private void OnGuardianDispelled(EntityUid uid, GuardianComponent guardian, DispelledEvent args) { if (TryComp(guardian.Host, out var host)) - _guardianSystem.ToggleGuardian(guardian.Host.Value, host); + _guardianSystem.ToggleGuardian(guardian.Host, host); DealDispelDamage(uid); args.Handled = true; @@ -133,7 +127,7 @@ public void DealDispelDamage(EntityUid uid, DamageSpecifier? damage = null) return; _popupSystem.PopupCoordinates(Loc.GetString("psionic-burn-resist", ("item", uid)), Transform(uid).Coordinates, Filter.Pvs(uid), true, Shared.Popups.PopupType.SmallCaution); - _audioSystem.PlayEntity("/Audio/Effects/lightburn.ogg", Filter.Pvs(uid), uid, true); + _audioSystem.Play("/Audio/Effects/lightburn.ogg", Filter.Pvs(uid), uid, true); if (damage == null) { @@ -143,7 +137,8 @@ public void DealDispelDamage(EntityUid uid, DamageSpecifier? damage = null) _damageableSystem.TryChangeDamage(uid, damage, true, true); } } - public sealed class DispelledEvent : HandledEntityEventArgs {} -} + public sealed class DispelPowerActionEvent : EntityTargetActionEvent {} + public sealed class DispelledEvent : HandledEntityEventArgs {} +} diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MetapsionicPowerSystem.cs b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MetapsionicPowerSystem.cs index b775117b716..ee3c9a58d9c 100644 --- a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MetapsionicPowerSystem.cs +++ b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MetapsionicPowerSystem.cs @@ -1,11 +1,11 @@ using Content.Shared.Actions; +using Content.Shared.Actions.ActionTypes; using Content.Shared.Abilities.Psionics; using Content.Shared.StatusEffect; using Content.Shared.Popups; using Robust.Shared.Prototypes; +using Robust.Shared.Player; using Robust.Shared.Timing; -using Content.Shared.Mind; -using Content.Shared.Actions.Events; namespace Content.Server.Abilities.Psionics { @@ -18,7 +18,6 @@ public sealed class MetapsionicPowerSystem : EntitySystem [Dependency] private readonly SharedPopupSystem _popups = default!; [Dependency] private readonly SharedPsionicAbilitiesSystem _psionics = default!; [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly SharedMindSystem _mindSystem = default!; public override void Initialize() @@ -31,26 +30,22 @@ public override void Initialize() private void OnInit(EntityUid uid, MetapsionicPowerComponent component, ComponentInit args) { - _actions.AddAction(uid, ref component.MetapsionicActionEntity, component.MetapsionicActionId ); - _actions.TryGetActionData( component.MetapsionicActionEntity, out var actionData ); - if (actionData is { UseDelay: not null }) - _actions.StartUseDelay(component.MetapsionicActionEntity); - if (TryComp(uid, out var psionic) && psionic.PsionicAbility == null) - { - psionic.PsionicAbility = component.MetapsionicActionEntity; - psionic.ActivePowers.Add(component); - } + if (!_prototypeManager.TryIndex("MetapsionicPulse", out var metapsionicPulse)) + return; + component.MetapsionicPowerAction = new InstantAction(metapsionicPulse); + if (metapsionicPulse.UseDelay != null) + component.MetapsionicPowerAction.Cooldown = (_gameTiming.CurTime, _gameTiming.CurTime + (TimeSpan) metapsionicPulse.UseDelay); + _actions.AddAction(uid, component.MetapsionicPowerAction, null); + + if (TryComp(uid, out var psionic) && psionic.PsionicAbility == null) + psionic.PsionicAbility = component.MetapsionicPowerAction; } private void OnShutdown(EntityUid uid, MetapsionicPowerComponent component, ComponentShutdown args) { - _actions.RemoveAction(uid, component.MetapsionicActionEntity); - - if (TryComp(uid, out var psionic)) - { - psionic.ActivePowers.Remove(component); - } + if (_prototypeManager.TryIndex("MetapsionicPulse", out var metapsionicPulse)) + _actions.RemoveAction(uid, new InstantAction(metapsionicPulse), null); } private void OnPowerUsed(EntityUid uid, MetapsionicPowerComponent component, MetapsionicPowerActionEvent args) @@ -71,4 +66,6 @@ private void OnPowerUsed(EntityUid uid, MetapsionicPowerComponent component, Met args.Handled = true; } } + + public sealed class MetapsionicPowerActionEvent : InstantActionEvent {} } diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MindSwapPowerSystem.cs b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MindSwapPowerSystem.cs index b23224cab48..5c83de2b526 100644 --- a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MindSwapPowerSystem.cs +++ b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MindSwapPowerSystem.cs @@ -1,4 +1,5 @@ using Content.Shared.Actions; +using Content.Shared.Actions.ActionTypes; using Content.Shared.Abilities.Psionics; using Content.Shared.Speech; using Content.Shared.Stealth.Components; @@ -6,14 +7,13 @@ using Content.Shared.Mobs; using Content.Shared.Damage; using Content.Server.Mind; +using Content.Server.Mind.Components; using Content.Shared.Mobs.Systems; using Content.Server.Popups; using Content.Server.Psionics; using Content.Server.GameTicking; using Robust.Shared.Prototypes; using Robust.Shared.Timing; -using Content.Shared.Mind; -using Content.Shared.Actions.Events; namespace Content.Server.Abilities.Psionics { @@ -26,7 +26,6 @@ public sealed class MindSwapPowerSystem : EntitySystem [Dependency] private readonly SharedPsionicAbilitiesSystem _psionics = default!; [Dependency] private readonly PopupSystem _popupSystem = default!; [Dependency] private readonly MindSystem _mindSystem = default!; - [Dependency] private readonly MetaDataSystem _metaDataSystem = default!; public override void Initialize() { @@ -44,24 +43,22 @@ public override void Initialize() private void OnInit(EntityUid uid, MindSwapPowerComponent component, ComponentInit args) { - _actions.AddAction(uid, ref component.MindSwapActionEntity, component.MindSwapActionId ); - _actions.TryGetActionData( component.MindSwapActionEntity, out var actionData ); - if (actionData is { UseDelay: not null }) - _actions.StartUseDelay(component.MindSwapActionEntity); + if (!_prototypeManager.TryIndex("MindSwap", out var mindSwap)) + return; + + component.MindSwapPowerAction = new EntityTargetAction(mindSwap); + if (mindSwap.UseDelay != null) + component.MindSwapPowerAction.Cooldown = (_gameTiming.CurTime, _gameTiming.CurTime + (TimeSpan) mindSwap.UseDelay); + _actions.AddAction(uid, component.MindSwapPowerAction, null); + if (TryComp(uid, out var psionic) && psionic.PsionicAbility == null) - { - psionic.PsionicAbility = component.MindSwapActionEntity; - psionic.ActivePowers.Add(component); - } + psionic.PsionicAbility = component.MindSwapPowerAction; } private void OnShutdown(EntityUid uid, MindSwapPowerComponent component, ComponentShutdown args) { - _actions.RemoveAction(uid, component.MindSwapActionEntity); - if (TryComp(uid, out var psionic)) - { - psionic.ActivePowers.Remove(component); - } + if (_prototypeManager.TryIndex("MindSwap", out var action)) + _actions.RemoveAction(uid, new EntityTargetAction(action), null); } private void OnPowerUsed(MindSwapPowerActionEvent args) @@ -137,9 +134,8 @@ private void OnGhostAttempt(GhostAttemptHandleEvent args) if (!HasComp(args.Mind.CurrentEntity)) return; - //No idea where the viaCommand went. It's on the internal OnGhostAttempt, but not this layer. Maybe unnecessary. - /*if (!args.viaCommand) - return;*/ + if (!args.ViaCommand) + return; args.Result = false; args.Handled = true; @@ -147,12 +143,12 @@ private void OnGhostAttempt(GhostAttemptHandleEvent args) private void OnSwapInit(EntityUid uid, MindSwappedComponent component, ComponentInit args) { - _actions.AddAction(uid, ref component.MindSwapReturnActionEntity, component.MindSwapReturnActionId ); - _actions.TryGetActionData( component.MindSwapReturnActionEntity, out var actionData ); - if (actionData is { UseDelay: not null }) - _actions.StartUseDelay(component.MindSwapReturnActionEntity); - if (TryComp(uid, out var psionic) && psionic.PsionicAbility == null) - psionic.PsionicAbility = component.MindSwapReturnActionEntity; + if (_prototypeManager.TryIndex("MindSwapReturn", out var mindSwap)) + { + var action = new InstantAction(mindSwap); + action.Cooldown = (_gameTiming.CurTime, _gameTiming.CurTime + TimeSpan.FromSeconds(15)); + _actions.AddAction(uid, action, null); + } } public void Swap(EntityUid performer, EntityUid target, bool end = false) @@ -161,35 +157,30 @@ public void Swap(EntityUid performer, EntityUid target, bool end = false) return; // Get the minds first. On transfer, they'll be gone. - MindComponent? performerMind = null; - MindComponent? targetMind = null; + Mind.Mind? performerMind = null; + Mind.Mind? targetMind = null; // This is here to prevent missing MindContainerComponent Resolve errors. - if(!_mindSystem.TryGetMind(performer, out var performerMindId, out performerMind)){ - performerMind = null; - }; - - if(!_mindSystem.TryGetMind(target, out var targetMindId, out targetMind)){ - targetMind = null; - }; - //This is a terrible way to 'unattach' minds. I wanted to use UnVisit but in TransferTo's code they say - //To unnatch the minds, do it like this. - //Have to unnattach the minds before we reattach them via transfer. Still feels weird, but seems to work well. - _mindSystem.TransferTo(performerMindId, null); - _mindSystem.TransferTo(targetMindId, null); + if (TryComp(performer, out var performerMindContainer)) + performerMind = _mindSystem.GetMind(performer, performerMindContainer); + + if (TryComp(target, out var targetMindContainer)) + targetMind = _mindSystem.GetMind(target, targetMindContainer); + // Do the transfer. if (performerMind != null) - _mindSystem.TransferTo(performerMindId, target, ghostCheckOverride: true, false, performerMind); + _mindSystem.TransferTo(performerMind, target, ghostCheckOverride: true); if (targetMind != null) - _mindSystem.TransferTo(targetMindId, performer, ghostCheckOverride: true, false, targetMind); + _mindSystem.TransferTo(targetMind, performer, ghostCheckOverride: true); if (end) { - var performerMindPowerComp = EntityManager.GetComponent(performer); - var targetMindPowerComp = EntityManager.GetComponent(target); - _actions.RemoveAction(performer, performerMindPowerComp.MindSwapReturnActionEntity); - _actions.RemoveAction(target, targetMindPowerComp.MindSwapReturnActionEntity); + if (_prototypeManager.TryIndex("MindSwapReturn", out var mindSwap)) + { + _actions.RemoveAction(performer, new InstantAction(mindSwap), null); + _actions.RemoveAction(target, new InstantAction(mindSwap), null); + } RemComp(performer); RemComp(target); @@ -205,10 +196,11 @@ public void Swap(EntityUid performer, EntityUid target, bool end = false) public void GetTrapped(EntityUid uid) { + if (!_prototypeManager.TryIndex("MindSwapReturn", out var action)) + return; _popupSystem.PopupEntity(Loc.GetString("mindswap-trapped"), uid, uid, Shared.Popups.PopupType.LargeCaution); - var perfComp = EnsureComp(uid); - _actions.RemoveAction(uid, perfComp.MindSwapReturnActionEntity, null); + _actions.RemoveAction(uid, action); if (HasComp(uid)) { @@ -216,9 +208,12 @@ public void GetTrapped(EntityUid uid) RemComp(uid); EnsureComp(uid); EnsureComp(uid); - _metaDataSystem.SetEntityName(uid, Loc.GetString("telegnostic-trapped-entity-name")); - _metaDataSystem.SetEntityDescription(uid, Loc.GetString("telegnostic-trapped-entity-desc")); + MetaData(uid).EntityName = Loc.GetString("telegnostic-trapped-entity-name"); + MetaData(uid).EntityDescription = Loc.GetString("telegnostic-trapped-entity-desc"); } } } + + public sealed class MindSwapPowerActionEvent : EntityTargetActionEvent {} + public sealed class MindSwapPowerReturnActionEvent : InstantActionEvent {} } diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MindSwappedComponent.cs b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MindSwappedComponent.cs index 72cd6a66ef9..84d2909c1f2 100644 --- a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MindSwappedComponent.cs +++ b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MindSwappedComponent.cs @@ -1,18 +1,9 @@ -using Robust.Shared.Prototypes; -using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; - namespace Content.Server.Abilities.Psionics { [RegisterComponent] - public sealed partial class MindSwappedComponent : Component + public sealed class MindSwappedComponent : Component { [ViewVariables] public EntityUid OriginalEntity = default!; - [DataField("mindSwapReturnActionId", - customTypeSerializer: typeof(PrototypeIdSerializer))] - public string? MindSwapReturnActionId = "ActionMindSwapReturn"; - - [DataField("mindSwapReturnActionEntity")] - public EntityUid? MindSwapReturnActionEntity; } } diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/NoosphericZapPowerSystem.cs b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/NoosphericZapPowerSystem.cs index 0fd261ef12f..c844030f1e1 100644 --- a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/NoosphericZapPowerSystem.cs +++ b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/NoosphericZapPowerSystem.cs @@ -1,4 +1,5 @@ using Content.Shared.Actions; +using Content.Shared.Actions.ActionTypes; using Content.Shared.Abilities.Psionics; using Content.Server.Psionics; using Content.Shared.StatusEffect; @@ -6,8 +7,6 @@ using Content.Server.Beam; using Robust.Shared.Prototypes; using Robust.Shared.Timing; -using Content.Server.Mind; -using Content.Shared.Actions.Events; namespace Content.Server.Abilities.Psionics { @@ -20,7 +19,6 @@ public sealed class NoosphericZapPowerSystem : EntitySystem [Dependency] private readonly StatusEffectsSystem _statusEffectsSystem = default!; [Dependency] private readonly IGameTiming _gameTiming = default!; [Dependency] private readonly BeamSystem _beam = default!; - [Dependency] private readonly MindSystem _mindSystem = default!; public override void Initialize() @@ -33,24 +31,22 @@ public override void Initialize() private void OnInit(EntityUid uid, NoosphericZapPowerComponent component, ComponentInit args) { - _actions.AddAction(uid, ref component.NoosphericZapActionEntity, component.NoosphericZapActionId ); - _actions.TryGetActionData( component.NoosphericZapActionEntity, out var actionData ); - if (actionData is { UseDelay: not null }) - _actions.StartUseDelay(component.NoosphericZapActionEntity); + if (!_prototypeManager.TryIndex("NoosphericZap", out var noosphericZap)) + return; + + component.NoosphericZapPowerAction = new EntityTargetAction(noosphericZap); + if (noosphericZap.UseDelay != null) + component.NoosphericZapPowerAction.Cooldown = (_gameTiming.CurTime, _gameTiming.CurTime + (TimeSpan) noosphericZap.UseDelay); + _actions.AddAction(uid, component.NoosphericZapPowerAction, null); + if (TryComp(uid, out var psionic) && psionic.PsionicAbility == null) - { - psionic.PsionicAbility = component.NoosphericZapActionEntity; - psionic.ActivePowers.Add(component); - } + psionic.PsionicAbility = component.NoosphericZapPowerAction; } private void OnShutdown(EntityUid uid, NoosphericZapPowerComponent component, ComponentShutdown args) { - _actions.RemoveAction(uid, component.NoosphericZapActionEntity); - if (TryComp(uid, out var psionic)) - { - psionic.ActivePowers.Remove(component); - } + if (_prototypeManager.TryIndex("NoosphericZap", out var noosphericZap)) + _actions.RemoveAction(uid, new EntityTargetAction(noosphericZap), null); } private void OnPowerUsed(NoosphericZapPowerActionEvent args) @@ -70,4 +66,6 @@ private void OnPowerUsed(NoosphericZapPowerActionEvent args) args.Handled = true; } } + + public sealed class NoosphericZapPowerActionEvent : EntityTargetActionEvent {} } diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PsionicInvisibilityPowerSystem.cs b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PsionicInvisibilityPowerSystem.cs index 5ca1dc7a6dc..3bbaf9d8136 100644 --- a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PsionicInvisibilityPowerSystem.cs +++ b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PsionicInvisibilityPowerSystem.cs @@ -1,4 +1,5 @@ using Content.Shared.Actions; +using Content.Shared.Actions.ActionTypes; using Content.Shared.CombatMode.Pacification; using Content.Shared.Abilities.Psionics; using Content.Shared.Damage; @@ -10,9 +11,6 @@ using Robust.Shared.Player; using Robust.Shared.Audio; using Robust.Shared.Timing; -using Content.Server.Mind; -using Content.Shared.Actions.Events; -using Robust.Shared.Audio.Systems; namespace Content.Server.Abilities.Psionics { @@ -24,8 +22,6 @@ public sealed class PsionicInvisibilityPowerSystem : EntitySystem [Dependency] private readonly SharedPsionicAbilitiesSystem _psionics = default!; [Dependency] private readonly SharedStealthSystem _stealth = default!; [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly MindSystem _mindSystem = default!; - [Dependency] private readonly SharedAudioSystem _audio = default!; public override void Initialize() { @@ -33,7 +29,7 @@ public override void Initialize() SubscribeLocalEvent(OnInit); SubscribeLocalEvent(OnShutdown); SubscribeLocalEvent(OnPowerUsed); - SubscribeLocalEvent(OnPowerOff); + SubscribeLocalEvent(OnPowerOff); SubscribeLocalEvent(OnStart); SubscribeLocalEvent(OnEnd); SubscribeLocalEvent(OnDamageChanged); @@ -41,24 +37,22 @@ public override void Initialize() private void OnInit(EntityUid uid, PsionicInvisibilityPowerComponent component, ComponentInit args) { - _actions.AddAction(uid, ref component.PsionicInvisibilityActionEntity, component.PsionicInvisibilityActionId ); - _actions.TryGetActionData( component.PsionicInvisibilityActionEntity, out var actionData ); - if (actionData is { UseDelay: not null }) - _actions.StartUseDelay(component.PsionicInvisibilityActionEntity); + if (!_prototypeManager.TryIndex("PsionicInvisibility", out var invis)) + return; + + component.PsionicInvisibilityPowerAction = new InstantAction(invis); + if (invis.UseDelay != null) + component.PsionicInvisibilityPowerAction.Cooldown = (_gameTiming.CurTime, _gameTiming.CurTime + (TimeSpan) invis.UseDelay); + _actions.AddAction(uid, component.PsionicInvisibilityPowerAction, null); + if (TryComp(uid, out var psionic) && psionic.PsionicAbility == null) - { - psionic.PsionicAbility = component.PsionicInvisibilityActionEntity; - psionic.ActivePowers.Add(component); - } + psionic.PsionicAbility = component.PsionicInvisibilityPowerAction; } private void OnShutdown(EntityUid uid, PsionicInvisibilityPowerComponent component, ComponentShutdown args) { - _actions.RemoveAction(uid, component.PsionicInvisibilityActionEntity); - if (TryComp(uid, out var psionic)) - { - psionic.ActivePowers.Remove(component); - } + if (_prototypeManager.TryIndex("PsionicInvisibility", out var invis)) + _actions.RemoveAction(uid, new InstantAction(invis), null); } private void OnPowerUsed(EntityUid uid, PsionicInvisibilityPowerComponent component, PsionicInvisibilityPowerActionEvent args) @@ -67,17 +61,15 @@ private void OnPowerUsed(EntityUid uid, PsionicInvisibilityPowerComponent compon return; ToggleInvisibility(args.Performer); - var action = Spawn(PsionicInvisibilityUsedComponent.PsionicInvisibilityUsedActionPrototype); - _actions.AddAction(uid, action, action); - _actions.TryGetActionData( action, out var actionData ); - if (actionData is { UseDelay: not null }) - _actions.StartUseDelay(action); + + if (_prototypeManager.TryIndex("PsionicInvisibilityOff", out var invis)) + _actions.AddAction(args.Performer, new InstantAction(invis), null); _psionics.LogPowerUsed(uid, "psionic invisibility"); args.Handled = true; } - private void OnPowerOff(RemovePsionicInvisibilityOffPowerActionEvent args) + private void OnPowerOff(PsionicInvisibilityPowerOffActionEvent args) { if (!HasComp(args.Performer)) return; @@ -92,7 +84,7 @@ private void OnStart(EntityUid uid, PsionicInvisibilityUsedComponent component, EnsureComp(uid); var stealth = EnsureComp(uid); _stealth.SetVisibility(uid, 0.66f, stealth); - _audio.PlayPvs("/Audio/Effects/toss.ogg", uid); + SoundSystem.Play("/Audio/Effects/toss.ogg", Filter.Pvs(uid), uid); } @@ -104,12 +96,13 @@ private void OnEnd(EntityUid uid, PsionicInvisibilityUsedComponent component, Co RemComp(uid); RemComp(uid); RemComp(uid); - _audio.PlayPvs("/Audio/Effects/toss.ogg", uid); - //Pretty sure this DOESN'T work as intended. - _actions.RemoveAction(uid, component.PsionicInvisibilityUsedActionEntity); + SoundSystem.Play("/Audio/Effects/toss.ogg", Filter.Pvs(uid), uid); + + if (_prototypeManager.TryIndex("PsionicInvisibilityOff", out var invis)) + _actions.RemoveAction(uid, new InstantAction(invis), null); _stunSystem.TryParalyze(uid, TimeSpan.FromSeconds(8), false); - DirtyEntity(uid); + Dirty(uid); } private void OnDamageChanged(EntityUid uid, PsionicInvisibilityUsedComponent component, DamageChangedEvent args) @@ -131,4 +124,7 @@ public void ToggleInvisibility(EntityUid uid) } } } + + public sealed class PsionicInvisibilityPowerActionEvent : InstantActionEvent {} + public sealed class PsionicInvisibilityPowerOffActionEvent : InstantActionEvent {} } diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PsionicRegenerationPowerSystem.cs b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PsionicRegenerationPowerSystem.cs index 2eca3173b6d..985f45b1f6c 100644 --- a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PsionicRegenerationPowerSystem.cs +++ b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PsionicRegenerationPowerSystem.cs @@ -4,10 +4,10 @@ using Robust.Shared.Prototypes; using Content.Server.Body.Components; using Content.Server.Body.Systems; -using Content.Server.Chemistry.Containers.EntitySystems; using Content.Server.Chemistry.EntitySystems; using Content.Server.DoAfter; using Content.Shared.Abilities.Psionics; +using Content.Shared.Actions.ActionTypes; using Content.Shared.Actions; using Content.Shared.Chemistry.Components; using Content.Shared.DoAfter; @@ -18,10 +18,6 @@ using Content.Shared.Examine; using static Content.Shared.Examine.ExamineSystemShared; using Robust.Shared.Timing; -using Content.Server.Mind; -using Content.Shared.Actions.Events; -using Content.Shared.Chemistry.EntitySystems; -using Robust.Server.Audio; namespace Content.Server.Abilities.Psionics { @@ -37,7 +33,6 @@ public sealed class PsionicRegenerationPowerSystem : EntitySystem [Dependency] private readonly SharedPopupSystem _popupSystem = default!; [Dependency] private readonly SharedPsionicAbilitiesSystem _psionics = default!; [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly MindSystem _mindSystem = default!; public override void Initialize() @@ -53,21 +48,22 @@ public override void Initialize() private void OnInit(EntityUid uid, PsionicRegenerationPowerComponent component, ComponentInit args) { - _actions.AddAction(uid, ref component.PsionicRegenerationActionEntity, component.PsionicRegenerationActionId ); - _actions.TryGetActionData( component.PsionicRegenerationActionEntity, out var actionData ); - if (actionData is { UseDelay: not null }) - _actions.StartUseDelay(component.PsionicRegenerationActionEntity); + if (!_prototypeManager.TryIndex("PsionicRegeneration", out var metapsionic)) + return; + + component.PsionicRegenerationPowerAction = new InstantAction(metapsionic); + if (metapsionic.UseDelay != null) + component.PsionicRegenerationPowerAction.Cooldown = (_gameTiming.CurTime, _gameTiming.CurTime + (TimeSpan) metapsionic.UseDelay); + _actions.AddAction(uid, component.PsionicRegenerationPowerAction, null); + if (TryComp(uid, out var psionic) && psionic.PsionicAbility == null) - { - psionic.PsionicAbility = component.PsionicRegenerationActionEntity; - psionic.ActivePowers.Add(component); - } + psionic.PsionicAbility = component.PsionicRegenerationPowerAction; } private void OnPowerUsed(EntityUid uid, PsionicRegenerationPowerComponent component, PsionicRegenerationPowerActionEvent args) { var ev = new PsionicRegenerationDoAfterEvent(_gameTiming.CurTime); - var doAfterArgs = new DoAfterArgs(EntityManager, uid, component.UseDelay, ev, uid); + var doAfterArgs = new DoAfterArgs(uid, component.UseDelay, ev, uid); _doAfterSystem.TryStartDoAfter(doAfterArgs, out var doAfterId); @@ -87,12 +83,8 @@ private void OnPowerUsed(EntityUid uid, PsionicRegenerationPowerComponent compon private void OnShutdown(EntityUid uid, PsionicRegenerationPowerComponent component, ComponentShutdown args) { - _actions.RemoveAction(uid, component.PsionicRegenerationActionEntity); - - if (TryComp(uid, out var psionic)) - { - psionic.ActivePowers.Remove(component); - } + if (_prototypeManager.TryIndex("PsionicRegeneration", out var metapsionic)) + _actions.RemoveAction(uid, new InstantAction(metapsionic), null); } private void OnDispelled(EntityUid uid, PsionicRegenerationPowerComponent component, DispelledEvent args) @@ -124,5 +116,7 @@ private void OnDoAfter(EntityUid uid, PsionicRegenerationPowerComponent componen _bloodstreamSystem.TryAddToChemicals(uid, solution, stream); } } + + public sealed class PsionicRegenerationPowerActionEvent : InstantActionEvent {} } diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PyrokinesisPowerSystem.cs b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PyrokinesisPowerSystem.cs index 407b72c6b58..d86c3a346f0 100644 --- a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PyrokinesisPowerSystem.cs +++ b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PyrokinesisPowerSystem.cs @@ -1,12 +1,12 @@ using Content.Shared.Actions; +using Content.Shared.Actions.ActionTypes; using Content.Shared.Abilities.Psionics; using Content.Server.Atmos.Components; using Content.Server.Atmos.EntitySystems; using Content.Server.Popups; using Robust.Shared.Prototypes; +using Robust.Shared.Player; using Robust.Shared.Timing; -using Content.Server.Mind; -using Content.Shared.Actions.Events; namespace Content.Server.Abilities.Psionics { @@ -18,7 +18,6 @@ public sealed class PyrokinesisPowerSystem : EntitySystem [Dependency] private readonly SharedPsionicAbilitiesSystem _psionics = default!; [Dependency] private readonly PopupSystem _popupSystem = default!; [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly MindSystem _mindSystem = default!; public override void Initialize() { @@ -30,24 +29,22 @@ public override void Initialize() private void OnInit(EntityUid uid, PyrokinesisPowerComponent component, ComponentInit args) { - _actions.AddAction(uid, ref component.PyrokinesisActionEntity, component.PyrokinesisActionId ); - _actions.TryGetActionData( component.PyrokinesisActionEntity, out var actionData ); - if (actionData is { UseDelay: not null }) - _actions.StartUseDelay(component.PyrokinesisActionEntity); + if (!_prototypeManager.TryIndex("Pyrokinesis", out var pyrokinesis)) + return; + + component.PyrokinesisPowerAction = new EntityTargetAction(pyrokinesis); + if (pyrokinesis.UseDelay != null) + component.PyrokinesisPowerAction.Cooldown = (_gameTiming.CurTime, _gameTiming.CurTime + (TimeSpan) pyrokinesis.UseDelay); + _actions.AddAction(uid, component.PyrokinesisPowerAction, null); + if (TryComp(uid, out var psionic) && psionic.PsionicAbility == null) - { - psionic.PsionicAbility = component.PyrokinesisActionEntity; - psionic.ActivePowers.Add(component); - } + psionic.PsionicAbility = component.PyrokinesisPowerAction; } private void OnShutdown(EntityUid uid, PyrokinesisPowerComponent component, ComponentShutdown args) { - _actions.RemoveAction(uid, component.PyrokinesisActionEntity); - if (TryComp(uid, out var psionic)) - { - psionic.ActivePowers.Remove(component); - } + if (_prototypeManager.TryIndex("Pyrokinesis", out var pyrokinesis)) + _actions.RemoveAction(uid, new EntityTargetAction(pyrokinesis), null); } private void OnPowerUsed(PyrokinesisPowerActionEvent args) @@ -56,11 +53,13 @@ private void OnPowerUsed(PyrokinesisPowerActionEvent args) return; flammableComponent.FireStacks += 5; - _flammableSystem.Ignite(args.Target, args.Target); + _flammableSystem.Ignite(args.Target, flammableComponent); _popupSystem.PopupEntity(Loc.GetString("pyrokinesis-power-used", ("target", args.Target)), args.Target, Shared.Popups.PopupType.LargeCaution); _psionics.LogPowerUsed(args.Performer, "pyrokinesis"); args.Handled = true; } } + + public sealed class PyrokinesisPowerActionEvent : EntityTargetActionEvent {} } diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/TelegnosisPowerSystem.cs b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/TelegnosisPowerSystem.cs index f7ae04b61ea..0d6adb7f9a9 100644 --- a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/TelegnosisPowerSystem.cs +++ b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/TelegnosisPowerSystem.cs @@ -1,11 +1,10 @@ using Content.Shared.Actions; +using Content.Shared.Actions.ActionTypes; using Content.Shared.StatusEffect; using Content.Shared.Abilities.Psionics; -using Content.Shared.Mind.Components; +using Content.Server.Mind.Components; using Robust.Shared.Prototypes; using Robust.Shared.Timing; -using Content.Server.Mind; -using Content.Shared.Actions.Events; namespace Content.Server.Abilities.Psionics { @@ -17,7 +16,6 @@ public sealed class TelegnosisPowerSystem : EntitySystem [Dependency] private readonly MindSwapPowerSystem _mindSwap = default!; [Dependency] private readonly SharedPsionicAbilitiesSystem _psionics = default!; [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly MindSystem _mindSystem = default!; public override void Initialize() { @@ -30,24 +28,22 @@ public override void Initialize() private void OnInit(EntityUid uid, TelegnosisPowerComponent component, ComponentInit args) { - _actions.AddAction(uid, ref component.TelegnosisActionEntity, component.TelegnosisActionId ); - _actions.TryGetActionData( component.TelegnosisActionEntity, out var actionData ); - if (actionData is { UseDelay: not null }) - _actions.StartUseDelay(component.TelegnosisActionEntity); + if (!_prototypeManager.TryIndex("Telegnosis", out var telegnosis)) + return; + + component.TelegnosisPowerAction = new InstantAction(telegnosis); + if (telegnosis.UseDelay != null) + component.TelegnosisPowerAction.Cooldown = (_gameTiming.CurTime, _gameTiming.CurTime + (TimeSpan) telegnosis.UseDelay); + _actions.AddAction(uid, component.TelegnosisPowerAction, null); + if (TryComp(uid, out var psionic) && psionic.PsionicAbility == null) - { - psionic.PsionicAbility = component.TelegnosisActionEntity; - psionic.ActivePowers.Add(component); - } + psionic.PsionicAbility = component.TelegnosisPowerAction; } private void OnShutdown(EntityUid uid, TelegnosisPowerComponent component, ComponentShutdown args) { - _actions.RemoveAction(uid, component.TelegnosisActionEntity); - if (TryComp(uid, out var psionic)) - { - psionic.ActivePowers.Remove(component); - } + if (_prototypeManager.TryIndex("Telegnosis", out var metapsionic)) + _actions.RemoveAction(uid, new InstantAction(metapsionic), null); } private void OnPowerUsed(EntityUid uid, TelegnosisPowerComponent component, TelegnosisPowerActionEvent args) @@ -64,4 +60,6 @@ private void OnMindRemoved(EntityUid uid, TelegnosticProjectionComponent compone QueueDel(uid); } } + + public sealed class TelegnosisPowerActionEvent : InstantActionEvent {} } diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/PsionicAbilitiesSystem.cs b/Content.Server/Nyanotrasen/Abilities/Psionics/PsionicAbilitiesSystem.cs index ee16aaccfb6..326be3e0583 100644 --- a/Content.Server/Nyanotrasen/Abilities/Psionics/PsionicAbilitiesSystem.cs +++ b/Content.Server/Nyanotrasen/Abilities/Psionics/PsionicAbilitiesSystem.cs @@ -6,14 +6,12 @@ using Content.Server.EUI; using Content.Server.Psionics; using Content.Server.Mind; -using Content.Shared.Mind; -using Content.Shared.Mind.Components; +using Content.Server.Mind.Components; using Content.Shared.StatusEffect; using Robust.Shared.Random; using Robust.Shared.Prototypes; using Robust.Server.GameObjects; using Robust.Server.Player; -using Robust.Shared.Player; namespace Content.Server.Abilities.Psionics { @@ -52,11 +50,8 @@ public void AddPsionics(EntityUid uid, bool warn = true) if (HasComp(uid)) return; - //Don't know if this will work. New mind state vs old. if (!TryComp(uid, out var mindContainer) || - !_mindSystem.TryGetMind(uid, out _, out var mind )) - //|| - //!_mindSystem.TryGetMind(uid, out var mind, mindContainer)) + !_mindSystem.TryGetMind(uid, out var mind, mindContainer)) { EnsureComp(uid); return; @@ -127,13 +122,8 @@ public void RemovePsionics(EntityUid uid) if (EntityManager.TryGetComponent(uid, comp.GetType(), out var psionicPower)) RemComp(uid, psionicPower); } - if (psionic.PsionicAbility != null){ - _actionsSystem.TryGetActionData( psionic.PsionicAbility, out var psiAbility ); - if (psiAbility != null){ - var owner = psiAbility.Owner; - _actionsSystem.RemoveAction(uid, psiAbility.Owner); - } - } + if (psionic.PsionicAbility != null) + _actionsSystem.RemoveAction(uid, psionic.PsionicAbility); _statusEffectsSystem.TryAddStatusEffect(uid, "Stutter", TimeSpan.FromMinutes(5), false, "StutteringAccent"); diff --git a/Content.Server/Nyanotrasen/Psionics/Invisibility/PsionicInvisibilitySystem.cs b/Content.Server/Nyanotrasen/Psionics/Invisibility/PsionicInvisibilitySystem.cs index 31e6b89f13d..1c9cb55f2dd 100644 --- a/Content.Server/Nyanotrasen/Psionics/Invisibility/PsionicInvisibilitySystem.cs +++ b/Content.Server/Nyanotrasen/Psionics/Invisibility/PsionicInvisibilitySystem.cs @@ -20,7 +20,6 @@ public override void Initialize() SubscribeLocalEvent(OnInit); SubscribeLocalEvent(OnInsulInit); SubscribeLocalEvent(OnInsulShutdown); - SubscribeLocalEvent(OnEyeInit); /// Layer SubscribeLocalEvent(OnInvisInit); @@ -36,11 +35,15 @@ private void OnInit(EntityUid uid, PotentialPsionicComponent component, Componen SetCanSeePsionicInvisiblity(uid, false); } + /// + /// Being able to see invisible by default is no longer tracked by "Not having Potential Psionic". + /// Anything intended to be immune to invisibility(and mind magic in general) should instead have PsionicInsulation as a built-in component + /// + /// + /// + /// private void OnInsulInit(EntityUid uid, PsionicInsulationComponent component, ComponentInit args) { - if (!HasComp(uid)) - return; - if (HasComp(uid)) _invisSystem.ToggleInvisibility(uid); @@ -61,9 +64,6 @@ private void OnInsulInit(EntityUid uid, PsionicInsulationComponent component, Co private void OnInsulShutdown(EntityUid uid, PsionicInsulationComponent component, ComponentShutdown args) { - if (!HasComp(uid)) - return; - SetCanSeePsionicInvisiblity(uid, false); if (!HasComp(uid)) @@ -99,10 +99,6 @@ private void OnInvisShutdown(EntityUid uid, PsionicallyInvisibleComponent compon } } - private void OnEyeInit(EntityUid uid, EyeComponent component, ComponentInit args) - { - //SetCanSeePsionicInvisiblity(uid, true); //JJ Comment - Not allowed to modifies .yml on spawn any longer. See UninitializedSaveTest. - } private void OnEntInserted(EntityUid uid, PsionicallyInvisibleComponent component, EntInsertedIntoContainerMessage args) { DirtyEntity(args.Entity); @@ -125,7 +121,7 @@ public void SetCanSeePsionicInvisiblity(EntityUid uid, bool set) { if (EntityManager.TryGetComponent(uid, out EyeComponent? eye)) { - _eye.SetVisibilityMask(uid, eye.VisibilityMask & ~ (int) VisibilityFlags.PsionicInvisibility, eye); + _eye.SetVisibilityMask(uid, eye.VisibilityMask & ~(int) VisibilityFlags.PsionicInvisibility, eye); } } } diff --git a/Content.Server/Nyanotrasen/Psionics/PsionicsSystem.cs b/Content.Server/Nyanotrasen/Psionics/PsionicsSystem.cs index 5a96af2e96b..9da293df0b5 100644 --- a/Content.Server/Nyanotrasen/Psionics/PsionicsSystem.cs +++ b/Content.Server/Nyanotrasen/Psionics/PsionicsSystem.cs @@ -1,19 +1,14 @@ using Content.Shared.Abilities.Psionics; using Content.Shared.StatusEffect; -using Content.Shared.Mobs; using Content.Shared.Psionics.Glimmer; using Content.Shared.Weapons.Melee.Events; using Content.Shared.Damage.Events; -using Content.Shared.IdentityManagement; using Content.Shared.CCVar; using Content.Server.Abilities.Psionics; -using Content.Server.Chat.Systems; using Content.Server.Electrocution; using Content.Server.NPC.Components; using Content.Server.NPC.Systems; -using Robust.Shared.Audio; using Robust.Shared.Audio.Systems; -using Robust.Shared.Player; using Robust.Shared.Configuration; using Robust.Shared.Random; @@ -27,7 +22,6 @@ public sealed class PsionicsSystem : EntitySystem [Dependency] private readonly ElectrocutionSystem _electrocutionSystem = default!; [Dependency] private readonly MindSwapPowerSystem _mindSwapPowerSystem = default!; [Dependency] private readonly GlimmerSystem _glimmerSystem = default!; - [Dependency] private readonly ChatSystem _chat = default!; [Dependency] private readonly NpcFactionSystem _npcFactonSystem = default!; [Dependency] private readonly IConfigurationManager _cfg = default!; [Dependency] private readonly SharedAudioSystem _audio = default!; @@ -151,7 +145,7 @@ public void RollPsionics(EntityUid uid, PotentialPsionicComponent component, boo chance = Math.Clamp(chance, 0, 1); if (_random.Prob(chance)) - _psionicAbilitiesSystem.AddPsionics(uid, warn); + _psionicAbilitiesSystem.AddPsionics(uid); } public void RerollPsionics(EntityUid uid, PotentialPsionicComponent? psionic = null, float bonusMuliplier = 1f) diff --git a/Resources/Prototypes/Nyanotrasen/Actions/types.yml b/Resources/Prototypes/Nyanotrasen/Actions/types.yml index e6e4bdc5a75..376d92e3efb 100644 --- a/Resources/Prototypes/Nyanotrasen/Actions/types.yml +++ b/Resources/Prototypes/Nyanotrasen/Actions/types.yml @@ -103,15 +103,29 @@ event: !type:PyrokinesisPowerActionEvent - type: entity - id: ActionMetapsionic - name: action-name-metapsionic - description: action-description-metapsionic + id: ActionWideMetapsionic + name: action-name-widemetapsionic + description: action-description-widemetapsionic noSpawn: true components: - type: InstantAction icon: Nyanotrasen/Interface/VerbIcons/metapsionic.png useDelay: 45 - event: !type:MetapsionicPowerActionEvent + event: !type:WideMetapsionicPowerActionEvent + +- type: entity + id: ActionFocusedMetapsionic + name: action-name-focusedmetapsionic + description: action-description-focusedmetapsionic + noSpawn: true + components: + - type: EntityTargetAction + icon: Nyanotrasen/Interface/VerbIcons/metapsionic.png + useDelay: 45 + range: 3 + checkCanAccess: false + itemIconStyle: BigAction + event: !type:FocusedMetapsionicPowerActionEvent - type: entity id: ActionPsionicRegeneration From afaedd2e747720e726d2a1bdb7d7147053273906 Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Fri, 3 May 2024 14:08:58 -0400 Subject: [PATCH 03/44] Last bit --- .../Nyanotrasen/Chat/NyanoChatSystem.cs | 5 ++- .../BecomePsionicConditionComponent.cs | 11 ------ .../Systems/BecomePsionicConditionSystem.cs | 32 ------------------ .../Audio/Nyanotrasen/heartbeat_fast.ogg | Bin 0 -> 39983 bytes .../nyanotrasen/psionics/psychic-feedback.ftl | 6 ++++ .../DeltaV/Entities/Mobs/Player/harpy.yml | 1 - .../DeltaV/Entities/Mobs/Player/vulpkanin.yml | 1 - .../Entities/Mobs/Player/arachnid.yml | 1 - .../Prototypes/Entities/Mobs/Player/diona.yml | 1 - .../Prototypes/Entities/Mobs/Player/dwarf.yml | 2 -- .../Prototypes/Entities/Mobs/Player/human.yml | 2 -- .../Prototypes/Entities/Mobs/Player/moth.yml | 2 -- .../Entities/Mobs/Player/reptilian.yml | 2 -- .../Prototypes/Entities/Mobs/Player/slime.yml | 2 -- .../Nyanotrasen/Entities/Mobs/Player/Oni.yml | 1 - .../Entities/Mobs/Player/felinid.yml | 2 -- .../Nyanotrasen/Objectives/traitor.yml | 23 ------------- .../Nyanotrasen/Traits/psionics.yml | 6 ++++ .../Prototypes/Objectives/objectiveGroups.yml | 1 - 19 files changed, 16 insertions(+), 85 deletions(-) delete mode 100644 Content.Server/Nyanotrasen/Objectives/Components/BecomePsionicConditionComponent.cs delete mode 100644 Content.Server/Nyanotrasen/Objectives/Systems/BecomePsionicConditionSystem.cs create mode 100644 Resources/Audio/Nyanotrasen/heartbeat_fast.ogg create mode 100644 Resources/Locale/en-US/nyanotrasen/psionics/psychic-feedback.ftl create mode 100644 Resources/Prototypes/Nyanotrasen/Traits/psionics.yml diff --git a/Content.Server/Nyanotrasen/Chat/NyanoChatSystem.cs b/Content.Server/Nyanotrasen/Chat/NyanoChatSystem.cs index 58ed1782741..e0fb18fcae4 100644 --- a/Content.Server/Nyanotrasen/Chat/NyanoChatSystem.cs +++ b/Content.Server/Nyanotrasen/Chat/NyanoChatSystem.cs @@ -2,6 +2,7 @@ using Content.Server.Administration.Managers; using Content.Server.Chat.Managers; using Content.Server.Chat.Systems; +using Content.Server.Psionics; using Content.Shared.Abilities.Psionics; using Content.Shared.Bed.Sleep; using Content.Shared.Chat; @@ -47,7 +48,9 @@ private IEnumerable GetAdminClients() private List GetDreamers(IEnumerable removeList) { var filtered = Filter.Empty() - .AddWhereAttachedEntity(entity => HasComp(entity) || HasComp(entity) && !HasComp(entity) && !HasComp(entity)) + .AddWhereAttachedEntity(entity => HasComp(entity) + || HasComp(entity) && !HasComp(entity) && !HasComp(entity) + || HasComp(entity) && !HasComp(entity) && !HasComp(entity)) .Recipients .Select(p => p.ConnectedClient); diff --git a/Content.Server/Nyanotrasen/Objectives/Components/BecomePsionicConditionComponent.cs b/Content.Server/Nyanotrasen/Objectives/Components/BecomePsionicConditionComponent.cs deleted file mode 100644 index 3b677bab2d4..00000000000 --- a/Content.Server/Nyanotrasen/Objectives/Components/BecomePsionicConditionComponent.cs +++ /dev/null @@ -1,11 +0,0 @@ -using Content.Server.Objectives.Systems; - -namespace Content.Server.Objectives.Components; - -/// -/// Requires that the player dies to be complete. -/// -[RegisterComponent, Access(typeof(BecomePsionicConditionSystem))] -public sealed partial class BecomePsionicConditionComponent : Component -{ -} \ No newline at end of file diff --git a/Content.Server/Nyanotrasen/Objectives/Systems/BecomePsionicConditionSystem.cs b/Content.Server/Nyanotrasen/Objectives/Systems/BecomePsionicConditionSystem.cs deleted file mode 100644 index d090c320a41..00000000000 --- a/Content.Server/Nyanotrasen/Objectives/Systems/BecomePsionicConditionSystem.cs +++ /dev/null @@ -1,32 +0,0 @@ -using Content.Shared.Abilities.Psionics; -using Content.Server.Objectives.Components; -using Content.Shared.Mind; -using Content.Shared.Objectives.Components; - -namespace Content.Server.Objectives.Systems -{ - public sealed class BecomePsionicConditionSystem : EntitySystem - { - private EntityQuery _metaQuery; - - public override void Initialize() - { - base.Initialize(); - - SubscribeLocalEvent(OnGetProgress); - } - - private void OnGetProgress(EntityUid uid, BecomePsionicConditionComponent comp, ref ObjectiveGetProgressEvent args) - { - args.Progress = GetProgress(args.Mind); - } - - private float GetProgress(MindComponent mind) - { - var entMan = IoCManager.Resolve(); - if (HasComp(mind.CurrentEntity)) - return 1; - return 0; - } - } -} diff --git a/Resources/Audio/Nyanotrasen/heartbeat_fast.ogg b/Resources/Audio/Nyanotrasen/heartbeat_fast.ogg new file mode 100644 index 0000000000000000000000000000000000000000..85a034d9bd0017dafea7df4128235c815babac0c GIT binary patch literal 39983 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 literal 0 HcmV?d00001 diff --git a/Resources/Locale/en-US/nyanotrasen/psionics/psychic-feedback.ftl b/Resources/Locale/en-US/nyanotrasen/psionics/psychic-feedback.ftl new file mode 100644 index 00000000000..5e6626eb9ca --- /dev/null +++ b/Resources/Locale/en-US/nyanotrasen/psionics/psychic-feedback.ftl @@ -0,0 +1,6 @@ +dispel-feedback = {CAPITALIZE($entity)} projects an aura of normality +no-powers = {CAPITALIZE($entity)} will never awaken from the dream in this life +psychic-potential = {CAPITALIZE($entity)} has a slim chance of awakening from the dream +focused-metapsionic-pulse-begin = The air around {CAPITALIZE($entity)} begins to shimmer faintly, like a heat haze crawling across the endless desert +psionic-regeneration-self-revive = As {CAPITALIZE($entity)} falls to the floor greviously wounded, + they begin visibly regenerating! diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Player/harpy.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Player/harpy.yml index 1f4eb696c65..e2541def035 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Player/harpy.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Player/harpy.yml @@ -26,4 +26,3 @@ - type: NpcFactionMember factions: - NanoTrasen - - type: PotentialPsionic diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Player/vulpkanin.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Player/vulpkanin.yml index 06abe8c45fa..ea2357a5c06 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Player/vulpkanin.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Player/vulpkanin.yml @@ -24,7 +24,6 @@ - type: NpcFactionMember factions: - NanoTrasen - - type: PotentialPsionic - type: Respirator damage: types: diff --git a/Resources/Prototypes/Entities/Mobs/Player/arachnid.yml b/Resources/Prototypes/Entities/Mobs/Player/arachnid.yml index 5ebd43ddf48..d9dea3c18d9 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/arachnid.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/arachnid.yml @@ -11,4 +11,3 @@ damageRecovery: types: Asphyxiation: -0.5 - - type: PotentialPsionic #Nyano - Summary: makes potentially psionic. diff --git a/Resources/Prototypes/Entities/Mobs/Player/diona.yml b/Resources/Prototypes/Entities/Mobs/Player/diona.yml index 28687c68bfc..dfd5e9a1be7 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/diona.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/diona.yml @@ -11,7 +11,6 @@ damageRecovery: types: Asphyxiation: -1.0 - - type: PotentialPsionic #Nyano - Summary: makes potentially psionic. # Reformed Diona - type: entity diff --git a/Resources/Prototypes/Entities/Mobs/Player/dwarf.yml b/Resources/Prototypes/Entities/Mobs/Player/dwarf.yml index fb84ad3650f..d1de65df012 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/dwarf.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/dwarf.yml @@ -3,5 +3,3 @@ name: Urist McHands The Dwarf parent: BaseMobDwarf id: MobDwarf - components: - - type: PotentialPsionic #Nyano - Summary: makes potentially psionic. \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Mobs/Player/human.yml b/Resources/Prototypes/Entities/Mobs/Player/human.yml index b864984a7f3..a96b53b9532 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/human.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/human.yml @@ -3,8 +3,6 @@ name: Urist McHands parent: BaseMobHuman id: MobHuman - components: - - type: PotentialPsionic #Nyano - Summary: makes potentially psionic. #Syndie - type: entity diff --git a/Resources/Prototypes/Entities/Mobs/Player/moth.yml b/Resources/Prototypes/Entities/Mobs/Player/moth.yml index ffdb36d86bd..72feba958ab 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/moth.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/moth.yml @@ -3,5 +3,3 @@ name: Urist McFluff parent: BaseMobMoth id: MobMoth - components: - - type: PotentialPsionic #Nyano - Summary: makes potentially psionic. \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Mobs/Player/reptilian.yml b/Resources/Prototypes/Entities/Mobs/Player/reptilian.yml index 71d74222979..b9f265e0bcf 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/reptilian.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/reptilian.yml @@ -3,7 +3,5 @@ name: Urisst' Mzhand parent: BaseMobReptilian id: MobReptilian - components: - - type: PotentialPsionic #Nyano - Summary: makes potentially psionic. #Weh diff --git a/Resources/Prototypes/Entities/Mobs/Player/slime.yml b/Resources/Prototypes/Entities/Mobs/Player/slime.yml index 79669a8fe2a..4e5974b3084 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/slime.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/slime.yml @@ -2,5 +2,3 @@ save: false parent: BaseMobSlimePerson id: MobSlimePerson - components: - - type: PotentialPsionic #Nyano - Summary: makes potentially psionic. \ No newline at end of file diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/Oni.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/Oni.yml index 562b9c564ec..1166d8a29f5 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/Oni.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/Oni.yml @@ -32,4 +32,3 @@ - type: NpcFactionMember factions: - NanoTrasen - - type: PotentialPsionic diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/felinid.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/felinid.yml index db7936cc5b4..94ac8403adc 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/felinid.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Player/felinid.yml @@ -49,5 +49,3 @@ - type: NpcFactionMember factions: - NanoTrasen - - type: PotentialPsionic - diff --git a/Resources/Prototypes/Nyanotrasen/Objectives/traitor.yml b/Resources/Prototypes/Nyanotrasen/Objectives/traitor.yml index 53910a54a92..e6e497003d5 100644 --- a/Resources/Prototypes/Nyanotrasen/Objectives/traitor.yml +++ b/Resources/Prototypes/Nyanotrasen/Objectives/traitor.yml @@ -9,29 +9,6 @@ stealGroup: AntiPsychicKnife owner: job-name-mantis -- type: entity - id: BecomePsionicObjective - parent: BaseTraitorObjective - name: Become psionic - description: We need you to acquire psionics and keep them until your mission is complete. - noSpawn: true - components: - - type: NotJobsRequirement - jobs: - - Mime - - ForensicMantis - - type: Objective - difficulty: 2.5 - #unique: false - icon: - sprite: Nyanotrasen/Icons/psi.rsi - state: psi - - type: ObjectiveBlacklistRequirement - blacklist: - components: - - BecomeGolemCondition - - type: BecomePsionicCondition - #- type: entity # id: BecomeGolemObjective # parent: BaseTraitorObjective diff --git a/Resources/Prototypes/Nyanotrasen/Traits/psionics.yml b/Resources/Prototypes/Nyanotrasen/Traits/psionics.yml new file mode 100644 index 00000000000..5fef3427703 --- /dev/null +++ b/Resources/Prototypes/Nyanotrasen/Traits/psionics.yml @@ -0,0 +1,6 @@ +- type: trait + id: LatentPsychic + name: Latent Psychic + description: trait-latent-psychic-desc + components: + - type: PotentialPsionic diff --git a/Resources/Prototypes/Objectives/objectiveGroups.yml b/Resources/Prototypes/Objectives/objectiveGroups.yml index 2fe5f7c833f..5ddf7af8efe 100644 --- a/Resources/Prototypes/Objectives/objectiveGroups.yml +++ b/Resources/Prototypes/Objectives/objectiveGroups.yml @@ -39,7 +39,6 @@ EscapeShuttleObjective: 1 # DieObjective: 0.05 # DeltaV - Disable the lrp objective aka murderbone justification #HijackShuttleObjective: 0.02 - BecomePsionicObjective: 1 # Nyanotrasen - Become Psionic objective, see Resources/Prototypes/Nyanotrasen/Objectives/traitor.yml #BecomeGolemObjective: 0.5 # Nyanotrasen - Become a golem objective, see Resources/Prototypes/Nyanotrasen/Objectives/traitor.yml - type: weightedRandom From 1566ee557d9d442eb2d8af7e83f845ed563d6436 Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Fri, 3 May 2024 14:11:28 -0400 Subject: [PATCH 04/44] Last one missed --- Resources/Prototypes/Entities/Mobs/Species/human.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Mobs/Species/human.yml b/Resources/Prototypes/Entities/Mobs/Species/human.yml index 7bf96efe2cc..900de77712e 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/human.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/human.yml @@ -16,7 +16,6 @@ spawned: - id: FoodMeatHuman amount: 5 - - type: PotentialPsionic #Nyano - Summary: makes potentially psionic. - type: entity parent: BaseSpeciesDummy From c832f5f240ae87b83f2aca4487093929d9a67a3d Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Fri, 3 May 2024 17:57:09 -0400 Subject: [PATCH 05/44] I accidentally sent the DeltaV legacy version of these --- .../Psionics/Abilities/DispelPowerSystem.cs | 54 ++++--- .../Abilities/MetapsionicPowerSystem.cs | 144 +++++++++++++++--- .../Psionics/Abilities/MindSwapPowerSystem.cs | 117 ++++++++------ .../Abilities/MindSwappedComponent.cs | 14 +- .../Abilities/NoosphericZapPowerSystem.cs | 34 ++--- .../PsionicInvisibilityPowerSystem.cs | 102 ++++++++----- .../PsionicRegenerationPowerSystem.cs | 108 +++++++++---- .../Abilities/PyrokinesisPowerSystem.cs | 35 +++-- .../Abilities/TelegnosisPowerSystem.cs | 34 +++-- .../Psionics/PsionicAbilitiesSystem.cs | 83 ++++------ 10 files changed, 469 insertions(+), 256 deletions(-) diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/DispelPowerSystem.cs b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/DispelPowerSystem.cs index f7d88f4cb83..8cde75f461d 100644 --- a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/DispelPowerSystem.cs +++ b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/DispelPowerSystem.cs @@ -1,5 +1,4 @@ using Content.Shared.Actions; -using Content.Shared.Actions.ActionTypes; using Content.Shared.StatusEffect; using Content.Shared.Abilities.Psionics; using Content.Shared.Damage; @@ -7,16 +6,15 @@ using Content.Server.Guardian; using Content.Server.Bible.Components; using Content.Server.Popups; -using Robust.Shared.Prototypes; using Robust.Shared.Player; using Robust.Shared.Random; -using Robust.Shared.Timing; +using Content.Shared.Actions.Events; +using Robust.Shared.Audio.Systems; namespace Content.Server.Abilities.Psionics { public sealed class DispelPowerSystem : EntitySystem { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; [Dependency] private readonly StatusEffectsSystem _statusEffects = default!; [Dependency] private readonly SharedActionsSystem _actions = default!; [Dependency] private readonly DamageableSystem _damageableSystem = default!; @@ -25,7 +23,6 @@ public sealed class DispelPowerSystem : EntitySystem [Dependency] private readonly SharedPsionicAbilitiesSystem _psionics = default!; [Dependency] private readonly SharedAudioSystem _audioSystem = default!; [Dependency] private readonly PopupSystem _popupSystem = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; public override void Initialize() @@ -45,28 +42,38 @@ public override void Initialize() private void OnInit(EntityUid uid, DispelPowerComponent component, ComponentInit args) { - if (!_prototypeManager.TryIndex("Dispel", out var action)) - return; - - component.DispelPowerAction = new EntityTargetAction(action); - if (action.UseDelay != null) - component.DispelPowerAction.Cooldown = (_gameTiming.CurTime, _gameTiming.CurTime + (TimeSpan) action.UseDelay); - _actions.AddAction(uid, component.DispelPowerAction, null); - - if (TryComp(uid, out var psionic) && psionic.PsionicAbility == null) - psionic.PsionicAbility = component.DispelPowerAction; + _actions.AddAction(uid, ref component.DispelActionEntity, component.DispelActionId ); + _actions.TryGetActionData( component.DispelActionEntity, out var actionData ); + if (actionData is { UseDelay: not null }) + _actions.StartUseDelay(component.DispelActionEntity); + if (TryComp(uid, out var psionic)) + { + psionic.ActivePowers.Add(component); + psionic.PsychicFeedback.Add(component.DispelFeedback); + //It's fully intended that Dispel doesn't increase Amplification, and instead heavily spikes Dampening + //Antimage archetype. + psionic.Dampening += 1f; + } } private void OnShutdown(EntityUid uid, DispelPowerComponent component, ComponentShutdown args) { - if (_prototypeManager.TryIndex("Dispel", out var action)) - _actions.RemoveAction(uid, new EntityTargetAction(action), null); + _actions.RemoveAction(uid, component.DispelActionEntity); + + if (TryComp(uid, out var psionic)) + { + psionic.ActivePowers.Remove(component); + psionic.PsychicFeedback.Remove(component.DispelFeedback); + psionic.Dampening -= 1f; + } } private void OnPowerUsed(DispelPowerActionEvent args) { if (HasComp(args.Target)) return; + if (!TryComp(args.Performer, out var psionic) || !HasComp(args.Target)) + return; var ev = new DispelledEvent(); RaiseLocalEvent(args.Target, ev, false); @@ -74,7 +81,7 @@ private void OnPowerUsed(DispelPowerActionEvent args) if (ev.Handled) { args.Handled = true; - _psionics.LogPowerUsed(args.Performer, "dispel"); + _psionics.LogPowerUsed(args.Performer, "dispel", (int) MathF.Round(psionic.Dampening * -2), (int) MathF.Round(psionic.Dampening * -4)); } } @@ -83,14 +90,14 @@ private void OnDispelled(EntityUid uid, DispellableComponent component, Dispelle QueueDel(uid); Spawn("Ash", Transform(uid).Coordinates); _popupSystem.PopupCoordinates(Loc.GetString("psionic-burns-up", ("item", uid)), Transform(uid).Coordinates, Filter.Pvs(uid), true, Shared.Popups.PopupType.MediumCaution); - _audioSystem.Play("/Audio/Effects/lightburn.ogg", Filter.Pvs(uid), uid, true); + _audioSystem.PlayEntity("/Audio/Effects/lightburn.ogg", Filter.Pvs(uid), uid, true); args.Handled = true; } private void OnDmgDispelled(EntityUid uid, DamageOnDispelComponent component, DispelledEvent args) { var damage = component.Damage; - var modifier = (1 + component.Variance) - (_random.NextFloat(0, component.Variance * 2)); + var modifier = 1 + component.Variance - _random.NextFloat(0, component.Variance * 2); damage *= modifier; DealDispelDamage(uid, damage); @@ -100,7 +107,7 @@ private void OnDmgDispelled(EntityUid uid, DamageOnDispelComponent component, Di private void OnGuardianDispelled(EntityUid uid, GuardianComponent guardian, DispelledEvent args) { if (TryComp(guardian.Host, out var host)) - _guardianSystem.ToggleGuardian(guardian.Host, host); + _guardianSystem.ToggleGuardian(guardian.Host.Value, host); DealDispelDamage(uid); args.Handled = true; @@ -127,7 +134,7 @@ public void DealDispelDamage(EntityUid uid, DamageSpecifier? damage = null) return; _popupSystem.PopupCoordinates(Loc.GetString("psionic-burn-resist", ("item", uid)), Transform(uid).Coordinates, Filter.Pvs(uid), true, Shared.Popups.PopupType.SmallCaution); - _audioSystem.Play("/Audio/Effects/lightburn.ogg", Filter.Pvs(uid), uid, true); + _audioSystem.PlayEntity("/Audio/Effects/lightburn.ogg", Filter.Pvs(uid), uid, true); if (damage == null) { @@ -137,8 +144,5 @@ public void DealDispelDamage(EntityUid uid, DamageSpecifier? damage = null) _damageableSystem.TryChangeDamage(uid, damage, true, true); } } - - public sealed class DispelPowerActionEvent : EntityTargetActionEvent {} - public sealed class DispelledEvent : HandledEntityEventArgs {} } diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MetapsionicPowerSystem.cs b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MetapsionicPowerSystem.cs index ee3c9a58d9c..44953767f19 100644 --- a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MetapsionicPowerSystem.cs +++ b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MetapsionicPowerSystem.cs @@ -1,23 +1,29 @@ using Content.Shared.Actions; -using Content.Shared.Actions.ActionTypes; +using Content.Shared.Actions.Events; using Content.Shared.Abilities.Psionics; -using Content.Shared.StatusEffect; +using Content.Shared.DoAfter; +using Content.Shared.Examine; +using static Content.Shared.Examine.ExamineSystemShared; using Content.Shared.Popups; -using Robust.Shared.Prototypes; -using Robust.Shared.Player; +using Robust.Server.Audio; +using Robust.Shared.Audio; using Robust.Shared.Timing; +using Robust.Shared.Player; +using Content.Server.DoAfter; +using Content.Shared.Psionics.Events; +using Content.Server.Psionics; namespace Content.Server.Abilities.Psionics { public sealed class MetapsionicPowerSystem : EntitySystem { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly StatusEffectsSystem _statusEffects = default!; [Dependency] private readonly SharedActionsSystem _actions = default!; [Dependency] private readonly EntityLookupSystem _lookup = default!; [Dependency] private readonly SharedPopupSystem _popups = default!; [Dependency] private readonly SharedPsionicAbilitiesSystem _psionics = default!; [Dependency] private readonly IGameTiming _gameTiming = default!; + [Dependency] private readonly DoAfterSystem _doAfterSystem = default!; + [Dependency] private readonly AudioSystem _audioSystem = default!; public override void Initialize() @@ -25,31 +31,60 @@ public override void Initialize() base.Initialize(); SubscribeLocalEvent(OnInit); SubscribeLocalEvent(OnShutdown); - SubscribeLocalEvent(OnPowerUsed); + SubscribeLocalEvent(OnWidePowerUsed); + SubscribeLocalEvent(OnFocusedPowerUsed); + SubscribeLocalEvent(OnDoAfter); } private void OnInit(EntityUid uid, MetapsionicPowerComponent component, ComponentInit args) { - if (!_prototypeManager.TryIndex("MetapsionicPulse", out var metapsionicPulse)) + if (!TryComp(uid, out ActionsComponent? comp)) return; + _actions.AddAction(uid, ref component.ActionWideMetapsionicEntity, component.ActionWideMetapsionic, component: comp); + _actions.AddAction(uid, ref component.ActionFocusedMetapsionicEntity, component.ActionFocusedMetapsionic, component: comp); + _actions.TryGetActionData(component.ActionWideMetapsionicEntity, out var actionData); + if (actionData is { UseDelay: not null }) + { + _actions.StartUseDelay(component.ActionWideMetapsionicEntity); + _actions.StartUseDelay(component.ActionFocusedMetapsionicEntity); + } + if (TryComp(uid, out var psionic)) + { + psionic.ActivePowers.Add(component); + psionic.PsychicFeedback.Add(component.MetapsionicFeedback); + psionic.Amplification += 0.1f; + psionic.Dampening += 0.5f; + } - component.MetapsionicPowerAction = new InstantAction(metapsionicPulse); - if (metapsionicPulse.UseDelay != null) - component.MetapsionicPowerAction.Cooldown = (_gameTiming.CurTime, _gameTiming.CurTime + (TimeSpan) metapsionicPulse.UseDelay); - _actions.AddAction(uid, component.MetapsionicPowerAction, null); + } - if (TryComp(uid, out var psionic) && psionic.PsionicAbility == null) - psionic.PsionicAbility = component.MetapsionicPowerAction; + private void UpdateActions(EntityUid uid, MetapsionicPowerComponent? component = null) + { + if (!Resolve(uid, ref component)) + return; + _actions.StartUseDelay(component.ActionWideMetapsionicEntity); + _actions.StartUseDelay(component.ActionFocusedMetapsionicEntity); } private void OnShutdown(EntityUid uid, MetapsionicPowerComponent component, ComponentShutdown args) { - if (_prototypeManager.TryIndex("MetapsionicPulse", out var metapsionicPulse)) - _actions.RemoveAction(uid, new InstantAction(metapsionicPulse), null); + _actions.RemoveAction(uid, component.ActionWideMetapsionicEntity); + _actions.RemoveAction(uid, component.ActionFocusedMetapsionicEntity); + + if (TryComp(uid, out var psionic)) + { + psionic.ActivePowers.Remove(component); + psionic.PsychicFeedback.Remove(component.MetapsionicFeedback); + psionic.Amplification -= 0.1f; + psionic.Dampening -= 0.5f; + } } - private void OnPowerUsed(EntityUid uid, MetapsionicPowerComponent component, MetapsionicPowerActionEvent args) + private void OnWidePowerUsed(EntityUid uid, MetapsionicPowerComponent component, WideMetapsionicPowerActionEvent args) { + if (!TryComp(uid, out var psionic)) + return; + foreach (var entity in _lookup.GetEntitiesInRange(uid, component.Range)) { if (HasComp(entity) && entity != uid && !HasComp(entity) && @@ -61,11 +96,80 @@ private void OnPowerUsed(EntityUid uid, MetapsionicPowerComponent component, Met } } _popups.PopupEntity(Loc.GetString("metapsionic-pulse-failure"), uid, uid, PopupType.Large); - _psionics.LogPowerUsed(uid, "metapsionic pulse", 2, 4); + _psionics.LogPowerUsed(uid, "metapsionic pulse", (int) MathF.Round(psionic.Amplification / psionic.Dampening * 2), (int) MathF.Round(psionic.Amplification / psionic.Dampening * 4)); + UpdateActions(uid, component); + args.Handled = true; + } + + private void OnFocusedPowerUsed(FocusedMetapsionicPowerActionEvent args) + { + if (!TryComp(args.Performer, out var psionic)) + return; + + if (HasComp(args.Target)) + return; + + if (!TryComp(args.Performer, out var component)) + return; + + var ev = new FocusedMetapsionicDoAfterEvent(_gameTiming.CurTime); + + _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, args.Performer, component.UseDelay, ev, args.Performer, args.Target, args.Performer) + { + BlockDuplicate = true, + BreakOnUserMove = true, + BreakOnTargetMove = true, + BreakOnDamage = true, + }, out var doAfterId); + component.DoAfter = doAfterId; + + _popups.PopupEntity(Loc.GetString("focused-metapsionic-pulse-begin", ("entity", args.Performer)), + args.Performer, + // TODO: Use LoS-based Filter when one is available. + Filter.Pvs(args.Performer).RemoveWhereAttachedEntity(entity => !ExamineSystemShared.InRangeUnOccluded(args.Performer, entity, ExamineRange, null)), + true, + PopupType.Medium); + + _audioSystem.PlayPvs(component.SoundUse, component.Owner, AudioParams.Default.WithVolume(8f).WithMaxDistance(1.5f).WithRolloffFactor(3.5f)); + _psionics.LogPowerUsed(args.Performer, "focused metapsionic pulse", (int) MathF.Round(psionic.Amplification / psionic.Dampening * 3), (int) MathF.Round(psionic.Amplification / psionic.Dampening * 6)); args.Handled = true; + + UpdateActions(args.Performer, component); } - } - public sealed class MetapsionicPowerActionEvent : InstantActionEvent {} + private void OnDoAfter(EntityUid uid, MetapsionicPowerComponent component, FocusedMetapsionicDoAfterEvent args) + { + if (!TryComp(args.Target, out var psychic)) + return; + + component.DoAfter = null; + + if (args.Target == null) return; + + if (args.Target == uid) + { + _popups.PopupEntity(Loc.GetString("metapulse-self", ("entity", args.Target)), uid, uid, PopupType.LargeCaution); + return; + } + + if (!HasComp(args.Target)) + { + _popups.PopupEntity(Loc.GetString("no-powers", ("entity", args.Target)), uid, uid, PopupType.LargeCaution); + return; + } + + if (HasComp(args.Target) & !HasComp(args.Target)) + { + _popups.PopupEntity(Loc.GetString("psychic-potential", ("entity", args.Target)), uid, uid, PopupType.LargeCaution); + return; + } + + foreach (var psychicFeedback in psychic.PsychicFeedback) + { + _popups.PopupEntity(Loc.GetString(psychicFeedback, ("entity", args.Target)), uid, uid, PopupType.LargeCaution); + } + + } + } } diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MindSwapPowerSystem.cs b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MindSwapPowerSystem.cs index 5c83de2b526..04b90fe4d44 100644 --- a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MindSwapPowerSystem.cs +++ b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MindSwapPowerSystem.cs @@ -1,5 +1,4 @@ using Content.Shared.Actions; -using Content.Shared.Actions.ActionTypes; using Content.Shared.Abilities.Psionics; using Content.Shared.Speech; using Content.Shared.Stealth.Components; @@ -7,25 +6,25 @@ using Content.Shared.Mobs; using Content.Shared.Damage; using Content.Server.Mind; -using Content.Server.Mind.Components; using Content.Shared.Mobs.Systems; using Content.Server.Popups; using Content.Server.Psionics; using Content.Server.GameTicking; using Robust.Shared.Prototypes; using Robust.Shared.Timing; +using Content.Shared.Mind; +using Content.Shared.Actions.Events; namespace Content.Server.Abilities.Psionics { public sealed class MindSwapPowerSystem : EntitySystem { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; [Dependency] private readonly SharedActionsSystem _actions = default!; [Dependency] private readonly MobStateSystem _mobStateSystem = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; [Dependency] private readonly SharedPsionicAbilitiesSystem _psionics = default!; [Dependency] private readonly PopupSystem _popupSystem = default!; [Dependency] private readonly MindSystem _mindSystem = default!; + [Dependency] private readonly MetaDataSystem _metaDataSystem = default!; public override void Initialize() { @@ -39,39 +38,50 @@ public override void Initialize() SubscribeLocalEvent(OnGhostAttempt); // SubscribeLocalEvent(OnSwapInit); + SubscribeLocalEvent(OnSwapShutdown); } private void OnInit(EntityUid uid, MindSwapPowerComponent component, ComponentInit args) { - if (!_prototypeManager.TryIndex("MindSwap", out var mindSwap)) - return; - - component.MindSwapPowerAction = new EntityTargetAction(mindSwap); - if (mindSwap.UseDelay != null) - component.MindSwapPowerAction.Cooldown = (_gameTiming.CurTime, _gameTiming.CurTime + (TimeSpan) mindSwap.UseDelay); - _actions.AddAction(uid, component.MindSwapPowerAction, null); - - if (TryComp(uid, out var psionic) && psionic.PsionicAbility == null) - psionic.PsionicAbility = component.MindSwapPowerAction; + _actions.AddAction(uid, ref component.MindSwapActionEntity, component.MindSwapActionId); + _actions.TryGetActionData( component.MindSwapActionEntity, out var actionData); + if (actionData is { UseDelay: not null }) + _actions.StartUseDelay(component.MindSwapActionEntity); + if (TryComp(uid, out var psionic)) + { + psionic.PsionicAbility = component.MindSwapActionEntity; + psionic.ActivePowers.Add(component); + psionic.PsychicFeedback.Add(component.MindSwapFeedback); + psionic.Amplification += 1f; + } } private void OnShutdown(EntityUid uid, MindSwapPowerComponent component, ComponentShutdown args) { - if (_prototypeManager.TryIndex("MindSwap", out var action)) - _actions.RemoveAction(uid, new EntityTargetAction(action), null); + _actions.RemoveAction(uid, component.MindSwapActionEntity); + if (TryComp(uid, out var psionic)) + { + psionic.ActivePowers.Remove(component); + psionic.PsychicFeedback.Remove(component.MindSwapFeedback); + psionic.Amplification -= 1f; + } } private void OnPowerUsed(MindSwapPowerActionEvent args) { + if (!(TryComp(args.Target, out var damageable) && damageable.DamageContainerID == "Biological")) return; if (HasComp(args.Target)) return; + if (!TryComp(args.Performer, out var psionic)) + return; + Swap(args.Performer, args.Target); - _psionics.LogPowerUsed(args.Performer, "mind swap"); + _psionics.LogPowerUsed(args.Performer, "mind swap", (int) MathF.Round(psionic.Amplification / psionic.Dampening * 8), (int) MathF.Round(psionic.Amplification / psionic.Dampening * 12)); args.Handled = true; } @@ -134,8 +144,9 @@ private void OnGhostAttempt(GhostAttemptHandleEvent args) if (!HasComp(args.Mind.CurrentEntity)) return; - if (!args.ViaCommand) - return; + //No idea where the viaCommand went. It's on the internal OnGhostAttempt, but not this layer. Maybe unnecessary. + /*if (!args.viaCommand) + return;*/ args.Result = false; args.Handled = true; @@ -143,11 +154,24 @@ private void OnGhostAttempt(GhostAttemptHandleEvent args) private void OnSwapInit(EntityUid uid, MindSwappedComponent component, ComponentInit args) { - if (_prototypeManager.TryIndex("MindSwapReturn", out var mindSwap)) + _actions.AddAction(uid, ref component.MindSwapReturnActionEntity, component.MindSwapReturnActionId ); + _actions.TryGetActionData( component.MindSwapReturnActionEntity, out var actionData ); + if (actionData is { UseDelay: not null }) + _actions.StartUseDelay(component.MindSwapReturnActionEntity); + if (TryComp(uid, out var psionic)) + { + psionic.ActivePowers.Add(component); + psionic.PsychicFeedback.Add(component.MindSwappedFeedback); + } + } + + private void OnSwapShutdown(EntityUid uid, MindSwappedComponent component, ComponentShutdown args) + { + _actions.RemoveAction(uid, component.MindSwapReturnActionEntity); + if (TryComp(uid, out var psionic)) { - var action = new InstantAction(mindSwap); - action.Cooldown = (_gameTiming.CurTime, _gameTiming.CurTime + TimeSpan.FromSeconds(15)); - _actions.AddAction(uid, action, null); + psionic.ActivePowers.Remove(component); + psionic.PsychicFeedback.Remove(component.MindSwappedFeedback); } } @@ -157,30 +181,35 @@ public void Swap(EntityUid performer, EntityUid target, bool end = false) return; // Get the minds first. On transfer, they'll be gone. - Mind.Mind? performerMind = null; - Mind.Mind? targetMind = null; + MindComponent? performerMind = null; + MindComponent? targetMind = null; // This is here to prevent missing MindContainerComponent Resolve errors. - if (TryComp(performer, out var performerMindContainer)) - performerMind = _mindSystem.GetMind(performer, performerMindContainer); - - if (TryComp(target, out var targetMindContainer)) - targetMind = _mindSystem.GetMind(target, targetMindContainer); - + if(!_mindSystem.TryGetMind(performer, out var performerMindId, out performerMind)){ + performerMind = null; + }; + + if(!_mindSystem.TryGetMind(target, out var targetMindId, out targetMind)){ + targetMind = null; + }; + //This is a terrible way to 'unattach' minds. I wanted to use UnVisit but in TransferTo's code they say + //To unnatch the minds, do it like this. + //Have to unnattach the minds before we reattach them via transfer. Still feels weird, but seems to work well. + _mindSystem.TransferTo(performerMindId, null); + _mindSystem.TransferTo(targetMindId, null); // Do the transfer. if (performerMind != null) - _mindSystem.TransferTo(performerMind, target, ghostCheckOverride: true); + _mindSystem.TransferTo(performerMindId, target, ghostCheckOverride: true, false, performerMind); if (targetMind != null) - _mindSystem.TransferTo(targetMind, performer, ghostCheckOverride: true); + _mindSystem.TransferTo(targetMindId, performer, ghostCheckOverride: true, false, targetMind); if (end) { - if (_prototypeManager.TryIndex("MindSwapReturn", out var mindSwap)) - { - _actions.RemoveAction(performer, new InstantAction(mindSwap), null); - _actions.RemoveAction(target, new InstantAction(mindSwap), null); - } + var performerMindPowerComp = EntityManager.GetComponent(performer); + var targetMindPowerComp = EntityManager.GetComponent(target); + _actions.RemoveAction(performer, performerMindPowerComp.MindSwapReturnActionEntity); + _actions.RemoveAction(target, targetMindPowerComp.MindSwapReturnActionEntity); RemComp(performer); RemComp(target); @@ -196,11 +225,10 @@ public void Swap(EntityUid performer, EntityUid target, bool end = false) public void GetTrapped(EntityUid uid) { - if (!_prototypeManager.TryIndex("MindSwapReturn", out var action)) - return; _popupSystem.PopupEntity(Loc.GetString("mindswap-trapped"), uid, uid, Shared.Popups.PopupType.LargeCaution); - _actions.RemoveAction(uid, action); + var perfComp = EnsureComp(uid); + _actions.RemoveAction(uid, perfComp.MindSwapReturnActionEntity, null); if (HasComp(uid)) { @@ -208,12 +236,9 @@ public void GetTrapped(EntityUid uid) RemComp(uid); EnsureComp(uid); EnsureComp(uid); - MetaData(uid).EntityName = Loc.GetString("telegnostic-trapped-entity-name"); - MetaData(uid).EntityDescription = Loc.GetString("telegnostic-trapped-entity-desc"); + _metaDataSystem.SetEntityName(uid, Loc.GetString("telegnostic-trapped-entity-name")); + _metaDataSystem.SetEntityDescription(uid, Loc.GetString("telegnostic-trapped-entity-desc")); } } } - - public sealed class MindSwapPowerActionEvent : EntityTargetActionEvent {} - public sealed class MindSwapPowerReturnActionEvent : InstantActionEvent {} } diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MindSwappedComponent.cs b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MindSwappedComponent.cs index 84d2909c1f2..92fc94773db 100644 --- a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MindSwappedComponent.cs +++ b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MindSwappedComponent.cs @@ -1,9 +1,21 @@ +using Robust.Shared.Prototypes; +using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; + namespace Content.Server.Abilities.Psionics { [RegisterComponent] - public sealed class MindSwappedComponent : Component + public sealed partial class MindSwappedComponent : Component { [ViewVariables] public EntityUid OriginalEntity = default!; + [DataField("mindSwapReturnActionId", + customTypeSerializer: typeof(PrototypeIdSerializer))] + public string? MindSwapReturnActionId = "ActionMindSwapReturn"; + + [DataField("mindSwapReturnActionEntity")] + public EntityUid? MindSwapReturnActionEntity; + + [DataField("mindSwappedFeedback")] + public string MindSwappedFeedback = "mindswapped-feedback"; } } diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/NoosphericZapPowerSystem.cs b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/NoosphericZapPowerSystem.cs index c844030f1e1..61917df3c7a 100644 --- a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/NoosphericZapPowerSystem.cs +++ b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/NoosphericZapPowerSystem.cs @@ -1,23 +1,19 @@ using Content.Shared.Actions; -using Content.Shared.Actions.ActionTypes; using Content.Shared.Abilities.Psionics; using Content.Server.Psionics; using Content.Shared.StatusEffect; using Content.Server.Stunnable; using Content.Server.Beam; -using Robust.Shared.Prototypes; -using Robust.Shared.Timing; +using Content.Shared.Actions.Events; namespace Content.Server.Abilities.Psionics { public sealed class NoosphericZapPowerSystem : EntitySystem { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; [Dependency] private readonly SharedActionsSystem _actions = default!; [Dependency] private readonly SharedPsionicAbilitiesSystem _psionics = default!; [Dependency] private readonly StunSystem _stunSystem = default!; [Dependency] private readonly StatusEffectsSystem _statusEffectsSystem = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; [Dependency] private readonly BeamSystem _beam = default!; @@ -31,22 +27,26 @@ public override void Initialize() private void OnInit(EntityUid uid, NoosphericZapPowerComponent component, ComponentInit args) { - if (!_prototypeManager.TryIndex("NoosphericZap", out var noosphericZap)) - return; - - component.NoosphericZapPowerAction = new EntityTargetAction(noosphericZap); - if (noosphericZap.UseDelay != null) - component.NoosphericZapPowerAction.Cooldown = (_gameTiming.CurTime, _gameTiming.CurTime + (TimeSpan) noosphericZap.UseDelay); - _actions.AddAction(uid, component.NoosphericZapPowerAction, null); - + _actions.AddAction(uid, ref component.NoosphericZapActionEntity, component.NoosphericZapActionId ); + _actions.TryGetActionData( component.NoosphericZapActionEntity, out var actionData ); + if (actionData is { UseDelay: not null }) + _actions.StartUseDelay(component.NoosphericZapActionEntity); if (TryComp(uid, out var psionic) && psionic.PsionicAbility == null) - psionic.PsionicAbility = component.NoosphericZapPowerAction; + { + psionic.PsionicAbility = component.NoosphericZapActionEntity; + psionic.ActivePowers.Add(component); + psionic.PsychicFeedback.Add(component.NoosphericZapFeedback); + } } private void OnShutdown(EntityUid uid, NoosphericZapPowerComponent component, ComponentShutdown args) { - if (_prototypeManager.TryIndex("NoosphericZap", out var noosphericZap)) - _actions.RemoveAction(uid, new EntityTargetAction(noosphericZap), null); + _actions.RemoveAction(uid, component.NoosphericZapActionEntity); + if (TryComp(uid, out var psionic)) + { + psionic.ActivePowers.Remove(component); + psionic.PsychicFeedback.Remove(component.NoosphericZapFeedback); + } } private void OnPowerUsed(NoosphericZapPowerActionEvent args) @@ -66,6 +66,4 @@ private void OnPowerUsed(NoosphericZapPowerActionEvent args) args.Handled = true; } } - - public sealed class NoosphericZapPowerActionEvent : EntityTargetActionEvent {} } diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PsionicInvisibilityPowerSystem.cs b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PsionicInvisibilityPowerSystem.cs index 3bbaf9d8136..cf3da800ed7 100644 --- a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PsionicInvisibilityPowerSystem.cs +++ b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PsionicInvisibilityPowerSystem.cs @@ -1,27 +1,31 @@ +using Content.Server.DoAfter; using Content.Shared.Actions; -using Content.Shared.Actions.ActionTypes; -using Content.Shared.CombatMode.Pacification; using Content.Shared.Abilities.Psionics; using Content.Shared.Damage; +using Content.Shared.DoAfter; using Content.Shared.Stunnable; using Content.Shared.Stealth; using Content.Shared.Stealth.Components; using Content.Server.Psionics; -using Robust.Shared.Prototypes; -using Robust.Shared.Player; -using Robust.Shared.Audio; +using Content.Shared.Psionics.Events; +using Content.Shared.Actions.Events; +using Robust.Shared.Audio.Systems; +using Content.Shared.Interaction.Events; +using Content.Shared.Weapons.Ranged.Events; +using Content.Shared.Throwing; using Robust.Shared.Timing; namespace Content.Server.Abilities.Psionics { public sealed class PsionicInvisibilityPowerSystem : EntitySystem { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; [Dependency] private readonly SharedActionsSystem _actions = default!; [Dependency] private readonly SharedStunSystem _stunSystem = default!; [Dependency] private readonly SharedPsionicAbilitiesSystem _psionics = default!; [Dependency] private readonly SharedStealthSystem _stealth = default!; + [Dependency] private readonly SharedAudioSystem _audio = default!; [Dependency] private readonly IGameTiming _gameTiming = default!; + [Dependency] private readonly DoAfterSystem _doAfterSystem = default!; public override void Initialize() { @@ -29,47 +33,61 @@ public override void Initialize() SubscribeLocalEvent(OnInit); SubscribeLocalEvent(OnShutdown); SubscribeLocalEvent(OnPowerUsed); - SubscribeLocalEvent(OnPowerOff); + SubscribeLocalEvent(OnPowerOff); SubscribeLocalEvent(OnStart); SubscribeLocalEvent(OnEnd); SubscribeLocalEvent(OnDamageChanged); + SubscribeLocalEvent(OnAttackAttempt); + SubscribeLocalEvent(OnShootAttempt); + SubscribeLocalEvent(OnThrowAttempt); } private void OnInit(EntityUid uid, PsionicInvisibilityPowerComponent component, ComponentInit args) { - if (!_prototypeManager.TryIndex("PsionicInvisibility", out var invis)) - return; - - component.PsionicInvisibilityPowerAction = new InstantAction(invis); - if (invis.UseDelay != null) - component.PsionicInvisibilityPowerAction.Cooldown = (_gameTiming.CurTime, _gameTiming.CurTime + (TimeSpan) invis.UseDelay); - _actions.AddAction(uid, component.PsionicInvisibilityPowerAction, null); - - if (TryComp(uid, out var psionic) && psionic.PsionicAbility == null) - psionic.PsionicAbility = component.PsionicInvisibilityPowerAction; + _actions.AddAction(uid, ref component.PsionicInvisibilityActionEntity, component.PsionicInvisibilityActionId); + _actions.TryGetActionData( component.PsionicInvisibilityActionEntity, out var actionData); + if (actionData is { UseDelay: not null }) + _actions.StartUseDelay(component.PsionicInvisibilityActionEntity); + if (TryComp(uid, out var psionic)) + { + psionic.PsionicAbility = component.PsionicInvisibilityActionEntity; + psionic.ActivePowers.Add(component); + psionic.PsychicFeedback.Add(component.InvisibilityFeedback); + psionic.Amplification += 0.5f; + } } private void OnShutdown(EntityUid uid, PsionicInvisibilityPowerComponent component, ComponentShutdown args) { - if (_prototypeManager.TryIndex("PsionicInvisibility", out var invis)) - _actions.RemoveAction(uid, new InstantAction(invis), null); + RemComp(uid); + RemComp(uid); + _actions.RemoveAction(uid, component.PsionicInvisibilityActionEntity); + if (TryComp(uid, out var psionic)) + { + psionic.ActivePowers.Remove(component); + psionic.PsychicFeedback.Remove(component.InvisibilityFeedback); + psionic.Amplification -= 0.5f; + } } private void OnPowerUsed(EntityUid uid, PsionicInvisibilityPowerComponent component, PsionicInvisibilityPowerActionEvent args) { - if (HasComp(uid)) - return; + var ev = new PsionicInvisibilityTimerEvent(_gameTiming.CurTime); + var doAfterArgs = new DoAfterArgs(EntityManager, uid, component.UseTimer, ev, uid) { Hidden = true }; + _doAfterSystem.TryStartDoAfter(doAfterArgs); ToggleInvisibility(args.Performer); - - if (_prototypeManager.TryIndex("PsionicInvisibilityOff", out var invis)) - _actions.AddAction(args.Performer, new InstantAction(invis), null); + var action = Spawn(PsionicInvisibilityUsedComponent.PsionicInvisibilityUsedActionPrototype); + _actions.AddAction(uid, action, action); + _actions.TryGetActionData( action, out var actionData ); + if (actionData is { UseDelay: not null }) + _actions.StartUseDelay(action); _psionics.LogPowerUsed(uid, "psionic invisibility"); args.Handled = true; } - private void OnPowerOff(PsionicInvisibilityPowerOffActionEvent args) + private void OnPowerOff(RemovePsionicInvisibilityOffPowerActionEvent args) { if (!HasComp(args.Performer)) return; @@ -81,10 +99,9 @@ private void OnPowerOff(PsionicInvisibilityPowerOffActionEvent args) private void OnStart(EntityUid uid, PsionicInvisibilityUsedComponent component, ComponentInit args) { EnsureComp(uid); - EnsureComp(uid); var stealth = EnsureComp(uid); _stealth.SetVisibility(uid, 0.66f, stealth); - SoundSystem.Play("/Audio/Effects/toss.ogg", Filter.Pvs(uid), uid); + _audio.PlayPvs("/Audio/Effects/toss.ogg", uid); } @@ -94,25 +111,34 @@ private void OnEnd(EntityUid uid, PsionicInvisibilityUsedComponent component, Co return; RemComp(uid); - RemComp(uid); RemComp(uid); - SoundSystem.Play("/Audio/Effects/toss.ogg", Filter.Pvs(uid), uid); + _audio.PlayPvs("/Audio/Effects/toss.ogg", uid); + _actions.RemoveAction(uid, component.PsionicInvisibilityUsedActionEntity); + DirtyEntity(uid); + } - if (_prototypeManager.TryIndex("PsionicInvisibilityOff", out var invis)) - _actions.RemoveAction(uid, new InstantAction(invis), null); + private void OnAttackAttempt(EntityUid uid, PsionicInvisibilityUsedComponent component, AttackAttemptEvent args) + { + RemComp(uid); + } - _stunSystem.TryParalyze(uid, TimeSpan.FromSeconds(8), false); - Dirty(uid); + private void OnShootAttempt(EntityUid uid, PsionicInvisibilityUsedComponent component, ShotAttemptedEvent args) + { + RemComp(uid); } + private void OnThrowAttempt(EntityUid uid, PsionicInvisibilityUsedComponent component, ThrowAttemptEvent args) + { + RemComp(uid); + } private void OnDamageChanged(EntityUid uid, PsionicInvisibilityUsedComponent component, DamageChangedEvent args) { if (!args.DamageIncreased) return; ToggleInvisibility(uid); + _stunSystem.TryParalyze(uid, TimeSpan.FromSeconds(4), false); } - public void ToggleInvisibility(EntityUid uid) { if (!HasComp(uid)) @@ -123,8 +149,10 @@ public void ToggleInvisibility(EntityUid uid) RemComp(uid); } } - } - public sealed class PsionicInvisibilityPowerActionEvent : InstantActionEvent {} - public sealed class PsionicInvisibilityPowerOffActionEvent : InstantActionEvent {} + public void OnDoAfter(EntityUid uid, PsionicInvisibilityPowerComponent component, PsionicInvisibilityTimerEvent args) + { + RemComp(uid); + } + } } diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PsionicRegenerationPowerSystem.cs b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PsionicRegenerationPowerSystem.cs index 985f45b1f6c..707e8d61298 100644 --- a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PsionicRegenerationPowerSystem.cs +++ b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PsionicRegenerationPowerSystem.cs @@ -1,39 +1,34 @@ using Robust.Shared.Audio; -using Robust.Server.GameObjects; using Robust.Shared.Player; -using Robust.Shared.Prototypes; using Content.Server.Body.Components; using Content.Server.Body.Systems; -using Content.Server.Chemistry.EntitySystems; using Content.Server.DoAfter; using Content.Shared.Abilities.Psionics; -using Content.Shared.Actions.ActionTypes; using Content.Shared.Actions; using Content.Shared.Chemistry.Components; using Content.Shared.DoAfter; using Content.Shared.FixedPoint; +using Content.Shared.Mobs; using Content.Shared.Popups; using Content.Shared.Psionics.Events; -using Content.Shared.Tag; using Content.Shared.Examine; using static Content.Shared.Examine.ExamineSystemShared; using Robust.Shared.Timing; +using Content.Shared.Actions.Events; +using Robust.Server.Audio; namespace Content.Server.Abilities.Psionics { public sealed class PsionicRegenerationPowerSystem : EntitySystem { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; [Dependency] private readonly SharedActionsSystem _actions = default!; - [Dependency] private readonly SolutionContainerSystem _solutionSystem = default!; [Dependency] private readonly BloodstreamSystem _bloodstreamSystem = default!; [Dependency] private readonly AudioSystem _audioSystem = default!; - [Dependency] private readonly TagSystem _tagSystem = default!; [Dependency] private readonly DoAfterSystem _doAfterSystem = default!; [Dependency] private readonly SharedPopupSystem _popupSystem = default!; [Dependency] private readonly SharedPsionicAbilitiesSystem _psionics = default!; [Dependency] private readonly IGameTiming _gameTiming = default!; - + [Dependency] private readonly ExamineSystemShared _examine = default!; public override void Initialize() { @@ -41,29 +36,34 @@ public override void Initialize() SubscribeLocalEvent(OnInit); SubscribeLocalEvent(OnShutdown); SubscribeLocalEvent(OnPowerUsed); - + SubscribeLocalEvent(OnMobStateChangedEvent); SubscribeLocalEvent(OnDispelled); SubscribeLocalEvent(OnDoAfter); } private void OnInit(EntityUid uid, PsionicRegenerationPowerComponent component, ComponentInit args) { - if (!_prototypeManager.TryIndex("PsionicRegeneration", out var metapsionic)) - return; - - component.PsionicRegenerationPowerAction = new InstantAction(metapsionic); - if (metapsionic.UseDelay != null) - component.PsionicRegenerationPowerAction.Cooldown = (_gameTiming.CurTime, _gameTiming.CurTime + (TimeSpan) metapsionic.UseDelay); - _actions.AddAction(uid, component.PsionicRegenerationPowerAction, null); - - if (TryComp(uid, out var psionic) && psionic.PsionicAbility == null) - psionic.PsionicAbility = component.PsionicRegenerationPowerAction; + _actions.AddAction(uid, ref component.PsionicRegenerationActionEntity, component.PsionicRegenerationActionId ); + _actions.TryGetActionData( component.PsionicRegenerationActionEntity, out var actionData ); + if (actionData is { UseDelay: not null }) + _actions.StartUseDelay(component.PsionicRegenerationActionEntity); + if (TryComp(uid, out var psionic)) + { + psionic.ActivePowers.Add(component); + psionic.PsychicFeedback.Add(component.RegenerationFeedback); + } } private void OnPowerUsed(EntityUid uid, PsionicRegenerationPowerComponent component, PsionicRegenerationPowerActionEvent args) { var ev = new PsionicRegenerationDoAfterEvent(_gameTiming.CurTime); - var doAfterArgs = new DoAfterArgs(uid, component.UseDelay, ev, uid); + var doAfterArgs = new DoAfterArgs(EntityManager, uid, component.UseDelay, ev, uid); + + //Prevent the power from ignoring its own cooldown + _actions.TryGetActionData(component.PsionicRegenerationActionEntity, out var actionData); + var curTime = _gameTiming.CurTime; + if (actionData != null && actionData.Cooldown.HasValue && actionData.Cooldown.Value.End > curTime) + return; _doAfterSystem.TryStartDoAfter(doAfterArgs, out var doAfterId); @@ -72,19 +72,67 @@ private void OnPowerUsed(EntityUid uid, PsionicRegenerationPowerComponent compon _popupSystem.PopupEntity(Loc.GetString("psionic-regeneration-begin", ("entity", uid)), uid, // TODO: Use LoS-based Filter when one is available. - Filter.Pvs(uid).RemoveWhereAttachedEntity(entity => !ExamineSystemShared.InRangeUnOccluded(uid, entity, ExamineRange, null)), + Filter.Pvs(uid).RemoveWhereAttachedEntity(entity => !_examine.InRangeUnOccluded(uid, entity, ExamineRange, null)), true, PopupType.Medium); - _audioSystem.PlayPvs(component.SoundUse, component.Owner, AudioParams.Default.WithVolume(8f).WithMaxDistance(1.5f).WithRolloffFactor(3.5f)); + _audioSystem.PlayPvs(component.SoundUse, uid, AudioParams.Default.WithVolume(8f).WithMaxDistance(1.5f).WithRolloffFactor(3.5f)); _psionics.LogPowerUsed(uid, "psionic regeneration"); args.Handled = true; } + /// + /// Regenerators automatically activate upon crit, provided the power was off cooldown at that exact point in time. + /// Self-rescusitation is also far more costly, and extremely obvious + /// + /// + /// + /// + private void OnMobStateChangedEvent(EntityUid uid, PsionicRegenerationPowerComponent component, MobStateChangedEvent args) + { + if (HasComp(uid)) + return; + + if (args.NewMobState is MobState.Critical) + { + _actions.TryGetActionData(component.PsionicRegenerationActionEntity, out var actionData); + var curTime = _gameTiming.CurTime; + if (actionData != null && actionData.Cooldown.HasValue && actionData.Cooldown.Value.End > curTime) + return; + + if (actionData is { UseDelay: not null }) + { + component.SelfRevive = true; + _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, uid, component.UseDelay, new PsionicRegenerationDoAfterEvent(_gameTiming.CurTime), uid, args.Target, uid) + { + BreakOnUserMove = false, + BreakOnTargetMove = false, + BreakOnWeightlessMove = false, + BreakOnDamage = false, + RequireCanInteract = false, + }); + _popupSystem.PopupEntity(Loc.GetString("psionic-regeneration-self-revive", ("entity", uid)), + uid, + // TODO: Use LoS-based Filter when one is available. + Filter.Pvs(uid).RemoveWhereAttachedEntity(entity => !_examine.InRangeUnOccluded(uid, entity, ExamineRange, null)), + true, + PopupType.MediumCaution); + _audioSystem.PlayPvs(component.SoundUse, uid, AudioParams.Default.WithVolume(8f).WithMaxDistance(1.5f).WithRolloffFactor(3.5f)); + _psionics.LogPowerUsed(uid, "psionic regeneration", 20, 40); + _actions.StartUseDelay(component.PsionicRegenerationActionEntity); + } + } + } + private void OnShutdown(EntityUid uid, PsionicRegenerationPowerComponent component, ComponentShutdown args) { - if (_prototypeManager.TryIndex("PsionicRegeneration", out var metapsionic)) - _actions.RemoveAction(uid, new InstantAction(metapsionic), null); + _actions.RemoveAction(uid, component.PsionicRegenerationActionEntity); + + if (TryComp(uid, out var psionic)) + { + psionic.ActivePowers.Remove(component); + psionic.PsychicFeedback.Remove(component.RegenerationFeedback); + } } private void OnDispelled(EntityUid uid, PsionicRegenerationPowerComponent component, DispelledEvent args) @@ -114,9 +162,13 @@ private void OnDoAfter(EntityUid uid, PsionicRegenerationPowerComponent componen var solution = new Solution(); solution.AddReagent("PsionicRegenerationEssence", FixedPoint2.New(component.EssenceAmount * percentageComplete)); _bloodstreamSystem.TryAddToChemicals(uid, solution, stream); + if (component.SelfRevive == true) + { + var critSolution = new Solution(); + critSolution.AddReagent("Epinephrine", 10); + _bloodstreamSystem.TryAddToChemicals(uid, critSolution, stream); + component.SelfRevive = false; + } } } - - public sealed class PsionicRegenerationPowerActionEvent : InstantActionEvent {} } - diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PyrokinesisPowerSystem.cs b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PyrokinesisPowerSystem.cs index d86c3a346f0..28b4d1b597b 100644 --- a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PyrokinesisPowerSystem.cs +++ b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PyrokinesisPowerSystem.cs @@ -1,12 +1,12 @@ using Content.Shared.Actions; -using Content.Shared.Actions.ActionTypes; using Content.Shared.Abilities.Psionics; using Content.Server.Atmos.Components; using Content.Server.Atmos.EntitySystems; using Content.Server.Popups; using Robust.Shared.Prototypes; -using Robust.Shared.Player; using Robust.Shared.Timing; +using Content.Server.Mind; +using Content.Shared.Actions.Events; namespace Content.Server.Abilities.Psionics { @@ -18,6 +18,7 @@ public sealed class PyrokinesisPowerSystem : EntitySystem [Dependency] private readonly SharedPsionicAbilitiesSystem _psionics = default!; [Dependency] private readonly PopupSystem _popupSystem = default!; [Dependency] private readonly IGameTiming _gameTiming = default!; + [Dependency] private readonly MindSystem _mindSystem = default!; public override void Initialize() { @@ -29,22 +30,26 @@ public override void Initialize() private void OnInit(EntityUid uid, PyrokinesisPowerComponent component, ComponentInit args) { - if (!_prototypeManager.TryIndex("Pyrokinesis", out var pyrokinesis)) - return; - - component.PyrokinesisPowerAction = new EntityTargetAction(pyrokinesis); - if (pyrokinesis.UseDelay != null) - component.PyrokinesisPowerAction.Cooldown = (_gameTiming.CurTime, _gameTiming.CurTime + (TimeSpan) pyrokinesis.UseDelay); - _actions.AddAction(uid, component.PyrokinesisPowerAction, null); - + _actions.AddAction(uid, ref component.PyrokinesisActionEntity, component.PyrokinesisActionId ); + _actions.TryGetActionData( component.PyrokinesisActionEntity, out var actionData ); + if (actionData is { UseDelay: not null }) + _actions.StartUseDelay(component.PyrokinesisActionEntity); if (TryComp(uid, out var psionic) && psionic.PsionicAbility == null) - psionic.PsionicAbility = component.PyrokinesisPowerAction; + { + psionic.PsionicAbility = component.PyrokinesisActionEntity; + psionic.ActivePowers.Add(component); + psionic.PsychicFeedback.Add(component.PyrokinesisFeedback); + } } private void OnShutdown(EntityUid uid, PyrokinesisPowerComponent component, ComponentShutdown args) { - if (_prototypeManager.TryIndex("Pyrokinesis", out var pyrokinesis)) - _actions.RemoveAction(uid, new EntityTargetAction(pyrokinesis), null); + _actions.RemoveAction(uid, component.PyrokinesisActionEntity); + if (TryComp(uid, out var psionic)) + { + psionic.ActivePowers.Remove(component); + psionic.PsychicFeedback.Remove(component.PyrokinesisFeedback); + } } private void OnPowerUsed(PyrokinesisPowerActionEvent args) @@ -53,13 +58,11 @@ private void OnPowerUsed(PyrokinesisPowerActionEvent args) return; flammableComponent.FireStacks += 5; - _flammableSystem.Ignite(args.Target, flammableComponent); + _flammableSystem.Ignite(args.Target, args.Target); _popupSystem.PopupEntity(Loc.GetString("pyrokinesis-power-used", ("target", args.Target)), args.Target, Shared.Popups.PopupType.LargeCaution); _psionics.LogPowerUsed(args.Performer, "pyrokinesis"); args.Handled = true; } } - - public sealed class PyrokinesisPowerActionEvent : EntityTargetActionEvent {} } diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/TelegnosisPowerSystem.cs b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/TelegnosisPowerSystem.cs index 0d6adb7f9a9..1000ff453f5 100644 --- a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/TelegnosisPowerSystem.cs +++ b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/TelegnosisPowerSystem.cs @@ -1,10 +1,11 @@ using Content.Shared.Actions; -using Content.Shared.Actions.ActionTypes; using Content.Shared.StatusEffect; using Content.Shared.Abilities.Psionics; -using Content.Server.Mind.Components; +using Content.Shared.Mind.Components; using Robust.Shared.Prototypes; using Robust.Shared.Timing; +using Content.Server.Mind; +using Content.Shared.Actions.Events; namespace Content.Server.Abilities.Psionics { @@ -16,6 +17,7 @@ public sealed class TelegnosisPowerSystem : EntitySystem [Dependency] private readonly MindSwapPowerSystem _mindSwap = default!; [Dependency] private readonly SharedPsionicAbilitiesSystem _psionics = default!; [Dependency] private readonly IGameTiming _gameTiming = default!; + [Dependency] private readonly MindSystem _mindSystem = default!; public override void Initialize() { @@ -28,22 +30,26 @@ public override void Initialize() private void OnInit(EntityUid uid, TelegnosisPowerComponent component, ComponentInit args) { - if (!_prototypeManager.TryIndex("Telegnosis", out var telegnosis)) - return; - - component.TelegnosisPowerAction = new InstantAction(telegnosis); - if (telegnosis.UseDelay != null) - component.TelegnosisPowerAction.Cooldown = (_gameTiming.CurTime, _gameTiming.CurTime + (TimeSpan) telegnosis.UseDelay); - _actions.AddAction(uid, component.TelegnosisPowerAction, null); - + _actions.AddAction(uid, ref component.TelegnosisActionEntity, component.TelegnosisActionId ); + _actions.TryGetActionData( component.TelegnosisActionEntity, out var actionData ); + if (actionData is { UseDelay: not null }) + _actions.StartUseDelay(component.TelegnosisActionEntity); if (TryComp(uid, out var psionic) && psionic.PsionicAbility == null) - psionic.PsionicAbility = component.TelegnosisPowerAction; + { + psionic.PsionicAbility = component.TelegnosisActionEntity; + psionic.ActivePowers.Add(component); + psionic.PsychicFeedback.Add(component.TelegnosisFeedback); + } } private void OnShutdown(EntityUid uid, TelegnosisPowerComponent component, ComponentShutdown args) { - if (_prototypeManager.TryIndex("Telegnosis", out var metapsionic)) - _actions.RemoveAction(uid, new InstantAction(metapsionic), null); + _actions.RemoveAction(uid, component.TelegnosisActionEntity); + if (TryComp(uid, out var psionic)) + { + psionic.ActivePowers.Remove(component); + psionic.PsychicFeedback.Remove(component.TelegnosisFeedback); + } } private void OnPowerUsed(EntityUid uid, TelegnosisPowerComponent component, TelegnosisPowerActionEvent args) @@ -60,6 +66,4 @@ private void OnMindRemoved(EntityUid uid, TelegnosticProjectionComponent compone QueueDel(uid); } } - - public sealed class TelegnosisPowerActionEvent : InstantActionEvent {} } diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/PsionicAbilitiesSystem.cs b/Content.Server/Nyanotrasen/Abilities/Psionics/PsionicAbilitiesSystem.cs index 326be3e0583..860b7baab21 100644 --- a/Content.Server/Nyanotrasen/Abilities/Psionics/PsionicAbilitiesSystem.cs +++ b/Content.Server/Nyanotrasen/Abilities/Psionics/PsionicAbilitiesSystem.cs @@ -6,12 +6,15 @@ using Content.Server.EUI; using Content.Server.Psionics; using Content.Server.Mind; -using Content.Server.Mind.Components; +using Content.Shared.Mind.Components; using Content.Shared.StatusEffect; using Robust.Shared.Random; using Robust.Shared.Prototypes; -using Robust.Server.GameObjects; -using Robust.Server.Player; +using Robust.Shared.Player; +using Content.Shared.Examine; +using Content.Shared.Popups; +using Content.Shared.Examine; +using static Content.Shared.Examine.ExamineSystemShared; namespace Content.Server.Abilities.Psionics { @@ -20,29 +23,26 @@ public sealed class PsionicAbilitiesSystem : EntitySystem [Dependency] private readonly IComponentFactory _componentFactory = default!; [Dependency] private readonly IRobustRandom _random = default!; [Dependency] private readonly SharedActionsSystem _actionsSystem = default!; - [Dependency] private readonly IPlayerManager _playerManager = default!; [Dependency] private readonly EuiManager _euiManager = default!; [Dependency] private readonly StatusEffectsSystem _statusEffectsSystem = default!; [Dependency] private readonly GlimmerSystem _glimmerSystem = default!; [Dependency] private readonly IPrototypeManager _prototypeManager = default!; [Dependency] private readonly MindSystem _mindSystem = default!; + [Dependency] private readonly SharedPopupSystem _popups = default!; public override void Initialize() { base.Initialize(); - SubscribeLocalEvent(OnPlayerAttached); } - private void OnPlayerAttached(EntityUid uid, PsionicAwaitingPlayerComponent component, PlayerAttachedEvent args) - { - if (TryComp(uid, out var bonus) && bonus.Warn == true) - _euiManager.OpenEui(new AcceptPsionicsEui(uid, this), args.Player); - else - AddRandomPsionicPower(uid); - RemCompDeferred(uid); - } - - public void AddPsionics(EntityUid uid, bool warn = true) + /// + /// Adds a psychic power once a character rolls one. This used to be a system you have to select for. However the opt-in is no longer the text window, but is now done at character creation. + /// This is going to get removed when I reach Part 3 of my reworks, when I touch upon the GlimmerSystem itself and overhaul how players get powers. + /// + /// + /// + /// + public void AddPsionics(EntityUid uid) { if (Deleted(uid)) return; @@ -50,41 +50,11 @@ public void AddPsionics(EntityUid uid, bool warn = true) if (HasComp(uid)) return; - if (!TryComp(uid, out var mindContainer) || - !_mindSystem.TryGetMind(uid, out var mind, mindContainer)) - { - EnsureComp(uid); - return; - } - - if (!_mindSystem.TryGetSession(mind, out var client)) - return; - - if (warn && TryComp(uid, out var actor)) - _euiManager.OpenEui(new AcceptPsionicsEui(uid, this), client); - else - AddRandomPsionicPower(uid); + AddRandomPsionicPower(uid); } - - public void AddPsionics(EntityUid uid, string powerComp) - { - if (Deleted(uid)) - return; - - if (HasComp(uid)) - return; - - AddComp(uid); - - var newComponent = (Component) _componentFactory.GetComponent(powerComp); - newComponent.Owner = uid; - - EntityManager.AddComponent(uid, newComponent); - } - public void AddRandomPsionicPower(EntityUid uid) { - AddComp(uid); + EnsureComp(uid, out var psionic); if (!_prototypeManager.TryIndex("RandomPsionicPowerPool", out var pool)) { @@ -98,7 +68,7 @@ public void AddRandomPsionicPower(EntityUid uid) EntityManager.AddComponent(uid, newComponent); - _glimmerSystem.Glimmer += _random.Next(1, 5); + _glimmerSystem.Glimmer += _random.Next((int) MathF.Round(psionic.Amplification * psionic.Dampening * 1), (int) MathF.Round(psionic.Amplification * psionic.Dampening * 5)); } public void RemovePsionics(EntityUid uid) @@ -122,12 +92,25 @@ public void RemovePsionics(EntityUid uid) if (EntityManager.TryGetComponent(uid, comp.GetType(), out var psionicPower)) RemComp(uid, psionicPower); } - if (psionic.PsionicAbility != null) - _actionsSystem.RemoveAction(uid, psionic.PsionicAbility); + if (psionic.PsionicAbility != null){ + _actionsSystem.TryGetActionData( psionic.PsionicAbility, out var psiAbility ); + if (psiAbility != null){ + _actionsSystem.RemoveAction(uid, psiAbility.Owner); + } + } + + _popups.PopupEntity(Loc.GetString("mindbreaking-feedback", ("entity", uid)), + uid, + // TODO: Use LoS-based Filter when one is available. + Filter.Pvs(uid).RemoveWhereAttachedEntity(entity => !ExamineSystemShared.InRangeUnOccluded(uid, entity, ExamineRange, null)), + true, + PopupType.Medium); _statusEffectsSystem.TryAddStatusEffect(uid, "Stutter", TimeSpan.FromMinutes(5), false, "StutteringAccent"); + _glimmerSystem.Glimmer += _random.Next((int) MathF.Round(psionic.Amplification * psionic.Dampening * -5), (int) MathF.Round(psionic.Amplification * psionic.Dampening * -10)); RemComp(uid); + RemComp(uid); } } } From 827bdb2084de621f9a5db427b7a92d2be7ad3d13 Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Tue, 14 May 2024 16:02:58 -0400 Subject: [PATCH 06/44] Finishing Mind Swap rework --- .../Abilities/MetapsionicPowerSystem.cs | 2 +- .../Psionics/Abilities/MindSwapPowerSystem.cs | 20 +++++++++++-------- .../Abilities/NoosphericZapPowerSystem.cs | 3 +-- .../PsionicInvisibilityPowerSystem.cs | 1 - .../Abilities/PyrokinesisPowerSystem.cs | 3 +-- .../Abilities/TelegnosisPowerSystem.cs | 3 +-- .../Psionics/SharedPsionicSystem.Insulated.cs | 19 ++++++++++++++++++ 7 files changed, 35 insertions(+), 16 deletions(-) create mode 100644 Content.Shared/Nyanotrasen/Psionics/SharedPsionicSystem.Insulated.cs diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MetapsionicPowerSystem.cs b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MetapsionicPowerSystem.cs index 44953767f19..fd9b8107568 100644 --- a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MetapsionicPowerSystem.cs +++ b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MetapsionicPowerSystem.cs @@ -131,7 +131,7 @@ private void OnFocusedPowerUsed(FocusedMetapsionicPowerActionEvent args) true, PopupType.Medium); - _audioSystem.PlayPvs(component.SoundUse, component.Owner, AudioParams.Default.WithVolume(8f).WithMaxDistance(1.5f).WithRolloffFactor(3.5f)); + _audioSystem.PlayPvs(component.SoundUse, args.Performer, AudioParams.Default.WithVolume(8f).WithMaxDistance(1.5f).WithRolloffFactor(3.5f)); _psionics.LogPowerUsed(args.Performer, "focused metapsionic pulse", (int) MathF.Round(psionic.Amplification / psionic.Dampening * 3), (int) MathF.Round(psionic.Amplification / psionic.Dampening * 6)); args.Handled = true; diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MindSwapPowerSystem.cs b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MindSwapPowerSystem.cs index 04b90fe4d44..8f191949472 100644 --- a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MindSwapPowerSystem.cs +++ b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MindSwapPowerSystem.cs @@ -1,5 +1,6 @@ using Content.Shared.Actions; using Content.Shared.Abilities.Psionics; +using Content.Shared.Psionics; using Content.Shared.Speech; using Content.Shared.Stealth.Components; using Content.Shared.Mobs.Components; @@ -10,8 +11,6 @@ using Content.Server.Popups; using Content.Server.Psionics; using Content.Server.GameTicking; -using Robust.Shared.Prototypes; -using Robust.Shared.Timing; using Content.Shared.Mind; using Content.Shared.Actions.Events; @@ -36,9 +35,9 @@ public override void Initialize() SubscribeLocalEvent(OnDispelled); SubscribeLocalEvent(OnMobStateChanged); SubscribeLocalEvent(OnGhostAttempt); - // SubscribeLocalEvent(OnSwapInit); SubscribeLocalEvent(OnSwapShutdown); + SubscribeLocalEvent(OnInsulated); } private void OnInit(EntityUid uid, MindSwapPowerComponent component, ComponentInit args) @@ -49,7 +48,6 @@ private void OnInit(EntityUid uid, MindSwapPowerComponent component, ComponentIn _actions.StartUseDelay(component.MindSwapActionEntity); if (TryComp(uid, out var psionic)) { - psionic.PsionicAbility = component.MindSwapActionEntity; psionic.ActivePowers.Add(component); psionic.PsychicFeedback.Add(component.MindSwapFeedback); psionic.Amplification += 1f; @@ -132,8 +130,8 @@ private void OnDispelled(EntityUid uid, MindSwappedComponent component, Dispelle private void OnMobStateChanged(EntityUid uid, MindSwappedComponent component, MobStateChangedEvent args) { - if (args.NewMobState == MobState.Dead) - RemComp(uid); + if (args.NewMobState == MobState.Dead || args.NewMobState == MobState.Critical) + Swap(uid, component.OriginalEntity, true); } private void OnGhostAttempt(GhostAttemptHandleEvent args) @@ -185,11 +183,13 @@ public void Swap(EntityUid performer, EntityUid target, bool end = false) MindComponent? targetMind = null; // This is here to prevent missing MindContainerComponent Resolve errors. - if(!_mindSystem.TryGetMind(performer, out var performerMindId, out performerMind)){ + if (!_mindSystem.TryGetMind(performer, out var performerMindId, out performerMind)) + { performerMind = null; }; - if(!_mindSystem.TryGetMind(target, out var targetMindId, out targetMind)){ + if (!_mindSystem.TryGetMind(target, out var targetMindId, out targetMind)) + { targetMind = null; }; //This is a terrible way to 'unattach' minds. I wanted to use UnVisit but in TransferTo's code they say @@ -240,5 +240,9 @@ public void GetTrapped(EntityUid uid) _metaDataSystem.SetEntityDescription(uid, Loc.GetString("telegnostic-trapped-entity-desc")); } } + public void OnInsulated(EntityUid uid, MindSwappedComponent component, PsionicInsulationEvent args) + { + Swap(uid, component.OriginalEntity, true); + } } } diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/NoosphericZapPowerSystem.cs b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/NoosphericZapPowerSystem.cs index 61917df3c7a..cceb3ef2075 100644 --- a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/NoosphericZapPowerSystem.cs +++ b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/NoosphericZapPowerSystem.cs @@ -31,9 +31,8 @@ private void OnInit(EntityUid uid, NoosphericZapPowerComponent component, Compon _actions.TryGetActionData( component.NoosphericZapActionEntity, out var actionData ); if (actionData is { UseDelay: not null }) _actions.StartUseDelay(component.NoosphericZapActionEntity); - if (TryComp(uid, out var psionic) && psionic.PsionicAbility == null) + if (TryComp(uid, out var psionic)) { - psionic.PsionicAbility = component.NoosphericZapActionEntity; psionic.ActivePowers.Add(component); psionic.PsychicFeedback.Add(component.NoosphericZapFeedback); } diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PsionicInvisibilityPowerSystem.cs b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PsionicInvisibilityPowerSystem.cs index cf3da800ed7..af2ae0c7f05 100644 --- a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PsionicInvisibilityPowerSystem.cs +++ b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PsionicInvisibilityPowerSystem.cs @@ -50,7 +50,6 @@ private void OnInit(EntityUid uid, PsionicInvisibilityPowerComponent component, _actions.StartUseDelay(component.PsionicInvisibilityActionEntity); if (TryComp(uid, out var psionic)) { - psionic.PsionicAbility = component.PsionicInvisibilityActionEntity; psionic.ActivePowers.Add(component); psionic.PsychicFeedback.Add(component.InvisibilityFeedback); psionic.Amplification += 0.5f; diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PyrokinesisPowerSystem.cs b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PyrokinesisPowerSystem.cs index 28b4d1b597b..8300b204dca 100644 --- a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PyrokinesisPowerSystem.cs +++ b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PyrokinesisPowerSystem.cs @@ -34,9 +34,8 @@ private void OnInit(EntityUid uid, PyrokinesisPowerComponent component, Componen _actions.TryGetActionData( component.PyrokinesisActionEntity, out var actionData ); if (actionData is { UseDelay: not null }) _actions.StartUseDelay(component.PyrokinesisActionEntity); - if (TryComp(uid, out var psionic) && psionic.PsionicAbility == null) + if (TryComp(uid, out var psionic)) { - psionic.PsionicAbility = component.PyrokinesisActionEntity; psionic.ActivePowers.Add(component); psionic.PsychicFeedback.Add(component.PyrokinesisFeedback); } diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/TelegnosisPowerSystem.cs b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/TelegnosisPowerSystem.cs index 1000ff453f5..00d06e6dd28 100644 --- a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/TelegnosisPowerSystem.cs +++ b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/TelegnosisPowerSystem.cs @@ -34,9 +34,8 @@ private void OnInit(EntityUid uid, TelegnosisPowerComponent component, Component _actions.TryGetActionData( component.TelegnosisActionEntity, out var actionData ); if (actionData is { UseDelay: not null }) _actions.StartUseDelay(component.TelegnosisActionEntity); - if (TryComp(uid, out var psionic) && psionic.PsionicAbility == null) + if (TryComp(uid, out var psionic)) { - psionic.PsionicAbility = component.TelegnosisActionEntity; psionic.ActivePowers.Add(component); psionic.PsychicFeedback.Add(component.TelegnosisFeedback); } diff --git a/Content.Shared/Nyanotrasen/Psionics/SharedPsionicSystem.Insulated.cs b/Content.Shared/Nyanotrasen/Psionics/SharedPsionicSystem.Insulated.cs new file mode 100644 index 00000000000..c59f98db7f0 --- /dev/null +++ b/Content.Shared/Nyanotrasen/Psionics/SharedPsionicSystem.Insulated.cs @@ -0,0 +1,19 @@ +using Content.Shared.Abilities.Psionics; + +namespace Content.Shared.Psionics +{ + public sealed class PsionicInsulationSystem : EntitySystem + { + public override void Initialize() + { + base.Initialize(); + SubscribeLocalEvent(OnInsulated); + } + + public void OnInsulated(EntityUid uid, PsionicInsulationComponent component, ComponentInit args) + { + RaiseLocalEvent(uid, new PsionicInsulationEvent()); + } + } + public readonly record struct PsionicInsulationEvent; +} From 22f405be7b2fa47a8d91f156f43354cdd50b441b Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Tue, 14 May 2024 16:58:05 -0400 Subject: [PATCH 07/44] Noospheric Zap updating --- .../Abilities/NoosphericZapPowerSystem.cs | 26 ++++++++++++------- .../Prototypes/Nyanotrasen/psionicPowers.yml | 3 ++- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/NoosphericZapPowerSystem.cs b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/NoosphericZapPowerSystem.cs index cceb3ef2075..d849d383033 100644 --- a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/NoosphericZapPowerSystem.cs +++ b/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/NoosphericZapPowerSystem.cs @@ -1,7 +1,8 @@ using Content.Shared.Actions; using Content.Shared.Abilities.Psionics; -using Content.Server.Psionics; +using Content.Shared.Damage; using Content.Shared.StatusEffect; +using Content.Server.Electrocution; using Content.Server.Stunnable; using Content.Server.Beam; using Content.Shared.Actions.Events; @@ -15,6 +16,8 @@ public sealed class NoosphericZapPowerSystem : EntitySystem [Dependency] private readonly StunSystem _stunSystem = default!; [Dependency] private readonly StatusEffectsSystem _statusEffectsSystem = default!; [Dependency] private readonly BeamSystem _beam = default!; + [Dependency] private readonly DamageableSystem _damageableSystem = default!; + [Dependency] private readonly ElectrocutionSystem _electrocution = default!; public override void Initialize() @@ -35,6 +38,7 @@ private void OnInit(EntityUid uid, NoosphericZapPowerComponent component, Compon { psionic.ActivePowers.Add(component); psionic.PsychicFeedback.Add(component.NoosphericZapFeedback); + psionic.Amplification += 1f; } } @@ -45,24 +49,26 @@ private void OnShutdown(EntityUid uid, NoosphericZapPowerComponent component, Co { psionic.ActivePowers.Remove(component); psionic.PsychicFeedback.Remove(component.NoosphericZapFeedback); + psionic.Amplification += 1f; } } private void OnPowerUsed(NoosphericZapPowerActionEvent args) { - if (!HasComp(args.Target)) + if (!TryComp(args.Performer, out var psionic)) return; - if (HasComp(args.Target)) - return; - - _beam.TryCreateBeam(args.Performer, args.Target, "LightningNoospheric"); + if (!HasComp(args.Target) && !HasComp(args.Performer)) + { + _beam.TryCreateBeam(args.Performer, args.Target, "LightningNoospheric"); + _stunSystem.TryParalyze(args.Target, TimeSpan.FromSeconds(1 * psionic.Amplification), false); - _stunSystem.TryParalyze(args.Target, TimeSpan.FromSeconds(5), false); - _statusEffectsSystem.TryAddStatusEffect(args.Target, "Stutter", TimeSpan.FromSeconds(10), false, "StutteringAccent"); + _electrocution.TryDoElectrocution(args.Target, null, (int) MathF.Round(5f * psionic.Amplification), new TimeSpan((long) MathF.Round(1f * psionic.Amplification)), true, ignoreInsulation: true); + _statusEffectsSystem.TryAddStatusEffect(args.Target, "Stutter", TimeSpan.FromSeconds(2 * psionic.Amplification), false, "StutteringAccent"); - _psionics.LogPowerUsed(args.Performer, "noospheric zap"); - args.Handled = true; + _psionics.LogPowerUsed(args.Performer, "noopsheric zap", (int) MathF.Round(psionic.Dampening * -4), (int) MathF.Round(psionic.Dampening * -6)); + args.Handled = true; + } } } } diff --git a/Resources/Prototypes/Nyanotrasen/psionicPowers.yml b/Resources/Prototypes/Nyanotrasen/psionicPowers.yml index f40b688fd18..cb3f88d6a4a 100644 --- a/Resources/Prototypes/Nyanotrasen/psionicPowers.yml +++ b/Resources/Prototypes/Nyanotrasen/psionicPowers.yml @@ -6,5 +6,6 @@ TelegnosisPower: 1 PsionicRegenerationPower: 1 MassSleepPower: 0.3 -# PsionicInvisibilityPower: 0.15 + PsionicInvisibilityPower: 0.15 MindSwapPower: 0.15 + NoosphericZapPower: 0.15 From f50f9df784d98d5b3e4e35468c4be3c1519d27d4 Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Tue, 14 May 2024 20:18:02 -0400 Subject: [PATCH 08/44] Almost done --- .../Components/IgniteOnCollideComponent.cs | 4 +- .../Nyanotrasen/Chat/NyanoChatSystem.cs | 8 +-- .../Psionics/Abilities/DispelPowerSystem.cs | 8 ++- .../Abilities/MetapsionicPowerSystem.cs | 13 ++++- .../Psionics/Abilities/MindSwapPowerSystem.cs | 4 +- .../Abilities/MindSwappedComponent.cs | 2 +- .../Abilities/NoosphericZapPowerSystem.cs | 15 +++-- .../Abilities}/PsionicAbilitiesSystem.cs | 2 +- .../PsionicInvisibilityPowerSystem.cs | 30 ++++++++-- .../PsionicRegenerationPowerSystem.cs | 36 +++++++++--- .../Abilities/PyrokinesisPowerSystem.cs | 54 +++++++++++------ .../Abilities/TelegnosisPowerSystem.cs | 58 +++++++++++++++---- .../Psionics/AcceptPsionicsEui.cs | 2 +- .../Psionics/AntiPsychicWeaponComponent.cs | 0 .../Audio/GlimmerSoundComponent.cs | 6 +- .../Psionics/Dreams/DreamSystem.cs | 1 - .../Psionics/Glimmer/GlimmerCommands.cs | 0 .../Psionics/Glimmer/GlimmerReactiveSystem.cs | 0 .../Glimmer/PassiveGlimmerReductionSystem.cs | 2 - .../Structures/GlimmerSourceComponent.cs | 0 .../Structures/GlimmerStructuresSystem.cs | 0 .../Invisibility/PsionicInvisibilitySystem.cs | 3 + .../PsionicInvisibleContactsComponent.cs | 0 .../PsionicInvisibleContactsSystem.cs | 0 .../PsionicallyInvisibleComponent.cs | 0 .../Psionics/PotentialPsionicComponent.cs | 0 .../PsionicAwaitingPlayerComponent.cs | 0 .../Psionics/PsionicBonusChanceComponent.cs | 0 .../Psionics/PsionicsCommands.cs | 0 .../Psionics/PsionicsSystem.cs | 39 ++++++++++++- .../PsionicRegenerationPowerComponent.cs | 2 +- .../Telegnosis/TelegnosisPowerComponent.cs | 3 + .../TelegnosticProjectionComponent.cs | 6 +- .../Abilities/Psionics/PsionicComponent.cs | 6 +- .../Events/PyrokinesisPowerActionEvent.cs | 4 +- .../Psionics/SharedPsionicSystem.Insulated.cs | 15 ----- .../Prototypes/Nyanotrasen/Actions/types.yml | 2 +- .../Prototypes/Nyanotrasen/psionicPowers.yml | 1 + 38 files changed, 229 insertions(+), 97 deletions(-) rename Content.Server/{Nyanotrasen/Abilities => }/Psionics/Abilities/DispelPowerSystem.cs (95%) rename Content.Server/{Nyanotrasen/Abilities => }/Psionics/Abilities/MetapsionicPowerSystem.cs (93%) rename Content.Server/{Nyanotrasen/Abilities => }/Psionics/Abilities/MindSwapPowerSystem.cs (98%) rename Content.Server/{Nyanotrasen/Abilities => }/Psionics/Abilities/MindSwappedComponent.cs (94%) rename Content.Server/{Nyanotrasen/Abilities => }/Psionics/Abilities/NoosphericZapPowerSystem.cs (87%) rename Content.Server/{Nyanotrasen/Abilities/Psionics => Psionics/Abilities}/PsionicAbilitiesSystem.cs (99%) rename Content.Server/{Nyanotrasen/Abilities => }/Psionics/Abilities/PsionicInvisibilityPowerSystem.cs (84%) rename Content.Server/{Nyanotrasen/Abilities => }/Psionics/Abilities/PsionicRegenerationPowerSystem.cs (86%) rename Content.Server/{Nyanotrasen/Abilities => }/Psionics/Abilities/PyrokinesisPowerSystem.cs (50%) rename Content.Server/{Nyanotrasen/Abilities => }/Psionics/Abilities/TelegnosisPowerSystem.cs (52%) rename Content.Server/{Nyanotrasen => }/Psionics/AcceptPsionicsEui.cs (95%) rename Content.Server/{Nyanotrasen => }/Psionics/AntiPsychicWeaponComponent.cs (100%) rename Content.Server/{Nyanotrasen => Psionics}/Audio/GlimmerSoundComponent.cs (80%) rename Content.Server/{Nyanotrasen => }/Psionics/Dreams/DreamSystem.cs (98%) rename Content.Server/{Nyanotrasen => }/Psionics/Glimmer/GlimmerCommands.cs (100%) rename Content.Server/{Nyanotrasen => }/Psionics/Glimmer/GlimmerReactiveSystem.cs (100%) rename Content.Server/{Nyanotrasen => }/Psionics/Glimmer/PassiveGlimmerReductionSystem.cs (94%) rename Content.Server/{Nyanotrasen => }/Psionics/Glimmer/Structures/GlimmerSourceComponent.cs (100%) rename Content.Server/{Nyanotrasen => }/Psionics/Glimmer/Structures/GlimmerStructuresSystem.cs (100%) rename Content.Server/{Nyanotrasen => }/Psionics/Invisibility/PsionicInvisibilitySystem.cs (98%) rename Content.Server/{Nyanotrasen => }/Psionics/Invisibility/PsionicInvisibleContactsComponent.cs (100%) rename Content.Server/{Nyanotrasen => }/Psionics/Invisibility/PsionicInvisibleContactsSystem.cs (100%) rename Content.Server/{Nyanotrasen => }/Psionics/Invisibility/PsionicallyInvisibleComponent.cs (100%) rename Content.Server/{Nyanotrasen => }/Psionics/PotentialPsionicComponent.cs (100%) rename Content.Server/{Nyanotrasen => }/Psionics/PsionicAwaitingPlayerComponent.cs (100%) rename Content.Server/{Nyanotrasen => }/Psionics/PsionicBonusChanceComponent.cs (100%) rename Content.Server/{Nyanotrasen => }/Psionics/PsionicsCommands.cs (100%) rename Content.Server/{Nyanotrasen => }/Psionics/PsionicsSystem.cs (79%) diff --git a/Content.Server/Atmos/Components/IgniteOnCollideComponent.cs b/Content.Server/Atmos/Components/IgniteOnCollideComponent.cs index a58d3a3c122..710c37b62fe 100644 --- a/Content.Server/Atmos/Components/IgniteOnCollideComponent.cs +++ b/Content.Server/Atmos/Components/IgniteOnCollideComponent.cs @@ -1,8 +1,6 @@ -using Content.Server.Atmos.EntitySystems; - namespace Content.Server.Atmos.Components; -[RegisterComponent, Access(typeof(FlammableSystem))] +[RegisterComponent] public sealed partial class IgniteOnCollideComponent : Component { /// diff --git a/Content.Server/Nyanotrasen/Chat/NyanoChatSystem.cs b/Content.Server/Nyanotrasen/Chat/NyanoChatSystem.cs index e0fb18fcae4..62d8032df1d 100644 --- a/Content.Server/Nyanotrasen/Chat/NyanoChatSystem.cs +++ b/Content.Server/Nyanotrasen/Chat/NyanoChatSystem.cs @@ -64,7 +64,7 @@ private List GetDreamers(IEnumerable removeList) private bool IsEligibleForTelepathy(EntityUid entity) { - return HasComp(entity) + return TryComp(entity, out var psionic) && psionic.Telepath && !HasComp(entity) && !HasComp(entity) && (!TryComp(entity, out var mobstate) || mobstate.CurrentState == MobState.Alive); @@ -95,9 +95,9 @@ public void SendTelepathicChat(EntityUid source, string message, bool hideChat) if (_random.Prob(0.1f)) _glimmerSystem.Glimmer++; - if (_random.Prob(Math.Min(0.33f + ((float) _glimmerSystem.Glimmer / 1500), 1))) + if (_random.Prob(Math.Min(0.33f + (float) _glimmerSystem.Glimmer / 1500, 1))) { - float obfuscation = (0.25f + (float) _glimmerSystem.Glimmer / 2000); + float obfuscation = 0.25f + (float) _glimmerSystem.Glimmer / 2000; var obfuscated = ObfuscateMessageReadability(message, obfuscation); _chatManager.ChatMessageToMany(ChatChannel.Telepathic, obfuscated, messageWrap, source, hideChat, false, GetDreamers(clients), Color.PaleVioletRed); } @@ -114,7 +114,7 @@ private string ObfuscateMessageReadability(string message, float chance) for (var i = 0; i < message.Length; i++) { - if (char.IsWhiteSpace((modifiedMessage[i]))) + if (char.IsWhiteSpace(modifiedMessage[i])) { continue; } diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/DispelPowerSystem.cs b/Content.Server/Psionics/Abilities/DispelPowerSystem.cs similarity index 95% rename from Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/DispelPowerSystem.cs rename to Content.Server/Psionics/Abilities/DispelPowerSystem.cs index 8cde75f461d..14e3ea14aeb 100644 --- a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/DispelPowerSystem.cs +++ b/Content.Server/Psionics/Abilities/DispelPowerSystem.cs @@ -11,7 +11,7 @@ using Content.Shared.Actions.Events; using Robust.Shared.Audio.Systems; -namespace Content.Server.Abilities.Psionics +namespace Content.Server.Psionics.Abilities { public sealed class DispelPowerSystem : EntitySystem { @@ -70,7 +70,7 @@ private void OnShutdown(EntityUid uid, DispelPowerComponent component, Component private void OnPowerUsed(DispelPowerActionEvent args) { - if (HasComp(args.Target)) + if (HasComp(args.Target) || HasComp(args.Performer)) return; if (!TryComp(args.Performer, out var psionic) || !HasComp(args.Target)) return; @@ -81,7 +81,9 @@ private void OnPowerUsed(DispelPowerActionEvent args) if (ev.Handled) { args.Handled = true; - _psionics.LogPowerUsed(args.Performer, "dispel", (int) MathF.Round(psionic.Dampening * -2), (int) MathF.Round(psionic.Dampening * -4)); + _psionics.LogPowerUsed(args.Performer, "dispel", + (int) MathF.Round(-2 * psionic.Dampening + psionic.Amplification), + (int) MathF.Round(-4 * psionic.Dampening + psionic.Amplification)); } } diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MetapsionicPowerSystem.cs b/Content.Server/Psionics/Abilities/MetapsionicPowerSystem.cs similarity index 93% rename from Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MetapsionicPowerSystem.cs rename to Content.Server/Psionics/Abilities/MetapsionicPowerSystem.cs index fd9b8107568..6279aa88622 100644 --- a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MetapsionicPowerSystem.cs +++ b/Content.Server/Psionics/Abilities/MetapsionicPowerSystem.cs @@ -13,7 +13,7 @@ using Content.Shared.Psionics.Events; using Content.Server.Psionics; -namespace Content.Server.Abilities.Psionics +namespace Content.Server.Psionics.Abilities { public sealed class MetapsionicPowerSystem : EntitySystem { @@ -82,6 +82,9 @@ private void OnShutdown(EntityUid uid, MetapsionicPowerComponent component, Comp private void OnWidePowerUsed(EntityUid uid, MetapsionicPowerComponent component, WideMetapsionicPowerActionEvent args) { + if (HasComp(uid)) + return; + if (!TryComp(uid, out var psionic)) return; @@ -96,7 +99,9 @@ private void OnWidePowerUsed(EntityUid uid, MetapsionicPowerComponent component, } } _popups.PopupEntity(Loc.GetString("metapsionic-pulse-failure"), uid, uid, PopupType.Large); - _psionics.LogPowerUsed(uid, "metapsionic pulse", (int) MathF.Round(psionic.Amplification / psionic.Dampening * 2), (int) MathF.Round(psionic.Amplification / psionic.Dampening * 4)); + _psionics.LogPowerUsed(uid, "metapsionic pulse", + (int) MathF.Round(2 * psionic.Amplification - psionic.Dampening), + (int) MathF.Round(4 * psionic.Amplification - psionic.Dampening)); UpdateActions(uid, component); args.Handled = true; } @@ -132,7 +137,9 @@ private void OnFocusedPowerUsed(FocusedMetapsionicPowerActionEvent args) PopupType.Medium); _audioSystem.PlayPvs(component.SoundUse, args.Performer, AudioParams.Default.WithVolume(8f).WithMaxDistance(1.5f).WithRolloffFactor(3.5f)); - _psionics.LogPowerUsed(args.Performer, "focused metapsionic pulse", (int) MathF.Round(psionic.Amplification / psionic.Dampening * 3), (int) MathF.Round(psionic.Amplification / psionic.Dampening * 6)); + _psionics.LogPowerUsed(args.Performer, "focused metapsionic pulse", + (int) MathF.Round(3 * psionic.Amplification - psionic.Dampening), + (int) MathF.Round(6 * psionic.Amplification - psionic.Dampening)); args.Handled = true; UpdateActions(args.Performer, component); diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MindSwapPowerSystem.cs b/Content.Server/Psionics/Abilities/MindSwapPowerSystem.cs similarity index 98% rename from Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MindSwapPowerSystem.cs rename to Content.Server/Psionics/Abilities/MindSwapPowerSystem.cs index 8f191949472..0beea77aa53 100644 --- a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MindSwapPowerSystem.cs +++ b/Content.Server/Psionics/Abilities/MindSwapPowerSystem.cs @@ -14,7 +14,7 @@ using Content.Shared.Mind; using Content.Shared.Actions.Events; -namespace Content.Server.Abilities.Psionics +namespace Content.Server.Psionics.Abilities { public sealed class MindSwapPowerSystem : EntitySystem { @@ -222,7 +222,7 @@ public void Swap(EntityUid performer, EntityUid target, bool end = false) perfComp.OriginalEntity = target; targetComp.OriginalEntity = performer; } - + //It shouldn't actually be possible anymore to get trapped under most circumstances, but for niche edge cases, I am leaving this here public void GetTrapped(EntityUid uid) { diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MindSwappedComponent.cs b/Content.Server/Psionics/Abilities/MindSwappedComponent.cs similarity index 94% rename from Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MindSwappedComponent.cs rename to Content.Server/Psionics/Abilities/MindSwappedComponent.cs index 92fc94773db..82c0313bca6 100644 --- a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MindSwappedComponent.cs +++ b/Content.Server/Psionics/Abilities/MindSwappedComponent.cs @@ -1,7 +1,7 @@ using Robust.Shared.Prototypes; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; -namespace Content.Server.Abilities.Psionics +namespace Content.Server.Psionics.Abilities { [RegisterComponent] public sealed partial class MindSwappedComponent : Component diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/NoosphericZapPowerSystem.cs b/Content.Server/Psionics/Abilities/NoosphericZapPowerSystem.cs similarity index 87% rename from Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/NoosphericZapPowerSystem.cs rename to Content.Server/Psionics/Abilities/NoosphericZapPowerSystem.cs index d849d383033..7e4ba64afde 100644 --- a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/NoosphericZapPowerSystem.cs +++ b/Content.Server/Psionics/Abilities/NoosphericZapPowerSystem.cs @@ -1,13 +1,12 @@ using Content.Shared.Actions; using Content.Shared.Abilities.Psionics; -using Content.Shared.Damage; using Content.Shared.StatusEffect; using Content.Server.Electrocution; using Content.Server.Stunnable; using Content.Server.Beam; using Content.Shared.Actions.Events; -namespace Content.Server.Abilities.Psionics +namespace Content.Server.Psionics.Abilities { public sealed class NoosphericZapPowerSystem : EntitySystem { @@ -16,7 +15,6 @@ public sealed class NoosphericZapPowerSystem : EntitySystem [Dependency] private readonly StunSystem _stunSystem = default!; [Dependency] private readonly StatusEffectsSystem _statusEffectsSystem = default!; [Dependency] private readonly BeamSystem _beam = default!; - [Dependency] private readonly DamageableSystem _damageableSystem = default!; [Dependency] private readonly ElectrocutionSystem _electrocution = default!; @@ -63,10 +61,17 @@ private void OnPowerUsed(NoosphericZapPowerActionEvent args) _beam.TryCreateBeam(args.Performer, args.Target, "LightningNoospheric"); _stunSystem.TryParalyze(args.Target, TimeSpan.FromSeconds(1 * psionic.Amplification), false); - _electrocution.TryDoElectrocution(args.Target, null, (int) MathF.Round(5f * psionic.Amplification), new TimeSpan((long) MathF.Round(1f * psionic.Amplification)), true, ignoreInsulation: true); + _electrocution.TryDoElectrocution(args.Target, null, + (int) MathF.Round(5f * psionic.Amplification), + new TimeSpan((long) MathF.Round(1f * psionic.Amplification)), + true, + ignoreInsulation: true); + _statusEffectsSystem.TryAddStatusEffect(args.Target, "Stutter", TimeSpan.FromSeconds(2 * psionic.Amplification), false, "StutteringAccent"); - _psionics.LogPowerUsed(args.Performer, "noopsheric zap", (int) MathF.Round(psionic.Dampening * -4), (int) MathF.Round(psionic.Dampening * -6)); + _psionics.LogPowerUsed(args.Performer, "noopsheric zap", + (int) MathF.Round(6 * psionic.Amplification - psionic.Dampening), + (int) MathF.Round(8 * psionic.Amplification - psionic.Dampening)); args.Handled = true; } } diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/PsionicAbilitiesSystem.cs b/Content.Server/Psionics/Abilities/PsionicAbilitiesSystem.cs similarity index 99% rename from Content.Server/Nyanotrasen/Abilities/Psionics/PsionicAbilitiesSystem.cs rename to Content.Server/Psionics/Abilities/PsionicAbilitiesSystem.cs index 860b7baab21..1bfacb0f119 100644 --- a/Content.Server/Nyanotrasen/Abilities/Psionics/PsionicAbilitiesSystem.cs +++ b/Content.Server/Psionics/Abilities/PsionicAbilitiesSystem.cs @@ -16,7 +16,7 @@ using Content.Shared.Examine; using static Content.Shared.Examine.ExamineSystemShared; -namespace Content.Server.Abilities.Psionics +namespace Content.Server.Psionics.Abilities { public sealed class PsionicAbilitiesSystem : EntitySystem { diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PsionicInvisibilityPowerSystem.cs b/Content.Server/Psionics/Abilities/PsionicInvisibilityPowerSystem.cs similarity index 84% rename from Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PsionicInvisibilityPowerSystem.cs rename to Content.Server/Psionics/Abilities/PsionicInvisibilityPowerSystem.cs index af2ae0c7f05..77690c49f48 100644 --- a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PsionicInvisibilityPowerSystem.cs +++ b/Content.Server/Psionics/Abilities/PsionicInvisibilityPowerSystem.cs @@ -14,8 +14,9 @@ using Content.Shared.Weapons.Ranged.Events; using Content.Shared.Throwing; using Robust.Shared.Timing; +using Content.Shared.Psionics; -namespace Content.Server.Abilities.Psionics +namespace Content.Server.Psionics.Abilities { public sealed class PsionicInvisibilityPowerSystem : EntitySystem { @@ -40,6 +41,7 @@ public override void Initialize() SubscribeLocalEvent(OnAttackAttempt); SubscribeLocalEvent(OnShootAttempt); SubscribeLocalEvent(OnThrowAttempt); + SubscribeLocalEvent(OnInsulated); } private void OnInit(EntityUid uid, PsionicInvisibilityPowerComponent component, ComponentInit args) @@ -71,6 +73,12 @@ private void OnShutdown(EntityUid uid, PsionicInvisibilityPowerComponent compone private void OnPowerUsed(EntityUid uid, PsionicInvisibilityPowerComponent component, PsionicInvisibilityPowerActionEvent args) { + if (!TryComp(uid, out var psionic)) + return; + + if (HasComp(uid)) + return; + var ev = new PsionicInvisibilityTimerEvent(_gameTiming.CurTime); var doAfterArgs = new DoAfterArgs(EntityManager, uid, component.UseTimer, ev, uid) { Hidden = true }; _doAfterSystem.TryStartDoAfter(doAfterArgs); @@ -78,11 +86,13 @@ private void OnPowerUsed(EntityUid uid, PsionicInvisibilityPowerComponent compon ToggleInvisibility(args.Performer); var action = Spawn(PsionicInvisibilityUsedComponent.PsionicInvisibilityUsedActionPrototype); _actions.AddAction(uid, action, action); - _actions.TryGetActionData( action, out var actionData ); + _actions.TryGetActionData(action, out var actionData); if (actionData is { UseDelay: not null }) _actions.StartUseDelay(action); - _psionics.LogPowerUsed(uid, "psionic invisibility"); + _psionics.LogPowerUsed(uid, "psionic invisibility", + (int) MathF.Round(8 * psionic.Amplification - 2 * psionic.Dampening), + (int) MathF.Round(12 * psionic.Amplification - 2 * psionic.Dampening)); args.Handled = true; } @@ -132,11 +142,14 @@ private void OnThrowAttempt(EntityUid uid, PsionicInvisibilityUsedComponent comp } private void OnDamageChanged(EntityUid uid, PsionicInvisibilityUsedComponent component, DamageChangedEvent args) { + if (!TryComp(uid, out var psionic)) + return; + if (!args.DamageIncreased) return; ToggleInvisibility(uid); - _stunSystem.TryParalyze(uid, TimeSpan.FromSeconds(4), false); + _stunSystem.TryParalyze(uid, TimeSpan.FromSeconds(4f / psionic.Dampening + psionic.Amplification), false); } public void ToggleInvisibility(EntityUid uid) { @@ -153,5 +166,14 @@ public void OnDoAfter(EntityUid uid, PsionicInvisibilityPowerComponent component { RemComp(uid); } + + private void OnInsulated(EntityUid uid, PsionicInvisibilityUsedComponent component, PsionicInsulationEvent args) + { + if (!TryComp(uid, out var psionic)) + return; + + RemComp(uid); + _stunSystem.TryParalyze(uid, TimeSpan.FromSeconds(4f / psionic.Dampening + psionic.Amplification), false); + } } } diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PsionicRegenerationPowerSystem.cs b/Content.Server/Psionics/Abilities/PsionicRegenerationPowerSystem.cs similarity index 86% rename from Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PsionicRegenerationPowerSystem.cs rename to Content.Server/Psionics/Abilities/PsionicRegenerationPowerSystem.cs index 707e8d61298..995bebb0fbe 100644 --- a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PsionicRegenerationPowerSystem.cs +++ b/Content.Server/Psionics/Abilities/PsionicRegenerationPowerSystem.cs @@ -17,7 +17,7 @@ using Content.Shared.Actions.Events; using Robust.Server.Audio; -namespace Content.Server.Abilities.Psionics +namespace Content.Server.Psionics.Abilities { public sealed class PsionicRegenerationPowerSystem : EntitySystem { @@ -28,7 +28,6 @@ public sealed class PsionicRegenerationPowerSystem : EntitySystem [Dependency] private readonly SharedPopupSystem _popupSystem = default!; [Dependency] private readonly SharedPsionicAbilitiesSystem _psionics = default!; [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly ExamineSystemShared _examine = default!; public override void Initialize() { @@ -51,11 +50,16 @@ private void OnInit(EntityUid uid, PsionicRegenerationPowerComponent component, { psionic.ActivePowers.Add(component); psionic.PsychicFeedback.Add(component.RegenerationFeedback); + psionic.Amplification += 0.5f; + psionic.Dampening += 0.5f; } } private void OnPowerUsed(EntityUid uid, PsionicRegenerationPowerComponent component, PsionicRegenerationPowerActionEvent args) { + if (!TryComp(uid, out var psionic)) + return; + var ev = new PsionicRegenerationDoAfterEvent(_gameTiming.CurTime); var doAfterArgs = new DoAfterArgs(EntityManager, uid, component.UseDelay, ev, uid); @@ -72,12 +76,16 @@ private void OnPowerUsed(EntityUid uid, PsionicRegenerationPowerComponent compon _popupSystem.PopupEntity(Loc.GetString("psionic-regeneration-begin", ("entity", uid)), uid, // TODO: Use LoS-based Filter when one is available. - Filter.Pvs(uid).RemoveWhereAttachedEntity(entity => !_examine.InRangeUnOccluded(uid, entity, ExamineRange, null)), + Filter.Pvs(uid).RemoveWhereAttachedEntity(entity => !ExamineSystemShared.InRangeUnOccluded(uid, entity, ExamineRange, null)), true, PopupType.Medium); _audioSystem.PlayPvs(component.SoundUse, uid, AudioParams.Default.WithVolume(8f).WithMaxDistance(1.5f).WithRolloffFactor(3.5f)); - _psionics.LogPowerUsed(uid, "psionic regeneration"); + + _psionics.LogPowerUsed(uid, "psionic regeneration", + (int) Math.Round(6 * psionic.Amplification - psionic.Dampening), + (int) Math.Round(8 * psionic.Amplification - psionic.Dampening)); + args.Handled = true; } @@ -90,6 +98,9 @@ private void OnPowerUsed(EntityUid uid, PsionicRegenerationPowerComponent compon /// private void OnMobStateChangedEvent(EntityUid uid, PsionicRegenerationPowerComponent component, MobStateChangedEvent args) { + if (!TryComp(uid, out var psionic)) + return; + if (HasComp(uid)) return; @@ -114,11 +125,15 @@ private void OnMobStateChangedEvent(EntityUid uid, PsionicRegenerationPowerCompo _popupSystem.PopupEntity(Loc.GetString("psionic-regeneration-self-revive", ("entity", uid)), uid, // TODO: Use LoS-based Filter when one is available. - Filter.Pvs(uid).RemoveWhereAttachedEntity(entity => !_examine.InRangeUnOccluded(uid, entity, ExamineRange, null)), + Filter.Pvs(uid).RemoveWhereAttachedEntity(entity => !ExamineSystemShared.InRangeUnOccluded(uid, entity, ExamineRange, null)), true, PopupType.MediumCaution); _audioSystem.PlayPvs(component.SoundUse, uid, AudioParams.Default.WithVolume(8f).WithMaxDistance(1.5f).WithRolloffFactor(3.5f)); - _psionics.LogPowerUsed(uid, "psionic regeneration", 20, 40); + + _psionics.LogPowerUsed(uid, "psionic regeneration", + (int) Math.Round(10 * psionic.Amplification - 2 * psionic.Dampening), + (int) Math.Round(20 * psionic.Amplification - 2 * psionic.Dampening)); + _actions.StartUseDelay(component.PsionicRegenerationActionEntity); } } @@ -132,6 +147,8 @@ private void OnShutdown(EntityUid uid, PsionicRegenerationPowerComponent compone { psionic.ActivePowers.Remove(component); psionic.PsychicFeedback.Remove(component.RegenerationFeedback); + psionic.Amplification += 0.5f; + psionic.Dampening -= 0.5f; } } @@ -150,6 +167,9 @@ private void OnDoAfter(EntityUid uid, PsionicRegenerationPowerComponent componen { component.DoAfter = null; + if (!TryComp(uid, out var psionic)) + return; + if (!TryComp(uid, out var stream)) return; @@ -160,12 +180,12 @@ private void OnDoAfter(EntityUid uid, PsionicRegenerationPowerComponent componen var percentageComplete = Math.Min(1f, (_gameTiming.CurTime - args.StartedAt).TotalSeconds / component.UseDelay); var solution = new Solution(); - solution.AddReagent("PsionicRegenerationEssence", FixedPoint2.New(component.EssenceAmount * percentageComplete)); + solution.AddReagent("PsionicRegenerationEssence", FixedPoint2.New(component.EssenceAmount * percentageComplete + 10f * psionic.Dampening)); _bloodstreamSystem.TryAddToChemicals(uid, solution, stream); if (component.SelfRevive == true) { var critSolution = new Solution(); - critSolution.AddReagent("Epinephrine", 10); + critSolution.AddReagent("Epinephrine", MathF.MinMagnitude(5 + 5 * psionic.Dampening, 15)); _bloodstreamSystem.TryAddToChemicals(uid, critSolution, stream); component.SelfRevive = false; } diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PyrokinesisPowerSystem.cs b/Content.Server/Psionics/Abilities/PyrokinesisPowerSystem.cs similarity index 50% rename from Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PyrokinesisPowerSystem.cs rename to Content.Server/Psionics/Abilities/PyrokinesisPowerSystem.cs index 8300b204dca..d93b17f55cc 100644 --- a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PyrokinesisPowerSystem.cs +++ b/Content.Server/Psionics/Abilities/PyrokinesisPowerSystem.cs @@ -1,24 +1,20 @@ using Content.Shared.Actions; using Content.Shared.Abilities.Psionics; using Content.Server.Atmos.Components; -using Content.Server.Atmos.EntitySystems; -using Content.Server.Popups; -using Robust.Shared.Prototypes; -using Robust.Shared.Timing; -using Content.Server.Mind; +using Content.Server.Weapons.Ranged.Systems; +using Robust.Server.GameObjects; using Content.Shared.Actions.Events; +using Content.Server.Explosion.Components; -namespace Content.Server.Abilities.Psionics +namespace Content.Server.Psionics.Abilities { public sealed class PyrokinesisPowerSystem : EntitySystem { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; [Dependency] private readonly SharedActionsSystem _actions = default!; - [Dependency] private readonly FlammableSystem _flammableSystem = default!; [Dependency] private readonly SharedPsionicAbilitiesSystem _psionics = default!; - [Dependency] private readonly PopupSystem _popupSystem = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly MindSystem _mindSystem = default!; + [Dependency] private readonly GunSystem _gunSystem = default!; + [Dependency] private readonly SharedTransformSystem _transformSystem = default!; + [Dependency] private readonly PhysicsSystem _physics = default!; public override void Initialize() { @@ -30,14 +26,15 @@ public override void Initialize() private void OnInit(EntityUid uid, PyrokinesisPowerComponent component, ComponentInit args) { - _actions.AddAction(uid, ref component.PyrokinesisActionEntity, component.PyrokinesisActionId ); - _actions.TryGetActionData( component.PyrokinesisActionEntity, out var actionData ); + _actions.AddAction(uid, ref component.PyrokinesisActionEntity, component.PyrokinesisActionId); + _actions.TryGetActionData( component.PyrokinesisActionEntity, out var actionData); if (actionData is { UseDelay: not null }) _actions.StartUseDelay(component.PyrokinesisActionEntity); if (TryComp(uid, out var psionic)) { psionic.ActivePowers.Add(component); psionic.PsychicFeedback.Add(component.PyrokinesisFeedback); + psionic.Amplification += 1f; } } @@ -48,20 +45,39 @@ private void OnShutdown(EntityUid uid, PyrokinesisPowerComponent component, Comp { psionic.ActivePowers.Remove(component); psionic.PsychicFeedback.Remove(component.PyrokinesisFeedback); + psionic.Amplification += 1f; } } private void OnPowerUsed(PyrokinesisPowerActionEvent args) { - if (!TryComp(args.Target, out var flammableComponent)) + if (!TryComp(args.Performer, out var psionic)) return; - flammableComponent.FireStacks += 5; - _flammableSystem.Ignite(args.Target, args.Target); - _popupSystem.PopupEntity(Loc.GetString("pyrokinesis-power-used", ("target", args.Target)), args.Target, Shared.Popups.PopupType.LargeCaution); + if (!HasComp(args.Performer)) + { + var ent = Spawn("ProjectileAnomalyFireball"); + + if (TryComp(ent, out var fireball)) + { + fireball.MaxIntensity = (int) MathF.Round(20 * psionic.Amplification - 10 * psionic.Dampening); + + if (psionic.Amplification > 5 && EnsureComp(ent, out var ignite)) + { + ignite.FireStacks = 0.1f * psionic.Amplification - 0.1f * psionic.Dampening; + } + } - _psionics.LogPowerUsed(args.Performer, "pyrokinesis"); - args.Handled = true; + var userVelocity = _physics.GetMapLinearVelocity(args.Performer); + var direction = args.Target.ToMapPos(EntityManager, _transformSystem); + + _gunSystem.ShootProjectile(ent, direction, userVelocity, args.Performer, args.Performer, 20f); + + _psionics.LogPowerUsed(args.Performer, "pyrokinesis", + (int) MathF.Round(6f * psionic.Amplification - psionic.Dampening), + (int) MathF.Round(8f * psionic.Amplification - psionic.Dampening)); + args.Handled = true; + } } } } diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/TelegnosisPowerSystem.cs b/Content.Server/Psionics/Abilities/TelegnosisPowerSystem.cs similarity index 52% rename from Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/TelegnosisPowerSystem.cs rename to Content.Server/Psionics/Abilities/TelegnosisPowerSystem.cs index 00d06e6dd28..aa0f5487c08 100644 --- a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/TelegnosisPowerSystem.cs +++ b/Content.Server/Psionics/Abilities/TelegnosisPowerSystem.cs @@ -1,23 +1,17 @@ using Content.Shared.Actions; -using Content.Shared.StatusEffect; using Content.Shared.Abilities.Psionics; using Content.Shared.Mind.Components; -using Robust.Shared.Prototypes; -using Robust.Shared.Timing; -using Content.Server.Mind; using Content.Shared.Actions.Events; +using Content.Shared.Mobs; +using Content.Shared.Storage.Components; -namespace Content.Server.Abilities.Psionics +namespace Content.Server.Psionics.Abilities { public sealed class TelegnosisPowerSystem : EntitySystem { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly StatusEffectsSystem _statusEffects = default!; [Dependency] private readonly SharedActionsSystem _actions = default!; [Dependency] private readonly MindSwapPowerSystem _mindSwap = default!; [Dependency] private readonly SharedPsionicAbilitiesSystem _psionics = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly MindSystem _mindSystem = default!; public override void Initialize() { @@ -26,6 +20,9 @@ public override void Initialize() SubscribeLocalEvent(OnShutdown); SubscribeLocalEvent(OnPowerUsed); SubscribeLocalEvent(OnMindRemoved); + SubscribeLocalEvent(OnDispelled); + SubscribeLocalEvent(OnMobstateChanged); + SubscribeLocalEvent(OnStorageInsertAttempt); } private void OnInit(EntityUid uid, TelegnosisPowerComponent component, ComponentInit args) @@ -38,6 +35,8 @@ private void OnInit(EntityUid uid, TelegnosisPowerComponent component, Component { psionic.ActivePowers.Add(component); psionic.PsychicFeedback.Add(component.TelegnosisFeedback); + psionic.Amplification += 0.3f; + psionic.Dampening += 0.3f; } } @@ -48,21 +47,60 @@ private void OnShutdown(EntityUid uid, TelegnosisPowerComponent component, Compo { psionic.ActivePowers.Remove(component); psionic.PsychicFeedback.Remove(component.TelegnosisFeedback); + psionic.Amplification -= 0.3f; + psionic.Dampening -= 0.3f; } } private void OnPowerUsed(EntityUid uid, TelegnosisPowerComponent component, TelegnosisPowerActionEvent args) { + if (!TryComp(uid, out var psionic)) + return; + + if (HasComp(uid)) + return; + var projection = Spawn(component.Prototype, Transform(uid).Coordinates); Transform(projection).AttachToGridOrMap(); + component.OriginalEntity = uid; + component.IsProjecting = true; + component.ProjectionUid = projection; _mindSwap.Swap(uid, projection); - _psionics.LogPowerUsed(uid, "telegnosis"); + if (EnsureComp(projection, out var projectionComponent)) + projectionComponent.OriginalEntity = uid; + + _psionics.LogPowerUsed(uid, "telegnosis", + (int) Math.Round(8f * psionic.Amplification - psionic.Dampening), + (int) Math.Round(12f * psionic.Amplification - psionic.Dampening)); + args.Handled = true; } private void OnMindRemoved(EntityUid uid, TelegnosticProjectionComponent component, MindRemovedMessage args) { + if (TryComp(component.OriginalEntity, out var originalEntity)) + originalEntity.IsProjecting = false; + QueueDel(uid); } + + private void OnDispelled(EntityUid uid, TelegnosisPowerComponent component, DispelledEvent args) + { + if (component.IsProjecting) + _mindSwap.Swap(uid, component.ProjectionUid); + } + + private void OnMobstateChanged(EntityUid uid, TelegnosisPowerComponent component, MobStateChangedEvent args) + { + if (component.IsProjecting && args.NewMobState is MobState.Critical + || component.IsProjecting && args.NewMobState is MobState.Dead) + _mindSwap.Swap(uid, component.ProjectionUid); + } + + private void OnStorageInsertAttempt(EntityUid uid, TelegnosisPowerComponent component, InsertIntoEntityStorageAttemptEvent args) + { + if (component.IsProjecting) + _mindSwap.Swap(uid, component.ProjectionUid); + } } } diff --git a/Content.Server/Nyanotrasen/Psionics/AcceptPsionicsEui.cs b/Content.Server/Psionics/AcceptPsionicsEui.cs similarity index 95% rename from Content.Server/Nyanotrasen/Psionics/AcceptPsionicsEui.cs rename to Content.Server/Psionics/AcceptPsionicsEui.cs index 80fd8946f28..7c652664c64 100644 --- a/Content.Server/Nyanotrasen/Psionics/AcceptPsionicsEui.cs +++ b/Content.Server/Psionics/AcceptPsionicsEui.cs @@ -1,7 +1,7 @@ using Content.Shared.Psionics; using Content.Shared.Eui; using Content.Server.EUI; -using Content.Server.Abilities.Psionics; +using Content.Server.Psionics.Abilities; namespace Content.Server.Psionics { diff --git a/Content.Server/Nyanotrasen/Psionics/AntiPsychicWeaponComponent.cs b/Content.Server/Psionics/AntiPsychicWeaponComponent.cs similarity index 100% rename from Content.Server/Nyanotrasen/Psionics/AntiPsychicWeaponComponent.cs rename to Content.Server/Psionics/AntiPsychicWeaponComponent.cs diff --git a/Content.Server/Nyanotrasen/Audio/GlimmerSoundComponent.cs b/Content.Server/Psionics/Audio/GlimmerSoundComponent.cs similarity index 80% rename from Content.Server/Nyanotrasen/Audio/GlimmerSoundComponent.cs rename to Content.Server/Psionics/Audio/GlimmerSoundComponent.cs index 850be3e831c..9a6c62381be 100644 --- a/Content.Server/Nyanotrasen/Audio/GlimmerSoundComponent.cs +++ b/Content.Server/Psionics/Audio/GlimmerSoundComponent.cs @@ -2,12 +2,8 @@ using Content.Shared.Audio; using Content.Shared.Psionics.Glimmer; using Robust.Shared.Audio; -using Robust.Shared.ComponentTrees; -using Robust.Shared.GameStates; -using Robust.Shared.Physics; -using Robust.Shared.Serialization; -namespace Content.Server.Audio +namespace Content.Server.Psionics.Audio { [RegisterComponent] [Access(typeof(SharedAmbientSoundSystem), typeof(GlimmerReactiveSystem))] diff --git a/Content.Server/Nyanotrasen/Psionics/Dreams/DreamSystem.cs b/Content.Server/Psionics/Dreams/DreamSystem.cs similarity index 98% rename from Content.Server/Nyanotrasen/Psionics/Dreams/DreamSystem.cs rename to Content.Server/Psionics/Dreams/DreamSystem.cs index d6067717c94..15e1593a859 100644 --- a/Content.Server/Nyanotrasen/Psionics/Dreams/DreamSystem.cs +++ b/Content.Server/Psionics/Dreams/DreamSystem.cs @@ -4,7 +4,6 @@ using Content.Server.Chat.Managers; using Robust.Shared.Random; using Robust.Shared.Prototypes; -using Robust.Server.GameObjects; using Robust.Shared.Player; namespace Content.Server.Psionics.Dreams diff --git a/Content.Server/Nyanotrasen/Psionics/Glimmer/GlimmerCommands.cs b/Content.Server/Psionics/Glimmer/GlimmerCommands.cs similarity index 100% rename from Content.Server/Nyanotrasen/Psionics/Glimmer/GlimmerCommands.cs rename to Content.Server/Psionics/Glimmer/GlimmerCommands.cs diff --git a/Content.Server/Nyanotrasen/Psionics/Glimmer/GlimmerReactiveSystem.cs b/Content.Server/Psionics/Glimmer/GlimmerReactiveSystem.cs similarity index 100% rename from Content.Server/Nyanotrasen/Psionics/Glimmer/GlimmerReactiveSystem.cs rename to Content.Server/Psionics/Glimmer/GlimmerReactiveSystem.cs diff --git a/Content.Server/Nyanotrasen/Psionics/Glimmer/PassiveGlimmerReductionSystem.cs b/Content.Server/Psionics/Glimmer/PassiveGlimmerReductionSystem.cs similarity index 94% rename from Content.Server/Nyanotrasen/Psionics/Glimmer/PassiveGlimmerReductionSystem.cs rename to Content.Server/Psionics/Glimmer/PassiveGlimmerReductionSystem.cs index f0da85ce453..57c74398b08 100644 --- a/Content.Server/Nyanotrasen/Psionics/Glimmer/PassiveGlimmerReductionSystem.cs +++ b/Content.Server/Psionics/Glimmer/PassiveGlimmerReductionSystem.cs @@ -4,7 +4,6 @@ using Content.Shared.CCVar; using Content.Shared.Psionics.Glimmer; using Content.Shared.GameTicking; -using Content.Server.CartridgeLoader.Cartridges; namespace Content.Server.Psionics.Glimmer { @@ -17,7 +16,6 @@ public sealed class PassiveGlimmerReductionSystem : EntitySystem [Dependency] private readonly IRobustRandom _random = default!; [Dependency] private readonly IGameTiming _timing = default!; [Dependency] private readonly IConfigurationManager _cfg = default!; - [Dependency] private readonly GlimmerMonitorCartridgeSystem _cartridgeSys = default!; /// List of glimmer values spaced by minute. public List GlimmerValues = new(); diff --git a/Content.Server/Nyanotrasen/Psionics/Glimmer/Structures/GlimmerSourceComponent.cs b/Content.Server/Psionics/Glimmer/Structures/GlimmerSourceComponent.cs similarity index 100% rename from Content.Server/Nyanotrasen/Psionics/Glimmer/Structures/GlimmerSourceComponent.cs rename to Content.Server/Psionics/Glimmer/Structures/GlimmerSourceComponent.cs diff --git a/Content.Server/Nyanotrasen/Psionics/Glimmer/Structures/GlimmerStructuresSystem.cs b/Content.Server/Psionics/Glimmer/Structures/GlimmerStructuresSystem.cs similarity index 100% rename from Content.Server/Nyanotrasen/Psionics/Glimmer/Structures/GlimmerStructuresSystem.cs rename to Content.Server/Psionics/Glimmer/Structures/GlimmerStructuresSystem.cs diff --git a/Content.Server/Nyanotrasen/Psionics/Invisibility/PsionicInvisibilitySystem.cs b/Content.Server/Psionics/Invisibility/PsionicInvisibilitySystem.cs similarity index 98% rename from Content.Server/Nyanotrasen/Psionics/Invisibility/PsionicInvisibilitySystem.cs rename to Content.Server/Psionics/Invisibility/PsionicInvisibilitySystem.cs index 1c9cb55f2dd..f85460a69f5 100644 --- a/Content.Server/Nyanotrasen/Psionics/Invisibility/PsionicInvisibilitySystem.cs +++ b/Content.Server/Psionics/Invisibility/PsionicInvisibilitySystem.cs @@ -1,4 +1,5 @@ using Content.Shared.Abilities.Psionics; +using Content.Shared.Psionics; using Content.Server.Abilities.Psionics; using Content.Shared.Eye; using Content.Server.NPC.Systems; @@ -44,6 +45,8 @@ private void OnInit(EntityUid uid, PotentialPsionicComponent component, Componen /// private void OnInsulInit(EntityUid uid, PsionicInsulationComponent component, ComponentInit args) { + RaiseLocalEvent(uid, new PsionicInsulationEvent()); + if (HasComp(uid)) _invisSystem.ToggleInvisibility(uid); diff --git a/Content.Server/Nyanotrasen/Psionics/Invisibility/PsionicInvisibleContactsComponent.cs b/Content.Server/Psionics/Invisibility/PsionicInvisibleContactsComponent.cs similarity index 100% rename from Content.Server/Nyanotrasen/Psionics/Invisibility/PsionicInvisibleContactsComponent.cs rename to Content.Server/Psionics/Invisibility/PsionicInvisibleContactsComponent.cs diff --git a/Content.Server/Nyanotrasen/Psionics/Invisibility/PsionicInvisibleContactsSystem.cs b/Content.Server/Psionics/Invisibility/PsionicInvisibleContactsSystem.cs similarity index 100% rename from Content.Server/Nyanotrasen/Psionics/Invisibility/PsionicInvisibleContactsSystem.cs rename to Content.Server/Psionics/Invisibility/PsionicInvisibleContactsSystem.cs diff --git a/Content.Server/Nyanotrasen/Psionics/Invisibility/PsionicallyInvisibleComponent.cs b/Content.Server/Psionics/Invisibility/PsionicallyInvisibleComponent.cs similarity index 100% rename from Content.Server/Nyanotrasen/Psionics/Invisibility/PsionicallyInvisibleComponent.cs rename to Content.Server/Psionics/Invisibility/PsionicallyInvisibleComponent.cs diff --git a/Content.Server/Nyanotrasen/Psionics/PotentialPsionicComponent.cs b/Content.Server/Psionics/PotentialPsionicComponent.cs similarity index 100% rename from Content.Server/Nyanotrasen/Psionics/PotentialPsionicComponent.cs rename to Content.Server/Psionics/PotentialPsionicComponent.cs diff --git a/Content.Server/Nyanotrasen/Psionics/PsionicAwaitingPlayerComponent.cs b/Content.Server/Psionics/PsionicAwaitingPlayerComponent.cs similarity index 100% rename from Content.Server/Nyanotrasen/Psionics/PsionicAwaitingPlayerComponent.cs rename to Content.Server/Psionics/PsionicAwaitingPlayerComponent.cs diff --git a/Content.Server/Nyanotrasen/Psionics/PsionicBonusChanceComponent.cs b/Content.Server/Psionics/PsionicBonusChanceComponent.cs similarity index 100% rename from Content.Server/Nyanotrasen/Psionics/PsionicBonusChanceComponent.cs rename to Content.Server/Psionics/PsionicBonusChanceComponent.cs diff --git a/Content.Server/Nyanotrasen/Psionics/PsionicsCommands.cs b/Content.Server/Psionics/PsionicsCommands.cs similarity index 100% rename from Content.Server/Nyanotrasen/Psionics/PsionicsCommands.cs rename to Content.Server/Psionics/PsionicsCommands.cs diff --git a/Content.Server/Nyanotrasen/Psionics/PsionicsSystem.cs b/Content.Server/Psionics/PsionicsSystem.cs similarity index 79% rename from Content.Server/Nyanotrasen/Psionics/PsionicsSystem.cs rename to Content.Server/Psionics/PsionicsSystem.cs index 9da293df0b5..7920a09844a 100644 --- a/Content.Server/Nyanotrasen/Psionics/PsionicsSystem.cs +++ b/Content.Server/Psionics/PsionicsSystem.cs @@ -4,13 +4,14 @@ using Content.Shared.Weapons.Melee.Events; using Content.Shared.Damage.Events; using Content.Shared.CCVar; -using Content.Server.Abilities.Psionics; +using Content.Server.Psionics.Abilities; using Content.Server.Electrocution; using Content.Server.NPC.Components; using Content.Server.NPC.Systems; using Robust.Shared.Audio.Systems; using Robust.Shared.Configuration; using Robust.Shared.Random; +using Content.Shared.Psionics; namespace Content.Server.Psionics { @@ -49,6 +50,9 @@ public override void Initialize() SubscribeLocalEvent(OnInit); SubscribeLocalEvent(OnRemove); + + SubscribeLocalEvent(OnInnatePsiInit); + SubscribeLocalEvent(OnInnatePsiShutdown); } private void OnStartup(EntityUid uid, PotentialPsionicComponent component, MapInitEvent args) @@ -84,6 +88,16 @@ private void OnMeleeHit(EntityUid uid, AntiPsionicWeaponComponent component, Mel private void OnInit(EntityUid uid, PsionicComponent component, ComponentInit args) { + component.Amplification = _random.NextFloat(0.3f, 1.2f); + component.Dampening = _random.NextFloat(0.3f, 1.2f); + + if (TryComp(uid, out var innatePsicaster)) + { + component.Amplification += innatePsicaster.Amplification; + component.Dampening += innatePsicaster.Dampening; + component.InnatePsiChecked = true; + } + if (!component.Removable) return; @@ -98,7 +112,7 @@ private void OnInit(EntityUid uid, PsionicComponent component, ComponentInit arg private void OnRemove(EntityUid uid, PsionicComponent component, ComponentRemove args) { - if (!TryComp(uid, out var factions)) + if (!HasComp(uid)) return; _npcFactonSystem.RemoveFaction(uid, "PsionicInterloper"); @@ -138,7 +152,7 @@ public void RollPsionics(EntityUid uid, PotentialPsionicComponent component, boo } if (applyGlimmer) - chance += ((float) _glimmerSystem.Glimmer / 1000); + chance += (float) _glimmerSystem.Glimmer / 1000; chance *= multiplier; @@ -159,5 +173,24 @@ public void RerollPsionics(EntityUid uid, PotentialPsionicComponent? psionic = n RollPsionics(uid, psionic, multiplier: bonusMuliplier); psionic.Rerolled = true; } + + private void OnInnatePsiInit(EntityUid uid, InnatePsicasterComponent component, ComponentInit args) + { + if (EnsureComp(uid, out var psionic) && !psionic.InnatePsiChecked) + { + psionic.Amplification += component.Amplification; + psionic.Dampening += component.Dampening; + psionic.InnatePsiChecked = true; + } + } + + private void OnInnatePsiShutdown(EntityUid uid, InnatePsicasterComponent component, ComponentShutdown args) + { + if (TryComp(uid, out var psionic)) + { + psionic.Amplification -= component.Amplification; + psionic.Dampening -= component.Amplification; + } + } } } diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/PsionicRegeneration/PsionicRegenerationPowerComponent.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/PsionicRegeneration/PsionicRegenerationPowerComponent.cs index 2f86615b836..a4fc8b632ca 100644 --- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/PsionicRegeneration/PsionicRegenerationPowerComponent.cs +++ b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/PsionicRegeneration/PsionicRegenerationPowerComponent.cs @@ -12,7 +12,7 @@ public sealed partial class PsionicRegenerationPowerComponent : Component public DoAfterId? DoAfter; [DataField("essence")] - public float EssenceAmount = 20; + public float EssenceAmount = 10; [DataField("useDelay")] public float UseDelay = 8f; diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Telegnosis/TelegnosisPowerComponent.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Telegnosis/TelegnosisPowerComponent.cs index cd298c3ec0f..e1a523c50d3 100644 --- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Telegnosis/TelegnosisPowerComponent.cs +++ b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Telegnosis/TelegnosisPowerComponent.cs @@ -22,5 +22,8 @@ public sealed partial class TelegnosisPowerComponent : Component [DataField("telegnosisFeedback")] public string TelegnosisFeedback = "telegnosis-feedback"; + public EntityUid OriginalEntity = default!; + public EntityUid ProjectionUid = default!; + public bool IsProjecting = false; } } diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Telegnosis/TelegnosticProjectionComponent.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Telegnosis/TelegnosticProjectionComponent.cs index 9d627cb42d8..93359f2758c 100644 --- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Telegnosis/TelegnosticProjectionComponent.cs +++ b/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Telegnosis/TelegnosticProjectionComponent.cs @@ -2,5 +2,7 @@ namespace Content.Shared.Abilities.Psionics { [RegisterComponent] public sealed partial class TelegnosticProjectionComponent : Component - {} -} \ No newline at end of file + { + public EntityUid OriginalEntity = default!; + } +} diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/PsionicComponent.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/PsionicComponent.cs index 7c7befa33c3..cdccee393c4 100644 --- a/Content.Shared/Nyanotrasen/Abilities/Psionics/PsionicComponent.cs +++ b/Content.Shared/Nyanotrasen/Abilities/Psionics/PsionicComponent.cs @@ -20,9 +20,11 @@ public sealed partial class PsionicComponent : Component public List PsychicFeedback= new(); [DataField("amplification")] - public float Amplification = 1f; + public float Amplification = default!; [DataField("dampening")] - public float Dampening = 1f; + public float Dampening = default!; + public bool Telepath = false; + public bool InnatePsiChecked = false; } } diff --git a/Content.Shared/Nyanotrasen/Actions/Events/PyrokinesisPowerActionEvent.cs b/Content.Shared/Nyanotrasen/Actions/Events/PyrokinesisPowerActionEvent.cs index 896ec0bb63d..4639aadd55b 100644 --- a/Content.Shared/Nyanotrasen/Actions/Events/PyrokinesisPowerActionEvent.cs +++ b/Content.Shared/Nyanotrasen/Actions/Events/PyrokinesisPowerActionEvent.cs @@ -1,2 +1,4 @@ namespace Content.Shared.Actions.Events; -public sealed partial class PyrokinesisPowerActionEvent : EntityTargetActionEvent {} +public sealed partial class PyrokinesisPowerActionEvent : WorldTargetActionEvent {} + + diff --git a/Content.Shared/Nyanotrasen/Psionics/SharedPsionicSystem.Insulated.cs b/Content.Shared/Nyanotrasen/Psionics/SharedPsionicSystem.Insulated.cs index c59f98db7f0..5c89f39354c 100644 --- a/Content.Shared/Nyanotrasen/Psionics/SharedPsionicSystem.Insulated.cs +++ b/Content.Shared/Nyanotrasen/Psionics/SharedPsionicSystem.Insulated.cs @@ -1,19 +1,4 @@ -using Content.Shared.Abilities.Psionics; - namespace Content.Shared.Psionics { - public sealed class PsionicInsulationSystem : EntitySystem - { - public override void Initialize() - { - base.Initialize(); - SubscribeLocalEvent(OnInsulated); - } - - public void OnInsulated(EntityUid uid, PsionicInsulationComponent component, ComponentInit args) - { - RaiseLocalEvent(uid, new PsionicInsulationEvent()); - } - } public readonly record struct PsionicInsulationEvent; } diff --git a/Resources/Prototypes/Nyanotrasen/Actions/types.yml b/Resources/Prototypes/Nyanotrasen/Actions/types.yml index 376d92e3efb..71a92ec4516 100644 --- a/Resources/Prototypes/Nyanotrasen/Actions/types.yml +++ b/Resources/Prototypes/Nyanotrasen/Actions/types.yml @@ -94,7 +94,7 @@ description: action-description-pyrokinesis noSpawn: true components: - - type: EntityTargetAction + - type: WorldTargetAction icon: Nyanotrasen/Interface/VerbIcons/pyrokinesis.png useDelay: 50 range: 6 diff --git a/Resources/Prototypes/Nyanotrasen/psionicPowers.yml b/Resources/Prototypes/Nyanotrasen/psionicPowers.yml index cb3f88d6a4a..b577d419e38 100644 --- a/Resources/Prototypes/Nyanotrasen/psionicPowers.yml +++ b/Resources/Prototypes/Nyanotrasen/psionicPowers.yml @@ -9,3 +9,4 @@ PsionicInvisibilityPower: 0.15 MindSwapPower: 0.15 NoosphericZapPower: 0.15 + PyrokinesisPower: 0.15 From 834e0ebb7fb5d26502bf457746755d8c208f3a2c Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Tue, 14 May 2024 20:23:41 -0400 Subject: [PATCH 09/44] guh --- Content.Server/Psionics/PsionicsSystem.cs | 33 ++----------------- .../Abilities/Psionics/PsionicComponent.cs | 4 +-- 2 files changed, 4 insertions(+), 33 deletions(-) diff --git a/Content.Server/Psionics/PsionicsSystem.cs b/Content.Server/Psionics/PsionicsSystem.cs index 7920a09844a..06d0a51c84d 100644 --- a/Content.Server/Psionics/PsionicsSystem.cs +++ b/Content.Server/Psionics/PsionicsSystem.cs @@ -50,9 +50,6 @@ public override void Initialize() SubscribeLocalEvent(OnInit); SubscribeLocalEvent(OnRemove); - - SubscribeLocalEvent(OnInnatePsiInit); - SubscribeLocalEvent(OnInnatePsiShutdown); } private void OnStartup(EntityUid uid, PotentialPsionicComponent component, MapInitEvent args) @@ -88,15 +85,8 @@ private void OnMeleeHit(EntityUid uid, AntiPsionicWeaponComponent component, Mel private void OnInit(EntityUid uid, PsionicComponent component, ComponentInit args) { - component.Amplification = _random.NextFloat(0.3f, 1.2f); - component.Dampening = _random.NextFloat(0.3f, 1.2f); - - if (TryComp(uid, out var innatePsicaster)) - { - component.Amplification += innatePsicaster.Amplification; - component.Dampening += innatePsicaster.Dampening; - component.InnatePsiChecked = true; - } + component.Amplification = _random.NextFloat(0.3f, 1.1f); + component.Dampening = _random.NextFloat(0.3f, 1.1f); if (!component.Removable) return; @@ -173,24 +163,5 @@ public void RerollPsionics(EntityUid uid, PotentialPsionicComponent? psionic = n RollPsionics(uid, psionic, multiplier: bonusMuliplier); psionic.Rerolled = true; } - - private void OnInnatePsiInit(EntityUid uid, InnatePsicasterComponent component, ComponentInit args) - { - if (EnsureComp(uid, out var psionic) && !psionic.InnatePsiChecked) - { - psionic.Amplification += component.Amplification; - psionic.Dampening += component.Dampening; - psionic.InnatePsiChecked = true; - } - } - - private void OnInnatePsiShutdown(EntityUid uid, InnatePsicasterComponent component, ComponentShutdown args) - { - if (TryComp(uid, out var psionic)) - { - psionic.Amplification -= component.Amplification; - psionic.Dampening -= component.Amplification; - } - } } } diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/PsionicComponent.cs b/Content.Shared/Nyanotrasen/Abilities/Psionics/PsionicComponent.cs index cdccee393c4..e1574485074 100644 --- a/Content.Shared/Nyanotrasen/Abilities/Psionics/PsionicComponent.cs +++ b/Content.Shared/Nyanotrasen/Abilities/Psionics/PsionicComponent.cs @@ -20,10 +20,10 @@ public sealed partial class PsionicComponent : Component public List PsychicFeedback= new(); [DataField("amplification")] - public float Amplification = default!; + public float Amplification = 0.1f; [DataField("dampening")] - public float Dampening = default!; + public float Dampening = 0.1f; public bool Telepath = false; public bool InnatePsiChecked = false; } From 372671eb2a970e3cfb4756d1b6767943b6f75007 Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Tue, 14 May 2024 20:36:35 -0400 Subject: [PATCH 10/44] More migrations --- Content.Server/Psionics/Abilities/DispelPowerSystem.cs | 2 +- Content.Server/Psionics/Abilities/MetapsionicPowerSystem.cs | 2 +- Content.Server/Psionics/Abilities/MindSwapPowerSystem.cs | 2 +- Content.Server/Psionics/Abilities/NoosphericZapPowerSystem.cs | 2 +- Content.Server/Psionics/Abilities/PsionicAbilitiesSystem.cs | 2 +- .../Psionics/Abilities/PsionicInvisibilityPowerSystem.cs | 2 +- .../Psionics/Abilities/PsionicRegenerationPowerSystem.cs | 2 +- Content.Server/Psionics/Abilities/PyrokinesisPowerSystem.cs | 2 +- Content.Server/Psionics/Abilities/TelegnosisPowerSystem.cs | 2 +- Content.Server/Psionics/PsionicsSystem.cs | 2 +- .../Psionics/Abilities/AcceptPsionicsEuiMessage.cs | 0 .../Psionics/Abilities/Dispel/DamageOnDispelComponent.cs | 2 +- .../Psionics/Abilities/Dispel/DispelPowerComponent.cs | 2 +- .../Psionics/Abilities/Dispel/DispellableComponent.cs | 2 +- .../Psionics/Abilities/MassSleep/MassSleepPowerComponent.cs | 2 +- .../Psionics/Abilities/MassSleep/MassSleepPowerSystem.cs | 2 +- .../Abilities/Metapsionics/MetapsionicPowerComponent.cs | 2 +- .../Psionics/Abilities/MindSwap/MindSwapPowerComponent.cs | 2 +- .../Abilities/NoosphericZap/NoosphericZapPowerComponent.cs | 2 +- .../PsionicInvisibility/PsionicInvisibilityPowerComponent.cs | 2 +- .../PsionicInvisibility/PsionicInvisibilityUsedComponent.cs | 3 ++- .../PsionicRegeneration/PsionicRegenerationPowerComponent.cs | 2 +- .../Abilities/Pyrokinesis/PyrokinesisPowerComponent.cs | 2 +- .../Psionics/Abilities/Telegnosis/TelegnosisPowerComponent.cs | 2 +- .../Abilities/Telegnosis/TelegnosticProjectionComponent.cs | 2 +- Content.Shared/{Nyanotrasen => }/Psionics/Events.cs | 0 .../{Nyanotrasen => }/Psionics/Glimmer/GlimmerSystem.cs | 0 .../Psionics/Glimmer/SharedGlimmerReactiveComponent.cs | 0 .../Psionics/Glimmer/SharedGlimmerReactiveVisuals.cs | 0 .../Psionics/Items/ClothingGrantPsionicPowerComponent.cs | 2 +- .../Abilities => }/Psionics/Items/HeadCageComponent.cs | 2 +- .../Abilities => }/Psionics/Items/HeadCagedComponent.cs | 2 +- .../Abilities => }/Psionics/Items/PsionicItemsSystem.cs | 2 +- .../Abilities => }/Psionics/Items/TinfoilHatComponent.cs | 2 +- .../{Nyanotrasen/Abilities => }/Psionics/PsionicComponent.cs | 2 +- .../Abilities => }/Psionics/PsionicInsulationComponent.cs | 2 +- .../Abilities => }/Psionics/PsionicsDisabledComponent.cs | 2 +- .../Abilities => }/Psionics/SharedPsionicAbilitiesSystem.cs | 3 ++- .../Psionics/SharedPsionicSystem.Insulated.cs | 0 39 files changed, 35 insertions(+), 33 deletions(-) rename Content.Shared/{Nyanotrasen/Abilities => }/Psionics/Abilities/AcceptPsionicsEuiMessage.cs (100%) rename Content.Shared/{Nyanotrasen/Abilities => }/Psionics/Abilities/Dispel/DamageOnDispelComponent.cs (89%) rename Content.Shared/{Nyanotrasen/Abilities => }/Psionics/Abilities/Dispel/DispelPowerComponent.cs (93%) rename Content.Shared/{Nyanotrasen/Abilities => }/Psionics/Abilities/Dispel/DispellableComponent.cs (69%) rename Content.Shared/{Nyanotrasen/Abilities => }/Psionics/Abilities/MassSleep/MassSleepPowerComponent.cs (93%) rename Content.Shared/{Nyanotrasen/Abilities => }/Psionics/Abilities/MassSleep/MassSleepPowerSystem.cs (98%) rename Content.Shared/{Nyanotrasen/Abilities => }/Psionics/Abilities/Metapsionics/MetapsionicPowerComponent.cs (96%) rename Content.Shared/{Nyanotrasen/Abilities => }/Psionics/Abilities/MindSwap/MindSwapPowerComponent.cs (93%) rename Content.Shared/{Nyanotrasen/Abilities => }/Psionics/Abilities/NoosphericZap/NoosphericZapPowerComponent.cs (93%) rename Content.Shared/{Nyanotrasen/Abilities => }/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityPowerComponent.cs (94%) rename Content.Shared/{Nyanotrasen/Abilities => }/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityUsedComponent.cs (94%) rename Content.Shared/{Nyanotrasen/Abilities => }/Psionics/Abilities/PsionicRegeneration/PsionicRegenerationPowerComponent.cs (96%) rename Content.Shared/{Nyanotrasen/Abilities => }/Psionics/Abilities/Pyrokinesis/PyrokinesisPowerComponent.cs (94%) rename Content.Shared/{Nyanotrasen/Abilities => }/Psionics/Abilities/Telegnosis/TelegnosisPowerComponent.cs (96%) rename Content.Shared/{Nyanotrasen/Abilities => }/Psionics/Abilities/Telegnosis/TelegnosticProjectionComponent.cs (79%) rename Content.Shared/{Nyanotrasen => }/Psionics/Events.cs (100%) rename Content.Shared/{Nyanotrasen => }/Psionics/Glimmer/GlimmerSystem.cs (100%) rename Content.Shared/{Nyanotrasen => }/Psionics/Glimmer/SharedGlimmerReactiveComponent.cs (100%) rename Content.Shared/{Nyanotrasen => }/Psionics/Glimmer/SharedGlimmerReactiveVisuals.cs (100%) rename Content.Shared/{Nyanotrasen/Abilities => }/Psionics/Items/ClothingGrantPsionicPowerComponent.cs (84%) rename Content.Shared/{Nyanotrasen/Abilities => }/Psionics/Items/HeadCageComponent.cs (96%) rename Content.Shared/{Nyanotrasen/Abilities => }/Psionics/Items/HeadCagedComponent.cs (81%) rename Content.Shared/{Nyanotrasen/Abilities => }/Psionics/Items/PsionicItemsSystem.cs (98%) rename Content.Shared/{Nyanotrasen/Abilities => }/Psionics/Items/TinfoilHatComponent.cs (90%) rename Content.Shared/{Nyanotrasen/Abilities => }/Psionics/PsionicComponent.cs (95%) rename Content.Shared/{Nyanotrasen/Abilities => }/Psionics/PsionicInsulationComponent.cs (82%) rename Content.Shared/{Nyanotrasen/Abilities => }/Psionics/PsionicsDisabledComponent.cs (84%) rename Content.Shared/{Nyanotrasen/Abilities => }/Psionics/SharedPsionicAbilitiesSystem.cs (98%) rename Content.Shared/{Nyanotrasen => }/Psionics/SharedPsionicSystem.Insulated.cs (100%) diff --git a/Content.Server/Psionics/Abilities/DispelPowerSystem.cs b/Content.Server/Psionics/Abilities/DispelPowerSystem.cs index 14e3ea14aeb..cb7ef8313cd 100644 --- a/Content.Server/Psionics/Abilities/DispelPowerSystem.cs +++ b/Content.Server/Psionics/Abilities/DispelPowerSystem.cs @@ -1,6 +1,6 @@ using Content.Shared.Actions; using Content.Shared.StatusEffect; -using Content.Shared.Abilities.Psionics; +using Content.Shared.Psionics.Abilities; using Content.Shared.Damage; using Content.Shared.Revenant.Components; using Content.Server.Guardian; diff --git a/Content.Server/Psionics/Abilities/MetapsionicPowerSystem.cs b/Content.Server/Psionics/Abilities/MetapsionicPowerSystem.cs index 6279aa88622..c30abd84f57 100644 --- a/Content.Server/Psionics/Abilities/MetapsionicPowerSystem.cs +++ b/Content.Server/Psionics/Abilities/MetapsionicPowerSystem.cs @@ -1,6 +1,6 @@ using Content.Shared.Actions; using Content.Shared.Actions.Events; -using Content.Shared.Abilities.Psionics; +using Content.Shared.Psionics.Abilities; using Content.Shared.DoAfter; using Content.Shared.Examine; using static Content.Shared.Examine.ExamineSystemShared; diff --git a/Content.Server/Psionics/Abilities/MindSwapPowerSystem.cs b/Content.Server/Psionics/Abilities/MindSwapPowerSystem.cs index 0beea77aa53..1e50a586b4f 100644 --- a/Content.Server/Psionics/Abilities/MindSwapPowerSystem.cs +++ b/Content.Server/Psionics/Abilities/MindSwapPowerSystem.cs @@ -1,5 +1,5 @@ using Content.Shared.Actions; -using Content.Shared.Abilities.Psionics; +using Content.Shared.Psionics.Abilities; using Content.Shared.Psionics; using Content.Shared.Speech; using Content.Shared.Stealth.Components; diff --git a/Content.Server/Psionics/Abilities/NoosphericZapPowerSystem.cs b/Content.Server/Psionics/Abilities/NoosphericZapPowerSystem.cs index 7e4ba64afde..ce55cb3bb7d 100644 --- a/Content.Server/Psionics/Abilities/NoosphericZapPowerSystem.cs +++ b/Content.Server/Psionics/Abilities/NoosphericZapPowerSystem.cs @@ -1,5 +1,5 @@ using Content.Shared.Actions; -using Content.Shared.Abilities.Psionics; +using Content.Shared.Psionics.Abilities; using Content.Shared.StatusEffect; using Content.Server.Electrocution; using Content.Server.Stunnable; diff --git a/Content.Server/Psionics/Abilities/PsionicAbilitiesSystem.cs b/Content.Server/Psionics/Abilities/PsionicAbilitiesSystem.cs index 1bfacb0f119..74e6ed3b091 100644 --- a/Content.Server/Psionics/Abilities/PsionicAbilitiesSystem.cs +++ b/Content.Server/Psionics/Abilities/PsionicAbilitiesSystem.cs @@ -1,4 +1,4 @@ -using Content.Shared.Abilities.Psionics; +using Content.Shared.Psionics.Abilities; using Content.Shared.Actions; using Content.Shared.Psionics.Glimmer; using Content.Shared.Random; diff --git a/Content.Server/Psionics/Abilities/PsionicInvisibilityPowerSystem.cs b/Content.Server/Psionics/Abilities/PsionicInvisibilityPowerSystem.cs index 77690c49f48..9422dfb9acf 100644 --- a/Content.Server/Psionics/Abilities/PsionicInvisibilityPowerSystem.cs +++ b/Content.Server/Psionics/Abilities/PsionicInvisibilityPowerSystem.cs @@ -1,6 +1,6 @@ using Content.Server.DoAfter; using Content.Shared.Actions; -using Content.Shared.Abilities.Psionics; +using Content.Shared.Psionics.Abilities; using Content.Shared.Damage; using Content.Shared.DoAfter; using Content.Shared.Stunnable; diff --git a/Content.Server/Psionics/Abilities/PsionicRegenerationPowerSystem.cs b/Content.Server/Psionics/Abilities/PsionicRegenerationPowerSystem.cs index 995bebb0fbe..e6ef1ac6d73 100644 --- a/Content.Server/Psionics/Abilities/PsionicRegenerationPowerSystem.cs +++ b/Content.Server/Psionics/Abilities/PsionicRegenerationPowerSystem.cs @@ -3,7 +3,7 @@ using Content.Server.Body.Components; using Content.Server.Body.Systems; using Content.Server.DoAfter; -using Content.Shared.Abilities.Psionics; +using Content.Shared.Psionics.Abilities; using Content.Shared.Actions; using Content.Shared.Chemistry.Components; using Content.Shared.DoAfter; diff --git a/Content.Server/Psionics/Abilities/PyrokinesisPowerSystem.cs b/Content.Server/Psionics/Abilities/PyrokinesisPowerSystem.cs index d93b17f55cc..444675d9b3f 100644 --- a/Content.Server/Psionics/Abilities/PyrokinesisPowerSystem.cs +++ b/Content.Server/Psionics/Abilities/PyrokinesisPowerSystem.cs @@ -1,5 +1,5 @@ using Content.Shared.Actions; -using Content.Shared.Abilities.Psionics; +using Content.Shared.Psionics.Abilities; using Content.Server.Atmos.Components; using Content.Server.Weapons.Ranged.Systems; using Robust.Server.GameObjects; diff --git a/Content.Server/Psionics/Abilities/TelegnosisPowerSystem.cs b/Content.Server/Psionics/Abilities/TelegnosisPowerSystem.cs index aa0f5487c08..f03b001fc70 100644 --- a/Content.Server/Psionics/Abilities/TelegnosisPowerSystem.cs +++ b/Content.Server/Psionics/Abilities/TelegnosisPowerSystem.cs @@ -1,5 +1,5 @@ using Content.Shared.Actions; -using Content.Shared.Abilities.Psionics; +using Content.Shared.Psionics.Abilities; using Content.Shared.Mind.Components; using Content.Shared.Actions.Events; using Content.Shared.Mobs; diff --git a/Content.Server/Psionics/PsionicsSystem.cs b/Content.Server/Psionics/PsionicsSystem.cs index 06d0a51c84d..f2cb8754326 100644 --- a/Content.Server/Psionics/PsionicsSystem.cs +++ b/Content.Server/Psionics/PsionicsSystem.cs @@ -1,4 +1,4 @@ -using Content.Shared.Abilities.Psionics; +using Content.Shared.Psionics.Abilities; using Content.Shared.StatusEffect; using Content.Shared.Psionics.Glimmer; using Content.Shared.Weapons.Melee.Events; diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/AcceptPsionicsEuiMessage.cs b/Content.Shared/Psionics/Abilities/AcceptPsionicsEuiMessage.cs similarity index 100% rename from Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/AcceptPsionicsEuiMessage.cs rename to Content.Shared/Psionics/Abilities/AcceptPsionicsEuiMessage.cs diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Dispel/DamageOnDispelComponent.cs b/Content.Shared/Psionics/Abilities/Dispel/DamageOnDispelComponent.cs similarity index 89% rename from Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Dispel/DamageOnDispelComponent.cs rename to Content.Shared/Psionics/Abilities/Dispel/DamageOnDispelComponent.cs index ce86111fc4b..89168d2b259 100644 --- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Dispel/DamageOnDispelComponent.cs +++ b/Content.Shared/Psionics/Abilities/Dispel/DamageOnDispelComponent.cs @@ -1,6 +1,6 @@ using Content.Shared.Damage; -namespace Content.Shared.Abilities.Psionics +namespace Content.Shared.Psionics.Abilities { /// /// Takes damage when dispelled. diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Dispel/DispelPowerComponent.cs b/Content.Shared/Psionics/Abilities/Dispel/DispelPowerComponent.cs similarity index 93% rename from Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Dispel/DispelPowerComponent.cs rename to Content.Shared/Psionics/Abilities/Dispel/DispelPowerComponent.cs index 837bdd96a87..1426712cf94 100644 --- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Dispel/DispelPowerComponent.cs +++ b/Content.Shared/Psionics/Abilities/Dispel/DispelPowerComponent.cs @@ -2,7 +2,7 @@ using Robust.Shared.Prototypes; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; -namespace Content.Shared.Abilities.Psionics +namespace Content.Shared.Psionics.Abilities { [RegisterComponent] public sealed partial class DispelPowerComponent : Component diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Dispel/DispellableComponent.cs b/Content.Shared/Psionics/Abilities/Dispel/DispellableComponent.cs similarity index 69% rename from Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Dispel/DispellableComponent.cs rename to Content.Shared/Psionics/Abilities/Dispel/DispellableComponent.cs index 40352004187..4bb5ee653d2 100644 --- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Dispel/DispellableComponent.cs +++ b/Content.Shared/Psionics/Abilities/Dispel/DispellableComponent.cs @@ -1,4 +1,4 @@ -namespace Content.Shared.Abilities.Psionics +namespace Content.Shared.Psionics.Abilities { [RegisterComponent] public sealed partial class DispellableComponent : Component diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/MassSleep/MassSleepPowerComponent.cs b/Content.Shared/Psionics/Abilities/MassSleep/MassSleepPowerComponent.cs similarity index 93% rename from Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/MassSleep/MassSleepPowerComponent.cs rename to Content.Shared/Psionics/Abilities/MassSleep/MassSleepPowerComponent.cs index c092cacd8b8..dcd1d2c1c42 100644 --- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/MassSleep/MassSleepPowerComponent.cs +++ b/Content.Shared/Psionics/Abilities/MassSleep/MassSleepPowerComponent.cs @@ -2,7 +2,7 @@ using Robust.Shared.Prototypes; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; -namespace Content.Shared.Abilities.Psionics +namespace Content.Shared.Psionics.Abilities { [RegisterComponent] public sealed partial class MassSleepPowerComponent : Component diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/MassSleep/MassSleepPowerSystem.cs b/Content.Shared/Psionics/Abilities/MassSleep/MassSleepPowerSystem.cs similarity index 98% rename from Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/MassSleep/MassSleepPowerSystem.cs rename to Content.Shared/Psionics/Abilities/MassSleep/MassSleepPowerSystem.cs index e36a3c70e8a..1f2f6954e77 100644 --- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/MassSleep/MassSleepPowerSystem.cs +++ b/Content.Shared/Psionics/Abilities/MassSleep/MassSleepPowerSystem.cs @@ -8,7 +8,7 @@ using Content.Shared.Mind; using Content.Shared.Actions.Events; -namespace Content.Shared.Abilities.Psionics +namespace Content.Shared.Psionics.Abilities { public sealed class MassSleepPowerSystem : EntitySystem { diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Metapsionics/MetapsionicPowerComponent.cs b/Content.Shared/Psionics/Abilities/Metapsionics/MetapsionicPowerComponent.cs similarity index 96% rename from Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Metapsionics/MetapsionicPowerComponent.cs rename to Content.Shared/Psionics/Abilities/Metapsionics/MetapsionicPowerComponent.cs index 0e12d05dead..8570668f744 100644 --- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Metapsionics/MetapsionicPowerComponent.cs +++ b/Content.Shared/Psionics/Abilities/Metapsionics/MetapsionicPowerComponent.cs @@ -4,7 +4,7 @@ using Robust.Shared.Prototypes; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; -namespace Content.Shared.Abilities.Psionics +namespace Content.Shared.Psionics.Abilities { [RegisterComponent] public sealed partial class MetapsionicPowerComponent : Component diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/MindSwap/MindSwapPowerComponent.cs b/Content.Shared/Psionics/Abilities/MindSwap/MindSwapPowerComponent.cs similarity index 93% rename from Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/MindSwap/MindSwapPowerComponent.cs rename to Content.Shared/Psionics/Abilities/MindSwap/MindSwapPowerComponent.cs index e617c48cf2d..94b73c41e38 100644 --- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/MindSwap/MindSwapPowerComponent.cs +++ b/Content.Shared/Psionics/Abilities/MindSwap/MindSwapPowerComponent.cs @@ -1,7 +1,7 @@ using Robust.Shared.Prototypes; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; -namespace Content.Shared.Abilities.Psionics +namespace Content.Shared.Psionics.Abilities { [RegisterComponent] public sealed partial class MindSwapPowerComponent : Component diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/NoosphericZap/NoosphericZapPowerComponent.cs b/Content.Shared/Psionics/Abilities/NoosphericZap/NoosphericZapPowerComponent.cs similarity index 93% rename from Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/NoosphericZap/NoosphericZapPowerComponent.cs rename to Content.Shared/Psionics/Abilities/NoosphericZap/NoosphericZapPowerComponent.cs index 24c144079e4..997db65e1b1 100644 --- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/NoosphericZap/NoosphericZapPowerComponent.cs +++ b/Content.Shared/Psionics/Abilities/NoosphericZap/NoosphericZapPowerComponent.cs @@ -2,7 +2,7 @@ using Robust.Shared.Prototypes; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; -namespace Content.Shared.Abilities.Psionics +namespace Content.Shared.Psionics.Abilities { [RegisterComponent] public sealed partial class NoosphericZapPowerComponent : Component diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityPowerComponent.cs b/Content.Shared/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityPowerComponent.cs similarity index 94% rename from Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityPowerComponent.cs rename to Content.Shared/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityPowerComponent.cs index 3b29a1e4367..d9c36f5b22a 100644 --- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityPowerComponent.cs +++ b/Content.Shared/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityPowerComponent.cs @@ -1,7 +1,7 @@ using Robust.Shared.Prototypes; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; -namespace Content.Shared.Abilities.Psionics +namespace Content.Shared.Psionics.Abilities { [RegisterComponent] public sealed partial class PsionicInvisibilityPowerComponent : Component diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityUsedComponent.cs b/Content.Shared/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityUsedComponent.cs similarity index 94% rename from Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityUsedComponent.cs rename to Content.Shared/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityUsedComponent.cs index 9037b8bcdfe..2a9dd7642ba 100644 --- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityUsedComponent.cs +++ b/Content.Shared/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityUsedComponent.cs @@ -1,6 +1,7 @@ using Robust.Shared.Prototypes; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; -namespace Content.Shared.Abilities.Psionics + +namespace Content.Shared.Psionics.Abilities { [RegisterComponent] public sealed partial class PsionicInvisibilityUsedComponent : Component diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/PsionicRegeneration/PsionicRegenerationPowerComponent.cs b/Content.Shared/Psionics/Abilities/PsionicRegeneration/PsionicRegenerationPowerComponent.cs similarity index 96% rename from Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/PsionicRegeneration/PsionicRegenerationPowerComponent.cs rename to Content.Shared/Psionics/Abilities/PsionicRegeneration/PsionicRegenerationPowerComponent.cs index a4fc8b632ca..3184bf7de5b 100644 --- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/PsionicRegeneration/PsionicRegenerationPowerComponent.cs +++ b/Content.Shared/Psionics/Abilities/PsionicRegeneration/PsionicRegenerationPowerComponent.cs @@ -3,7 +3,7 @@ using Robust.Shared.Prototypes; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; -namespace Content.Shared.Abilities.Psionics +namespace Content.Shared.Psionics.Abilities { [RegisterComponent] public sealed partial class PsionicRegenerationPowerComponent : Component diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Pyrokinesis/PyrokinesisPowerComponent.cs b/Content.Shared/Psionics/Abilities/Pyrokinesis/PyrokinesisPowerComponent.cs similarity index 94% rename from Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Pyrokinesis/PyrokinesisPowerComponent.cs rename to Content.Shared/Psionics/Abilities/Pyrokinesis/PyrokinesisPowerComponent.cs index d2af000e269..1f88741b9a9 100644 --- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Pyrokinesis/PyrokinesisPowerComponent.cs +++ b/Content.Shared/Psionics/Abilities/Pyrokinesis/PyrokinesisPowerComponent.cs @@ -2,7 +2,7 @@ using Robust.Shared.Prototypes; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; -namespace Content.Shared.Abilities.Psionics +namespace Content.Shared.Psionics.Abilities { [RegisterComponent] public sealed partial class PyrokinesisPowerComponent : Component diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Telegnosis/TelegnosisPowerComponent.cs b/Content.Shared/Psionics/Abilities/Telegnosis/TelegnosisPowerComponent.cs similarity index 96% rename from Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Telegnosis/TelegnosisPowerComponent.cs rename to Content.Shared/Psionics/Abilities/Telegnosis/TelegnosisPowerComponent.cs index e1a523c50d3..f1a71332b18 100644 --- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Telegnosis/TelegnosisPowerComponent.cs +++ b/Content.Shared/Psionics/Abilities/Telegnosis/TelegnosisPowerComponent.cs @@ -3,7 +3,7 @@ using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; -namespace Content.Shared.Abilities.Psionics +namespace Content.Shared.Psionics.Abilities { [RegisterComponent] public sealed partial class TelegnosisPowerComponent : Component diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Telegnosis/TelegnosticProjectionComponent.cs b/Content.Shared/Psionics/Abilities/Telegnosis/TelegnosticProjectionComponent.cs similarity index 79% rename from Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Telegnosis/TelegnosticProjectionComponent.cs rename to Content.Shared/Psionics/Abilities/Telegnosis/TelegnosticProjectionComponent.cs index 93359f2758c..bc18ff9f3c2 100644 --- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Telegnosis/TelegnosticProjectionComponent.cs +++ b/Content.Shared/Psionics/Abilities/Telegnosis/TelegnosticProjectionComponent.cs @@ -1,4 +1,4 @@ -namespace Content.Shared.Abilities.Psionics +namespace Content.Shared.Psionics.Abilities { [RegisterComponent] public sealed partial class TelegnosticProjectionComponent : Component diff --git a/Content.Shared/Nyanotrasen/Psionics/Events.cs b/Content.Shared/Psionics/Events.cs similarity index 100% rename from Content.Shared/Nyanotrasen/Psionics/Events.cs rename to Content.Shared/Psionics/Events.cs diff --git a/Content.Shared/Nyanotrasen/Psionics/Glimmer/GlimmerSystem.cs b/Content.Shared/Psionics/Glimmer/GlimmerSystem.cs similarity index 100% rename from Content.Shared/Nyanotrasen/Psionics/Glimmer/GlimmerSystem.cs rename to Content.Shared/Psionics/Glimmer/GlimmerSystem.cs diff --git a/Content.Shared/Nyanotrasen/Psionics/Glimmer/SharedGlimmerReactiveComponent.cs b/Content.Shared/Psionics/Glimmer/SharedGlimmerReactiveComponent.cs similarity index 100% rename from Content.Shared/Nyanotrasen/Psionics/Glimmer/SharedGlimmerReactiveComponent.cs rename to Content.Shared/Psionics/Glimmer/SharedGlimmerReactiveComponent.cs diff --git a/Content.Shared/Nyanotrasen/Psionics/Glimmer/SharedGlimmerReactiveVisuals.cs b/Content.Shared/Psionics/Glimmer/SharedGlimmerReactiveVisuals.cs similarity index 100% rename from Content.Shared/Nyanotrasen/Psionics/Glimmer/SharedGlimmerReactiveVisuals.cs rename to Content.Shared/Psionics/Glimmer/SharedGlimmerReactiveVisuals.cs diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Items/ClothingGrantPsionicPowerComponent.cs b/Content.Shared/Psionics/Items/ClothingGrantPsionicPowerComponent.cs similarity index 84% rename from Content.Shared/Nyanotrasen/Abilities/Psionics/Items/ClothingGrantPsionicPowerComponent.cs rename to Content.Shared/Psionics/Items/ClothingGrantPsionicPowerComponent.cs index 4cbb05c8395..f09efc3064c 100644 --- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Items/ClothingGrantPsionicPowerComponent.cs +++ b/Content.Shared/Psionics/Items/ClothingGrantPsionicPowerComponent.cs @@ -1,4 +1,4 @@ -namespace Content.Shared.Abilities.Psionics +namespace Content.Shared.Psionics.Abilities { [RegisterComponent] public sealed partial class ClothingGrantPsionicPowerComponent : Component diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Items/HeadCageComponent.cs b/Content.Shared/Psionics/Items/HeadCageComponent.cs similarity index 96% rename from Content.Shared/Nyanotrasen/Abilities/Psionics/Items/HeadCageComponent.cs rename to Content.Shared/Psionics/Items/HeadCageComponent.cs index acaa832860f..c03241e47c7 100644 --- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Items/HeadCageComponent.cs +++ b/Content.Shared/Psionics/Items/HeadCageComponent.cs @@ -1,7 +1,7 @@ using System.Threading; using Robust.Shared.Audio; -namespace Content.Shared.Abilities.Psionics +namespace Content.Shared.Psionics.Abilities { [RegisterComponent] public sealed partial class HeadCageComponent : Component diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Items/HeadCagedComponent.cs b/Content.Shared/Psionics/Items/HeadCagedComponent.cs similarity index 81% rename from Content.Shared/Nyanotrasen/Abilities/Psionics/Items/HeadCagedComponent.cs rename to Content.Shared/Psionics/Items/HeadCagedComponent.cs index f8af46b8878..0f826f7a05e 100644 --- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Items/HeadCagedComponent.cs +++ b/Content.Shared/Psionics/Items/HeadCagedComponent.cs @@ -1,4 +1,4 @@ -namespace Content.Shared.Abilities.Psionics +namespace Content.Shared.Psionics.Abilities { [RegisterComponent] /// diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Items/PsionicItemsSystem.cs b/Content.Shared/Psionics/Items/PsionicItemsSystem.cs similarity index 98% rename from Content.Shared/Nyanotrasen/Abilities/Psionics/Items/PsionicItemsSystem.cs rename to Content.Shared/Psionics/Items/PsionicItemsSystem.cs index f88acf61f3c..950353c5dfb 100644 --- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Items/PsionicItemsSystem.cs +++ b/Content.Shared/Psionics/Items/PsionicItemsSystem.cs @@ -2,7 +2,7 @@ using Content.Shared.Clothing.Components; using Content.Shared.StatusEffect; -namespace Content.Shared.Abilities.Psionics +namespace Content.Shared.Psionics.Abilities { public sealed class PsionicItemsSystem : EntitySystem { diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Items/TinfoilHatComponent.cs b/Content.Shared/Psionics/Items/TinfoilHatComponent.cs similarity index 90% rename from Content.Shared/Nyanotrasen/Abilities/Psionics/Items/TinfoilHatComponent.cs rename to Content.Shared/Psionics/Items/TinfoilHatComponent.cs index 5086b9f4977..6ef7bdc823b 100644 --- a/Content.Shared/Nyanotrasen/Abilities/Psionics/Items/TinfoilHatComponent.cs +++ b/Content.Shared/Psionics/Items/TinfoilHatComponent.cs @@ -1,4 +1,4 @@ -namespace Content.Shared.Abilities.Psionics +namespace Content.Shared.Psionics.Abilities { [RegisterComponent] public sealed partial class TinfoilHatComponent : Component diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/PsionicComponent.cs b/Content.Shared/Psionics/PsionicComponent.cs similarity index 95% rename from Content.Shared/Nyanotrasen/Abilities/Psionics/PsionicComponent.cs rename to Content.Shared/Psionics/PsionicComponent.cs index e1574485074..76e629f0839 100644 --- a/Content.Shared/Nyanotrasen/Abilities/Psionics/PsionicComponent.cs +++ b/Content.Shared/Psionics/PsionicComponent.cs @@ -1,6 +1,6 @@ using Robust.Shared.GameStates; -namespace Content.Shared.Abilities.Psionics +namespace Content.Shared.Psionics.Abilities { [RegisterComponent, NetworkedComponent] public sealed partial class PsionicComponent : Component diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/PsionicInsulationComponent.cs b/Content.Shared/Psionics/PsionicInsulationComponent.cs similarity index 82% rename from Content.Shared/Nyanotrasen/Abilities/Psionics/PsionicInsulationComponent.cs rename to Content.Shared/Psionics/PsionicInsulationComponent.cs index 12370da5ae4..2ab054b1f8f 100644 --- a/Content.Shared/Nyanotrasen/Abilities/Psionics/PsionicInsulationComponent.cs +++ b/Content.Shared/Psionics/PsionicInsulationComponent.cs @@ -1,4 +1,4 @@ -namespace Content.Shared.Abilities.Psionics +namespace Content.Shared.Psionics.Abilities { [RegisterComponent] public sealed partial class PsionicInsulationComponent : Component diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/PsionicsDisabledComponent.cs b/Content.Shared/Psionics/PsionicsDisabledComponent.cs similarity index 84% rename from Content.Shared/Nyanotrasen/Abilities/Psionics/PsionicsDisabledComponent.cs rename to Content.Shared/Psionics/PsionicsDisabledComponent.cs index 28e7157a9d2..00cf5506523 100644 --- a/Content.Shared/Nyanotrasen/Abilities/Psionics/PsionicsDisabledComponent.cs +++ b/Content.Shared/Psionics/PsionicsDisabledComponent.cs @@ -1,6 +1,6 @@ using Robust.Shared.GameStates; -namespace Content.Shared.Abilities.Psionics +namespace Content.Shared.Psionics.Abilities { /// /// Only use this for the status effect, please. diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/SharedPsionicAbilitiesSystem.cs b/Content.Shared/Psionics/SharedPsionicAbilitiesSystem.cs similarity index 98% rename from Content.Shared/Nyanotrasen/Abilities/Psionics/SharedPsionicAbilitiesSystem.cs rename to Content.Shared/Psionics/SharedPsionicAbilitiesSystem.cs index 2739d5ba31a..a4b283f59ce 100644 --- a/Content.Shared/Nyanotrasen/Abilities/Psionics/SharedPsionicAbilitiesSystem.cs +++ b/Content.Shared/Psionics/SharedPsionicAbilitiesSystem.cs @@ -4,10 +4,11 @@ using Content.Shared.Mobs.Components; using Content.Shared.Popups; using Content.Shared.Psionics.Glimmer; +using Content.Shared.Psionics.Abilities; using Robust.Shared.Random; using Robust.Shared.Serialization; -namespace Content.Shared.Abilities.Psionics +namespace Content.Shared.Psionics.Abilities { public sealed class SharedPsionicAbilitiesSystem : EntitySystem { diff --git a/Content.Shared/Nyanotrasen/Psionics/SharedPsionicSystem.Insulated.cs b/Content.Shared/Psionics/SharedPsionicSystem.Insulated.cs similarity index 100% rename from Content.Shared/Nyanotrasen/Psionics/SharedPsionicSystem.Insulated.cs rename to Content.Shared/Psionics/SharedPsionicSystem.Insulated.cs From f3bc3d81cd17fffdc58302e566f34cab8be69595 Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Tue, 14 May 2024 20:45:39 -0400 Subject: [PATCH 11/44] Final migrations --- .../Psionics/Glimmer/GlimmerReactiveVisuals.cs | 0 .../Chat => Psionics/Telepathy}/PsionicChatUpdateSystem.cs | 4 ++-- .../UI => Psionics/UserInterface}/AcceptPsionicsEUI.cs | 0 .../UI => Psionics/UserInterface}/AcceptPsionicsWindow.cs | 0 .../{Nyanotrasen => Psionics}/UserInterface/GlimmerGraph.cs | 2 +- Content.Server/Psionics/Abilities/PsionicAbilitiesSystem.cs | 3 --- Content.Server/Psionics/PsionicsCommands.cs | 3 +-- Content.Server/Psionics/PsionicsSystem.cs | 1 - .../{Nyanotrasen/Chat => Psionics/Telepathy}/TSayCommand.cs | 2 +- .../Telepathy}/TelepathicRepeaterComponent.cs | 2 +- .../Telepathy/TelepathyChatSystem.cs} | 6 +++--- 11 files changed, 9 insertions(+), 14 deletions(-) rename Content.Client/{Nyanotrasen => }/Psionics/Glimmer/GlimmerReactiveVisuals.cs (100%) rename Content.Client/{Nyanotrasen/Chat => Psionics/Telepathy}/PsionicChatUpdateSystem.cs (92%) rename Content.Client/{Nyanotrasen/Psionics/UI => Psionics/UserInterface}/AcceptPsionicsEUI.cs (100%) rename Content.Client/{Nyanotrasen/Psionics/UI => Psionics/UserInterface}/AcceptPsionicsWindow.cs (100%) rename Content.Client/{Nyanotrasen => Psionics}/UserInterface/GlimmerGraph.cs (97%) rename Content.Server/{Nyanotrasen/Chat => Psionics/Telepathy}/TSayCommand.cs (96%) rename Content.Server/{Nyanotrasen/Chat => Psionics/Telepathy}/TelepathicRepeaterComponent.cs (82%) rename Content.Server/{Nyanotrasen/Chat/NyanoChatSystem.cs => Psionics/Telepathy/TelepathyChatSystem.cs} (97%) diff --git a/Content.Client/Nyanotrasen/Psionics/Glimmer/GlimmerReactiveVisuals.cs b/Content.Client/Psionics/Glimmer/GlimmerReactiveVisuals.cs similarity index 100% rename from Content.Client/Nyanotrasen/Psionics/Glimmer/GlimmerReactiveVisuals.cs rename to Content.Client/Psionics/Glimmer/GlimmerReactiveVisuals.cs diff --git a/Content.Client/Nyanotrasen/Chat/PsionicChatUpdateSystem.cs b/Content.Client/Psionics/Telepathy/PsionicChatUpdateSystem.cs similarity index 92% rename from Content.Client/Nyanotrasen/Chat/PsionicChatUpdateSystem.cs rename to Content.Client/Psionics/Telepathy/PsionicChatUpdateSystem.cs index 84602052fe7..7bb88764a1f 100644 --- a/Content.Client/Nyanotrasen/Chat/PsionicChatUpdateSystem.cs +++ b/Content.Client/Psionics/Telepathy/PsionicChatUpdateSystem.cs @@ -1,8 +1,8 @@ -using Content.Shared.Abilities.Psionics; +using Content.Shared.Psionics.Abilities; using Content.Client.Chat.Managers; using Robust.Client.Player; -namespace Content.Client.Nyanotrasen.Chat +namespace Content.Client.Psionics.Chat { public sealed class PsionicChatUpdateSystem : EntitySystem { diff --git a/Content.Client/Nyanotrasen/Psionics/UI/AcceptPsionicsEUI.cs b/Content.Client/Psionics/UserInterface/AcceptPsionicsEUI.cs similarity index 100% rename from Content.Client/Nyanotrasen/Psionics/UI/AcceptPsionicsEUI.cs rename to Content.Client/Psionics/UserInterface/AcceptPsionicsEUI.cs diff --git a/Content.Client/Nyanotrasen/Psionics/UI/AcceptPsionicsWindow.cs b/Content.Client/Psionics/UserInterface/AcceptPsionicsWindow.cs similarity index 100% rename from Content.Client/Nyanotrasen/Psionics/UI/AcceptPsionicsWindow.cs rename to Content.Client/Psionics/UserInterface/AcceptPsionicsWindow.cs diff --git a/Content.Client/Nyanotrasen/UserInterface/GlimmerGraph.cs b/Content.Client/Psionics/UserInterface/GlimmerGraph.cs similarity index 97% rename from Content.Client/Nyanotrasen/UserInterface/GlimmerGraph.cs rename to Content.Client/Psionics/UserInterface/GlimmerGraph.cs index c4a9109dcd8..111c810acb1 100644 --- a/Content.Client/Nyanotrasen/UserInterface/GlimmerGraph.cs +++ b/Content.Client/Psionics/UserInterface/GlimmerGraph.cs @@ -4,7 +4,7 @@ using Robust.Client.ResourceManagement; using Robust.Client.UserInterface; -namespace Content.Client.Nyanotrasen.UserInterface; +namespace Content.Client.Psionics.UI; public sealed class GlimmerGraph : Control { diff --git a/Content.Server/Psionics/Abilities/PsionicAbilitiesSystem.cs b/Content.Server/Psionics/Abilities/PsionicAbilitiesSystem.cs index 74e6ed3b091..b6ab74627d3 100644 --- a/Content.Server/Psionics/Abilities/PsionicAbilitiesSystem.cs +++ b/Content.Server/Psionics/Abilities/PsionicAbilitiesSystem.cs @@ -4,16 +4,13 @@ using Content.Shared.Random; using Content.Shared.Random.Helpers; using Content.Server.EUI; -using Content.Server.Psionics; using Content.Server.Mind; -using Content.Shared.Mind.Components; using Content.Shared.StatusEffect; using Robust.Shared.Random; using Robust.Shared.Prototypes; using Robust.Shared.Player; using Content.Shared.Examine; using Content.Shared.Popups; -using Content.Shared.Examine; using static Content.Shared.Examine.ExamineSystemShared; namespace Content.Server.Psionics.Abilities diff --git a/Content.Server/Psionics/PsionicsCommands.cs b/Content.Server/Psionics/PsionicsCommands.cs index 959251d1fb7..2eda2cd2bc8 100644 --- a/Content.Server/Psionics/PsionicsCommands.cs +++ b/Content.Server/Psionics/PsionicsCommands.cs @@ -1,9 +1,8 @@ using Content.Server.Administration; using Content.Shared.Administration; -using Content.Shared.Abilities.Psionics; +using Content.Shared.Psionics.Abilities; using Content.Shared.Mobs.Components; using Robust.Shared.Console; -using Robust.Server.GameObjects; using Content.Shared.Actions; using Robust.Shared.Player; diff --git a/Content.Server/Psionics/PsionicsSystem.cs b/Content.Server/Psionics/PsionicsSystem.cs index f2cb8754326..5c10e4160ca 100644 --- a/Content.Server/Psionics/PsionicsSystem.cs +++ b/Content.Server/Psionics/PsionicsSystem.cs @@ -11,7 +11,6 @@ using Robust.Shared.Audio.Systems; using Robust.Shared.Configuration; using Robust.Shared.Random; -using Content.Shared.Psionics; namespace Content.Server.Psionics { diff --git a/Content.Server/Nyanotrasen/Chat/TSayCommand.cs b/Content.Server/Psionics/Telepathy/TSayCommand.cs similarity index 96% rename from Content.Server/Nyanotrasen/Chat/TSayCommand.cs rename to Content.Server/Psionics/Telepathy/TSayCommand.cs index 9ba27b65d71..378789ccbf9 100644 --- a/Content.Server/Nyanotrasen/Chat/TSayCommand.cs +++ b/Content.Server/Psionics/Telepathy/TSayCommand.cs @@ -5,7 +5,7 @@ using Robust.Shared.Enums; using Robust.Shared.Player; -namespace Content.Server.Chat.Commands +namespace Content.Server.Psionics.Telepathy { [AnyCommand] internal sealed class TSayCommand : IConsoleCommand diff --git a/Content.Server/Nyanotrasen/Chat/TelepathicRepeaterComponent.cs b/Content.Server/Psionics/Telepathy/TelepathicRepeaterComponent.cs similarity index 82% rename from Content.Server/Nyanotrasen/Chat/TelepathicRepeaterComponent.cs rename to Content.Server/Psionics/Telepathy/TelepathicRepeaterComponent.cs index fc199f4332a..6e194f76c8f 100644 --- a/Content.Server/Nyanotrasen/Chat/TelepathicRepeaterComponent.cs +++ b/Content.Server/Psionics/Telepathy/TelepathicRepeaterComponent.cs @@ -1,4 +1,4 @@ -namespace Content.Server.Nyanotrasen.Chat +namespace Content.Server.Psionics.Telepathy { /// /// Repeats whatever is happening in telepathic chat. diff --git a/Content.Server/Nyanotrasen/Chat/NyanoChatSystem.cs b/Content.Server/Psionics/Telepathy/TelepathyChatSystem.cs similarity index 97% rename from Content.Server/Nyanotrasen/Chat/NyanoChatSystem.cs rename to Content.Server/Psionics/Telepathy/TelepathyChatSystem.cs index 62d8032df1d..565e7c7f0e6 100644 --- a/Content.Server/Nyanotrasen/Chat/NyanoChatSystem.cs +++ b/Content.Server/Psionics/Telepathy/TelepathyChatSystem.cs @@ -3,7 +3,7 @@ using Content.Server.Chat.Managers; using Content.Server.Chat.Systems; using Content.Server.Psionics; -using Content.Shared.Abilities.Psionics; +using Content.Shared.Psionics.Abilities; using Content.Shared.Bed.Sleep; using Content.Shared.Chat; using Content.Shared.Database; @@ -17,10 +17,10 @@ using System.Linq; using System.Text; -namespace Content.Server.Nyanotrasen.Chat +namespace Content.Server.Psionics.Telepathy { /// - /// Extensions for nyano's chat stuff + /// Extensions for Telepathic Chat /// public sealed class NyanoChatSystem : EntitySystem From 303d1b307efa8f951bae9f3729f92e8f175d0d8d Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Tue, 14 May 2024 21:05:43 -0400 Subject: [PATCH 12/44] Last set of migrations --- .../GlimmerMonitor}/GlimmerMonitorUi.cs | 3 ++- .../GlimmerMonitor}/GlimmerMonitorUiFragment.xaml | 2 +- .../GlimmerMonitor}/GlimmerMonitorUiFragment.xaml.cs | 4 ++-- .../UserInterface/Systems/Chat/ChatUIController.cs | 9 ++++----- Content.Server/Abilities/Mime/MimePowersSystem.cs | 2 +- Content.Server/Anomaly/AnomalySystem.Psionics.cs | 4 ++-- Content.Server/Chat/Systems/ChatSystem.cs | 2 +- .../DeltaV/StationEvents/Events/GlimmerMobSpawnRule.cs | 2 +- .../Nyanotrasen/Chemistry/Effects/ChemRemovePsionic.cs | 2 +- .../Nyanotrasen/Research/Oracle/OracleSystem.cs | 2 +- .../Research/SophicScribe/SophicScribeSystem.cs | 2 +- .../StationEvents/Events/GlimmerWispSpawnRule.cs | 2 +- .../Nyanotrasen/StationEvents/Events/MassMindSwapRule.cs | 5 ++--- .../StationEvents/Events/NoosphericFryRule.cs | 2 +- .../StationEvents/Events/NoosphericStormRule.cs | 4 ++-- .../StationEvents/Events/NoosphericZapRule.cs | 2 +- .../StationEvents/Events/PsionicCatGotYourTongueRule.cs | 2 +- Content.Server/Psionics/Glimmer/GlimmerReactiveSystem.cs | 2 +- .../Psionics/Invisibility/PsionicInvisibilitySystem.cs | 4 ++-- .../Singularity/EntitySystems/EventHorizonSystem.cs | 4 ++-- Content.Server/Zombies/ZombieSystem.Transform.cs | 2 +- 21 files changed, 31 insertions(+), 32 deletions(-) rename Content.Client/{Nyanotrasen/CartridgeLoader/Cartridges => Psionics/GlimmerMonitor}/GlimmerMonitorUi.cs (92%) rename Content.Client/{Nyanotrasen/CartridgeLoader/Cartridges => Psionics/GlimmerMonitor}/GlimmerMonitorUiFragment.xaml (93%) rename Content.Client/{Nyanotrasen/CartridgeLoader/Cartridges => Psionics/GlimmerMonitor}/GlimmerMonitorUiFragment.xaml.cs (96%) diff --git a/Content.Client/Nyanotrasen/CartridgeLoader/Cartridges/GlimmerMonitorUi.cs b/Content.Client/Psionics/GlimmerMonitor/GlimmerMonitorUi.cs similarity index 92% rename from Content.Client/Nyanotrasen/CartridgeLoader/Cartridges/GlimmerMonitorUi.cs rename to Content.Client/Psionics/GlimmerMonitor/GlimmerMonitorUi.cs index 0b5fc7ad38c..0d8accb9f86 100644 --- a/Content.Client/Nyanotrasen/CartridgeLoader/Cartridges/GlimmerMonitorUi.cs +++ b/Content.Client/Psionics/GlimmerMonitor/GlimmerMonitorUi.cs @@ -1,10 +1,11 @@ using Robust.Client.GameObjects; using Robust.Client.UserInterface; +using Content.Client.Psionics.UI; using Content.Client.UserInterface.Fragments; using Content.Shared.CartridgeLoader.Cartridges; using Content.Shared.CartridgeLoader; -namespace Content.Client.Nyanotrasen.CartridgeLoader.Cartridges; +namespace Content.Client.Psionics.GlimmerMonitor; public sealed partial class GlimmerMonitorUi : UIFragment { diff --git a/Content.Client/Nyanotrasen/CartridgeLoader/Cartridges/GlimmerMonitorUiFragment.xaml b/Content.Client/Psionics/GlimmerMonitor/GlimmerMonitorUiFragment.xaml similarity index 93% rename from Content.Client/Nyanotrasen/CartridgeLoader/Cartridges/GlimmerMonitorUiFragment.xaml rename to Content.Client/Psionics/GlimmerMonitor/GlimmerMonitorUiFragment.xaml index 119a1831e6e..3044680e27b 100644 --- a/Content.Client/Nyanotrasen/CartridgeLoader/Cartridges/GlimmerMonitorUiFragment.xaml +++ b/Content.Client/Psionics/GlimmerMonitor/GlimmerMonitorUiFragment.xaml @@ -1,4 +1,4 @@ - diff --git a/Content.Client/Nyanotrasen/CartridgeLoader/Cartridges/GlimmerMonitorUiFragment.xaml.cs b/Content.Client/Psionics/GlimmerMonitor/GlimmerMonitorUiFragment.xaml.cs similarity index 96% rename from Content.Client/Nyanotrasen/CartridgeLoader/Cartridges/GlimmerMonitorUiFragment.xaml.cs rename to Content.Client/Psionics/GlimmerMonitor/GlimmerMonitorUiFragment.xaml.cs index 43d9202aa45..58bbee38a2f 100644 --- a/Content.Client/Nyanotrasen/CartridgeLoader/Cartridges/GlimmerMonitorUiFragment.xaml.cs +++ b/Content.Client/Psionics/GlimmerMonitor/GlimmerMonitorUiFragment.xaml.cs @@ -1,12 +1,12 @@ using System.Linq; using System.Numerics; -using Content.Client.Nyanotrasen.UserInterface; +using Content.Client.Psionics.UI; using Robust.Client.AutoGenerated; using Robust.Client.ResourceManagement; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.XAML; -namespace Content.Client.Nyanotrasen.CartridgeLoader.Cartridges; +namespace Content.Client.Psionics.GlimmerMonitor; [GenerateTypedNameReferences] public sealed partial class GlimmerMonitorUiFragment : BoxContainer diff --git a/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs b/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs index ff4972d9d08..79c1909ebaf 100644 --- a/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs +++ b/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs @@ -20,7 +20,6 @@ using Content.Shared.Examine; using Content.Shared.Input; using Content.Shared.Radio; -using Robust.Client.GameObjects; using Robust.Client.Graphics; using Robust.Client.Input; using Robust.Client.Player; @@ -37,7 +36,7 @@ using Robust.Shared.Replays; using Robust.Shared.Timing; using Robust.Shared.Utility; -using Content.Client.Nyanotrasen.Chat; //Nyano - Summary: chat namespace. +using Content.Client.Psionics.Chat; namespace Content.Client.UserInterface.Systems.Chat; @@ -61,7 +60,7 @@ public sealed class ChatUIController : UIController [UISystemDependency] private readonly GhostSystem? _ghost = default; [UISystemDependency] private readonly TypingIndicatorSystem? _typingIndicator = default; [UISystemDependency] private readonly ChatSystem? _chatSys = default; - [UISystemDependency] private readonly PsionicChatUpdateSystem? _psionic = default!; //Nyano - Summary: makes the psionic chat available. + [UISystemDependency] private readonly PsionicChatUpdateSystem? _psionic = default!; //EE - Summary: makes the psionic chat available. [ValidatePrototypeId] private const string ChatNamePalette = "ChatNames"; @@ -82,7 +81,7 @@ public sealed class ChatUIController : UIController {SharedChatSystem.AdminPrefix, ChatSelectChannel.Admin}, {SharedChatSystem.RadioCommonPrefix, ChatSelectChannel.Radio}, {SharedChatSystem.DeadPrefix, ChatSelectChannel.Dead}, - {SharedChatSystem.TelepathicPrefix, ChatSelectChannel.Telepathic} //Nyano - Summary: adds the telepathic prefix =. + {SharedChatSystem.TelepathicPrefix, ChatSelectChannel.Telepathic} //EE - Summary: adds the telepathic prefix =. }; public static readonly Dictionary ChannelPrefixes = new() @@ -96,7 +95,7 @@ public sealed class ChatUIController : UIController {ChatSelectChannel.Admin, SharedChatSystem.AdminPrefix}, {ChatSelectChannel.Radio, SharedChatSystem.RadioCommonPrefix}, {ChatSelectChannel.Dead, SharedChatSystem.DeadPrefix}, - {ChatSelectChannel.Telepathic, SharedChatSystem.TelepathicPrefix } //Nyano - Summary: associates telepathic with =. + {ChatSelectChannel.Telepathic, SharedChatSystem.TelepathicPrefix } //EE - Summary: associates telepathic with =. }; /// diff --git a/Content.Server/Abilities/Mime/MimePowersSystem.cs b/Content.Server/Abilities/Mime/MimePowersSystem.cs index c1d2643d6fa..3e7605a07d3 100644 --- a/Content.Server/Abilities/Mime/MimePowersSystem.cs +++ b/Content.Server/Abilities/Mime/MimePowersSystem.cs @@ -10,7 +10,7 @@ using Robust.Shared.Containers; using Robust.Shared.Map; using Robust.Shared.Timing; -using Content.Shared.Abilities.Psionics; //Nyano - Summary: Makes Mime psionic. +using Content.Shared.Psionics.Abilities; //EE - Summary: Makes Mime psionic. using Content.Shared.Speech.Muting; namespace Content.Server.Abilities.Mime diff --git a/Content.Server/Anomaly/AnomalySystem.Psionics.cs b/Content.Server/Anomaly/AnomalySystem.Psionics.cs index 95fda1d5035..3a5a55c0bdc 100644 --- a/Content.Server/Anomaly/AnomalySystem.Psionics.cs +++ b/Content.Server/Anomaly/AnomalySystem.Psionics.cs @@ -1,4 +1,4 @@ -using Content.Server.Abilities.Psionics; //Nyano - Summary: the psniocs bin where dispel is located. +using Content.Server.Psionics.Abilities; //EE - Summary: the psionics bin where dispel is located. using Content.Shared.Anomaly; using Content.Shared.Anomaly.Components; using Robust.Shared.Random; @@ -15,7 +15,7 @@ private void InitializePsionics() SubscribeLocalEvent(OnDispelled); } - //Nyano - Summary: gives dispellable behavior to Anomalies. + //Nyano - Summary: gives dispellable behavior to Anomalies. private void OnDispelled(EntityUid uid, AnomalyComponent component, DispelledEvent args) { _dispel.DealDispelDamage(uid); diff --git a/Content.Server/Chat/Systems/ChatSystem.cs b/Content.Server/Chat/Systems/ChatSystem.cs index be6e8b78fef..6cdb088dbb0 100644 --- a/Content.Server/Chat/Systems/ChatSystem.cs +++ b/Content.Server/Chat/Systems/ChatSystem.cs @@ -7,7 +7,7 @@ using Content.Server.GameTicking; using Content.Server.Speech.Components; using Content.Server.Speech.EntitySystems; -using Content.Server.Nyanotrasen.Chat; +using Content.Server.Psionics.Telepathy; using Content.Server.Speech.Components; using Content.Server.Speech.EntitySystems; using Content.Server.Station.Components; diff --git a/Content.Server/DeltaV/StationEvents/Events/GlimmerMobSpawnRule.cs b/Content.Server/DeltaV/StationEvents/Events/GlimmerMobSpawnRule.cs index ec9ec770313..22d96a54146 100644 --- a/Content.Server/DeltaV/StationEvents/Events/GlimmerMobSpawnRule.cs +++ b/Content.Server/DeltaV/StationEvents/Events/GlimmerMobSpawnRule.cs @@ -5,7 +5,7 @@ using Content.Server.Psionics.Glimmer; using Content.Server.StationEvents.Components; using Content.Shared.Psionics.Glimmer; -using Content.Shared.Abilities.Psionics; +using Content.Shared.Psionics.Abilities; namespace Content.Server.StationEvents.Events; diff --git a/Content.Server/Nyanotrasen/Chemistry/Effects/ChemRemovePsionic.cs b/Content.Server/Nyanotrasen/Chemistry/Effects/ChemRemovePsionic.cs index a23a5b3d77d..0ce3f9d7c64 100644 --- a/Content.Server/Nyanotrasen/Chemistry/Effects/ChemRemovePsionic.cs +++ b/Content.Server/Nyanotrasen/Chemistry/Effects/ChemRemovePsionic.cs @@ -1,5 +1,5 @@ using Content.Shared.Chemistry.Reagent; -using Content.Server.Abilities.Psionics; +using Content.Server.Psionics.Abilities; using JetBrains.Annotations; using Robust.Shared.Prototypes; diff --git a/Content.Server/Nyanotrasen/Research/Oracle/OracleSystem.cs b/Content.Server/Nyanotrasen/Research/Oracle/OracleSystem.cs index 148598fe2c3..24459d29e22 100644 --- a/Content.Server/Nyanotrasen/Research/Oracle/OracleSystem.cs +++ b/Content.Server/Nyanotrasen/Research/Oracle/OracleSystem.cs @@ -5,7 +5,7 @@ using Content.Server.Chemistry.Containers.EntitySystems; using Content.Server.Fluids.EntitySystems; using Content.Server.Psionics; -using Content.Shared.Abilities.Psionics; +using Content.Shared.Psionics.Abilities; using Content.Shared.Chat; using Content.Shared.Chemistry.Components; using Content.Shared.Chemistry.EntitySystems; diff --git a/Content.Server/Nyanotrasen/Research/SophicScribe/SophicScribeSystem.cs b/Content.Server/Nyanotrasen/Research/SophicScribe/SophicScribeSystem.cs index bc3c22cc350..b8cdcb56d47 100644 --- a/Content.Server/Nyanotrasen/Research/SophicScribe/SophicScribeSystem.cs +++ b/Content.Server/Nyanotrasen/Research/SophicScribe/SophicScribeSystem.cs @@ -1,4 +1,4 @@ -using Content.Server.Abilities.Psionics; +using Content.Server.Psionics.Abilities; using Content.Server.Chat.Systems; using Content.Server.Radio.Components; using Content.Server.Radio.EntitySystems; diff --git a/Content.Server/Nyanotrasen/StationEvents/Events/GlimmerWispSpawnRule.cs b/Content.Server/Nyanotrasen/StationEvents/Events/GlimmerWispSpawnRule.cs index 66eea988aeb..89b5a176f24 100644 --- a/Content.Server/Nyanotrasen/StationEvents/Events/GlimmerWispSpawnRule.cs +++ b/Content.Server/Nyanotrasen/StationEvents/Events/GlimmerWispSpawnRule.cs @@ -5,7 +5,7 @@ using Content.Server.Psionics.Glimmer; using Content.Server.StationEvents.Components; using Content.Shared.Psionics.Glimmer; -using Content.Shared.Abilities.Psionics; +using Content.Shared.Psionics.Abilities; namespace Content.Server.StationEvents.Events; diff --git a/Content.Server/Nyanotrasen/StationEvents/Events/MassMindSwapRule.cs b/Content.Server/Nyanotrasen/StationEvents/Events/MassMindSwapRule.cs index 63944563269..89f3bc97501 100644 --- a/Content.Server/Nyanotrasen/StationEvents/Events/MassMindSwapRule.cs +++ b/Content.Server/Nyanotrasen/StationEvents/Events/MassMindSwapRule.cs @@ -1,10 +1,9 @@ -using Robust.Server.GameObjects; using Robust.Shared.Random; -using Content.Server.Abilities.Psionics; +using Content.Server.Psionics.Abilities; using Content.Server.GameTicking.Rules.Components; using Content.Server.Psionics; using Content.Server.StationEvents.Components; -using Content.Shared.Abilities.Psionics; +using Content.Shared.Psionics.Abilities; using Content.Shared.Mobs.Components; using Content.Shared.Mobs.Systems; using Robust.Shared.Player; diff --git a/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericFryRule.cs b/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericFryRule.cs index c04543d2195..6a2c1c3ba7d 100644 --- a/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericFryRule.cs +++ b/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericFryRule.cs @@ -10,7 +10,7 @@ using Content.Server.Power.EntitySystems; using Content.Server.Psionics.Glimmer; using Content.Server.StationEvents.Components; -using Content.Shared.Abilities.Psionics; +using Content.Shared.Psionics.Abilities; using Content.Shared.Damage; using Content.Shared.Inventory; using Content.Shared.Mobs.Components; diff --git a/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericStormRule.cs b/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericStormRule.cs index 175318e15bd..8812ed1fe37 100644 --- a/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericStormRule.cs +++ b/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericStormRule.cs @@ -1,9 +1,9 @@ using Robust.Shared.Random; -using Content.Server.Abilities.Psionics; +using Content.Server.Psionics.Abilities; using Content.Server.GameTicking.Rules.Components; using Content.Server.StationEvents.Components; using Content.Server.Psionics; -using Content.Shared.Abilities.Psionics; +using Content.Shared.Psionics.Abilities; using Content.Shared.Mobs.Systems; using Content.Shared.Psionics.Glimmer; using Content.Shared.Zombies; diff --git a/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericZapRule.cs b/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericZapRule.cs index 82c3d72b139..3672d317d9e 100644 --- a/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericZapRule.cs +++ b/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericZapRule.cs @@ -3,7 +3,7 @@ using Content.Server.Psionics; using Content.Server.StationEvents.Components; using Content.Server.Stunnable; -using Content.Shared.Abilities.Psionics; +using Content.Shared.Psionics.Abilities; using Content.Shared.Mobs.Components; using Content.Shared.Mobs.Systems; using Content.Shared.StatusEffect; diff --git a/Content.Server/Nyanotrasen/StationEvents/Events/PsionicCatGotYourTongueRule.cs b/Content.Server/Nyanotrasen/StationEvents/Events/PsionicCatGotYourTongueRule.cs index 63e0a435cb0..753b2e25729 100644 --- a/Content.Server/Nyanotrasen/StationEvents/Events/PsionicCatGotYourTongueRule.cs +++ b/Content.Server/Nyanotrasen/StationEvents/Events/PsionicCatGotYourTongueRule.cs @@ -4,7 +4,7 @@ using Content.Server.GameTicking.Rules.Components; using Content.Server.StationEvents.Components; using Content.Shared.Mobs.Components; -using Content.Shared.Abilities.Psionics; +using Content.Shared.Psionics.Abilities; using Content.Shared.StatusEffect; using Content.Shared.Mobs.Systems; using Robust.Shared.Audio.Systems; diff --git a/Content.Server/Psionics/Glimmer/GlimmerReactiveSystem.cs b/Content.Server/Psionics/Glimmer/GlimmerReactiveSystem.cs index da3b07d6dab..db61a3753a3 100644 --- a/Content.Server/Psionics/Glimmer/GlimmerReactiveSystem.cs +++ b/Content.Server/Psionics/Glimmer/GlimmerReactiveSystem.cs @@ -1,4 +1,4 @@ -using Content.Server.Audio; +using Content.Server.Psionics.Audio; using Content.Server.Power.Components; using Content.Server.Electrocution; using Content.Server.Lightning; diff --git a/Content.Server/Psionics/Invisibility/PsionicInvisibilitySystem.cs b/Content.Server/Psionics/Invisibility/PsionicInvisibilitySystem.cs index f85460a69f5..9583f45fdc9 100644 --- a/Content.Server/Psionics/Invisibility/PsionicInvisibilitySystem.cs +++ b/Content.Server/Psionics/Invisibility/PsionicInvisibilitySystem.cs @@ -1,6 +1,6 @@ -using Content.Shared.Abilities.Psionics; +using Content.Shared.Psionics.Abilities; using Content.Shared.Psionics; -using Content.Server.Abilities.Psionics; +using Content.Server.Psionics.Abilities; using Content.Shared.Eye; using Content.Server.NPC.Systems; using Robust.Shared.Containers; diff --git a/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs b/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs index 7784db015d3..ba07375699b 100644 --- a/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs +++ b/Content.Server/Singularity/EntitySystems/EventHorizonSystem.cs @@ -13,7 +13,7 @@ using Robust.Shared.Map.Components; using Robust.Shared.Physics.Events; using Robust.Shared.Timing; -using Content.Shared.Abilities.Psionics; //Nyano - Summary: for the telegnostic projection. +using Content.Shared.Psionics.Abilities; //EE - Summary: for the telegnostic projection. namespace Content.Server.Singularity.EntitySystems; @@ -39,7 +39,7 @@ public override void Initialize() SubscribeLocalEvent(PreventConsume); SubscribeLocalEvent(PreventConsume); - SubscribeLocalEvent(PreventConsume); ///Nyano - Summary: the telegnositic projection has the same trait as ghosts. + SubscribeLocalEvent(PreventConsume); ///EE - Summary: the telegnositic projection has the same trait as ghosts. SubscribeLocalEvent(PreventConsume); SubscribeLocalEvent(OnHorizonMapInit); SubscribeLocalEvent(OnStartCollide); diff --git a/Content.Server/Zombies/ZombieSystem.Transform.cs b/Content.Server/Zombies/ZombieSystem.Transform.cs index daadd4b518b..09a4489cf4c 100644 --- a/Content.Server/Zombies/ZombieSystem.Transform.cs +++ b/Content.Server/Zombies/ZombieSystem.Transform.cs @@ -16,7 +16,7 @@ using Content.Server.Roles; using Content.Server.Speech.Components; using Content.Server.Temperature.Components; -using Content.Shared.Abilities.Psionics; +using Content.Shared.Psionics.Abilities; using Content.Shared.CombatMode; using Content.Shared.CombatMode.Pacification; using Content.Shared.Damage; From 62163f025aeba8d687bb8fcd486b9d7518b2298c Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Tue, 14 May 2024 21:25:46 -0400 Subject: [PATCH 13/44] Update PsionicsSystem.cs --- Content.Server/Psionics/PsionicsSystem.cs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Content.Server/Psionics/PsionicsSystem.cs b/Content.Server/Psionics/PsionicsSystem.cs index 5c10e4160ca..f51d89200fa 100644 --- a/Content.Server/Psionics/PsionicsSystem.cs +++ b/Content.Server/Psionics/PsionicsSystem.cs @@ -48,6 +48,7 @@ public override void Initialize() SubscribeLocalEvent(OnStamHit); SubscribeLocalEvent(OnInit); + SubscribeLocalEvent(OnStartup); SubscribeLocalEvent(OnRemove); } @@ -81,12 +82,13 @@ private void OnMeleeHit(EntityUid uid, AntiPsionicWeaponComponent component, Mel _electrocutionSystem.TryDoElectrocution(args.User, null, 20, TimeSpan.FromSeconds(5), false); } } - - private void OnInit(EntityUid uid, PsionicComponent component, ComponentInit args) + private void OnStartup(EntityUid uid, PsionicComponent component, ComponentStartup args) { component.Amplification = _random.NextFloat(0.3f, 1.1f); component.Dampening = _random.NextFloat(0.3f, 1.1f); - + } + private void OnInit(EntityUid uid, PsionicComponent component, ComponentInit args) + { if (!component.Removable) return; From 83ea6ace23a52093d296076c624ef4641523fa11 Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Tue, 14 May 2024 22:05:31 -0400 Subject: [PATCH 14/44] Almost got it, one last bug to squash --- .../Abilities/PyrokinesisPowerSystem.cs | 17 ++++++++++++++--- Content.Server/Psionics/PsionicsSystem.cs | 4 ++-- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/Content.Server/Psionics/Abilities/PyrokinesisPowerSystem.cs b/Content.Server/Psionics/Abilities/PyrokinesisPowerSystem.cs index 444675d9b3f..64621313db8 100644 --- a/Content.Server/Psionics/Abilities/PyrokinesisPowerSystem.cs +++ b/Content.Server/Psionics/Abilities/PyrokinesisPowerSystem.cs @@ -5,17 +5,20 @@ using Robust.Server.GameObjects; using Content.Shared.Actions.Events; using Content.Server.Explosion.Components; +using Content.Shared.Mobs.Components; +using Robust.Shared.Map; namespace Content.Server.Psionics.Abilities { public sealed class PyrokinesisPowerSystem : EntitySystem { + [Dependency] private readonly TransformSystem _xform = default!; [Dependency] private readonly SharedActionsSystem _actions = default!; [Dependency] private readonly SharedPsionicAbilitiesSystem _psionics = default!; [Dependency] private readonly GunSystem _gunSystem = default!; [Dependency] private readonly SharedTransformSystem _transformSystem = default!; [Dependency] private readonly PhysicsSystem _physics = default!; - + [Dependency] private readonly IMapManager _mapManager = default!; public override void Initialize() { base.Initialize(); @@ -56,7 +59,15 @@ private void OnPowerUsed(PyrokinesisPowerActionEvent args) if (!HasComp(args.Performer)) { - var ent = Spawn("ProjectileAnomalyFireball"); + var xformQuery = GetEntityQuery(); + var xform = xformQuery.GetComponent(args.Performer); + + var mapPos = xform.Coordinates.ToMap(EntityManager, _xform); + var spawnCoords = _mapManager.TryFindGridAt(mapPos, out var gridUid, out _) + ? xform.Coordinates.WithEntityId(gridUid, EntityManager) + : new(_mapManager.GetMapEntityId(mapPos.MapId), mapPos.Position); + + var ent = Spawn("ProjectileAnomalyFireball", spawnCoords); if (TryComp(ent, out var fireball)) { @@ -69,7 +80,7 @@ private void OnPowerUsed(PyrokinesisPowerActionEvent args) } var userVelocity = _physics.GetMapLinearVelocity(args.Performer); - var direction = args.Target.ToMapPos(EntityManager, _transformSystem); + var direction = args.Target.Position; _gunSystem.ShootProjectile(ent, direction, userVelocity, args.Performer, args.Performer, 20f); diff --git a/Content.Server/Psionics/PsionicsSystem.cs b/Content.Server/Psionics/PsionicsSystem.cs index f51d89200fa..bf829477609 100644 --- a/Content.Server/Psionics/PsionicsSystem.cs +++ b/Content.Server/Psionics/PsionicsSystem.cs @@ -48,7 +48,7 @@ public override void Initialize() SubscribeLocalEvent(OnStamHit); SubscribeLocalEvent(OnInit); - SubscribeLocalEvent(OnStartup); + SubscribeLocalEvent(OnStartup); SubscribeLocalEvent(OnRemove); } @@ -82,7 +82,7 @@ private void OnMeleeHit(EntityUid uid, AntiPsionicWeaponComponent component, Mel _electrocutionSystem.TryDoElectrocution(args.User, null, 20, TimeSpan.FromSeconds(5), false); } } - private void OnStartup(EntityUid uid, PsionicComponent component, ComponentStartup args) + private void OnStartup(EntityUid uid, PsionicComponent component, MapInitEvent args) { component.Amplification = _random.NextFloat(0.3f, 1.1f); component.Dampening = _random.NextFloat(0.3f, 1.1f); From c569e2e92c2d5e39c98ddded0307b093536beed2 Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Tue, 14 May 2024 22:22:29 -0400 Subject: [PATCH 15/44] slightly more acccurate but still not quite right --- Content.Server/Psionics/Abilities/PyrokinesisPowerSystem.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Content.Server/Psionics/Abilities/PyrokinesisPowerSystem.cs b/Content.Server/Psionics/Abilities/PyrokinesisPowerSystem.cs index 64621313db8..4659ca0f463 100644 --- a/Content.Server/Psionics/Abilities/PyrokinesisPowerSystem.cs +++ b/Content.Server/Psionics/Abilities/PyrokinesisPowerSystem.cs @@ -79,10 +79,9 @@ private void OnPowerUsed(PyrokinesisPowerActionEvent args) } } - var userVelocity = _physics.GetMapLinearVelocity(args.Performer); var direction = args.Target.Position; - _gunSystem.ShootProjectile(ent, direction, userVelocity, args.Performer, args.Performer, 20f); + _gunSystem.ShootProjectile(ent, direction, new System.Numerics.Vector2(0, 0), args.Performer, args.Performer, 20f); _psionics.LogPowerUsed(args.Performer, "pyrokinesis", (int) MathF.Round(6f * psionic.Amplification - psionic.Dampening), From 851bebaa43a1153aa12284b70476fc3c812bc663 Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Tue, 14 May 2024 22:28:42 -0400 Subject: [PATCH 16/44] Update PyrokinesisPowerSystem.cs --- Content.Server/Psionics/Abilities/PyrokinesisPowerSystem.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Server/Psionics/Abilities/PyrokinesisPowerSystem.cs b/Content.Server/Psionics/Abilities/PyrokinesisPowerSystem.cs index 4659ca0f463..c0b35ae6169 100644 --- a/Content.Server/Psionics/Abilities/PyrokinesisPowerSystem.cs +++ b/Content.Server/Psionics/Abilities/PyrokinesisPowerSystem.cs @@ -75,7 +75,7 @@ private void OnPowerUsed(PyrokinesisPowerActionEvent args) if (psionic.Amplification > 5 && EnsureComp(ent, out var ignite)) { - ignite.FireStacks = 0.1f * psionic.Amplification - 0.1f * psionic.Dampening; + ignite.FireStacks = 0.2f * psionic.Amplification - 0.1f * psionic.Dampening; } } From 0597405a48a588c9127e1bdbdca1b3d8aae81732 Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Tue, 14 May 2024 22:35:26 -0400 Subject: [PATCH 17/44] removing some errant instances of potentialpsionic --- Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml | 1 - Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml | 4 ---- Resources/Prototypes/Entities/Mobs/Player/skeleton.yml | 1 - Resources/Prototypes/Entities/Mobs/Player/vox.yml | 2 -- 4 files changed, 8 deletions(-) diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml index 89a6f16e525..b5d8dbb53f7 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml @@ -118,7 +118,6 @@ - type: Grammar attributes: gender: male - - type: PotentialPsionic # Nyano - type: entity id: MobRatKingBuff diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml index d0ac6fc0265..d70cf3277a0 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml @@ -121,10 +121,6 @@ molsPerSecondPerUnitMass: 0.0005 - type: Speech speechVerb: LargeMob - - type: PotentialPsionic #Nyano - Summary: makes potentially psionic. - chance: -2 - - type: Psionic #Nyano - Summary: makes psionic by default. - removable: false - type: entity name: Praetorian diff --git a/Resources/Prototypes/Entities/Mobs/Player/skeleton.yml b/Resources/Prototypes/Entities/Mobs/Player/skeleton.yml index bf41f2dda6e..f9132ce0ea0 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/skeleton.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/skeleton.yml @@ -8,7 +8,6 @@ interactSuccessString: hugging-success-generic interactSuccessSound: /Audio/Effects/thudswoosh.ogg messagePerceivedByOthers: hugging-success-generic-others - - type: PotentialPsionic #Nyano - Summary: makes potentially psionic. - type: entity name: skeleton pirate diff --git a/Resources/Prototypes/Entities/Mobs/Player/vox.yml b/Resources/Prototypes/Entities/Mobs/Player/vox.yml index 0a6f4f43644..de1e3da2be7 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/vox.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/vox.yml @@ -3,5 +3,3 @@ name: Vox parent: BaseMobVox id: MobVox - components: - - type: PotentialPsionic #Nyano - Summary: makes potentially psionic. From f96847f90b8fb49a44ca4b5f829f9a67989df2de Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Tue, 14 May 2024 22:37:03 -0400 Subject: [PATCH 18/44] Revert "removing some errant instances of potentialpsionic" This reverts commit 0597405a48a588c9127e1bdbdca1b3d8aae81732. --- Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml | 1 + Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml | 4 ++++ Resources/Prototypes/Entities/Mobs/Player/skeleton.yml | 1 + Resources/Prototypes/Entities/Mobs/Player/vox.yml | 2 ++ 4 files changed, 8 insertions(+) diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml index b5d8dbb53f7..89a6f16e525 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml @@ -118,6 +118,7 @@ - type: Grammar attributes: gender: male + - type: PotentialPsionic # Nyano - type: entity id: MobRatKingBuff diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml index d70cf3277a0..d0ac6fc0265 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/xeno.yml @@ -121,6 +121,10 @@ molsPerSecondPerUnitMass: 0.0005 - type: Speech speechVerb: LargeMob + - type: PotentialPsionic #Nyano - Summary: makes potentially psionic. + chance: -2 + - type: Psionic #Nyano - Summary: makes psionic by default. + removable: false - type: entity name: Praetorian diff --git a/Resources/Prototypes/Entities/Mobs/Player/skeleton.yml b/Resources/Prototypes/Entities/Mobs/Player/skeleton.yml index f9132ce0ea0..bf41f2dda6e 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/skeleton.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/skeleton.yml @@ -8,6 +8,7 @@ interactSuccessString: hugging-success-generic interactSuccessSound: /Audio/Effects/thudswoosh.ogg messagePerceivedByOthers: hugging-success-generic-others + - type: PotentialPsionic #Nyano - Summary: makes potentially psionic. - type: entity name: skeleton pirate diff --git a/Resources/Prototypes/Entities/Mobs/Player/vox.yml b/Resources/Prototypes/Entities/Mobs/Player/vox.yml index de1e3da2be7..0a6f4f43644 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/vox.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/vox.yml @@ -3,3 +3,5 @@ name: Vox parent: BaseMobVox id: MobVox + components: + - type: PotentialPsionic #Nyano - Summary: makes potentially psionic. From 0e11da63167c8cb08abebde6e24bd041fb883ffc Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Wed, 15 May 2024 17:31:32 -0400 Subject: [PATCH 19/44] Final power update --- .../Abilities/MetapsionicPowerSystem.cs | 6 ++ .../Abilities/NoosphericZapPowerSystem.cs | 2 +- .../Abilities/PsionicAbilitiesSystem.cs | 4 - .../PsionicInvisibilityPowerSystem.cs | 1 - .../PsionicRegenerationPowerSystem.cs | 10 +-- .../Abilities/PyrokinesisPowerSystem.cs | 2 +- .../RegenerativeStasisPowerSystem.cs | 76 +++++++++++++++++++ Content.Server/Psionics/Dreams/DreamSystem.cs | 2 - .../Psionics/Glimmer/GlimmerReactiveSystem.cs | 3 - .../PsionicInvisibleContactsComponent.cs | 1 - .../PsionicInvisibleContactsSystem.cs | 2 - Content.Server/Psionics/PsionicsCommands.cs | 3 +- .../Psionics/Telepathy/TSayCommand.cs | 1 - .../Psionics/Telepathy/TelepathyChatSystem.cs | 1 - .../Zombies/ZombieSystem.Transform.cs | 2 - .../Events/MassSleepPowerActionEvent.cs | 2 - .../RegenerativeStasisPowerActionEvent.cs | 2 + .../Dispel/DamageOnDispelComponent.cs | 2 +- .../Abilities/Dispel/DispelPowerComponent.cs | 1 - .../MassSleep/MassSleepPowerComponent.cs | 21 ----- .../MassSleep/MassSleepPowerSystem.cs | 59 -------------- .../Metapsionics/MetapsionicPowerComponent.cs | 1 - .../RegenerativeStasisPowerComponent.cs | 20 +++++ .../Psionics/Glimmer/GlimmerSystem.cs | 2 +- Content.Shared/Psionics/PsionicComponent.cs | 2 +- .../Psionics/SharedPsionicAbilitiesSystem.cs | 3 +- .../nyanotrasen/psionics/psychic-feedback.ftl | 21 ++++- .../Prototypes/Nyanotrasen/Actions/types.yml | 10 +-- .../Machines/metempsychoticMachine.yml | 2 + .../Entities/Structures/Research/oracle.yml | 2 + .../Structures/Research/sophicscribe.yml | 2 + 31 files changed, 143 insertions(+), 125 deletions(-) create mode 100644 Content.Server/Psionics/Abilities/RegenerativeStasisPowerSystem.cs delete mode 100644 Content.Shared/Nyanotrasen/Actions/Events/MassSleepPowerActionEvent.cs create mode 100644 Content.Shared/Nyanotrasen/Actions/Events/RegenerativeStasisPowerActionEvent.cs delete mode 100644 Content.Shared/Psionics/Abilities/MassSleep/MassSleepPowerComponent.cs delete mode 100644 Content.Shared/Psionics/Abilities/MassSleep/MassSleepPowerSystem.cs create mode 100644 Content.Shared/Psionics/Abilities/RegenerativeStasis/RegenerativeStasisPowerComponent.cs diff --git a/Content.Server/Psionics/Abilities/MetapsionicPowerSystem.cs b/Content.Server/Psionics/Abilities/MetapsionicPowerSystem.cs index c30abd84f57..ffe8ab00c2f 100644 --- a/Content.Server/Psionics/Abilities/MetapsionicPowerSystem.cs +++ b/Content.Server/Psionics/Abilities/MetapsionicPowerSystem.cs @@ -154,6 +154,12 @@ private void OnDoAfter(EntityUid uid, MetapsionicPowerComponent component, Focus if (args.Target == null) return; + if (TryComp(args.Target, out var swapped)) + { + _popups.PopupEntity(Loc.GetString(swapped.MindSwappedFeedback, ("entity", args.Target)), uid, uid, PopupType.LargeCaution); + return; + } + if (args.Target == uid) { _popups.PopupEntity(Loc.GetString("metapulse-self", ("entity", args.Target)), uid, uid, PopupType.LargeCaution); diff --git a/Content.Server/Psionics/Abilities/NoosphericZapPowerSystem.cs b/Content.Server/Psionics/Abilities/NoosphericZapPowerSystem.cs index ce55cb3bb7d..c935bc0123d 100644 --- a/Content.Server/Psionics/Abilities/NoosphericZapPowerSystem.cs +++ b/Content.Server/Psionics/Abilities/NoosphericZapPowerSystem.cs @@ -47,7 +47,7 @@ private void OnShutdown(EntityUid uid, NoosphericZapPowerComponent component, Co { psionic.ActivePowers.Remove(component); psionic.PsychicFeedback.Remove(component.NoosphericZapFeedback); - psionic.Amplification += 1f; + psionic.Amplification -= 1f; } } diff --git a/Content.Server/Psionics/Abilities/PsionicAbilitiesSystem.cs b/Content.Server/Psionics/Abilities/PsionicAbilitiesSystem.cs index b6ab74627d3..5124aff0688 100644 --- a/Content.Server/Psionics/Abilities/PsionicAbilitiesSystem.cs +++ b/Content.Server/Psionics/Abilities/PsionicAbilitiesSystem.cs @@ -3,8 +3,6 @@ using Content.Shared.Psionics.Glimmer; using Content.Shared.Random; using Content.Shared.Random.Helpers; -using Content.Server.EUI; -using Content.Server.Mind; using Content.Shared.StatusEffect; using Robust.Shared.Random; using Robust.Shared.Prototypes; @@ -20,11 +18,9 @@ public sealed class PsionicAbilitiesSystem : EntitySystem [Dependency] private readonly IComponentFactory _componentFactory = default!; [Dependency] private readonly IRobustRandom _random = default!; [Dependency] private readonly SharedActionsSystem _actionsSystem = default!; - [Dependency] private readonly EuiManager _euiManager = default!; [Dependency] private readonly StatusEffectsSystem _statusEffectsSystem = default!; [Dependency] private readonly GlimmerSystem _glimmerSystem = default!; [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly MindSystem _mindSystem = default!; [Dependency] private readonly SharedPopupSystem _popups = default!; public override void Initialize() diff --git a/Content.Server/Psionics/Abilities/PsionicInvisibilityPowerSystem.cs b/Content.Server/Psionics/Abilities/PsionicInvisibilityPowerSystem.cs index 9422dfb9acf..0c50efb5cf3 100644 --- a/Content.Server/Psionics/Abilities/PsionicInvisibilityPowerSystem.cs +++ b/Content.Server/Psionics/Abilities/PsionicInvisibilityPowerSystem.cs @@ -6,7 +6,6 @@ using Content.Shared.Stunnable; using Content.Shared.Stealth; using Content.Shared.Stealth.Components; -using Content.Server.Psionics; using Content.Shared.Psionics.Events; using Content.Shared.Actions.Events; using Robust.Shared.Audio.Systems; diff --git a/Content.Server/Psionics/Abilities/PsionicRegenerationPowerSystem.cs b/Content.Server/Psionics/Abilities/PsionicRegenerationPowerSystem.cs index e6ef1ac6d73..882eb9e0b14 100644 --- a/Content.Server/Psionics/Abilities/PsionicRegenerationPowerSystem.cs +++ b/Content.Server/Psionics/Abilities/PsionicRegenerationPowerSystem.cs @@ -147,7 +147,7 @@ private void OnShutdown(EntityUid uid, PsionicRegenerationPowerComponent compone { psionic.ActivePowers.Remove(component); psionic.PsychicFeedback.Remove(component.RegenerationFeedback); - psionic.Amplification += 0.5f; + psionic.Amplification -= 0.5f; psionic.Dampening -= 0.5f; } } @@ -173,19 +173,15 @@ private void OnDoAfter(EntityUid uid, PsionicRegenerationPowerComponent componen if (!TryComp(uid, out var stream)) return; - // DoAfter has no way to run a callback during the process to give - // small doses of the reagent, so we wait until either the action - // is cancelled (by being dispelled) or complete to give the - // appropriate dose. A timestamp delta is used to accomplish this. var percentageComplete = Math.Min(1f, (_gameTiming.CurTime - args.StartedAt).TotalSeconds / component.UseDelay); var solution = new Solution(); - solution.AddReagent("PsionicRegenerationEssence", FixedPoint2.New(component.EssenceAmount * percentageComplete + 10f * psionic.Dampening)); + solution.AddReagent("PsionicRegenerationEssence", FixedPoint2.New(Math.Min(component.EssenceAmount * percentageComplete + 10f * psionic.Dampening, 15f))); _bloodstreamSystem.TryAddToChemicals(uid, solution, stream); if (component.SelfRevive == true) { var critSolution = new Solution(); - critSolution.AddReagent("Epinephrine", MathF.MinMagnitude(5 + 5 * psionic.Dampening, 15)); + critSolution.AddReagent("Epinephrine", MathF.Min(5 + 5 * psionic.Dampening, 15)); _bloodstreamSystem.TryAddToChemicals(uid, critSolution, stream); component.SelfRevive = false; } diff --git a/Content.Server/Psionics/Abilities/PyrokinesisPowerSystem.cs b/Content.Server/Psionics/Abilities/PyrokinesisPowerSystem.cs index c0b35ae6169..77075dab206 100644 --- a/Content.Server/Psionics/Abilities/PyrokinesisPowerSystem.cs +++ b/Content.Server/Psionics/Abilities/PyrokinesisPowerSystem.cs @@ -48,7 +48,7 @@ private void OnShutdown(EntityUid uid, PyrokinesisPowerComponent component, Comp { psionic.ActivePowers.Remove(component); psionic.PsychicFeedback.Remove(component.PyrokinesisFeedback); - psionic.Amplification += 1f; + psionic.Amplification -= 1f; } } diff --git a/Content.Server/Psionics/Abilities/RegenerativeStasisPowerSystem.cs b/Content.Server/Psionics/Abilities/RegenerativeStasisPowerSystem.cs new file mode 100644 index 00000000000..e184b19396b --- /dev/null +++ b/Content.Server/Psionics/Abilities/RegenerativeStasisPowerSystem.cs @@ -0,0 +1,76 @@ +using Content.Server.Body.Systems; +using Content.Server.Body.Components; +using Content.Shared.Actions; +using Content.Shared.Chemistry.Components; +using Content.Shared.Bed.Sleep; +using Content.Shared.Psionics.Abilities; +using Robust.Shared.Prototypes; +using Robust.Shared.Timing; +using Content.Shared.Mind; +using Content.Shared.Actions.Events; +using Content.Shared.FixedPoint; + +namespace Content.Server.Psionics.Abilities +{ + public sealed class MassSleepPowerSystem : EntitySystem + { + [Dependency] private readonly SharedActionsSystem _actions = default!; + [Dependency] private readonly SharedPsionicAbilitiesSystem _psionics = default!; + [Dependency] private readonly BloodstreamSystem _bloodstreamSystem = default!; + + public override void Initialize() + { + base.Initialize(); + SubscribeLocalEvent(OnInit); + SubscribeLocalEvent(OnShutdown); + SubscribeLocalEvent(OnPowerUsed); + } + + private void OnInit(EntityUid uid, RegenerativeStasisPowerComponent component, ComponentInit args) + { + _actions.AddAction(uid, ref component.RegenerativeStasisActionEntity, component.RegenerativeStasisActionId); + _actions.TryGetActionData(component.RegenerativeStasisActionEntity, out var actionData); + if (actionData is { UseDelay: not null }) + _actions.StartUseDelay(component.RegenerativeStasisActionEntity); + if (TryComp(uid, out var psionic)) + { + psionic.ActivePowers.Add(component); + psionic.PsychicFeedback.Add(component.RegenerativeStasisFeedback); + psionic.Amplification += 0.5f; + psionic.Dampening += 0.5f; + } + } + + private void OnShutdown(EntityUid uid, RegenerativeStasisPowerComponent component, ComponentShutdown args) + { + if (TryComp(uid, out var psionic)) + { + psionic.ActivePowers.Remove(component); + psionic.PsychicFeedback.Remove(component.RegenerativeStasisFeedback); + psionic.Amplification -= 0.5f; + psionic.Dampening -= 0.5f; + } + _actions.RemoveAction(uid, component.RegenerativeStasisActionEntity); + } + + private void OnPowerUsed(EntityUid uid, RegenerativeStasisPowerComponent component, RegenerativeStasisPowerActionEvent args) + { + if (TryComp(uid, out var psionic) + && !HasComp(uid) + && !HasComp(args.Target) + && TryComp(args.Target, out var stream)) + { + var solution = new Solution(); + solution.AddReagent("PsionicRegenerationEssence", FixedPoint2.New(MathF.Min(2.5f * psionic.Amplification + psionic.Dampening, 15f))); + solution.AddReagent("Epinephrine", FixedPoint2.New(MathF.Min(2.5f * psionic.Dampening + psionic.Amplification, 15f))); + _bloodstreamSystem.TryAddToChemicals(args.Target, solution, stream); + EnsureComp(args.Target); + + _psionics.LogPowerUsed(uid, "regenerative stasis", + (int) Math.Round(4 * psionic.Amplification - psionic.Dampening), + (int) Math.Round(6 * psionic.Amplification - psionic.Dampening)); + args.Handled = true; + } + } + } +} diff --git a/Content.Server/Psionics/Dreams/DreamSystem.cs b/Content.Server/Psionics/Dreams/DreamSystem.cs index 15e1593a859..1731c7a9bf5 100644 --- a/Content.Server/Psionics/Dreams/DreamSystem.cs +++ b/Content.Server/Psionics/Dreams/DreamSystem.cs @@ -1,6 +1,5 @@ using Content.Shared.Dataset; using Content.Shared.Bed.Sleep; -using Content.Server.Chat.Systems; using Content.Server.Chat.Managers; using Robust.Shared.Random; using Robust.Shared.Prototypes; @@ -10,7 +9,6 @@ namespace Content.Server.Psionics.Dreams { public sealed class DreamsSystem : EntitySystem { - [Dependency] private readonly ChatSystem _chat = default!; [Dependency] private readonly IRobustRandom _random = default!; [Dependency] private readonly IChatManager _chatManager = default!; [Dependency] private readonly IPrototypeManager _prototypeManager = default!; diff --git a/Content.Server/Psionics/Glimmer/GlimmerReactiveSystem.cs b/Content.Server/Psionics/Glimmer/GlimmerReactiveSystem.cs index db61a3753a3..c0802c8b670 100644 --- a/Content.Server/Psionics/Glimmer/GlimmerReactiveSystem.cs +++ b/Content.Server/Psionics/Glimmer/GlimmerReactiveSystem.cs @@ -3,12 +3,10 @@ using Content.Server.Electrocution; using Content.Server.Lightning; using Content.Server.Explosion.EntitySystems; -using Content.Server.Construction; using Content.Server.Ghost; using Content.Server.Revenant.EntitySystems; using Content.Shared.Audio; using Content.Shared.Construction.EntitySystems; -using Content.Shared.Coordinates.Helpers; using Content.Shared.GameTicking; using Content.Shared.Psionics.Glimmer; using Content.Shared.Verbs; @@ -16,7 +14,6 @@ using Content.Shared.Damage; using Content.Shared.Destructible; using Content.Shared.Construction.Components; -using Content.Shared.Mind; using Content.Shared.Mind.Components; using Content.Shared.Weapons.Melee.Components; using Robust.Shared.Audio; diff --git a/Content.Server/Psionics/Invisibility/PsionicInvisibleContactsComponent.cs b/Content.Server/Psionics/Invisibility/PsionicInvisibleContactsComponent.cs index 859ceb7b83a..268deddf6d9 100644 --- a/Content.Server/Psionics/Invisibility/PsionicInvisibleContactsComponent.cs +++ b/Content.Server/Psionics/Invisibility/PsionicInvisibleContactsComponent.cs @@ -1,5 +1,4 @@ using Content.Shared.Whitelist; -using Robust.Shared.Timing; namespace Content.Server.Psionics { diff --git a/Content.Server/Psionics/Invisibility/PsionicInvisibleContactsSystem.cs b/Content.Server/Psionics/Invisibility/PsionicInvisibleContactsSystem.cs index cec755e3260..403e0592617 100644 --- a/Content.Server/Psionics/Invisibility/PsionicInvisibleContactsSystem.cs +++ b/Content.Server/Psionics/Invisibility/PsionicInvisibleContactsSystem.cs @@ -2,7 +2,6 @@ using Content.Shared.Stealth.Components; using Robust.Shared.Physics.Events; using Robust.Shared.Physics.Systems; -using Robust.Shared.Timing; namespace Content.Server.Psionics { @@ -12,7 +11,6 @@ namespace Content.Server.Psionics public sealed class PsionicInvisibleContactsSystem : EntitySystem { [Dependency] private readonly SharedStealthSystem _stealth = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; public override void Initialize() { diff --git a/Content.Server/Psionics/PsionicsCommands.cs b/Content.Server/Psionics/PsionicsCommands.cs index 2eda2cd2bc8..3f9ee794b38 100644 --- a/Content.Server/Psionics/PsionicsCommands.cs +++ b/Content.Server/Psionics/PsionicsCommands.cs @@ -18,7 +18,8 @@ public async void Execute(IConsoleShell shell, string argStr, string[] args) { SharedActionsSystem actions = default!; var entMan = IoCManager.Resolve(); - foreach (var (actor, mob, psionic, meta) in entMan.EntityQuery()){ + foreach (var (actor, psionic, meta) in entMan.EntityQuery()) + { // filter out xenos, etc, with innate telepathy actions.TryGetActionData( psionic.PsionicAbility, out var actionData ); if (actionData == null || actionData.ToString() == null) diff --git a/Content.Server/Psionics/Telepathy/TSayCommand.cs b/Content.Server/Psionics/Telepathy/TSayCommand.cs index 378789ccbf9..8fbaa5e17b2 100644 --- a/Content.Server/Psionics/Telepathy/TSayCommand.cs +++ b/Content.Server/Psionics/Telepathy/TSayCommand.cs @@ -1,6 +1,5 @@ using Content.Server.Chat.Systems; using Content.Shared.Administration; -using Robust.Server.Player; using Robust.Shared.Console; using Robust.Shared.Enums; using Robust.Shared.Player; diff --git a/Content.Server/Psionics/Telepathy/TelepathyChatSystem.cs b/Content.Server/Psionics/Telepathy/TelepathyChatSystem.cs index 565e7c7f0e6..ad49075e65a 100644 --- a/Content.Server/Psionics/Telepathy/TelepathyChatSystem.cs +++ b/Content.Server/Psionics/Telepathy/TelepathyChatSystem.cs @@ -2,7 +2,6 @@ using Content.Server.Administration.Managers; using Content.Server.Chat.Managers; using Content.Server.Chat.Systems; -using Content.Server.Psionics; using Content.Shared.Psionics.Abilities; using Content.Shared.Bed.Sleep; using Content.Shared.Chat; diff --git a/Content.Server/Zombies/ZombieSystem.Transform.cs b/Content.Server/Zombies/ZombieSystem.Transform.cs index 09a4489cf4c..53128aade31 100644 --- a/Content.Server/Zombies/ZombieSystem.Transform.cs +++ b/Content.Server/Zombies/ZombieSystem.Transform.cs @@ -59,9 +59,7 @@ public sealed partial class ZombieSystem [Dependency] private readonly IChatManager _chatMan = default!; [Dependency] private readonly MindSystem _mind = default!; [Dependency] private readonly SharedRoleSystem _roles = default!; - [Dependency] private readonly MobThresholdSystem _mobThreshold = default!; [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly ActionsSystem _actions = default!; // DeltaV - No psionic zombies /// /// Handles an entity turning into a zombie when they die or go into crit diff --git a/Content.Shared/Nyanotrasen/Actions/Events/MassSleepPowerActionEvent.cs b/Content.Shared/Nyanotrasen/Actions/Events/MassSleepPowerActionEvent.cs deleted file mode 100644 index 6666ee48d6c..00000000000 --- a/Content.Shared/Nyanotrasen/Actions/Events/MassSleepPowerActionEvent.cs +++ /dev/null @@ -1,2 +0,0 @@ -namespace Content.Shared.Actions.Events; -public sealed partial class MassSleepPowerActionEvent : WorldTargetActionEvent {} diff --git a/Content.Shared/Nyanotrasen/Actions/Events/RegenerativeStasisPowerActionEvent.cs b/Content.Shared/Nyanotrasen/Actions/Events/RegenerativeStasisPowerActionEvent.cs new file mode 100644 index 00000000000..4435f475a44 --- /dev/null +++ b/Content.Shared/Nyanotrasen/Actions/Events/RegenerativeStasisPowerActionEvent.cs @@ -0,0 +1,2 @@ +namespace Content.Shared.Actions.Events; +public sealed partial class RegenerativeStasisPowerActionEvent : EntityTargetActionEvent {} diff --git a/Content.Shared/Psionics/Abilities/Dispel/DamageOnDispelComponent.cs b/Content.Shared/Psionics/Abilities/Dispel/DamageOnDispelComponent.cs index 89168d2b259..c3702880375 100644 --- a/Content.Shared/Psionics/Abilities/Dispel/DamageOnDispelComponent.cs +++ b/Content.Shared/Psionics/Abilities/Dispel/DamageOnDispelComponent.cs @@ -9,7 +9,7 @@ namespace Content.Shared.Psionics.Abilities public sealed partial class DamageOnDispelComponent : Component { [DataField("damage", required: true)] - public DamageSpecifier Damage = default!; + public DamageSpecifier Damage = default!; [DataField("variance")] public float Variance = 0.5f; diff --git a/Content.Shared/Psionics/Abilities/Dispel/DispelPowerComponent.cs b/Content.Shared/Psionics/Abilities/Dispel/DispelPowerComponent.cs index 1426712cf94..518a28b0967 100644 --- a/Content.Shared/Psionics/Abilities/Dispel/DispelPowerComponent.cs +++ b/Content.Shared/Psionics/Abilities/Dispel/DispelPowerComponent.cs @@ -1,4 +1,3 @@ -using Content.Shared.Actions; using Robust.Shared.Prototypes; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; diff --git a/Content.Shared/Psionics/Abilities/MassSleep/MassSleepPowerComponent.cs b/Content.Shared/Psionics/Abilities/MassSleep/MassSleepPowerComponent.cs deleted file mode 100644 index dcd1d2c1c42..00000000000 --- a/Content.Shared/Psionics/Abilities/MassSleep/MassSleepPowerComponent.cs +++ /dev/null @@ -1,21 +0,0 @@ -using Content.Shared.Actions; -using Robust.Shared.Prototypes; -using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; - -namespace Content.Shared.Psionics.Abilities -{ - [RegisterComponent] - public sealed partial class MassSleepPowerComponent : Component - { - public float Radius = 1.25f; - [DataField("massSleepActionId", - customTypeSerializer: typeof(PrototypeIdSerializer))] - public string? MassSleepActionId = "ActionMassSleep"; - - [DataField("massSleepActionEntity")] - public EntityUid? MassSleepActionEntity; - - [DataField("massSleepFeedback")] - public string MassSleepFeedback = "mass-sleep-feedback"; - } -} diff --git a/Content.Shared/Psionics/Abilities/MassSleep/MassSleepPowerSystem.cs b/Content.Shared/Psionics/Abilities/MassSleep/MassSleepPowerSystem.cs deleted file mode 100644 index 1f2f6954e77..00000000000 --- a/Content.Shared/Psionics/Abilities/MassSleep/MassSleepPowerSystem.cs +++ /dev/null @@ -1,59 +0,0 @@ -using Content.Shared.Actions; -using Content.Shared.Bed.Sleep; -using Content.Shared.Magic.Events; -using Content.Shared.Damage; -using Content.Shared.Mobs.Components; -using Robust.Shared.Prototypes; -using Robust.Shared.Timing; -using Content.Shared.Mind; -using Content.Shared.Actions.Events; - -namespace Content.Shared.Psionics.Abilities -{ - public sealed class MassSleepPowerSystem : EntitySystem - { - [Dependency] private readonly IPrototypeManager _prototypeManager = default!; - [Dependency] private readonly SharedActionsSystem _actions = default!; - [Dependency] private readonly EntityLookupSystem _lookup = default!; - [Dependency] private readonly SharedPsionicAbilitiesSystem _psionics = default!; - [Dependency] private readonly IGameTiming _gameTiming = default!; - [Dependency] private readonly SharedMindSystem _mindSystem = default!; - - public override void Initialize() - { - base.Initialize(); - SubscribeLocalEvent(OnInit); - SubscribeLocalEvent(OnShutdown); - SubscribeLocalEvent(OnPowerUsed); - } - - private void OnInit(EntityUid uid, MassSleepPowerComponent component, ComponentInit args) - { - _actions.AddAction(uid, ref component.MassSleepActionEntity, component.MassSleepActionId ); - _actions.TryGetActionData( component.MassSleepActionEntity, out var actionData ); - if (actionData is { UseDelay: not null }) - _actions.StartUseDelay(component.MassSleepActionEntity); - if (TryComp(uid, out var psionic) && psionic.PsionicAbility == null) - psionic.PsionicAbility = component.MassSleepActionEntity; - } - - private void OnShutdown(EntityUid uid, MassSleepPowerComponent component, ComponentShutdown args) - { - _actions.RemoveAction(uid, component.MassSleepActionEntity); - } - - private void OnPowerUsed(EntityUid uid, MassSleepPowerComponent component, MassSleepPowerActionEvent args) - { - foreach (var entity in _lookup.GetEntitiesInRange(args.Target, component.Radius)) - { - if (HasComp(entity) && entity != uid && !HasComp(entity)) - { - if (TryComp(entity, out var damageable) && damageable.DamageContainerID == "Biological") - EnsureComp(entity); - } - } - _psionics.LogPowerUsed(uid, "mass sleep"); - args.Handled = true; - } - } -} diff --git a/Content.Shared/Psionics/Abilities/Metapsionics/MetapsionicPowerComponent.cs b/Content.Shared/Psionics/Abilities/Metapsionics/MetapsionicPowerComponent.cs index 8570668f744..2fbfe18327e 100644 --- a/Content.Shared/Psionics/Abilities/Metapsionics/MetapsionicPowerComponent.cs +++ b/Content.Shared/Psionics/Abilities/Metapsionics/MetapsionicPowerComponent.cs @@ -1,4 +1,3 @@ -using Content.Shared.Actions; using Content.Shared.DoAfter; using Robust.Shared.Audio; using Robust.Shared.Prototypes; diff --git a/Content.Shared/Psionics/Abilities/RegenerativeStasis/RegenerativeStasisPowerComponent.cs b/Content.Shared/Psionics/Abilities/RegenerativeStasis/RegenerativeStasisPowerComponent.cs new file mode 100644 index 00000000000..27a0903e224 --- /dev/null +++ b/Content.Shared/Psionics/Abilities/RegenerativeStasis/RegenerativeStasisPowerComponent.cs @@ -0,0 +1,20 @@ +using Content.Shared.Actions; +using Robust.Shared.Prototypes; +using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; + +namespace Content.Shared.Psionics.Abilities +{ + [RegisterComponent] + public sealed partial class RegenerativeStasisPowerComponent : Component + { + [DataField("regenerativeStasisActionId", + customTypeSerializer: typeof(PrototypeIdSerializer))] + public string? RegenerativeStasisActionId = "ActionRegenerativeStasis"; + + [DataField("regenerativeStasisActionEntity")] + public EntityUid? RegenerativeStasisActionEntity; + + [DataField("regenerativeStasisFeedback")] + public string RegenerativeStasisFeedback = "regenerative-stasis-feedback"; + } +} diff --git a/Content.Shared/Psionics/Glimmer/GlimmerSystem.cs b/Content.Shared/Psionics/Glimmer/GlimmerSystem.cs index 31af85bbb51..8be02f936a9 100644 --- a/Content.Shared/Psionics/Glimmer/GlimmerSystem.cs +++ b/Content.Shared/Psionics/Glimmer/GlimmerSystem.cs @@ -40,7 +40,7 @@ public GlimmerTier GetGlimmerTier(int? glimmer = null) if (glimmer == null) glimmer = Glimmer; - return (glimmer) switch + return glimmer switch { <= 49 => GlimmerTier.Minimal, >= 50 and <= 99 => GlimmerTier.Low, diff --git a/Content.Shared/Psionics/PsionicComponent.cs b/Content.Shared/Psionics/PsionicComponent.cs index 76e629f0839..9a06e54cb31 100644 --- a/Content.Shared/Psionics/PsionicComponent.cs +++ b/Content.Shared/Psionics/PsionicComponent.cs @@ -17,7 +17,7 @@ public sealed partial class PsionicComponent : Component public List ActivePowers = new(); [DataField("psychicFeedback")] - public List PsychicFeedback= new(); + public List PsychicFeedback = new(); [DataField("amplification")] public float Amplification = 0.1f; diff --git a/Content.Shared/Psionics/SharedPsionicAbilitiesSystem.cs b/Content.Shared/Psionics/SharedPsionicAbilitiesSystem.cs index a4b283f59ce..603c5188a52 100644 --- a/Content.Shared/Psionics/SharedPsionicAbilitiesSystem.cs +++ b/Content.Shared/Psionics/SharedPsionicAbilitiesSystem.cs @@ -4,7 +4,6 @@ using Content.Shared.Mobs.Components; using Content.Shared.Popups; using Content.Shared.Psionics.Glimmer; -using Content.Shared.Psionics.Abilities; using Robust.Shared.Random; using Robust.Shared.Serialization; @@ -74,7 +73,7 @@ public void SetPsionicsThroughEligibility(EntityUid uid) if (actionData == null) return; - _actions.SetEnabled(actionData.Owner, IsEligibleForPsionics(uid)); + _actions.SetEnabled(uid, IsEligibleForPsionics(uid)); } private bool IsEligibleForPsionics(EntityUid uid) diff --git a/Resources/Locale/en-US/nyanotrasen/psionics/psychic-feedback.ftl b/Resources/Locale/en-US/nyanotrasen/psionics/psychic-feedback.ftl index 5e6626eb9ca..6bdc84dc3ea 100644 --- a/Resources/Locale/en-US/nyanotrasen/psionics/psychic-feedback.ftl +++ b/Resources/Locale/en-US/nyanotrasen/psionics/psychic-feedback.ftl @@ -1,6 +1,19 @@ -dispel-feedback = {CAPITALIZE($entity)} projects an aura of normality +# Feedback messages for Focused Metapsionic Pulse +metapulse-self = I AM. no-powers = {CAPITALIZE($entity)} will never awaken from the dream in this life psychic-potential = {CAPITALIZE($entity)} has a slim chance of awakening from the dream -focused-metapsionic-pulse-begin = The air around {CAPITALIZE($entity)} begins to shimmer faintly, like a heat haze crawling across the endless desert -psionic-regeneration-self-revive = As {CAPITALIZE($entity)} falls to the floor greviously wounded, - they begin visibly regenerating! +dispel-feedback = {CAPITALIZE($entity)} is a mighty stone, standing against the currents of fate +metasionic-feedback = {CAPITALIZE($entity)} gazes back upon thee +mind-swap-feedback = {CAPITALIZE($entity)}'s vessel seems fit for other souls +mindswapped-feedback = Cursed flesh! {CAPITALIZE($entity)} dwells within the wrong vessel! +noospheric-zap-feedback = {CAPITALIZE($entity)}'s soul writhes with thunder from beyond the veil +pyrokinesis-feedback = The Secret of Fire dwells within {CAPITALIZE($entity)} +invisibility-feedback = {CAPITALIZE($entity)}'s wyrd seeks to hide from thine gaze +telegnosis-feedback = {CAPITALIZE($entity)}'s soul travels across bridges composed of dreamlight. +sophic-grammateus-feedback = SEEKER, YOU NEED ONLY ASK FOR MY WISDOM. +oracle-feedback = WHY DO YOU BOTHER ME SEEKER? HAVE I NOT MADE MY DESIRES CLEAR? +metempsychotic-machine-feedback = The sea of fate flows through this machine + +# Power PVS Messages +focused-metapsionic-pulse-begin = The air around {CAPITALIZE($entity)} begins to shimmer faintly +psionic-regeneration-self-revive = {CAPITALIZE($entity)} begins to visibly regenerate diff --git a/Resources/Prototypes/Nyanotrasen/Actions/types.yml b/Resources/Prototypes/Nyanotrasen/Actions/types.yml index 71a92ec4516..55dd48e5470 100644 --- a/Resources/Prototypes/Nyanotrasen/Actions/types.yml +++ b/Resources/Prototypes/Nyanotrasen/Actions/types.yml @@ -36,18 +36,18 @@ event: !type:DispelPowerActionEvent - type: entity - id: ActionMassSleep - name: action-name-mass-sleep - description: action-description-mass-sleep + id: ActionRegenerativeStasis + name: action-name-regenerative-stasis + description: action-description-regenerative-stasis noSpawn: true components: - - type: WorldTargetAction + - type: EntityTargetAction icon: Nyanotrasen/Interface/VerbIcons/mass_sleep.png useDelay: 60 checkCanAccess: false range: 8 itemIconStyle: BigAction - event: !type:MassSleepPowerActionEvent + event: !type:RegenerativeStasisPowerActionEvent - type: entity id: ActionMindSwap diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/metempsychoticMachine.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/metempsychoticMachine.yml index d8e791af1ed..5018a1da8f9 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/metempsychoticMachine.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/metempsychoticMachine.yml @@ -23,3 +23,5 @@ Gore: { state: pod_1 } Idle: { state: pod_0 } - type: Psionic + psychicFeedback: + - "metempsychotic-machine-feedback" diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/oracle.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/oracle.yml index f7481abf1ed..4e2183ef0b9 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/oracle.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/oracle.yml @@ -17,6 +17,8 @@ - type: Speech speechSounds: Tenor - type: Psionic + psychicFeedback: + - "oracle-feedback" - type: SolutionContainerManager solutions: fountain: diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/sophicscribe.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/sophicscribe.yml index ae85cd25e03..8e34a07ea5e 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/sophicscribe.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/sophicscribe.yml @@ -29,6 +29,8 @@ - Science - type: PotentialPsionic #this makes her easier to access for glimmer events, dw about it - type: Psionic + psychicFeedback: + - "sophic-grammateus-feedback" - type: Grammar attributes: gender: female From d177e55d29e800a407606126e39631b18a66ce1a Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Wed, 15 May 2024 17:34:34 -0400 Subject: [PATCH 20/44] Update psionicPowers.yml --- Resources/Prototypes/Nyanotrasen/psionicPowers.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Nyanotrasen/psionicPowers.yml b/Resources/Prototypes/Nyanotrasen/psionicPowers.yml index b577d419e38..ca1764e204c 100644 --- a/Resources/Prototypes/Nyanotrasen/psionicPowers.yml +++ b/Resources/Prototypes/Nyanotrasen/psionicPowers.yml @@ -5,7 +5,7 @@ DispelPower: 1 TelegnosisPower: 1 PsionicRegenerationPower: 1 - MassSleepPower: 0.3 + RegenerativeStasisPower: 0.3 PsionicInvisibilityPower: 0.15 MindSwapPower: 0.15 NoosphericZapPower: 0.15 From 685fc5fb160fb2ecd219d8720e3c60b4a23a2049 Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Wed, 15 May 2024 17:40:52 -0400 Subject: [PATCH 21/44] Update psionic.ftl --- .../Locale/en-US/nyanotrasen/abilities/psionic.ftl | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Resources/Locale/en-US/nyanotrasen/abilities/psionic.ftl b/Resources/Locale/en-US/nyanotrasen/abilities/psionic.ftl index 91ae21233a3..a27803aa6f7 100644 --- a/Resources/Locale/en-US/nyanotrasen/abilities/psionic.ftl +++ b/Resources/Locale/en-US/nyanotrasen/abilities/psionic.ftl @@ -3,8 +3,11 @@ cage-resist-third-person = {CAPITALIZE(THE($user))} starts removing {POSS-ADJ($u cage-uncage-verb = Uncage -action-name-metapsionic = Metapsionic Pulse -action-description-metapsionic = Send a mental pulse through the area to see if there are any psychics nearby. +action-name-widemetapsionic = Wide Metapsionic Pulse +action-description-widemetapsionic = Send a mental pulse through the area to see if there are any psychics nearby. + +action-name-focusedmetapsionic = Focused Metapsionic Pulse +action-description-focusedmetapsionic = Probe an entity at close range to glean metaphorical information about any powers they may have metapsionic-pulse-success = You detect psychic presence nearby. metapsionic-pulse-failure = You don't detect any psychic presence nearby. @@ -13,8 +16,8 @@ metapsionic-pulse-power = You detect that {$power} was used nearby. action-name-dispel = Dispel action-description-dispel = Dispel summoned entities such as familiars or forcewalls. -action-name-mass-sleep = Mass Sleep -action-description-mass-sleep = Put targets in a small area to sleep. +action-name-regenerative-stasis = Regenerative Stasis +action-description-regenerative-stasis = Puts the target into a brief stasis, during which time their wounds rapidly heal. accept-psionics-window-title = Psionic! accept-psionics-window-prompt-text-part = You rolled a psionic power! @@ -63,8 +66,7 @@ action-name-noospheric-zap = Noospheric Zap action-description-noospheric-zap = Shocks the conciousness of the target and leaves them stunned and stuttering. action-name-pyrokinesis = Pyrokinesis -action-description-pyrokinesis = Light a flammable target on fire. -pyrokinesis-power-used = A wisp of flame engulfs {THE($target)}, igniting {OBJECT($target)}! +action-description-pyrokinesis = Hurl a small gateway to the plane of Gehenna at your target. action-name-psychokinesis = Psychokinesis action-description-psychokinesis = Bend the fabric of space to instantly move across it. From 0d37ceb6d48c3ea5007dca7bfe935cfe4a5a03a0 Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Wed, 15 May 2024 18:00:14 -0400 Subject: [PATCH 22/44] some more small tweaks --- Content.Server/Psionics/Abilities/MetapsionicPowerSystem.cs | 4 ++-- Resources/Locale/en-US/nyanotrasen/abilities/psionic.ftl | 4 ++++ .../Locale/en-US/nyanotrasen/psionics/psychic-feedback.ftl | 3 ++- .../Entities/Structures/Machines/metempsychoticMachine.yml | 1 + .../Nyanotrasen/Entities/Structures/Research/oracle.yml | 1 + 5 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Content.Server/Psionics/Abilities/MetapsionicPowerSystem.cs b/Content.Server/Psionics/Abilities/MetapsionicPowerSystem.cs index ffe8ab00c2f..7b3a417c53f 100644 --- a/Content.Server/Psionics/Abilities/MetapsionicPowerSystem.cs +++ b/Content.Server/Psionics/Abilities/MetapsionicPowerSystem.cs @@ -119,7 +119,7 @@ private void OnFocusedPowerUsed(FocusedMetapsionicPowerActionEvent args) var ev = new FocusedMetapsionicDoAfterEvent(_gameTiming.CurTime); - _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, args.Performer, component.UseDelay, ev, args.Performer, args.Target, args.Performer) + _doAfterSystem.TryStartDoAfter(new DoAfterArgs(EntityManager, args.Performer, component.UseDelay - psionic.Amplification, ev, args.Performer, args.Target, args.Performer) { BlockDuplicate = true, BreakOnUserMove = true, @@ -129,7 +129,7 @@ private void OnFocusedPowerUsed(FocusedMetapsionicPowerActionEvent args) component.DoAfter = doAfterId; - _popups.PopupEntity(Loc.GetString("focused-metapsionic-pulse-begin", ("entity", args.Performer)), + _popups.PopupEntity(Loc.GetString("focused-metapsionic-pulse-begin", ("entity", args.Target)), args.Performer, // TODO: Use LoS-based Filter when one is available. Filter.Pvs(args.Performer).RemoveWhereAttachedEntity(entity => !ExamineSystemShared.InRangeUnOccluded(args.Performer, entity, ExamineRange, null)), diff --git a/Resources/Locale/en-US/nyanotrasen/abilities/psionic.ftl b/Resources/Locale/en-US/nyanotrasen/abilities/psionic.ftl index a27803aa6f7..5b368e822f1 100644 --- a/Resources/Locale/en-US/nyanotrasen/abilities/psionic.ftl +++ b/Resources/Locale/en-US/nyanotrasen/abilities/psionic.ftl @@ -73,3 +73,7 @@ action-description-psychokinesis = Bend the fabric of space to instantly move ac action-name-rf-sensitivity = Toggle RF Sensitivity action-desc-rf-sensitivity = Toggle your ability to interpret radio waves on and off. + +trait-latent-psychic-desc = Your mind and soul are open to the noosphere, allowing for a limited use of Telepathy. + Thus, you are eligible for potentially receiving psychic powers. + It is possible that you may be hunted by otherworldly forces, so consider keeping your powers a secret. diff --git a/Resources/Locale/en-US/nyanotrasen/psionics/psychic-feedback.ftl b/Resources/Locale/en-US/nyanotrasen/psionics/psychic-feedback.ftl index 6bdc84dc3ea..d398c717c07 100644 --- a/Resources/Locale/en-US/nyanotrasen/psionics/psychic-feedback.ftl +++ b/Resources/Locale/en-US/nyanotrasen/psionics/psychic-feedback.ftl @@ -3,7 +3,7 @@ metapulse-self = I AM. no-powers = {CAPITALIZE($entity)} will never awaken from the dream in this life psychic-potential = {CAPITALIZE($entity)} has a slim chance of awakening from the dream dispel-feedback = {CAPITALIZE($entity)} is a mighty stone, standing against the currents of fate -metasionic-feedback = {CAPITALIZE($entity)} gazes back upon thee +metapsionic-feedback = {CAPITALIZE($entity)} gazes back upon thee mind-swap-feedback = {CAPITALIZE($entity)}'s vessel seems fit for other souls mindswapped-feedback = Cursed flesh! {CAPITALIZE($entity)} dwells within the wrong vessel! noospheric-zap-feedback = {CAPITALIZE($entity)}'s soul writhes with thunder from beyond the veil @@ -17,3 +17,4 @@ metempsychotic-machine-feedback = The sea of fate flows through this machine # Power PVS Messages focused-metapsionic-pulse-begin = The air around {CAPITALIZE($entity)} begins to shimmer faintly psionic-regeneration-self-revive = {CAPITALIZE($entity)} begins to visibly regenerate +mindbreaking-feedback = The light of life vanishes from {CAPITALIZE($entity)}'s eyes, leaving behind a husk pretending at sapience diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/metempsychoticMachine.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/metempsychoticMachine.yml index 5018a1da8f9..d773cf87c76 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/metempsychoticMachine.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/metempsychoticMachine.yml @@ -22,6 +22,7 @@ NoMind: { state: pod_1 } Gore: { state: pod_1 } Idle: { state: pod_0 } + - type: PotentialPsionic - type: Psionic psychicFeedback: - "metempsychotic-machine-feedback" diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/oracle.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/oracle.yml index 4e2183ef0b9..58189e49cec 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/oracle.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/oracle.yml @@ -16,6 +16,7 @@ - type: Oracle - type: Speech speechSounds: Tenor + - type: PotentialPsionic - type: Psionic psychicFeedback: - "oracle-feedback" From 324082a7a677683036e472ff378edea0ca422a12 Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Wed, 15 May 2024 18:04:27 -0400 Subject: [PATCH 23/44] Update PotentialPsionicComponent.cs --- Content.Server/Psionics/PotentialPsionicComponent.cs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Content.Server/Psionics/PotentialPsionicComponent.cs b/Content.Server/Psionics/PotentialPsionicComponent.cs index 9499497cd1d..e874296a4c3 100644 --- a/Content.Server/Psionics/PotentialPsionicComponent.cs +++ b/Content.Server/Psionics/PotentialPsionicComponent.cs @@ -3,8 +3,15 @@ namespace Content.Server.Psionics [RegisterComponent] public sealed partial class PotentialPsionicComponent : Component { + /// + /// The base chance of an entity rolling psychic powers, which is increased by other modifiers such as glimmer. + /// + /// + /// I have increased this to 10% up from its original value of 2%, because I estimate that most people won't take the Latent Psychic trait + /// Simply because they might not even know it exists + /// [DataField("chance")] - public float Chance = 0.04f; + public float Chance = 0.10f; /// /// YORO (you only reroll once) From 952b7e232728449bda79ceb92a1e9d67dd801931 Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Wed, 15 May 2024 18:41:37 -0400 Subject: [PATCH 24/44] Update Content.Server/Psionics/Abilities/PsionicAbilitiesSystem.cs Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> --- Content.Server/Psionics/Abilities/PsionicAbilitiesSystem.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.Server/Psionics/Abilities/PsionicAbilitiesSystem.cs b/Content.Server/Psionics/Abilities/PsionicAbilitiesSystem.cs index 5124aff0688..e912a36ba25 100644 --- a/Content.Server/Psionics/Abilities/PsionicAbilitiesSystem.cs +++ b/Content.Server/Psionics/Abilities/PsionicAbilitiesSystem.cs @@ -30,7 +30,7 @@ public override void Initialize() /// /// Adds a psychic power once a character rolls one. This used to be a system you have to select for. However the opt-in is no longer the text window, but is now done at character creation. - /// This is going to get removed when I reach Part 3 of my reworks, when I touch upon the GlimmerSystem itself and overhaul how players get powers. + /// TODO: This is going to get removed when I reach Part 3 of my reworks, when I touch upon the GlimmerSystem itself and overhaul how players get powers. /// /// /// From 1a1c62a01166ca5fbece08a9d14591d645d4066e Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Wed, 15 May 2024 18:42:15 -0400 Subject: [PATCH 25/44] Update PsionicAbilitiesSystem.cs --- .../Abilities/PsionicAbilitiesSystem.cs | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/Content.Server/Psionics/Abilities/PsionicAbilitiesSystem.cs b/Content.Server/Psionics/Abilities/PsionicAbilitiesSystem.cs index 5124aff0688..3f55e23794e 100644 --- a/Content.Server/Psionics/Abilities/PsionicAbilitiesSystem.cs +++ b/Content.Server/Psionics/Abilities/PsionicAbilitiesSystem.cs @@ -66,6 +66,16 @@ public void AddRandomPsionicPower(EntityUid uid) public void RemovePsionics(EntityUid uid) { + if (RemComp(uid)) + { + _popups.PopupEntity(Loc.GetString("mindbreaking-feedback", ("entity", uid)), + uid, + // TODO: Use LoS-based Filter when one is available. + Filter.Pvs(uid).RemoveWhereAttachedEntity(entity => !ExamineSystemShared.InRangeUnOccluded(uid, entity, ExamineRange, null)), + true, + PopupType.Medium); + } + if (!TryComp(uid, out var psionic)) return; @@ -92,16 +102,9 @@ public void RemovePsionics(EntityUid uid) } } - _popups.PopupEntity(Loc.GetString("mindbreaking-feedback", ("entity", uid)), - uid, - // TODO: Use LoS-based Filter when one is available. - Filter.Pvs(uid).RemoveWhereAttachedEntity(entity => !ExamineSystemShared.InRangeUnOccluded(uid, entity, ExamineRange, null)), - true, - PopupType.Medium); - _statusEffectsSystem.TryAddStatusEffect(uid, "Stutter", TimeSpan.FromMinutes(5), false, "StutteringAccent"); - _glimmerSystem.Glimmer += _random.Next((int) MathF.Round(psionic.Amplification * psionic.Dampening * -5), (int) MathF.Round(psionic.Amplification * psionic.Dampening * -10)); + _glimmerSystem.Glimmer += _random.Next((int) MathF.Round(psionic.Amplification * psionic.Dampening * -10), (int) MathF.Round(psionic.Amplification * psionic.Dampening * -5)); RemComp(uid); RemComp(uid); } From e4f387d83249484c2f6e216ce159264fdfd80dbe Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Wed, 15 May 2024 18:44:54 -0400 Subject: [PATCH 26/44] remove downstream comments --- Content.Server/Abilities/Mime/MimePowersSystem.cs | 2 +- Content.Server/Anomaly/AnomalySystem.Psionics.cs | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Content.Server/Abilities/Mime/MimePowersSystem.cs b/Content.Server/Abilities/Mime/MimePowersSystem.cs index 3e7605a07d3..b3bd3392434 100644 --- a/Content.Server/Abilities/Mime/MimePowersSystem.cs +++ b/Content.Server/Abilities/Mime/MimePowersSystem.cs @@ -10,7 +10,7 @@ using Robust.Shared.Containers; using Robust.Shared.Map; using Robust.Shared.Timing; -using Content.Shared.Psionics.Abilities; //EE - Summary: Makes Mime psionic. +using Content.Shared.Psionics.Abilities; using Content.Shared.Speech.Muting; namespace Content.Server.Abilities.Mime diff --git a/Content.Server/Anomaly/AnomalySystem.Psionics.cs b/Content.Server/Anomaly/AnomalySystem.Psionics.cs index 3a5a55c0bdc..84f200f47ba 100644 --- a/Content.Server/Anomaly/AnomalySystem.Psionics.cs +++ b/Content.Server/Anomaly/AnomalySystem.Psionics.cs @@ -1,4 +1,4 @@ -using Content.Server.Psionics.Abilities; //EE - Summary: the psionics bin where dispel is located. +using Content.Server.Psionics.Abilities; using Content.Shared.Anomaly; using Content.Shared.Anomaly.Components; using Robust.Shared.Random; @@ -14,8 +14,6 @@ private void InitializePsionics() { SubscribeLocalEvent(OnDispelled); } - - //Nyano - Summary: gives dispellable behavior to Anomalies. private void OnDispelled(EntityUid uid, AnomalyComponent component, DispelledEvent args) { _dispel.DealDispelDamage(uid); From f5bf4d5bab436ad13f67294a6ada41a8a086f563 Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Wed, 15 May 2024 19:32:40 -0400 Subject: [PATCH 27/44] Giving pyrokinesis back to ifrit, and setting up base caster stat bonuses to roundstart casters --- .../nyanotrasen/psionics/psychic-feedback.ftl | 3 +- .../DeltaV/Entities/Mobs/NPCs/familiars.yml | 7 +++-- .../Roles/Jobs/Epistemics/forensicmantis.yml | 15 +++++----- .../Roles/Jobs/Science/research_director.yml | 28 +++++++++---------- 4 files changed, 29 insertions(+), 24 deletions(-) diff --git a/Resources/Locale/en-US/nyanotrasen/psionics/psychic-feedback.ftl b/Resources/Locale/en-US/nyanotrasen/psionics/psychic-feedback.ftl index d398c717c07..26d2acb87cd 100644 --- a/Resources/Locale/en-US/nyanotrasen/psionics/psychic-feedback.ftl +++ b/Resources/Locale/en-US/nyanotrasen/psionics/psychic-feedback.ftl @@ -9,10 +9,11 @@ mindswapped-feedback = Cursed flesh! {CAPITALIZE($entity)} dwells within the wro noospheric-zap-feedback = {CAPITALIZE($entity)}'s soul writhes with thunder from beyond the veil pyrokinesis-feedback = The Secret of Fire dwells within {CAPITALIZE($entity)} invisibility-feedback = {CAPITALIZE($entity)}'s wyrd seeks to hide from thine gaze -telegnosis-feedback = {CAPITALIZE($entity)}'s soul travels across bridges composed of dreamlight. +telegnosis-feedback = {CAPITALIZE($entity)}'s soul travels across bridges composed of dreamlight sophic-grammateus-feedback = SEEKER, YOU NEED ONLY ASK FOR MY WISDOM. oracle-feedback = WHY DO YOU BOTHER ME SEEKER? HAVE I NOT MADE MY DESIRES CLEAR? metempsychotic-machine-feedback = The sea of fate flows through this machine +ifrit-feedback = A spirit of Gehenna, bound by the will of a powerful psychic # Power PVS Messages focused-metapsionic-pulse-begin = The air around {CAPITALIZE($entity)} begins to shimmer faintly diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/familiars.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/familiars.yml index 771da36719f..74a1eeee71b 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/familiars.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/familiars.yml @@ -84,7 +84,10 @@ - type: PotentialPsionic - type: Psionic removable: false - # - type: PyrokinesisPower # Pending psionic rework + amplification: 5 + psychicFeedback: + - "ifrit-feedback" + - type: PyrokinesisPower - type: Grammar attributes: proper: true @@ -103,7 +106,7 @@ requirements: - !type:DepartmentTimeRequirement department: Epistemics - time: 14400 # DeltaV - 4 hours + time: 14400 - type: entity parent: WelderExperimental diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml index c3e682e02a9..15b2cdd4fa7 100644 --- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml +++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml @@ -7,22 +7,24 @@ - !type:OverallPlaytimeRequirement time: 18000 - !type:DepartmentTimeRequirement - department: Epistemics # DeltaV - Epistemics Department replacing Science + department: Epistemics time: 3600 startingGear: ForensicMantisGear icon: "JobIconForensicMantis" supervisors: job-supervisors-rd - antagAdvantage: 5 # DeltaV - From 4 to 5 - canBeAntag: true # DeltaV - Mantis is no longer a Detective - # whitelistRequired: true + antagAdvantage: 5 + canBeAntag: true access: - Research - Maintenance - - Mantis # DeltaV - Psionic Mantis, see Resources/Prototypes/DeltaV/Access/epistemics.yml + - Mantis special: - !type:AddComponentSpecial components: + - type: PotentialPsionic - type: Psionic + amplification: 0.3 + dampening: 0.3 - type: MetapsionicPower - type: startingGear @@ -34,11 +36,10 @@ head: ClothingHeadHatFezMantis id: ForensicMantisPDA eyes: ClothingEyesGlassesSunglasses - ears: ClothingHeadsetScience # DeltaV - Mantis is part of Epistemics + ears: ClothingHeadsetScience gloves: ClothingHandsGlovesColorWhite outerClothing: ClothingOuterCoatMantis belt: ClothingBeltMantis - # pocket2: ForensicScanner # DeltaV - Mantis is no longer a Detective innerClothingSkirt: ClothingUniformSkirtMantis satchel: ClothingBackpackSatchelMantisFilled duffelbag: ClothingBackpackDuffelMantisFilled diff --git a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml index 19cf1419111..ddb779669eb 100644 --- a/Resources/Prototypes/Roles/Jobs/Science/research_director.yml +++ b/Resources/Prototypes/Roles/Jobs/Science/research_director.yml @@ -3,13 +3,13 @@ name: job-name-rd description: job-description-rd playTimeTracker: JobResearchDirector - antagAdvantage: 6 # DeltaV - Reduced TC: Head of Staff + antagAdvantage: 6 requirements: - !type:DepartmentTimeRequirement - department: Epistemics # DeltaV - Epistemics Department replacing Science - time: 54000 # DeltaV - 15 hours + department: Epistemics + time: 54000 - !type:OverallPlaytimeRequirement - time: 72000 # DeltaV - 20 hours + time: 72000 weight: 10 startingGear: ResearchDirectorGear icon: "JobIconResearchDirector" @@ -21,20 +21,20 @@ - Command - Maintenance - ResearchDirector - - Mantis # DeltaV - Psionic Mantis, see Resources/Prototypes/DeltaV/Access/epistemics.yml - - Chapel # DeltaV - Chaplain is in Epistemics + - Mantis + - Chapel - Cryogenics - special: # Nyanotrasen - Mystagogue can use the Bible + special: - !type:AddComponentSpecial components: - - type: BibleUser # Nyano - Lets them heal with bibles - - type: Psionic # Nyano - They start with telepathic chat - - type: DispelPower # Nyano - They get the Dispel psionic power on spawn + - type: BibleUser + - type: PotentialPsionic + - type: Psionic + dampening: 1 #Mystagogue gets a significant buff to his antimage abilities, making him better at dispelling than other people + - type: DispelPower + - type: CommandStaff - !type:AddImplantSpecial implants: [ MindShieldImplant ] - - !type:AddComponentSpecial - components: - - type: CommandStaff - type: startingGear id: ResearchDirectorGear @@ -44,7 +44,7 @@ shoes: ClothingShoesColorBrown id: RnDPDA ears: ClothingHeadsetRD - belt: BibleMystagogue # Nyanotrasen - Mystagogue book for their Ifrit + belt: BibleMystagogue innerClothingSkirt: ClothingUniformJumpskirtResearchDirector satchel: ClothingBackpackSatchelResearchDirectorFilled duffelbag: ClothingBackpackDuffelResearchDirectorFilled From 626f2a5c62942ab237df245552ce0d10a9dfbf6d Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Wed, 15 May 2024 19:42:58 -0400 Subject: [PATCH 28/44] Update familiars.yml --- Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/familiars.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/familiars.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/familiars.yml index 74a1eeee71b..4f255cad211 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/familiars.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/familiars.yml @@ -84,7 +84,7 @@ - type: PotentialPsionic - type: Psionic removable: false - amplification: 5 + amplification: 4 psychicFeedback: - "ifrit-feedback" - type: PyrokinesisPower From 3584a4e23499e2b1643ea3e409b01c7265d6ca84 Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Tue, 28 May 2024 21:40:16 -0400 Subject: [PATCH 29/44] Update PsionicRegenerationPowerSystem.cs --- .../Abilities/PsionicRegenerationPowerSystem.cs | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/Content.Server/Psionics/Abilities/PsionicRegenerationPowerSystem.cs b/Content.Server/Psionics/Abilities/PsionicRegenerationPowerSystem.cs index 882eb9e0b14..6958170a5c2 100644 --- a/Content.Server/Psionics/Abilities/PsionicRegenerationPowerSystem.cs +++ b/Content.Server/Psionics/Abilities/PsionicRegenerationPowerSystem.cs @@ -12,7 +12,6 @@ using Content.Shared.Popups; using Content.Shared.Psionics.Events; using Content.Shared.Examine; -using static Content.Shared.Examine.ExamineSystemShared; using Robust.Shared.Timing; using Content.Shared.Actions.Events; using Robust.Server.Audio; @@ -28,6 +27,7 @@ public sealed class PsionicRegenerationPowerSystem : EntitySystem [Dependency] private readonly SharedPopupSystem _popupSystem = default!; [Dependency] private readonly SharedPsionicAbilitiesSystem _psionics = default!; [Dependency] private readonly IGameTiming _gameTiming = default!; + [Dependency] private readonly ExamineSystemShared _examine = default!; public override void Initialize() { @@ -73,13 +73,7 @@ private void OnPowerUsed(EntityUid uid, PsionicRegenerationPowerComponent compon component.DoAfter = doAfterId; - _popupSystem.PopupEntity(Loc.GetString("psionic-regeneration-begin", ("entity", uid)), - uid, - // TODO: Use LoS-based Filter when one is available. - Filter.Pvs(uid).RemoveWhereAttachedEntity(entity => !ExamineSystemShared.InRangeUnOccluded(uid, entity, ExamineRange, null)), - true, - PopupType.Medium); - + _popupSystem.PopupEntity(Loc.GetString("psionic-regeneration-begin", ("entity", uid)), uid, PopupType.Medium); _audioSystem.PlayPvs(component.SoundUse, uid, AudioParams.Default.WithVolume(8f).WithMaxDistance(1.5f).WithRolloffFactor(3.5f)); _psionics.LogPowerUsed(uid, "psionic regeneration", @@ -122,12 +116,7 @@ private void OnMobStateChangedEvent(EntityUid uid, PsionicRegenerationPowerCompo BreakOnDamage = false, RequireCanInteract = false, }); - _popupSystem.PopupEntity(Loc.GetString("psionic-regeneration-self-revive", ("entity", uid)), - uid, - // TODO: Use LoS-based Filter when one is available. - Filter.Pvs(uid).RemoveWhereAttachedEntity(entity => !ExamineSystemShared.InRangeUnOccluded(uid, entity, ExamineRange, null)), - true, - PopupType.MediumCaution); + _popupSystem.PopupEntity(Loc.GetString("psionic-regeneration-self-revive", ("entity", uid)), uid, PopupType.MediumCaution); _audioSystem.PlayPvs(component.SoundUse, uid, AudioParams.Default.WithVolume(8f).WithMaxDistance(1.5f).WithRolloffFactor(3.5f)); _psionics.LogPowerUsed(uid, "psionic regeneration", From 8b3070ff96274483a376c4969c294cd27c5ac3bf Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Wed, 29 May 2024 02:37:00 -0400 Subject: [PATCH 30/44] Revert "Merge branch 'master' of https://github.com/VMSolidus/Einstein-Engines" This reverts commit 872b30147da98728d3c1b3c6fb7b90865c7bd7f8, reversing changes made to 15fc457e8f1ffa3a05966566dff93dbe6994310a. --- .vscode/extensions.json | 8 +- .../CardboardBox/CardboardBoxSystem.cs | 5 +- .../Cargo/UI/CargoConsoleMenu.xaml.cs | 4 +- .../Construction/ConstructionSystem.cs | 3 +- .../ContextMenu/UI/EntityMenuUIController.cs | 2 +- Content.Client/Gameplay/GameplayStateBase.cs | 2 +- Content.Client/NPC/PathfindingSystem.cs | 10 +- Content.Client/Popups/PopupOverlay.cs | 11 +- Content.Client/Popups/PopupSystem.cs | 5 - .../Overlays/RadiationPulseOverlay.cs | 5 +- Content.Client/Sandbox/SandboxSystem.cs | 3 +- .../Systems/Chat/ChatUIController.cs | 2 +- Content.Client/Verbs/VerbSystem.cs | 8 +- .../Tests/Wires/WireLayoutTest.cs | 103 ---------- .../Systems/AdminVerbSystem.Tools.cs | 16 +- .../Administration/Systems/AdminVerbSystem.cs | 3 +- .../AtmosphereSystem.HighPressureDelta.cs | 2 +- .../AtmosphereSystem.Monstermos.cs | 2 +- .../Bed/Components/SnoringComponent.cs | 10 - Content.Server/Bed/Sleep/SleepingSystem.cs | 5 +- .../TypingIndicator/TypingIndicatorSystem.cs | 2 +- .../Chemistry/EntitySystems/VaporSystem.cs | 4 +- .../Conditions/ComponentInTile.cs | 3 +- .../ConstructionSystem.Initial.cs | 7 +- .../Systems/DeviceNetworkJammerSystem.cs | 38 ---- .../Systems/DeviceNetworkSystem.cs | 11 +- .../Systems/SingletonDeviceNetServerSystem.cs | 5 +- Content.Server/Dragon/DragonSystem.cs | 3 +- .../EntitySystems/ExplosionSystem.cs | 2 +- .../GameTicking/GameTicker.Spawning.cs | 2 +- .../GameTicking/Rules/PiratesRuleSystem.cs | 4 +- Content.Server/Guardian/GuardianSystem.cs | 3 +- Content.Server/Hands/Systems/HandsSystem.cs | 3 +- .../Implants/SubdermalImplantSystem.cs | 2 +- Content.Server/Magic/MagicSystem.cs | 2 +- .../CoordinatesInRangePrecondition.cs | 2 +- .../CoordinatesNotInRangePrecondition.cs | 2 +- .../TargetInRangePrecondition.cs | 2 +- .../NPC/Pathfinding/PathfindingSystem.cs | 2 +- .../NPC/Systems/NPCSteeringSystem.Context.cs | 25 +-- .../NPC/Systems/NPCUtilitySystem.cs | 5 +- .../Pointing/EntitySystems/PointingSystem.cs | 10 +- .../EntitySystems/PowerReceiverSystem.cs | 17 +- .../Radio/EntitySystems/JammerSystem.cs | 17 -- Content.Server/Remotes/DoorRemoteSystem.cs | 3 +- .../Respawn/SpecialRespawnSystem.cs | 5 +- .../EntitySystems/GravityWellSystem.cs | 8 +- .../SingularityAttractorSystem.cs | 11 +- .../EntitySystems/BluespaceLockerSystem.cs | 3 +- .../Store/Systems/StoreSystem.Ui.cs | 9 +- .../Tabletop/TabletopSystem.Session.cs | 2 +- Content.Server/Wires/WireLayout.cs | 2 - .../Systems/Carvers/NoiseRangeCarverSystem.cs | 3 +- Content.Shared.Database/LogType.cs | 1 - Content.Shared/Anomaly/SharedAnomalySystem.cs | 2 +- .../Audio/SharedAmbientSoundSystem.cs | 11 +- .../Chemistry/Components/InjectorComponent.cs | 14 +- .../Conditions/WallmountCondition.cs | 3 +- .../DeviceNetworkJammerComponent.cs | 24 --- Content.Shared/Examine/ExamineSystemShared.cs | 12 +- .../EntitySystems/SharedHandsSystem.Pickup.cs | 2 +- .../Interaction/SharedInteractionSystem.cs | 6 +- .../Spawning/EntitySystemExtensions.cs | 2 +- Content.Shared/Store/ListingPrototype.cs | 5 +- .../Systems/SharedGunSystem.Ballistic.cs | 2 +- Resources/Changelog/Changelog.yml | 24 --- .../Locale/en-US/paper/book-authorbooks.ftl | 8 - .../catalog/cargo/cargoproduct-categories.ftl | 16 -- .../Locale/en-US/speech/speech-chatsan.ftl | 3 - Resources/Locale/en-US/traits/traits.ftl | 3 - .../Prototypes/Accents/word_replacements.yml | 17 +- Resources/Prototypes/Actions/types.yml | 2 +- .../Prototypes/Catalog/Cargo/cargo_armory.yml | 12 +- .../Catalog/Cargo/cargo_atmospherics.yml | 22 +- .../Prototypes/Catalog/Cargo/cargo_botany.yml | 10 +- .../Prototypes/Catalog/Cargo/cargo_cargo.yml | 4 +- .../Catalog/Cargo/cargo_circuitboards.yml | 2 +- .../Catalog/Cargo/cargo_emergency.yml | 16 +- .../Catalog/Cargo/cargo_engineering.yml | 28 +-- .../Catalog/Cargo/cargo_engines.yml | 36 ++-- .../Prototypes/Catalog/Cargo/cargo_food.yml | 16 +- .../Prototypes/Catalog/Cargo/cargo_fun.yml | 58 +++--- .../Catalog/Cargo/cargo_livestock.yml | 46 ++--- .../Catalog/Cargo/cargo_materials.yml | 22 +- .../Catalog/Cargo/cargo_medical.yml | 30 +-- .../Catalog/Cargo/cargo_science.yml | 6 +- .../Catalog/Cargo/cargo_security.yml | 18 +- .../Catalog/Cargo/cargo_service.yml | 38 ++-- .../Catalog/Cargo/cargo_shuttle.yml | 6 +- .../Catalog/Cargo/cargo_vending.yml | 50 ++--- .../VendingMachines/Inventories/theater.yml | 1 - .../Prototypes/Catalog/uplink_catalog.yml | 12 +- .../Entities/Clothing/Head/hats.yml | 5 +- .../Entities/Clothing/Masks/masks.yml | 10 - .../Entities/Clothing/Shoes/misc.yml | 3 - .../Prototypes/Entities/Mobs/Species/vox.yml | 2 - .../reinforcement_teleporter.yml | 2 +- .../Fun/Instruments/instruments_misc.yml | 3 - .../Instruments/instruments_percussion.yml | 2 - .../Fun/Instruments/instruments_wind.yml | 5 +- .../Prototypes/Entities/Objects/Fun/toys.yml | 3 - .../Entities/Objects/Misc/authorbooks.yml | 14 -- .../Objects/Specific/Medical/healing.yml | 28 +-- .../Entities/Objects/Specific/chemistry.yml | 7 - .../Entities/Objects/Specific/syndicate.yml | 4 +- .../Structures/Doors/Airlocks/access.yml | 189 +----------------- .../Doors/Airlocks/base_structureairlocks.yml | 3 + .../Doors/MaterialDoors/material_doors.yml | 3 + .../Structures/Doors/Shutter/shutters.yml | 3 + .../Entities/Structures/Furniture/chairs.yml | 14 +- .../Entities/Structures/Windows/window.yml | 4 +- .../Markers/Spawners/Random/books.yml | 1 - .../Markers/Spawners/Random/boxes.yml | 8 - .../Markers/Spawners/Random/devices.yml | 34 +--- .../Entities/Markers/Spawners/Random/hats.yml | 20 -- .../Markers/Spawners/Random/machineparts.yml | 2 +- .../Markers/Spawners/Random/seeds.yml | 3 - .../Graphs/clothing/ducky_slippers.yml | 22 -- .../Recipes/Construction/clothing.yml | 11 - .../Prototypes/Recipes/Reactions/drinks.yml | 6 +- Resources/Prototypes/Traits/disabilities.yml | 7 - Resources/Prototypes/Wires/layouts.yml | 20 -- Resources/Prototypes/tags.yml | 3 - .../ServerInfo/Guidebook/Engineering/TEG.xml | 179 ++--------------- .../Guidebook/Science/ArtifactReports.xml | 2 +- .../Clothing/Ears/Headsets/base.rsi/icon.png | Bin 387 -> 309 bytes .../Clothing/Ears/Headsets/base.rsi/meta.json | 2 +- .../Ears/Headsets/base_syndicate.rsi/icon.png | Bin 332 -> 288 bytes .../Headsets/base_syndicate.rsi/meta.json | 2 +- .../Clothing/Ears/Headsets/cargo.rsi/icon.png | Bin 402 -> 326 bytes .../Ears/Headsets/cargo.rsi/icon_alt.png | Bin 366 -> 516 bytes .../Ears/Headsets/cargo.rsi/meta.json | 2 +- .../Ears/Headsets/centcom.rsi/icon.png | Bin 307 -> 315 bytes .../Ears/Headsets/centcom.rsi/icon_alt.png | Bin 371 -> 469 bytes .../Ears/Headsets/centcom.rsi/meta.json | 2 +- .../Ears/Headsets/command.rsi/icon.png | Bin 396 -> 325 bytes .../Ears/Headsets/command.rsi/icon_alt.png | Bin 576 -> 504 bytes .../Ears/Headsets/command.rsi/meta.json | 2 +- .../Ears/Headsets/engineering.rsi/icon.png | Bin 405 -> 282 bytes .../Headsets/engineering.rsi/icon_alt.png | Bin 366 -> 490 bytes .../Ears/Headsets/engineering.rsi/meta.json | 2 +- .../Ears/Headsets/freelance.rsi/icon.png | Bin 402 -> 799 bytes .../Ears/Headsets/freelance.rsi/icon_alt.png | Bin 366 -> 991 bytes .../Ears/Headsets/freelance.rsi/meta.json | 2 +- .../Ears/Headsets/medical.rsi/icon.png | Bin 392 -> 287 bytes .../Ears/Headsets/medical.rsi/icon_alt.png | Bin 453 -> 469 bytes .../Ears/Headsets/medical.rsi/meta.json | 2 +- .../Ears/Headsets/medicalscience.rsi/icon.png | Bin 418 -> 316 bytes .../Headsets/medicalscience.rsi/meta.json | 2 +- .../Ears/Headsets/mining.rsi/icon.png | Bin 469 -> 396 bytes .../Ears/Headsets/mining.rsi/meta.json | 2 +- .../Ears/Headsets/robotics.rsi/icon.png | Bin 324 -> 296 bytes .../Ears/Headsets/robotics.rsi/meta.json | 2 +- .../Ears/Headsets/science.rsi/icon.png | Bin 396 -> 311 bytes .../Ears/Headsets/science.rsi/icon_alt.png | Bin 361 -> 498 bytes .../Ears/Headsets/science.rsi/meta.json | 2 +- .../Ears/Headsets/security.rsi/icon.png | Bin 408 -> 283 bytes .../Ears/Headsets/security.rsi/icon_alt.png | Bin 570 -> 455 bytes .../Ears/Headsets/security.rsi/meta.json | 2 +- .../Ears/Headsets/service.rsi/icon.png | Bin 418 -> 311 bytes .../Ears/Headsets/service.rsi/meta.json | 2 +- .../Headsets/servicesecurity.rsi/icon.png | Bin 418 -> 294 bytes .../Headsets/servicesecurity.rsi/meta.json | 2 +- .../Ears/Headsets/syndicate.rsi/icon_alt.png | Bin 515 -> 485 bytes .../Ears/Headsets/syndicate.rsi/meta.json | 2 +- .../equipped-MASK-reptilian.png | Bin 442 -> 0 bytes .../Mask/neckgaiterred.rsi/equipped-MASK.png | Bin 409 -> 0 bytes .../Clothing/Mask/neckgaiterred.rsi/icon.png | Bin 307 -> 0 bytes .../Mask/neckgaiterred.rsi/inhand-left.png | Bin 332 -> 0 bytes .../Mask/neckgaiterred.rsi/inhand-right.png | Bin 349 -> 0 bytes .../Clothing/Mask/neckgaiterred.rsi/meta.json | 30 --- .../Ears/Headsets/prisoner.rsi/icon.png | Bin 317 -> 390 bytes .../Ears/Headsets/prisoner.rsi/meta.json | 2 +- .../Headsets/securitymedical.rsi/icon.png | Bin 408 -> 371 bytes .../Headsets/securitymedical.rsi/meta.json | 2 +- .../Ears/Headsets/service.rsi/icon_alt.png | Bin 576 -> 915 bytes .../Ears/Headsets/service.rsi/meta.json | 2 +- .../syndicate_listening.rsi/icon_alt.png | Bin 515 -> 531 bytes .../syndicate_listening.rsi/meta.json | 2 +- .../Devices/communication.rsi/beacon.png | Bin 447 -> 317 bytes .../Devices/communication.rsi/beacon_dead.png | Bin 274 -> 253 bytes .../Devices/communication.rsi/meta.json | 36 ++-- .../old-radio-inhand-left.png | Bin 0 -> 215 bytes .../old-radio-inhand-right.png | Bin 0 -> 243 bytes .../Devices/communication.rsi/old-radio.png | Bin 0 -> 401 bytes .../communication.rsi/radio-inhand-left.png | Bin 215 -> 311 bytes .../communication.rsi/radio-inhand-right.png | Bin 243 -> 263 bytes .../Devices/communication.rsi/radio.png | Bin 1365 -> 536 bytes .../Devices/communication.rsi/signaller.png | Bin 456 -> 369 bytes .../communication.rsi/walkietalkie-off.png | Bin 348 -> 290 bytes .../communication.rsi/walkietalkie-on.png | Bin 207 -> 116 bytes .../communication.rsi/walkietalkie.png | Bin 509 -> 299 bytes .../Objects/Devices/jammer.rsi/jammer-on.png | Bin 537 -> 0 bytes .../Objects/Devices/jammer.rsi/jammer.png | Bin 329 -> 495 bytes .../Objects/Devices/jammer.rsi/meta.json | 16 +- .../Objects/Devices/signaller.rsi/meta.json | 4 +- .../Devices/signaller.rsi/signaller.png | Bin 456 -> 280 bytes .../Devices/station_beacon.rsi/blink.png | Bin 447 -> 373 bytes .../Devices/station_beacon.rsi/icon.png | Bin 274 -> 302 bytes .../Devices/station_beacon.rsi/meta.json | 2 +- .../Objects/Tools/crowbar.rsi/icon.png | Bin 371 -> 174 bytes .../Objects/Tools/crowbar.rsi/meta.json | 2 +- .../Objects/Tools/crowbar.rsi/red-icon.png | Bin 446 -> 200 bytes .../Objects/Tools/drill.rsi/drill_bolt.png | Bin 702 -> 886 bytes .../Objects/Tools/drill.rsi/drill_screw.png | Bin 691 -> 887 bytes .../Objects/Tools/drill.rsi/meta.json | 2 +- .../Objects/Tools/geiger.rsi/geiger_base.png | Bin 467 -> 427 bytes .../Tools/geiger.rsi/geiger_on_ext.png | Bin 260 -> 228 bytes .../Tools/geiger.rsi/geiger_on_high.png | Bin 218 -> 176 bytes .../Tools/geiger.rsi/geiger_on_idle.png | Bin 218 -> 173 bytes .../Tools/geiger.rsi/geiger_on_low.png | Bin 218 -> 176 bytes .../Tools/geiger.rsi/geiger_on_med.png | Bin 218 -> 176 bytes .../Objects/Tools/geiger.rsi/meta.json | 2 +- .../Tools/hand_labeler.rsi/hand_labeler.png | Bin 479 -> 273 bytes .../Objects/Tools/hand_labeler.rsi/meta.json | 2 +- .../Tools/multitool.rsi/green-unlit.png | Bin 176 -> 123 bytes .../Objects/Tools/multitool.rsi/icon.png | Bin 540 -> 359 bytes .../Objects/Tools/multitool.rsi/meta.json | 2 +- .../Objects/Tools/multitool.rsi/red-unlit.png | Bin 175 -> 117 bytes .../Tools/multitool.rsi/yellow-unlit.png | Bin 174 -> 121 bytes .../Textures/Objects/Tools/rcd.rsi/icon.png | Bin 857 -> 638 bytes .../Objects/Tools/screwdriver.rsi/meta.json | 2 +- .../Tools/screwdriver.rsi/screwdriver-map.png | Bin 310 -> 262 bytes .../screwdriver-screwybits.png | Bin 225 -> 152 bytes .../Tools/screwdriver.rsi/screwdriver.png | Bin 223 -> 227 bytes .../Objects/Tools/seclite.rsi/meta.json | 2 +- .../Objects/Tools/seclite.rsi/seclite-on.png | Bin 260 -> 287 bytes .../Tools/seclite.rsi/seclite-overlay.png | Bin 279 -> 121 bytes .../Objects/Tools/seclite.rsi/seclite.png | Bin 321 -> 286 bytes .../Objects/Tools/spray_painter.rsi/meta.json | 2 +- .../Tools/spray_painter.rsi/spray_painter.png | Bin 772 -> 518 bytes .../Objects/Tools/welder.rsi/icon.png | Bin 568 -> 290 bytes .../Objects/Tools/welder.rsi/meta.json | 2 +- .../Objects/Tools/welder.rsi/welder_flame.png | Bin 255 -> 181 bytes .../Tools/welder_experimental.rsi/icon.png | Bin 907 -> 564 bytes .../Tools/welder_experimental.rsi/meta.json | 2 +- .../welder_experimental.rsi/welder_flame.png | Bin 247 -> 295 bytes .../Tools/welder_industrial.rsi/icon.png | Bin 462 -> 345 bytes .../Tools/welder_industrial.rsi/meta.json | 2 +- .../welder_industrial.rsi/welder_flame.png | Bin 247 -> 296 bytes .../Tools/welder_industrialadv.rsi/icon.png | Bin 548 -> 396 bytes .../Tools/welder_industrialadv.rsi/meta.json | 2 +- .../welder_industrialadv.rsi/welder_flame.png | Bin 247 -> 297 bytes .../wirecutters.rsi/cutters-cutty-thingy.png | Bin 239 -> 217 bytes .../Tools/wirecutters.rsi/cutters-map.png | Bin 411 -> 331 bytes .../Objects/Tools/wirecutters.rsi/cutters.png | Bin 231 -> 228 bytes .../Objects/Tools/wirecutters.rsi/meta.json | 2 +- .../Objects/Tools/wrench.rsi/icon.png | Bin 484 -> 230 bytes .../Objects/Tools/wrench.rsi/meta.json | 2 +- .../Doors/secret_door.rsi/assembly.png | Bin 178 -> 305 bytes .../Doors/secret_door.rsi/closed.png | Bin 117 -> 171 bytes .../Doors/secret_door.rsi/closing.png | Bin 563 -> 516 bytes .../Doors/secret_door.rsi/meta.json | 24 +-- .../Structures/Doors/secret_door.rsi/open.png | Bin 170 -> 219 bytes .../Doors/secret_door.rsi/opening.png | Bin 582 -> 530 bytes .../Walls/reinforced_diagonal.rsi/meta.json | 2 +- .../Walls/reinforced_diagonal.rsi/state0.png | Bin 5943 -> 666 bytes .../Walls/reinforced_diagonal.rsi/state1.png | Bin 5829 -> 639 bytes .../Structures/Walls/shuttle.rsi/meta.json | 20 +- .../Walls/shuttle.rsi/shuttle_construct-0.png | Bin 632 -> 0 bytes .../Walls/shuttle.rsi/shuttle_construct-1.png | Bin 652 -> 0 bytes .../Walls/shuttle.rsi/shuttle_construct-2.png | Bin 689 -> 0 bytes .../Walls/shuttle.rsi/shuttle_construct-3.png | Bin 690 -> 0 bytes .../Walls/shuttle.rsi/shuttle_construct-4.png | Bin 675 -> 0 bytes .../Walls/shuttle.rsi/shuttle_construct-5.png | Bin 671 -> 0 bytes .../Structures/Walls/solid.rsi/full.png | Bin 168 -> 547 bytes .../Structures/Walls/solid.rsi/meta.json | 2 +- .../Walls/solid.rsi/reinf_construct-0.png | Bin 225 -> 891 bytes .../Walls/solid.rsi/reinf_construct-1.png | Bin 266 -> 863 bytes .../Walls/solid.rsi/reinf_construct-2.png | Bin 264 -> 956 bytes .../Walls/solid.rsi/reinf_construct-3.png | Bin 262 -> 956 bytes .../Walls/solid.rsi/reinf_construct-4.png | Bin 265 -> 963 bytes .../Walls/solid.rsi/reinf_construct-5.png | Bin 258 -> 1016 bytes .../Walls/solid.rsi/reinf_over0.png | Bin 481 -> 1128 bytes .../Walls/solid.rsi/reinf_over1.png | Bin 395 -> 994 bytes .../Walls/solid.rsi/reinf_over2.png | Bin 481 -> 1128 bytes .../Walls/solid.rsi/reinf_over3.png | Bin 395 -> 994 bytes .../Walls/solid.rsi/reinf_over4.png | Bin 393 -> 991 bytes .../Walls/solid.rsi/reinf_over5.png | Bin 352 -> 880 bytes .../Walls/solid.rsi/reinf_over6.png | Bin 393 -> 991 bytes .../Walls/solid.rsi/reinf_over7.png | Bin 204 -> 763 bytes .../Structures/Walls/solid.rsi/rgeneric.png | Bin 225 -> 864 bytes .../Structures/Walls/solid.rsi/solid0.png | Bin 391 -> 782 bytes .../Structures/Walls/solid.rsi/solid1.png | Bin 274 -> 415 bytes .../Structures/Walls/solid.rsi/solid2.png | Bin 391 -> 782 bytes .../Structures/Walls/solid.rsi/solid3.png | Bin 274 -> 415 bytes .../Structures/Walls/solid.rsi/solid4.png | Bin 280 -> 423 bytes .../Structures/Walls/solid.rsi/solid5.png | Bin 352 -> 448 bytes .../Structures/Walls/solid.rsi/solid6.png | Bin 280 -> 423 bytes .../Structures/Walls/solid.rsi/solid7.png | Bin 204 -> 261 bytes .../Walls/solid_diagonal.rsi/state0.png | Bin 316 -> 316 bytes .../Walls/solid_diagonal.rsi/state1.png | Bin 292 -> 297 bytes .../Windows/plasma_diagonal.rsi/state0.png | Bin 729 -> 15748 bytes .../Windows/plasma_diagonal.rsi/state1.png | Bin 704 -> 15665 bytes .../Windows/plasma_window.rsi/full.png | Bin 430 -> 1597 bytes .../Windows/plasma_window.rsi/meta.json | 2 +- .../Windows/plasma_window.rsi/pwindow0.png | Bin 762 -> 2063 bytes .../Windows/plasma_window.rsi/pwindow1.png | Bin 735 -> 1099 bytes .../Windows/plasma_window.rsi/pwindow2.png | Bin 762 -> 2063 bytes .../Windows/plasma_window.rsi/pwindow3.png | Bin 735 -> 1099 bytes .../Windows/plasma_window.rsi/pwindow4.png | Bin 734 -> 1161 bytes .../Windows/plasma_window.rsi/pwindow5.png | Bin 680 -> 1064 bytes .../Windows/plasma_window.rsi/pwindow6.png | Bin 734 -> 1161 bytes .../Windows/plasma_window.rsi/pwindow7.png | Bin 270 -> 247 bytes .../reinforced_plasma_diagonal.rsi/state0.png | Bin 764 -> 15911 bytes .../reinforced_plasma_diagonal.rsi/state1.png | Bin 737 -> 15885 bytes .../reinforced_plasma_window.rsi/full.png | Bin 443 -> 2495 bytes .../reinforced_plasma_window.rsi/meta.json | 2 +- .../rpwindow0.png | Bin 776 -> 2930 bytes .../rpwindow1.png | Bin 877 -> 1696 bytes .../rpwindow2.png | Bin 776 -> 2930 bytes .../rpwindow3.png | Bin 877 -> 1696 bytes .../rpwindow4.png | Bin 874 -> 1745 bytes .../rpwindow5.png | Bin 721 -> 1695 bytes .../rpwindow6.png | Bin 874 -> 1745 bytes .../rpwindow7.png | Bin 270 -> 910 bytes .../state0.png | Bin 765 -> 15734 bytes .../state1.png | Bin 739 -> 15695 bytes .../reinforced_uranium_window.rsi/full.png | Bin 452 -> 2067 bytes .../reinforced_uranium_window.rsi/meta.json | 90 ++++----- .../ruwindow0.png | Bin 750 -> 2366 bytes .../ruwindow1.png | Bin 872 -> 1169 bytes .../ruwindow2.png | Bin 750 -> 2342 bytes .../ruwindow3.png | Bin 872 -> 1138 bytes .../ruwindow4.png | Bin 874 -> 1133 bytes .../ruwindow5.png | Bin 704 -> 1088 bytes .../ruwindow6.png | Bin 874 -> 1129 bytes .../ruwindow7.png | Bin 270 -> 267 bytes .../Windows/reinforced_window.rsi/full.png | Bin 437 -> 2063 bytes .../Windows/reinforced_window.rsi/meta.json | 2 +- .../reinforced_window.rsi/rwindow0.png | Bin 758 -> 2229 bytes .../reinforced_window.rsi/rwindow1.png | Bin 620 -> 1148 bytes .../reinforced_window.rsi/rwindow2.png | Bin 758 -> 2229 bytes .../reinforced_window.rsi/rwindow3.png | Bin 620 -> 1148 bytes .../reinforced_window.rsi/rwindow4.png | Bin 615 -> 1130 bytes .../reinforced_window.rsi/rwindow5.png | Bin 706 -> 1025 bytes .../reinforced_window.rsi/rwindow6.png | Bin 615 -> 1130 bytes .../reinforced_window.rsi/rwindow7.png | Bin 268 -> 272 bytes .../reinforced_window_diagonal.rsi/state0.png | Bin 768 -> 16179 bytes .../reinforced_window_diagonal.rsi/state1.png | Bin 741 -> 16152 bytes .../Windows/tinted_window.rsi/full.png | Bin 387 -> 9436 bytes .../Windows/tinted_window.rsi/meta.json | 2 +- .../Windows/tinted_window.rsi/twindow0.png | Bin 2397 -> 10814 bytes .../Windows/tinted_window.rsi/twindow1.png | Bin 2230 -> 8214 bytes .../Windows/tinted_window.rsi/twindow2.png | Bin 2397 -> 10815 bytes .../Windows/tinted_window.rsi/twindow3.png | Bin 2230 -> 8477 bytes .../Windows/tinted_window.rsi/twindow4.png | Bin 2236 -> 8217 bytes .../Windows/tinted_window.rsi/twindow5.png | Bin 2336 -> 6896 bytes .../Windows/tinted_window.rsi/twindow6.png | Bin 2236 -> 8464 bytes .../Windows/tinted_window.rsi/twindow7.png | Bin 1915 -> 4882 bytes .../Windows/uranium_window.rsi/full.png | Bin 432 -> 1321 bytes .../Windows/uranium_window.rsi/meta.json | 90 ++++----- .../Windows/uranium_window.rsi/uwindow0.png | Bin 773 -> 1688 bytes .../Windows/uranium_window.rsi/uwindow1.png | Bin 739 -> 1225 bytes .../Windows/uranium_window.rsi/uwindow2.png | Bin 773 -> 1688 bytes .../Windows/uranium_window.rsi/uwindow3.png | Bin 739 -> 1225 bytes .../Windows/uranium_window.rsi/uwindow4.png | Bin 739 -> 1216 bytes .../Windows/uranium_window.rsi/uwindow5.png | Bin 664 -> 795 bytes .../Windows/uranium_window.rsi/uwindow6.png | Bin 739 -> 1229 bytes .../Windows/uranium_window.rsi/uwindow7.png | Bin 270 -> 297 bytes .../uranium_window_diagonal.rsi/state0.png | Bin 729 -> 15629 bytes .../uranium_window_diagonal.rsi/state1.png | Bin 703 -> 15604 bytes .../Structures/Windows/window.rsi/full.png | Bin 427 -> 1224 bytes .../Structures/Windows/window.rsi/meta.json | 2 +- .../Structures/Windows/window.rsi/window0.png | Bin 714 -> 1632 bytes .../Structures/Windows/window.rsi/window1.png | Bin 518 -> 1183 bytes .../Structures/Windows/window.rsi/window2.png | Bin 714 -> 1632 bytes .../Structures/Windows/window.rsi/window3.png | Bin 518 -> 1183 bytes .../Structures/Windows/window.rsi/window4.png | Bin 523 -> 1187 bytes .../Structures/Windows/window.rsi/window5.png | Bin 666 -> 800 bytes .../Structures/Windows/window.rsi/window6.png | Bin 523 -> 1187 bytes .../Structures/Windows/window.rsi/window7.png | Bin 268 -> 301 bytes .../Windows/window_diagonal.rsi/state0.png | Bin 735 -> 15988 bytes .../Windows/window_diagonal.rsi/state1.png | Bin 702 -> 15966 bytes Resources/engineCommandPerms.yml | 1 - 375 files changed, 561 insertions(+), 1474 deletions(-) delete mode 100644 Content.IntegrationTests/Tests/Wires/WireLayoutTest.cs delete mode 100644 Content.Server/Bed/Components/SnoringComponent.cs delete mode 100644 Content.Server/DeviceNetwork/Systems/DeviceNetworkJammerSystem.cs delete mode 100644 Content.Shared/DeviceNetwork/Components/DeviceNetworkJammerComponent.cs delete mode 100644 Resources/Locale/en-US/prototypes/catalog/cargo/cargoproduct-categories.ftl delete mode 100644 Resources/Prototypes/Recipes/Construction/Graphs/clothing/ducky_slippers.yml delete mode 100644 Resources/Textures/Clothing/Mask/neckgaiterred.rsi/equipped-MASK-reptilian.png delete mode 100644 Resources/Textures/Clothing/Mask/neckgaiterred.rsi/equipped-MASK.png delete mode 100644 Resources/Textures/Clothing/Mask/neckgaiterred.rsi/icon.png delete mode 100644 Resources/Textures/Clothing/Mask/neckgaiterred.rsi/inhand-left.png delete mode 100644 Resources/Textures/Clothing/Mask/neckgaiterred.rsi/inhand-right.png delete mode 100644 Resources/Textures/Clothing/Mask/neckgaiterred.rsi/meta.json create mode 100644 Resources/Textures/Objects/Devices/communication.rsi/old-radio-inhand-left.png create mode 100644 Resources/Textures/Objects/Devices/communication.rsi/old-radio-inhand-right.png create mode 100644 Resources/Textures/Objects/Devices/communication.rsi/old-radio.png delete mode 100644 Resources/Textures/Objects/Devices/jammer.rsi/jammer-on.png delete mode 100644 Resources/Textures/Structures/Walls/shuttle.rsi/shuttle_construct-0.png delete mode 100644 Resources/Textures/Structures/Walls/shuttle.rsi/shuttle_construct-1.png delete mode 100644 Resources/Textures/Structures/Walls/shuttle.rsi/shuttle_construct-2.png delete mode 100644 Resources/Textures/Structures/Walls/shuttle.rsi/shuttle_construct-3.png delete mode 100644 Resources/Textures/Structures/Walls/shuttle.rsi/shuttle_construct-4.png delete mode 100644 Resources/Textures/Structures/Walls/shuttle.rsi/shuttle_construct-5.png diff --git a/.vscode/extensions.json b/.vscode/extensions.json index 737b90563e8..83bca6f97bc 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -1,12 +1,6 @@ { "recommendations": [ "ms-dotnettools.csharp", - "editorconfig.editorconfig", - "aaron-bond.better-comments", - "tamasfe.even-better-toml", - "slava0135.robust-yaml", - "slevesque.shader", - "macabeus.vscode-fluent", - "redhat.vscode-yaml" + "editorconfig.editorconfig" ] } diff --git a/Content.Client/CardboardBox/CardboardBoxSystem.cs b/Content.Client/CardboardBox/CardboardBoxSystem.cs index 90a21d8e41b..50f9de239d5 100644 --- a/Content.Client/CardboardBox/CardboardBoxSystem.cs +++ b/Content.Client/CardboardBox/CardboardBoxSystem.cs @@ -1,4 +1,4 @@ -using System.Numerics; +using System.Numerics; using Content.Shared.CardboardBox; using Content.Shared.CardboardBox.Components; using Content.Shared.Examine; @@ -11,7 +11,6 @@ public sealed class CardboardBoxSystem : SharedCardboardBoxSystem { [Dependency] private readonly EntityLookupSystem _entityLookup = default!; [Dependency] private readonly TransformSystem _transform = default!; - [Dependency] private readonly ExamineSystemShared _examine = default!; public override void Initialize() { @@ -56,7 +55,7 @@ private void OnBoxEffect(PlayBoxEffectMessage msg) foreach (var mob in mobMoverEntities) { var mapPos = _transform.GetMapCoordinates(mob); - if (!_examine.InRangeUnOccluded(sourcePos, mapPos, box.Distance, null)) + if (!ExamineSystemShared.InRangeUnOccluded(sourcePos, mapPos, box.Distance, null)) continue; var ent = Spawn(box.Effect, mapPos); diff --git a/Content.Client/Cargo/UI/CargoConsoleMenu.xaml.cs b/Content.Client/Cargo/UI/CargoConsoleMenu.xaml.cs index e60335bc45c..baf0d31f1f1 100644 --- a/Content.Client/Cargo/UI/CargoConsoleMenu.xaml.cs +++ b/Content.Client/Cargo/UI/CargoConsoleMenu.xaml.cs @@ -93,7 +93,7 @@ public void PopulateProducts() if (search.Length == 0 && _category == null || search.Length != 0 && prototype.Name.ToLowerInvariant().Contains(search) || search.Length != 0 && prototype.Description.ToLowerInvariant().Contains(search) || - search.Length == 0 && _category != null && Loc.GetString(prototype.Category).Equals(_category)) + search.Length == 0 && _category != null && prototype.Category.Equals(_category)) { var button = new CargoProductRow { @@ -122,7 +122,7 @@ public void PopulateCategories() foreach (var prototype in ProductPrototypes) { - if (!_categoryStrings.Contains(Loc.GetString(prototype.Category))) + if (!_categoryStrings.Contains(prototype.Category)) { _categoryStrings.Add(Loc.GetString(prototype.Category)); } diff --git a/Content.Client/Construction/ConstructionSystem.cs b/Content.Client/Construction/ConstructionSystem.cs index 66000a8457d..ae1724c3bf6 100644 --- a/Content.Client/Construction/ConstructionSystem.cs +++ b/Content.Client/Construction/ConstructionSystem.cs @@ -27,7 +27,6 @@ public sealed class ConstructionSystem : SharedConstructionSystem [Dependency] private readonly IPlayerManager _playerManager = default!; [Dependency] private readonly IPrototypeManager _prototypeManager = default!; [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!; - [Dependency] private readonly SharedTransformSystem _transformSystem = default!; [Dependency] private readonly PopupSystem _popupSystem = default!; private readonly Dictionary _ghosts = new(); @@ -196,7 +195,7 @@ public bool TrySpawnGhost( return false; // This InRangeUnobstructed should probably be replaced with "is there something blocking us in that tile?" - var predicate = GetPredicate(prototype.CanBuildInImpassable, loc.ToMap(EntityManager, _transformSystem)); + var predicate = GetPredicate(prototype.CanBuildInImpassable, loc.ToMap(EntityManager)); if (!_interactionSystem.InRangeUnobstructed(user, loc, 20f, predicate: predicate)) return false; diff --git a/Content.Client/ContextMenu/UI/EntityMenuUIController.cs b/Content.Client/ContextMenu/UI/EntityMenuUIController.cs index a60619baa35..ae1b3ec3bf0 100644 --- a/Content.Client/ContextMenu/UI/EntityMenuUIController.cs +++ b/Content.Client/ContextMenu/UI/EntityMenuUIController.cs @@ -170,7 +170,7 @@ private bool HandleOpenEntityMenu(in PointerInputCmdHandler.PointerInputCmdArgs if (_combatMode.IsInCombatMode(args.Session?.AttachedEntity)) return false; - var coords = args.Coordinates.ToMap(_entityManager, _xform); + var coords = args.Coordinates.ToMap(_entityManager); if (_verbSystem.TryGetEntityMenuEntities(coords, out var entities)) OpenRootMenu(entities); diff --git a/Content.Client/Gameplay/GameplayStateBase.cs b/Content.Client/Gameplay/GameplayStateBase.cs index 6236cd8e958..bdbd69d1086 100644 --- a/Content.Client/Gameplay/GameplayStateBase.cs +++ b/Content.Client/Gameplay/GameplayStateBase.cs @@ -104,7 +104,7 @@ private bool HandleInspect(ICommonSession? session, EntityCoordinates coords, En public IEnumerable GetClickableEntities(EntityCoordinates coordinates) { - return GetClickableEntities(coordinates.ToMap(_entityManager, _entitySystemManager.GetEntitySystem())); + return GetClickableEntities(coordinates.ToMap(_entityManager)); } public IEnumerable GetClickableEntities(MapCoordinates coordinates) diff --git a/Content.Client/NPC/PathfindingSystem.cs b/Content.Client/NPC/PathfindingSystem.cs index 7bf3df1f0b9..548edd601ce 100644 --- a/Content.Client/NPC/PathfindingSystem.cs +++ b/Content.Client/NPC/PathfindingSystem.cs @@ -23,7 +23,6 @@ public sealed class PathfindingSystem : SharedPathfindingSystem [Dependency] private readonly IResourceCache _cache = default!; [Dependency] private readonly NPCSteeringSystem _steering = default!; [Dependency] private readonly MapSystem _mapSystem = default!; - [Dependency] private readonly SharedTransformSystem _transformSystem = default!; public PathfindingDebugMode Modes { @@ -40,7 +39,7 @@ public PathfindingDebugMode Modes } else if (!overlayManager.HasOverlay()) { - overlayManager.AddOverlay(new PathfindingOverlay(EntityManager, _eyeManager, _inputManager, _mapManager, _cache, this, _mapSystem, _transformSystem)); + overlayManager.AddOverlay(new PathfindingOverlay(EntityManager, _eyeManager, _inputManager, _mapManager, _cache, this, _mapSystem)); } if ((value & PathfindingDebugMode.Steering) != 0x0) @@ -141,7 +140,6 @@ public sealed class PathfindingOverlay : Overlay private readonly IMapManager _mapManager; private readonly PathfindingSystem _system; private readonly MapSystem _mapSystem; - private readonly SharedTransformSystem _transformSystem; public override OverlaySpace Space => OverlaySpace.ScreenSpace | OverlaySpace.WorldSpace; @@ -155,8 +153,7 @@ public PathfindingOverlay( IMapManager mapManager, IResourceCache cache, PathfindingSystem system, - MapSystem mapSystem, - SharedTransformSystem transformSystem) + MapSystem mapSystem) { _entManager = entManager; _eyeManager = eyeManager; @@ -164,7 +161,6 @@ public PathfindingOverlay( _mapManager = mapManager; _system = system; _mapSystem = mapSystem; - _transformSystem = transformSystem; _font = new VectorFont(cache.GetResource("/Fonts/NotoSans/NotoSans-Regular.ttf"), 10); } @@ -484,7 +480,7 @@ private void DrawWorld(OverlayDrawArgs args, DrawingHandleWorld worldHandle) if (neighborPoly.NetEntity != poly.GraphUid) { color = Color.Green; - var neighborMap = _entManager.GetCoordinates(neighborPoly).ToMap(_entManager, _transformSystem); + var neighborMap = _entManager.GetCoordinates(neighborPoly).ToMap(_entManager); if (neighborMap.MapId != args.MapId) continue; diff --git a/Content.Client/Popups/PopupOverlay.cs b/Content.Client/Popups/PopupOverlay.cs index fb6bb3bf565..1305d8bb947 100644 --- a/Content.Client/Popups/PopupOverlay.cs +++ b/Content.Client/Popups/PopupOverlay.cs @@ -21,8 +21,7 @@ public sealed class PopupOverlay : Overlay private readonly IUserInterfaceManager _uiManager; private readonly PopupSystem _popup; private readonly PopupUIController _controller; - private readonly ExamineSystemShared _examine; - private readonly SharedTransformSystem _transform; + private readonly ShaderInstance _shader; public override OverlaySpace Space => OverlaySpace.ScreenSpace; @@ -34,16 +33,12 @@ public PopupOverlay( IPrototypeManager protoManager, IUserInterfaceManager uiManager, PopupUIController controller, - ExamineSystemShared examine, - SharedTransformSystem transform, PopupSystem popup) { _configManager = configManager; _entManager = entManager; _playerMgr = playerMgr; _uiManager = uiManager; - _examine = examine; - _transform = transform; _popup = popup; _controller = controller; @@ -78,7 +73,7 @@ private void DrawWorld(DrawingHandleScreen worldHandle, OverlayDrawArgs args, fl foreach (var popup in _popup.WorldLabels) { - var mapPos = popup.InitialPos.ToMap(_entManager, _transform); + var mapPos = popup.InitialPos.ToMap(_entManager); if (mapPos.MapId != args.MapId) continue; @@ -86,7 +81,7 @@ private void DrawWorld(DrawingHandleScreen worldHandle, OverlayDrawArgs args, fl var distance = (mapPos.Position - args.WorldBounds.Center).Length(); // Should handle fade here too wyci. - if (!args.WorldBounds.Contains(mapPos.Position) || !_examine.InRangeUnOccluded(viewPos, mapPos, distance, + if (!args.WorldBounds.Contains(mapPos.Position) || !ExamineSystemShared.InRangeUnOccluded(viewPos, mapPos, distance, e => e == popup.InitialPos.EntityId || e == ourEntity, entMan: _entManager)) continue; diff --git a/Content.Client/Popups/PopupSystem.cs b/Content.Client/Popups/PopupSystem.cs index 479fb02906c..cf96c41241a 100644 --- a/Content.Client/Popups/PopupSystem.cs +++ b/Content.Client/Popups/PopupSystem.cs @@ -1,5 +1,4 @@ using System.Linq; -using Content.Shared.Examine; using Content.Shared.GameTicking; using Content.Shared.Popups; using Robust.Client.Graphics; @@ -27,8 +26,6 @@ public sealed class PopupSystem : SharedPopupSystem [Dependency] private readonly IGameTiming _timing = default!; [Dependency] private readonly IUserInterfaceManager _uiManager = default!; [Dependency] private readonly IReplayRecordingManager _replayRecording = default!; - [Dependency] private readonly ExamineSystemShared _examine = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; public IReadOnlyList WorldLabels => _aliveWorldLabels; public IReadOnlyList CursorLabels => _aliveCursorLabels; @@ -54,8 +51,6 @@ public override void Initialize() _prototype, _uiManager, _uiManager.GetUIController(), - _examine, - _transform, this)); } diff --git a/Content.Client/Radiation/Overlays/RadiationPulseOverlay.cs b/Content.Client/Radiation/Overlays/RadiationPulseOverlay.cs index 9012767ef3f..adc535b2684 100644 --- a/Content.Client/Radiation/Overlays/RadiationPulseOverlay.cs +++ b/Content.Client/Radiation/Overlays/RadiationPulseOverlay.cs @@ -121,10 +121,7 @@ private void RadiationQuery(IEye? currentEye) private bool PulseQualifies(EntityUid pulseEntity, MapCoordinates currentEyeLoc) { - var transformComponent = _entityManager.GetComponent(pulseEntity); - var transformSystem = _entityManager.System(); - return transformComponent.MapID == currentEyeLoc.MapId - && transformComponent.Coordinates.InRange(_entityManager, transformSystem, EntityCoordinates.FromMap(transformComponent.ParentUid, currentEyeLoc, transformSystem, _entityManager), MaxDist); + return _entityManager.GetComponent(pulseEntity).MapID == currentEyeLoc.MapId && _entityManager.GetComponent(pulseEntity).Coordinates.InRange(_entityManager, EntityCoordinates.FromMap(_entityManager, _entityManager.GetComponent(pulseEntity).ParentUid, currentEyeLoc), MaxDist); } private sealed record RadiationShaderInstance(MapCoordinates CurrentMapCoords, float Range, TimeSpan Start, float Duration) diff --git a/Content.Client/Sandbox/SandboxSystem.cs b/Content.Client/Sandbox/SandboxSystem.cs index 6a1129bb75d..d16751e3715 100644 --- a/Content.Client/Sandbox/SandboxSystem.cs +++ b/Content.Client/Sandbox/SandboxSystem.cs @@ -16,7 +16,6 @@ public sealed class SandboxSystem : SharedSandboxSystem [Dependency] private readonly IMapManager _map = default!; [Dependency] private readonly IPlacementManager _placement = default!; [Dependency] private readonly ContentEyeSystem _contentEye = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; private bool _sandboxEnabled; public bool SandboxAllowed { get; private set; } @@ -109,7 +108,7 @@ public bool Copy(ICommonSession? session, EntityCoordinates coords, EntityUid ui } // Try copy tile. - if (!_map.TryFindGridAt(coords.ToMap(EntityManager, _transform), out _, out var grid) || !grid.TryGetTileRef(coords, out var tileRef)) + if (!_map.TryFindGridAt(coords.ToMap(EntityManager), out _, out var grid) || !grid.TryGetTileRef(coords, out var tileRef)) return false; if (_placement.Eraser) diff --git a/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs b/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs index 57b22e3f333..79c1909ebaf 100644 --- a/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs +++ b/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs @@ -626,7 +626,7 @@ private void UpdateQueuedSpeechBubbles(FrameEventArgs delta) var otherPos = EntityManager.GetComponent(ent).MapPosition; - if (occluded && !_examine.InRangeUnOccluded( + if (occluded && !ExamineSystemShared.InRangeUnOccluded( playerPos, otherPos, 0f, (ent, player), predicate)) diff --git a/Content.Client/Verbs/VerbSystem.cs b/Content.Client/Verbs/VerbSystem.cs index 77f46a3fc97..329a8977a68 100644 --- a/Content.Client/Verbs/VerbSystem.cs +++ b/Content.Client/Verbs/VerbSystem.cs @@ -20,7 +20,7 @@ namespace Content.Client.Verbs public sealed class VerbSystem : SharedVerbSystem { [Dependency] private readonly PopupSystem _popupSystem = default!; - [Dependency] private readonly ExamineSystem _examine = default!; + [Dependency] private readonly ExamineSystem _examineSystem = default!; [Dependency] private readonly TagSystem _tagSystem = default!; [Dependency] private readonly IStateManager _stateManager = default!; [Dependency] private readonly EntityLookupSystem _entityLookup = default!; @@ -77,7 +77,7 @@ public bool TryGetEntityMenuEntities(MapCoordinates targetPos, [NotNullWhen(true bool Predicate(EntityUid e) => e == player || entitiesUnderMouse.Contains(e); // first check the general location. - if (!_examine.CanExamine(player.Value, targetPos, Predicate)) + if (!_examineSystem.CanExamine(player.Value, targetPos, Predicate)) return false; TryComp(player.Value, out ExaminerComponent? examiner); @@ -86,7 +86,7 @@ public bool TryGetEntityMenuEntities(MapCoordinates targetPos, [NotNullWhen(true entities = new(); foreach (var ent in _entityLookup.GetEntitiesInRange(targetPos, EntityMenuLookupSize)) { - if (_examine.CanExamine(player.Value, targetPos, Predicate, ent, examiner)) + if (_examineSystem.CanExamine(player.Value, targetPos, Predicate, ent, examiner)) entities.Add(ent); } } @@ -147,7 +147,7 @@ public bool TryGetEntityMenuEntities(MapCoordinates targetPos, [NotNullWhen(true { var entity = entities[i]; - if (!_examine.InRangeUnOccluded( + if (!ExamineSystemShared.InRangeUnOccluded( playerPos, xformQuery.GetComponent(entity).MapPosition, ExamineSystemShared.ExamineRange, diff --git a/Content.IntegrationTests/Tests/Wires/WireLayoutTest.cs b/Content.IntegrationTests/Tests/Wires/WireLayoutTest.cs deleted file mode 100644 index 920dc088186..00000000000 --- a/Content.IntegrationTests/Tests/Wires/WireLayoutTest.cs +++ /dev/null @@ -1,103 +0,0 @@ -using Content.Server.Doors; -using Content.Server.Power; -using Content.Server.Wires; -using Robust.Shared.GameObjects; -using Robust.Shared.IoC; -using Robust.Shared.Map; - -namespace Content.IntegrationTests.Tests.Wires; - -[TestFixture] -[Parallelizable(ParallelScope.All)] -[TestOf(typeof(WiresSystem))] -public sealed class WireLayoutTest -{ - [TestPrototypes] - public const string Prototypes = """ - - type: wireLayout - id: WireLayoutTest - dummyWires: 2 - wires: - - !type:PowerWireAction - - !type:DoorBoltWireAction - - - type: wireLayout - id: WireLayoutTest2 - parent: WireLayoutTest - wires: - - !type:PowerWireAction - - - type: wireLayout - id: WireLayoutTest3 - parent: WireLayoutTest - - - type: entity - id: WireLayoutTest - components: - - type: Wires - layoutId: WireLayoutTest - - - type: entity - id: WireLayoutTest2 - components: - - type: Wires - layoutId: WireLayoutTest2 - - - type: entity - id: WireLayoutTest3 - components: - - type: Wires - layoutId: WireLayoutTest3 - """; - - [Test] - public async Task TestLayoutInheritance() - { - await using var pair = await PoolManager.GetServerClient(); - var server = pair.Server; - var testMap = await pair.CreateTestMap(); - - await server.WaitAssertion(() => - { - var wires = IoCManager.Resolve().GetEntitySystem(); - - // Need to spawn these entities to make sure the wire layouts are initialized. - var ent1 = SpawnWithComp(server.EntMan, "WireLayoutTest", testMap.MapCoords); - var ent2 = SpawnWithComp(server.EntMan, "WireLayoutTest2", testMap.MapCoords); - var ent3 = SpawnWithComp(server.EntMan, "WireLayoutTest3", testMap.MapCoords); - - // Assert.That(wires.TryGetLayout("WireLayoutTest", out var layout1)); - // Assert.That(wires.TryGetLayout("WireLayoutTest2", out var layout2)); - // Assert.That(wires.TryGetLayout("WireLayoutTest3", out var layout3)); - - Assert.Multiple(() => - { - // Entity 1. - Assert.That(ent1.Comp.WiresList, Has.Count.EqualTo(4)); - Assert.That(ent1.Comp.WiresList, Has.Exactly(2).With.Property("Action").Null, "2 dummy wires"); - Assert.That(ent1.Comp.WiresList, Has.One.With.Property("Action").InstanceOf(), "1 power wire"); - Assert.That(ent1.Comp.WiresList, Has.One.With.Property("Action").InstanceOf(), "1 door bolt wire"); - - Assert.That(ent2.Comp.WiresList, Has.Count.EqualTo(5)); - Assert.That(ent2.Comp.WiresList, Has.Exactly(2).With.Property("Action").Null, "2 dummy wires"); - Assert.That(ent2.Comp.WiresList, Has.Exactly(2).With.Property("Action").InstanceOf(), "2 power wire"); - Assert.That(ent2.Comp.WiresList, Has.One.With.Property("Action").InstanceOf(), "1 door bolt wire"); - - Assert.That(ent3.Comp.WiresList, Has.Count.EqualTo(4)); - Assert.That(ent3.Comp.WiresList, Has.Exactly(2).With.Property("Action").Null, "2 dummy wires"); - Assert.That(ent3.Comp.WiresList, Has.One.With.Property("Action").InstanceOf(), "1 power wire"); - Assert.That(ent3.Comp.WiresList, Has.One.With.Property("Action").InstanceOf(), "1 door bolt wire"); - }); - }); - - await pair.CleanReturnAsync(); - } - - private static Entity SpawnWithComp(IEntityManager entityManager, string prototype, MapCoordinates coords) - where T : IComponent, new() - { - var ent = entityManager.Spawn(prototype, coords); - var comp = entityManager.EnsureComponent(ent); - return new Entity(ent, comp); - } -} diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs index 9d66338c8bf..c68336deab8 100644 --- a/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs +++ b/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs @@ -718,21 +718,9 @@ private void AddTricksVerbs(GetVerbsEvent args) Icon = new SpriteSpecifier.Rsi(new("/Textures/Objects/Fun/caps.rsi"), "mag-6"), Act = () => { - _quickDialog.OpenDialog(player, "Set Bullet Amount", $"Amount (standard {ballisticAmmo.Capacity}):", (string amount) => + _quickDialog.OpenDialog(player, "Set Bullet Amount", $"Amount (max {ballisticAmmo.Capacity}):", (int amount) => { - if (!int.TryParse(amount, out var result)) - return; - - if (result > 0) - { - ballisticAmmo.UnspawnedCount = result; - } - else - { - ballisticAmmo.UnspawnedCount = 0; - } - - _gun.UpdateBallisticAppearance(args.Target, ballisticAmmo); + ballisticAmmo.UnspawnedCount = amount; }); }, Impact = LogImpact.Medium, diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.cs b/Content.Server/Administration/Systems/AdminVerbSystem.cs index f5b237b4492..c4754af9340 100644 --- a/Content.Server/Administration/Systems/AdminVerbSystem.cs +++ b/Content.Server/Administration/Systems/AdminVerbSystem.cs @@ -66,7 +66,6 @@ public sealed partial class AdminVerbSystem : EntitySystem [Dependency] private readonly SharedPopupSystem _popup = default!; [Dependency] private readonly StationSystem _stations = default!; [Dependency] private readonly StationSpawningSystem _spawning = default!; - [Dependency] private readonly ExamineSystemShared _examine = default!; private readonly Dictionary> _openSolutionUis = new(); @@ -417,7 +416,7 @@ private void AddDebugVerbs(GetVerbsEvent args) Act = () => { - var message = _examine.InRangeUnOccluded(args.User, args.Target) + var message = ExamineSystemShared.InRangeUnOccluded(args.User, args.Target) ? Loc.GetString("in-range-unoccluded-verb-on-activate-not-occluded") : Loc.GetString("in-range-unoccluded-verb-on-activate-occluded"); diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.HighPressureDelta.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.HighPressureDelta.cs index cb50ff114e0..77b5bf18af2 100644 --- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.HighPressureDelta.cs +++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.HighPressureDelta.cs @@ -236,7 +236,7 @@ public void ExperiencePressureDifference( // TODO: Technically these directions won't be correct but uhh I'm just here for optimisations buddy not to fix my old bugs. if (throwTarget != EntityCoordinates.Invalid) { - var pos = ((throwTarget.ToMap(EntityManager, _transformSystem).Position - xform.WorldPosition).Normalized() + dirVec).Normalized(); + var pos = ((throwTarget.ToMap(EntityManager).Position - xform.WorldPosition).Normalized() + dirVec).Normalized(); _physics.ApplyLinearImpulse(uid, pos * moveForce, body: physics); } else diff --git a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Monstermos.cs b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Monstermos.cs index dcbc1e86ee2..f156125b0ff 100644 --- a/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Monstermos.cs +++ b/Content.Server/Atmos/EntitySystems/AtmosphereSystem.Monstermos.cs @@ -661,7 +661,7 @@ private void AdjustEqMovement(TileAtmosphere tile, AtmosDirection direction, flo // Turns out: no they don't. Temporary debug checks to figure out which caller is causing problems: if (tile == null) { - Log.Error($"Encountered null-tile in {nameof(AdjustEqMovement)}. Trace: {Environment.StackTrace}"); + Logger.Error($"Encountered null-tile in {nameof(AdjustEqMovement)}. Trace: {Environment.StackTrace}"); return; } var adj = tile.AdjacentTiles[direction.ToIndex()]; diff --git a/Content.Server/Bed/Components/SnoringComponent.cs b/Content.Server/Bed/Components/SnoringComponent.cs deleted file mode 100644 index 09f80327ba7..00000000000 --- a/Content.Server/Bed/Components/SnoringComponent.cs +++ /dev/null @@ -1,10 +0,0 @@ -namespace Content.Server.Bed.Sleep; - -/// -/// This is used for the snoring trait. -/// -[RegisterComponent] -public sealed partial class SnoringComponent : Component -{ - -} diff --git a/Content.Server/Bed/Sleep/SleepingSystem.cs b/Content.Server/Bed/Sleep/SleepingSystem.cs index b4972544338..685b1087d70 100644 --- a/Content.Server/Bed/Sleep/SleepingSystem.cs +++ b/Content.Server/Bed/Sleep/SleepingSystem.cs @@ -67,10 +67,7 @@ private void OnSleepStateChanged(EntityUid uid, MobStateComponent component, Sle if (TryComp(uid, out var sleepSound)) { var emitSound = EnsureComp(uid); - if (HasComp(uid)) - { - emitSound.Sound = sleepSound.Snore; - } + emitSound.Sound = sleepSound.Snore; emitSound.PlayChance = sleepSound.Chance; emitSound.RollInterval = sleepSound.Interval; emitSound.PopUp = sleepSound.PopUp; diff --git a/Content.Server/Chat/TypingIndicator/TypingIndicatorSystem.cs b/Content.Server/Chat/TypingIndicator/TypingIndicatorSystem.cs index c923738930a..761e9456bcd 100644 --- a/Content.Server/Chat/TypingIndicator/TypingIndicatorSystem.cs +++ b/Content.Server/Chat/TypingIndicator/TypingIndicatorSystem.cs @@ -39,7 +39,7 @@ private void OnClientTypingChanged(TypingChangedEvent ev, EntitySessionEventArgs var uid = args.SenderSession.AttachedEntity; if (!Exists(uid)) { - Log.Warning($"Client {args.SenderSession} sent TypingChangedEvent without an attached entity."); + Logger.Warning($"Client {args.SenderSession} sent TypingChangedEvent without an attached entity."); return; } diff --git a/Content.Server/Chemistry/EntitySystems/VaporSystem.cs b/Content.Server/Chemistry/EntitySystems/VaporSystem.cs index 1415b6cad3c..7d3f70bc0d8 100644 --- a/Content.Server/Chemistry/EntitySystems/VaporSystem.cs +++ b/Content.Server/Chemistry/EntitySystems/VaporSystem.cs @@ -22,8 +22,8 @@ namespace Content.Server.Chemistry.EntitySystems [UsedImplicitly] internal sealed class VaporSystem : EntitySystem { + [Dependency] private readonly IMapManager _mapManager = default!; [Dependency] private readonly IPrototypeManager _protoManager = default!; - [Dependency] private readonly SharedMapSystem _map = default!; [Dependency] private readonly SharedPhysicsSystem _physics = default!; [Dependency] private readonly SolutionContainerSystem _solutionContainerSystem = default!; [Dependency] private readonly ThrowingSystem _throwing = default!; @@ -115,7 +115,7 @@ private void Update(float frameTime, Entity ent, Entity(); - var indices = transform.Coordinates.ToVector2i(entityManager, IoCManager.Resolve(), transformSys); + var indices = transform.Coordinates.ToVector2i(entityManager, IoCManager.Resolve()); var lookup = entityManager.EntitySysManager.GetEntitySystem(); diff --git a/Content.Server/Construction/ConstructionSystem.Initial.cs b/Content.Server/Construction/ConstructionSystem.Initial.cs index 39705fc1974..e0bdf096296 100644 --- a/Content.Server/Construction/ConstructionSystem.Initial.cs +++ b/Content.Server/Construction/ConstructionSystem.Initial.cs @@ -2,6 +2,7 @@ using System.Linq; using System.Threading.Tasks; using Content.Server.Construction.Components; +using Content.Server.Storage.EntitySystems; using Content.Shared.ActionBlocker; using Content.Shared.Construction; using Content.Shared.Construction.Prototypes; @@ -14,6 +15,7 @@ using Content.Shared.Interaction; using Content.Shared.Inventory; using Content.Shared.Storage; +using Content.Shared.Tag; using Robust.Shared.Containers; using Robust.Shared.Player; using Robust.Shared.Timing; @@ -28,7 +30,8 @@ public sealed partial class ConstructionSystem [Dependency] private readonly ActionBlockerSystem _actionBlocker = default!; [Dependency] private readonly SharedHandsSystem _handsSystem = default!; [Dependency] private readonly EntityLookupSystem _lookupSystem = default!; - [Dependency] private readonly SharedTransformSystem _transformSystem = default!; + [Dependency] private readonly StorageSystem _storageSystem = default!; + [Dependency] private readonly TagSystem _tagSystem = default!; // --- WARNING! LEGACY CODE AHEAD! --- // This entire file contains the legacy code for initial construction. @@ -463,7 +466,7 @@ void Cleanup() return; } - var mapPos = location.ToMap(EntityManager, _transformSystem); + var mapPos = location.ToMap(EntityManager); var predicate = GetPredicate(constructionPrototype.CanBuildInImpassable, mapPos); if (!_interactionSystem.InRangeUnobstructed(user, mapPos, predicate: predicate)) diff --git a/Content.Server/DeviceNetwork/Systems/DeviceNetworkJammerSystem.cs b/Content.Server/DeviceNetwork/Systems/DeviceNetworkJammerSystem.cs deleted file mode 100644 index 3d3820562d6..00000000000 --- a/Content.Server/DeviceNetwork/Systems/DeviceNetworkJammerSystem.cs +++ /dev/null @@ -1,38 +0,0 @@ -using Content.Server.DeviceNetwork.Components; -using Content.Shared.DeviceNetwork.Components; -using Robust.Server.GameObjects; - -namespace Content.Server.DeviceNetwork.Systems; - -public sealed class DeviceNetworkJammerSystem : EntitySystem -{ - [Dependency] private TransformSystem _transform = default!; - public override void Initialize() - { - base.Initialize(); - - SubscribeLocalEvent(BeforePacketSent); - } - - private void BeforePacketSent(EntityUid uid, TransformComponent xform, BeforePacketSentEvent ev) - { - if (ev.Cancelled) - return; - - var query = EntityQueryEnumerator(); - - while (query.MoveNext(out _, out var jammerComp, out var jammerXform)) - { - if (!jammerComp.JammableNetworks.Contains(ev.NetworkId)) - continue; - - if (jammerXform.Coordinates.InRange(EntityManager, _transform, ev.SenderTransform.Coordinates, jammerComp.Range) - || jammerXform.Coordinates.InRange(EntityManager, _transform, xform.Coordinates, jammerComp.Range)) - { - ev.Cancel(); - return; - } - } - } - -} diff --git a/Content.Server/DeviceNetwork/Systems/DeviceNetworkSystem.cs b/Content.Server/DeviceNetwork/Systems/DeviceNetworkSystem.cs index 20ee7a5dd1b..83967c9bbd4 100644 --- a/Content.Server/DeviceNetwork/Systems/DeviceNetworkSystem.cs +++ b/Content.Server/DeviceNetwork/Systems/DeviceNetworkSystem.cs @@ -351,14 +351,13 @@ private void SendToConnections(ReadOnlySpan connections, var xform = Transform(packet.Sender); - var senderPos = _transformSystem.GetWorldPosition(xform); + BeforePacketSentEvent beforeEv = new(packet.Sender, xform, _transformSystem.GetWorldPosition(xform)); foreach (var connection in connections) { if (connection.Owner == packet.Sender) continue; - BeforePacketSentEvent beforeEv = new(packet.Sender, xform, senderPos, connection.NetIdEnum.ToString()); RaiseLocalEvent(connection.Owner, beforeEv, false); if (!beforeEv.Cancelled) @@ -387,17 +386,11 @@ public sealed class BeforePacketSentEvent : CancellableEntityEventArgs /// public readonly Vector2 SenderPosition; - /// - /// The network the packet will be sent to. - /// - public readonly string NetworkId; - - public BeforePacketSentEvent(EntityUid sender, TransformComponent xform, Vector2 senderPosition, string networkId) + public BeforePacketSentEvent(EntityUid sender, TransformComponent xform, Vector2 senderPosition) { Sender = sender; SenderTransform = xform; SenderPosition = senderPosition; - NetworkId = networkId; } } diff --git a/Content.Server/DeviceNetwork/Systems/SingletonDeviceNetServerSystem.cs b/Content.Server/DeviceNetwork/Systems/SingletonDeviceNetServerSystem.cs index cdc083feacd..fd62514d006 100644 --- a/Content.Server/DeviceNetwork/Systems/SingletonDeviceNetServerSystem.cs +++ b/Content.Server/DeviceNetwork/Systems/SingletonDeviceNetServerSystem.cs @@ -1,5 +1,4 @@ -using System.Diagnostics.CodeAnalysis; -using Content.Server.DeviceNetwork.Components; +using Content.Server.DeviceNetwork.Components; using Content.Server.Medical.CrewMonitoring; using Content.Server.Power.Components; using Content.Server.Station.Systems; @@ -39,7 +38,7 @@ public bool IsActiveServer(EntityUid serverId, SingletonDeviceNetServerComponent /// The address of the active server if it exists /// The component type that determines what type of server you're getting the address of /// True if there is an active serve. False otherwise - public bool TryGetActiveServerAddress(EntityUid stationId, [NotNullWhen(true)] out string? address) where TComp : IComponent + public bool TryGetActiveServerAddress(EntityUid stationId, out string? address) where TComp : IComponent { var servers = EntityQueryEnumerator< SingletonDeviceNetServerComponent, diff --git a/Content.Server/Dragon/DragonSystem.cs b/Content.Server/Dragon/DragonSystem.cs index 6400472d036..93d6bc8db0b 100644 --- a/Content.Server/Dragon/DragonSystem.cs +++ b/Content.Server/Dragon/DragonSystem.cs @@ -28,7 +28,6 @@ public sealed partial class DragonSystem : EntitySystem [Dependency] private readonly RoleSystem _role = default!; [Dependency] private readonly SharedActionsSystem _actions = default!; [Dependency] private readonly SharedAudioSystem _audio = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; private EntityQuery _objQuery; @@ -147,7 +146,7 @@ private void OnSpawnRift(EntityUid uid, DragonComponent component, DragonSpawnRi // cant stack rifts near eachother foreach (var (_, riftXform) in EntityQuery(true)) { - if (riftXform.Coordinates.InRange(EntityManager, _transform, xform.Coordinates, RiftRange)) + if (riftXform.Coordinates.InRange(EntityManager, xform.Coordinates, RiftRange)) { _popup.PopupEntity(Loc.GetString("carp-rift-proximity", ("proximity", RiftRange)), uid, uid); return; diff --git a/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs b/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs index 6351d999a98..1a5a5c40118 100644 --- a/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs +++ b/Content.Server/Explosion/EntitySystems/ExplosionSystem.cs @@ -331,7 +331,7 @@ public void QueueExplosion(MapCoordinates epicenter, CameraShake(iterationIntensity.Count * 4f, epicenter, totalIntensity); //For whatever bloody reason, sound system requires ENTITY coordinates. - var mapEntityCoords = EntityCoordinates.FromMap(_mapManager.GetMapEntityId(epicenter.MapId), epicenter, _transformSystem, EntityManager); + var mapEntityCoords = EntityCoordinates.FromMap(EntityManager, _mapManager.GetMapEntityId(epicenter.MapId), epicenter); // play sound. // for the normal audio, we want everyone in pvs range diff --git a/Content.Server/GameTicking/GameTicker.Spawning.cs b/Content.Server/GameTicking/GameTicker.Spawning.cs index bf69b4b9094..54587e95be3 100644 --- a/Content.Server/GameTicking/GameTicker.Spawning.cs +++ b/Content.Server/GameTicking/GameTicker.Spawning.cs @@ -394,7 +394,7 @@ public EntityCoordinates GetObserverSpawnPoint() // Ideally engine would just spawn them on grid directly I guess? Right now grid traversal is handling it during // update which means we need to add a hack somewhere around it. var spawn = _robustRandom.Pick(_possiblePositions); - var toMap = spawn.ToMap(EntityManager, _transform); + var toMap = spawn.ToMap(EntityManager); if (_mapManager.TryFindGridAt(toMap, out var gridUid, out _)) { diff --git a/Content.Server/GameTicking/Rules/PiratesRuleSystem.cs b/Content.Server/GameTicking/Rules/PiratesRuleSystem.cs index 98926536b9d..f83d719c219 100644 --- a/Content.Server/GameTicking/Rules/PiratesRuleSystem.cs +++ b/Content.Server/GameTicking/Rules/PiratesRuleSystem.cs @@ -201,7 +201,7 @@ private void OnPlayerSpawningEvent(RulePlayerSpawningEvent ev) if (!gridId.HasValue) { - Log.Error($"Gridid was null when loading \"{map}\", aborting."); + Logger.ErrorS("pirates", $"Gridid was null when loading \"{map}\", aborting."); foreach (var session in ops) { ev.PlayerPool.Add(session); @@ -230,7 +230,7 @@ private void OnPlayerSpawningEvent(RulePlayerSpawningEvent ev) if (spawns.Count == 0) { spawns.Add(Transform(pirates.PirateShip).Coordinates); - Log.Warning($"Fell back to default spawn for pirates!"); + Logger.WarningS("pirates", $"Fell back to default spawn for pirates!"); } for (var i = 0; i < ops.Length; i++) diff --git a/Content.Server/Guardian/GuardianSystem.cs b/Content.Server/Guardian/GuardianSystem.cs index d3a717c74af..627c336a36b 100644 --- a/Content.Server/Guardian/GuardianSystem.cs +++ b/Content.Server/Guardian/GuardianSystem.cs @@ -34,7 +34,6 @@ public sealed class GuardianSystem : EntitySystem [Dependency] private readonly SharedAudioSystem _audio = default!; [Dependency] private readonly BodySystem _bodySystem = default!; [Dependency] private readonly SharedContainerSystem _container = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; public override void Initialize() { @@ -329,7 +328,7 @@ private void CheckGuardianMove( if (!guardianComponent.GuardianLoose) return; - if (!guardianXform.Coordinates.InRange(EntityManager, _transform, hostXform.Coordinates, guardianComponent.DistanceAllowed)) + if (!guardianXform.Coordinates.InRange(EntityManager, hostXform.Coordinates, guardianComponent.DistanceAllowed)) RetractGuardian(hostUid, hostComponent, guardianUid, guardianComponent); } diff --git a/Content.Server/Hands/Systems/HandsSystem.cs b/Content.Server/Hands/Systems/HandsSystem.cs index a0e872dbeb1..a783a9e0968 100644 --- a/Content.Server/Hands/Systems/HandsSystem.cs +++ b/Content.Server/Hands/Systems/HandsSystem.cs @@ -31,7 +31,6 @@ public sealed class HandsSystem : SharedHandsSystem [Dependency] private readonly VirtualItemSystem _virtualItemSystem = default!; [Dependency] private readonly ActionBlockerSystem _actionBlockerSystem = default!; [Dependency] private readonly SharedHandsSystem _handsSystem = default!; - [Dependency] private readonly SharedTransformSystem _transformSystem = default!; [Dependency] private readonly PullingSystem _pullingSystem = default!; [Dependency] private readonly ThrowingSystem _throwingSystem = default!; @@ -192,7 +191,7 @@ hands.ActiveHandEntity is not { } throwEnt || throwEnt = splitStack.Value; } - var direction = coordinates.ToMapPos(EntityManager, _transformSystem) - Transform(player).WorldPosition; + var direction = coordinates.ToMapPos(EntityManager) - Transform(player).WorldPosition; if (direction == Vector2.Zero) return true; diff --git a/Content.Server/Implants/SubdermalImplantSystem.cs b/Content.Server/Implants/SubdermalImplantSystem.cs index 8eb27414481..ac415a04342 100644 --- a/Content.Server/Implants/SubdermalImplantSystem.cs +++ b/Content.Server/Implants/SubdermalImplantSystem.cs @@ -99,7 +99,7 @@ private void OnScramImplant(EntityUid uid, SubdermalImplantComponent component, return; var xform = Transform(ent); - var entityCoords = xform.Coordinates.ToMap(EntityManager, _xform); + var entityCoords = xform.Coordinates.ToMap(EntityManager); // try to find a valid position to teleport to, teleport to whatever works if we can't var targetCoords = new MapCoordinates(); diff --git a/Content.Server/Magic/MagicSystem.cs b/Content.Server/Magic/MagicSystem.cs index 92cd794ce2c..2c9b11dbd3d 100644 --- a/Content.Server/Magic/MagicSystem.cs +++ b/Content.Server/Magic/MagicSystem.cs @@ -168,7 +168,7 @@ private void OnProjectileSpell(ProjectileSpellEvent ev) foreach (var pos in GetSpawnPositions(xform, ev.Pos)) { // If applicable, this ensures the projectile is parented to grid on spawn, instead of the map. - var mapPos = pos.ToMap(EntityManager, _transformSystem); + var mapPos = pos.ToMap(EntityManager); var spawnCoords = _mapManager.TryFindGridAt(mapPos, out var gridUid, out _) ? pos.WithEntityId(gridUid, EntityManager) : new(_mapManager.GetMapEntityId(mapPos.MapId), mapPos.Position); diff --git a/Content.Server/NPC/HTN/Preconditions/CoordinatesInRangePrecondition.cs b/Content.Server/NPC/HTN/Preconditions/CoordinatesInRangePrecondition.cs index 3485bd2a18c..3e030aa8197 100644 --- a/Content.Server/NPC/HTN/Preconditions/CoordinatesInRangePrecondition.cs +++ b/Content.Server/NPC/HTN/Preconditions/CoordinatesInRangePrecondition.cs @@ -22,6 +22,6 @@ public override bool IsMet(NPCBlackboard blackboard) if (!blackboard.TryGetValue(TargetKey, out var target, _entManager)) return false; - return coordinates.InRange(_entManager, _entManager.System(), target, blackboard.GetValueOrDefault(RangeKey, _entManager)); + return coordinates.InRange(_entManager, target, blackboard.GetValueOrDefault(RangeKey, _entManager)); } } diff --git a/Content.Server/NPC/HTN/Preconditions/CoordinatesNotInRangePrecondition.cs b/Content.Server/NPC/HTN/Preconditions/CoordinatesNotInRangePrecondition.cs index 9d000ca2eb8..6d8977bb7a7 100644 --- a/Content.Server/NPC/HTN/Preconditions/CoordinatesNotInRangePrecondition.cs +++ b/Content.Server/NPC/HTN/Preconditions/CoordinatesNotInRangePrecondition.cs @@ -22,7 +22,7 @@ public override bool IsMet(NPCBlackboard blackboard) if (!blackboard.TryGetValue(TargetKey, out var target, _entManager)) return false; - return !coordinates.InRange(_entManager, _entManager.System(), target, blackboard.GetValueOrDefault(RangeKey, _entManager)); + return !coordinates.InRange(_entManager, target, blackboard.GetValueOrDefault(RangeKey, _entManager)); } } diff --git a/Content.Server/NPC/HTN/Preconditions/TargetInRangePrecondition.cs b/Content.Server/NPC/HTN/Preconditions/TargetInRangePrecondition.cs index aaccb426d71..5d616ba630e 100644 --- a/Content.Server/NPC/HTN/Preconditions/TargetInRangePrecondition.cs +++ b/Content.Server/NPC/HTN/Preconditions/TargetInRangePrecondition.cs @@ -23,6 +23,6 @@ public override bool IsMet(NPCBlackboard blackboard) !_entManager.TryGetComponent(target, out var targetXform)) return false; - return coordinates.InRange(_entManager, _entManager.System(), targetXform.Coordinates, blackboard.GetValueOrDefault(RangeKey, _entManager)); + return coordinates.InRange(_entManager, targetXform.Coordinates, blackboard.GetValueOrDefault(RangeKey, _entManager)); } } diff --git a/Content.Server/NPC/Pathfinding/PathfindingSystem.cs b/Content.Server/NPC/Pathfinding/PathfindingSystem.cs index a59af88ff58..95f931cdd6a 100644 --- a/Content.Server/NPC/Pathfinding/PathfindingSystem.cs +++ b/Content.Server/NPC/Pathfinding/PathfindingSystem.cs @@ -405,7 +405,7 @@ public async void GetPathEvent( return null; } - var localPos = xform.InvWorldMatrix.Transform(coordinates.ToMapPos(EntityManager, _transform)); + var localPos = xform.InvWorldMatrix.Transform(coordinates.ToMapPos(EntityManager)); var origin = GetOrigin(localPos); if (!TryGetChunk(origin, comp, out var chunk)) diff --git a/Content.Server/NPC/Systems/NPCSteeringSystem.Context.cs b/Content.Server/NPC/Systems/NPCSteeringSystem.Context.cs index e7af2c91073..7ac6768e359 100644 --- a/Content.Server/NPC/Systems/NPCSteeringSystem.Context.cs +++ b/Content.Server/NPC/Systems/NPCSteeringSystem.Context.cs @@ -56,30 +56,7 @@ private bool IsFreeSpace( return true; } - // TODO: Ideally for "FreeSpace" we check all entities on the tile and build flags dynamically (pathfinder refactor in future). - var ents = _entSetPool.Get(); - _lookup.GetLocalEntitiesIntersecting(node.GraphUid, node.ChunkOrigin, ents, flags: LookupFlags.Static); - var result = true; - - if (ents.Count > 0) - { - var fixtures = _fixturesQuery.GetComponent(uid); - var physics = _physicsQuery.GetComponent(uid); - - foreach (var intersecting in ents) - { - if (!_physics.IsCurrentlyHardCollidable((uid, fixtures, physics), intersecting)) - { - continue; - } - - result = false; - break; - } - } - - _entSetPool.Return(ents); - return result; + return false; } /// diff --git a/Content.Server/NPC/Systems/NPCUtilitySystem.cs b/Content.Server/NPC/Systems/NPCUtilitySystem.cs index 33941be9292..fc483f68c3b 100644 --- a/Content.Server/NPC/Systems/NPCUtilitySystem.cs +++ b/Content.Server/NPC/Systems/NPCUtilitySystem.cs @@ -43,7 +43,6 @@ public sealed class NPCUtilitySystem : EntitySystem [Dependency] private readonly SharedTransformSystem _transform = default!; [Dependency] private readonly SolutionContainerSystem _solutions = default!; [Dependency] private readonly WeldableSystem _weldable = default!; - [Dependency] private readonly ExamineSystemShared _examine = default!; private EntityQuery _puddleQuery; private EntityQuery _xformQuery; @@ -297,7 +296,7 @@ private float GetScore(NPCBlackboard blackboard, EntityUid targetUid, UtilityCon { var radius = blackboard.GetValueOrDefault(NPCBlackboard.VisionRadius, EntityManager); - return _examine.InRangeUnOccluded(owner, targetUid, radius + 0.5f, null) ? 1f : 0f; + return ExamineSystemShared.InRangeUnOccluded(owner, targetUid, radius + 0.5f, null) ? 1f : 0f; } case TargetInLOSOrCurrentCon: { @@ -314,7 +313,7 @@ private float GetScore(NPCBlackboard blackboard, EntityUid targetUid, UtilityCon return 1f; } - return _examine.InRangeUnOccluded(owner, targetUid, radius + bufferRange, null) ? 1f : 0f; + return ExamineSystemShared.InRangeUnOccluded(owner, targetUid, radius + bufferRange, null) ? 1f : 0f; } case TargetIsAliveCon: { diff --git a/Content.Server/Pointing/EntitySystems/PointingSystem.cs b/Content.Server/Pointing/EntitySystems/PointingSystem.cs index 9b2e14eff8b..a7c455e6a5d 100644 --- a/Content.Server/Pointing/EntitySystems/PointingSystem.cs +++ b/Content.Server/Pointing/EntitySystems/PointingSystem.cs @@ -36,9 +36,7 @@ internal sealed class PointingSystem : SharedPointingSystem [Dependency] private readonly SharedPopupSystem _popup = default!; [Dependency] private readonly VisibilitySystem _visibilitySystem = default!; [Dependency] private readonly SharedMindSystem _minds = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; [Dependency] private readonly IAdminLogManager _adminLogger = default!; - [Dependency] private readonly ExamineSystemShared _examine = default!; private static readonly TimeSpan PointDelay = TimeSpan.FromSeconds(0.5f); @@ -98,11 +96,11 @@ public bool InRange(EntityUid pointer, EntityCoordinates coordinates) { if (HasComp(pointer)) { - return Transform(pointer).Coordinates.InRange(EntityManager, _transform, coordinates, 15); + return Transform(pointer).Coordinates.InRange(EntityManager, coordinates, 15); } else { - return _examine.InRangeUnOccluded(pointer, coordinates, 15, predicate: e => e == pointer); + return ExamineSystemShared.InRangeUnOccluded(pointer, coordinates, 15, predicate: e => e == pointer); } } @@ -143,7 +141,7 @@ public bool TryPoint(ICommonSession? session, EntityCoordinates coordsPointed, E return false; } - var mapCoordsPointed = coordsPointed.ToMap(EntityManager, _transform); + var mapCoordsPointed = coordsPointed.ToMap(EntityManager); _rotateToFaceSystem.TryFaceCoordinates(player, mapCoordsPointed.Position); var arrow = EntityManager.SpawnEntity("PointingArrow", coordsPointed); @@ -151,7 +149,7 @@ public bool TryPoint(ICommonSession? session, EntityCoordinates coordsPointed, E if (TryComp(arrow, out var pointing)) { if (TryComp(player, out TransformComponent? xformPlayer)) - pointing.StartPosition = EntityCoordinates.FromMap(arrow, xformPlayer.Coordinates.ToMap(EntityManager, _transform), _transform).Position; + pointing.StartPosition = EntityCoordinates.FromMap(arrow, xformPlayer.Coordinates.ToMap(EntityManager)).Position; pointing.EndTime = _gameTiming.CurTime + PointDuration; diff --git a/Content.Server/Power/EntitySystems/PowerReceiverSystem.cs b/Content.Server/Power/EntitySystems/PowerReceiverSystem.cs index 048fda23553..5ed39d51787 100644 --- a/Content.Server/Power/EntitySystems/PowerReceiverSystem.cs +++ b/Content.Server/Power/EntitySystems/PowerReceiverSystem.cs @@ -20,8 +20,6 @@ public sealed class PowerReceiverSystem : EntitySystem [Dependency] private readonly IAdminManager _adminManager = default!; [Dependency] private readonly AppearanceSystem _appearance = default!; [Dependency] private readonly AudioSystem _audio = default!; - private EntityQuery _recQuery; - private EntityQuery _provQuery; public override void Initialize() { @@ -37,9 +35,6 @@ public override void Initialize() SubscribeLocalEvent>(OnGetVerbs); SubscribeLocalEvent>(AddSwitchPowerVerb); - - _recQuery = GetEntityQuery(); - _provQuery = GetEntityQuery(); } private void OnGetVerbs(EntityUid uid, ApcPowerReceiverComponent component, GetVerbsEvent args) @@ -82,7 +77,7 @@ private void OnProviderShutdown(EntityUid uid, ApcPowerProviderComponent compone private void OnProviderConnected(Entity receiver, ref ExtensionCableSystem.ProviderConnectedEvent args) { var providerUid = args.Provider.Owner; - if (!_provQuery.TryGetComponent(providerUid, out var provider)) + if (!EntityManager.TryGetComponent(providerUid, out var provider)) return; receiver.Comp.Provider = provider; @@ -99,7 +94,7 @@ private void OnProviderDisconnected(Entity receiver, private void OnReceiverConnected(Entity provider, ref ExtensionCableSystem.ReceiverConnectedEvent args) { - if (_recQuery.TryGetComponent(args.Receiver, out var receiver)) + if (EntityManager.TryGetComponent(args.Receiver, out ApcPowerReceiverComponent? receiver)) { provider.Comp.AddReceiver(receiver); } @@ -107,7 +102,7 @@ private void OnReceiverConnected(Entity provider, ref private void OnReceiverDisconnected(EntityUid uid, ApcPowerProviderComponent provider, ExtensionCableSystem.ReceiverDisconnectedEvent args) { - if (_recQuery.TryGetComponent(args.Receiver, out var receiver)) + if (EntityManager.TryGetComponent(args.Receiver, out ApcPowerReceiverComponent? receiver)) { provider.RemoveReceiver(receiver); } @@ -121,7 +116,7 @@ private void AddSwitchPowerVerb(EntityUid uid, PowerSwitchComponent component, G if (!HasComp(args.User)) return; - if (!_recQuery.TryGetComponent(uid, out var receiver)) + if (!TryComp(uid, out var receiver)) return; if (!receiver.NeedsPower) @@ -157,7 +152,7 @@ private void ProviderChanged(Entity receiver) /// public bool IsPowered(EntityUid uid, ApcPowerReceiverComponent? receiver = null) { - if (!_recQuery.Resolve(uid, ref receiver, false)) + if (!Resolve(uid, ref receiver, false)) return true; return receiver.Powered; @@ -169,7 +164,7 @@ public bool IsPowered(EntityUid uid, ApcPowerReceiverComponent? receiver = null) /// public bool TogglePower(EntityUid uid, bool playSwitchSound = true, ApcPowerReceiverComponent? receiver = null, EntityUid? user = null) { - if (!_recQuery.Resolve(uid, ref receiver, false)) + if (!Resolve(uid, ref receiver, false)) return true; // it'll save a lot of confusion if 'always powered' means 'always powered' diff --git a/Content.Server/Radio/EntitySystems/JammerSystem.cs b/Content.Server/Radio/EntitySystems/JammerSystem.cs index 53e0409af06..fdf02f94df5 100644 --- a/Content.Server/Radio/EntitySystems/JammerSystem.cs +++ b/Content.Server/Radio/EntitySystems/JammerSystem.cs @@ -1,13 +1,8 @@ -using Content.Server.DeviceNetwork.Components; -using Content.Server.DeviceNetwork.Systems; -using Content.Server.Medical.CrewMonitoring; using Content.Server.Medical.SuitSensors; using Content.Server.Popups; using Content.Server.Power.EntitySystems; using Content.Server.PowerCell; using Content.Server.Radio.Components; -using Content.Server.Station.Systems; -using Content.Shared.DeviceNetwork.Components; using Content.Shared.Examine; using Content.Shared.Interaction; using Content.Shared.PowerCell.Components; @@ -20,8 +15,6 @@ public sealed class JammerSystem : EntitySystem [Dependency] private readonly BatterySystem _battery = default!; [Dependency] private readonly PopupSystem _popup = default!; [Dependency] private readonly SharedTransformSystem _transform = default!; - [Dependency] private readonly StationSystem _stationSystem = default!; - [Dependency] private readonly SingletonDeviceNetServerSystem _singletonServerSystem = default!; public override void Initialize() { @@ -43,7 +36,6 @@ public override void Update(float frameTime) !_battery.TryUseCharge(batteryUid.Value, jam.Wattage * frameTime, battery)) { RemComp(uid); - RemComp(uid); } } } @@ -56,19 +48,10 @@ private void OnActivate(EntityUid uid, RadioJammerComponent comp, ActivateInWorl if (activated) { EnsureComp(uid); - var stationId = _stationSystem.GetOwningStation(uid); - if (stationId != null && _singletonServerSystem.TryGetActiveServerAddress(stationId.Value, out var netId)) - { - EnsureComp(uid, out var jammingComp); - jammingComp.Range = comp.Range; - jammingComp.JammableNetworks.Add(netId); - Dirty(uid, jammingComp); - } } else { RemComp(uid); - RemComp(uid); } var state = Loc.GetString(activated ? "radio-jammer-component-on-state" : "radio-jammer-component-off-state"); var message = Loc.GetString("radio-jammer-component-on-use", ("state", state)); diff --git a/Content.Server/Remotes/DoorRemoteSystem.cs b/Content.Server/Remotes/DoorRemoteSystem.cs index d335911901a..6403c41addf 100644 --- a/Content.Server/Remotes/DoorRemoteSystem.cs +++ b/Content.Server/Remotes/DoorRemoteSystem.cs @@ -22,7 +22,6 @@ public sealed class DoorRemoteSystem : EntitySystem [Dependency] private readonly SharedPopupSystem _popupSystem = default!; [Dependency] private readonly DoorSystem _doorSystem = default!; [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!; - [Dependency] private readonly ExamineSystemShared _examine = default!; // I'm so sorry [Dependency] private readonly SharedAirlockSystem _sharedAirlockSystem = default!; public override void Initialize() @@ -68,7 +67,7 @@ private void OnBeforeInteract(EntityUid uid, DoorRemoteComponent component, Befo || !TryComp(args.Target, out var doorComp) // If it isn't a door we don't use it // Only able to control doors if they are within your vision and within your max range. // Not affected by mobs or machines anymore. - || !_examine.InRangeUnOccluded(args.User, args.Target.Value, SharedInteractionSystem.MaxRaycastRange, null)) + || !ExamineSystemShared.InRangeUnOccluded(args.User, args.Target.Value, SharedInteractionSystem.MaxRaycastRange, null)) { return; } diff --git a/Content.Server/Respawn/SpecialRespawnSystem.cs b/Content.Server/Respawn/SpecialRespawnSystem.cs index 2822c94093f..51c092be18b 100644 --- a/Content.Server/Respawn/SpecialRespawnSystem.cs +++ b/Content.Server/Respawn/SpecialRespawnSystem.cs @@ -20,7 +20,6 @@ public sealed class SpecialRespawnSystem : SharedSpecialRespawnSystem [Dependency] private readonly ITileDefinitionManager _tileDefinitionManager = default!; [Dependency] private readonly AtmosphereSystem _atmosphere = default!; [Dependency] private readonly IRobustRandom _random = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; [Dependency] private readonly TurfSystem _turf = default!; [Dependency] private readonly IChatManager _chat = default!; @@ -130,11 +129,11 @@ private void OnTermination(EntityUid uid, SpecialRespawnComponent component, ref private void Respawn(EntityUid oldEntity, string prototype, EntityCoordinates coords) { var entity = Spawn(prototype, coords); - _adminLog.Add(LogType.Respawn, LogImpact.High, $"{ToPrettyString(oldEntity)} was deleted and was respawned at {coords.ToMap(EntityManager, _transform)} as {ToPrettyString(entity)}"); + _adminLog.Add(LogType.Respawn, LogImpact.High, $"{ToPrettyString(oldEntity)} was deleted and was respawned at {coords.ToMap(EntityManager)} as {ToPrettyString(entity)}"); _chat.SendAdminAlert($"{MetaData(oldEntity).EntityName} was deleted and was respawned as {ToPrettyString(entity)}"); } - /// + /// /// Try to find a random safe tile on the supplied grid /// /// The grid that you're looking for a safe tile on diff --git a/Content.Server/Singularity/EntitySystems/GravityWellSystem.cs b/Content.Server/Singularity/EntitySystems/GravityWellSystem.cs index f1d0af6f905..ce4334391db 100644 --- a/Content.Server/Singularity/EntitySystems/GravityWellSystem.cs +++ b/Content.Server/Singularity/EntitySystems/GravityWellSystem.cs @@ -18,13 +18,13 @@ namespace Content.Server.Singularity.EntitySystems; /// public sealed class GravityWellSystem : SharedGravityWellSystem { - #region Dependencies +#region Dependencies [Dependency] private readonly IGameTiming _timing = default!; [Dependency] private readonly IViewVariablesManager _vvManager = default!; [Dependency] private readonly EntityLookupSystem _lookup = default!; [Dependency] private readonly SharedPhysicsSystem _physics = default!; [Dependency] private readonly SharedTransformSystem _transform = default!; - #endregion Dependencies +#endregion Dependencies /// /// The minimum range at which gravpulses will act. @@ -155,7 +155,7 @@ public void GravPulse(EntityUid uid, float maxRange, float minRange, float baseR /// The minimum distance at which entities can be affected by the gravity pulse. /// The base velocity added to any entities within affected by the gravity pulse scaled by the displacement of those entities from the epicenter. public void GravPulse(EntityCoordinates entityPos, float maxRange, float minRange, in Matrix3 baseMatrixDeltaV) - => GravPulse(entityPos.ToMap(EntityManager, _transform), maxRange, minRange, in baseMatrixDeltaV); + => GravPulse(entityPos.ToMap(EntityManager), maxRange, minRange, in baseMatrixDeltaV); /// /// Greates a gravitational pulse, shoving around all entities within some distance of an epicenter. @@ -166,7 +166,7 @@ public void GravPulse(EntityCoordinates entityPos, float maxRange, float minRang /// The base radial velocity that will be added to entities within range towards the center of the gravitational pulse. /// The base tangential velocity that will be added to entities within countrclockwise around the center of the gravitational pulse. public void GravPulse(EntityCoordinates entityPos, float maxRange, float minRange, float baseRadialDeltaV = 0.0f, float baseTangentialDeltaV = 0.0f) - => GravPulse(entityPos.ToMap(EntityManager, _transform), maxRange, minRange, baseRadialDeltaV, baseTangentialDeltaV); + => GravPulse(entityPos.ToMap(EntityManager), maxRange, minRange, baseRadialDeltaV, baseTangentialDeltaV); /// /// Causes a gravitational pulse, shoving around all entities within some distance of an epicenter. diff --git a/Content.Server/Singularity/EntitySystems/SingularityAttractorSystem.cs b/Content.Server/Singularity/EntitySystems/SingularityAttractorSystem.cs index bc0de7c8c64..3c44a7fc7af 100644 --- a/Content.Server/Singularity/EntitySystems/SingularityAttractorSystem.cs +++ b/Content.Server/Singularity/EntitySystems/SingularityAttractorSystem.cs @@ -2,7 +2,12 @@ using Content.Server.Power.EntitySystems; using Content.Server.Singularity.Components; using Content.Shared.Singularity.Components; +using Content.Shared.Singularity.EntitySystems; using Robust.Shared.Map; +using Robust.Shared.Map.Components; +using Robust.Shared.Physics; +using Robust.Shared.Physics.Components; +using Robust.Shared.Physics.Systems; using Robust.Shared.Timing; using System.Numerics; @@ -13,8 +18,8 @@ namespace Content.Server.Singularity.EntitySystems; /// public sealed class SingularityAttractorSystem : EntitySystem { + [Dependency] private readonly EntityLookupSystem _lookup = default!; [Dependency] private readonly IGameTiming _timing = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; /// /// The minimum range at which the attraction will act. @@ -64,7 +69,7 @@ private void Update(EntityUid uid, SingularityAttractorComponent? attractor = nu attractor.LastPulseTime = _timing.CurTime; - var mapPos = xform.Coordinates.ToMap(EntityManager, _transform); + var mapPos = xform.Coordinates.ToMap(EntityManager); if (mapPos == MapCoordinates.Nullspace) return; @@ -72,7 +77,7 @@ private void Update(EntityUid uid, SingularityAttractorComponent? attractor = nu var query = EntityQuery(); foreach (var (singulo, walk, singuloXform) in query) { - var singuloMapPos = singuloXform.Coordinates.ToMap(EntityManager, _transform); + var singuloMapPos = singuloXform.Coordinates.ToMap(EntityManager); if (singuloMapPos.MapId != mapPos.MapId) continue; diff --git a/Content.Server/Storage/EntitySystems/BluespaceLockerSystem.cs b/Content.Server/Storage/EntitySystems/BluespaceLockerSystem.cs index 356768769bb..9995ed40c12 100644 --- a/Content.Server/Storage/EntitySystems/BluespaceLockerSystem.cs +++ b/Content.Server/Storage/EntitySystems/BluespaceLockerSystem.cs @@ -26,7 +26,6 @@ public sealed class BluespaceLockerSystem : EntitySystem [Dependency] private readonly WeldableSystem _weldableSystem = default!; [Dependency] private readonly LockSystem _lockSystem = default!; [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!; - [Dependency] private readonly SharedTransformSystem _transformSystem = default!; [Dependency] private readonly ExplosionSystem _explosionSystem = default!; public override void Initialize() @@ -387,7 +386,7 @@ private void DestroyAfterLimit(EntityUid uid, BluespaceLockerComponent component switch (component.BehaviorProperties.DestroyType) { case BluespaceLockerDestroyType.Explode: - _explosionSystem.QueueExplosion(uid.ToCoordinates().ToMap(EntityManager, _transformSystem), + _explosionSystem.QueueExplosion(uid.ToCoordinates().ToMap(EntityManager), ExplosionSystem.DefaultExplosionPrototypeId, 4, 1, 2, maxTileBreak: 0); goto case BluespaceLockerDestroyType.Delete; case BluespaceLockerDestroyType.Delete: diff --git a/Content.Server/Store/Systems/StoreSystem.Ui.cs b/Content.Server/Store/Systems/StoreSystem.Ui.cs index 49db980451e..281d8f57267 100644 --- a/Content.Server/Store/Systems/StoreSystem.Ui.cs +++ b/Content.Server/Store/Systems/StoreSystem.Ui.cs @@ -5,7 +5,6 @@ using Content.Server.Stack; using Content.Server.Store.Components; using Content.Shared.Actions; -using Content.Shared.Administration.Logs; using Content.Shared.Database; using Content.Shared.FixedPoint; using Content.Shared.Hands.EntitySystems; @@ -249,12 +248,10 @@ private void OnBuyRequest(EntityUid uid, StoreComponent component, StoreBuyListi HandleRefundComp(uid, component, upgradeActionId.Value); } + //broadcast event if (listing.ProductEvent != null) { - if (!listing.RaiseProductEventOnUser) - RaiseLocalEvent(listing.ProductEvent); - else - RaiseLocalEvent(buyer, listing.ProductEvent); + RaiseLocalEvent(listing.ProductEvent); } //log dat shit. @@ -324,8 +321,6 @@ private void OnRequestRefund(EntityUid uid, StoreComponent component, StoreReque if (!component.RefundAllowed || component.BoughtEntities.Count == 0) return; - _admin.Add(LogType.StoreRefund, LogImpact.Low, $"{ToPrettyString(buyer):player} has refunded their purchases from {ToPrettyString(uid):store}"); - for (var i = component.BoughtEntities.Count - 1; i >= 0; i--) { var purchase = component.BoughtEntities[i]; diff --git a/Content.Server/Tabletop/TabletopSystem.Session.cs b/Content.Server/Tabletop/TabletopSystem.Session.cs index c2bb8426fc2..f16f3f01e98 100644 --- a/Content.Server/Tabletop/TabletopSystem.Session.cs +++ b/Content.Server/Tabletop/TabletopSystem.Session.cs @@ -31,7 +31,7 @@ public TabletopSession EnsureSession(TabletopGameComponent tabletop) // Since this is the first time opening this session, set up the game tabletop.Setup.SetupTabletop(session, EntityManager); - Log.Info($"Created tabletop session number {tabletop} at position {session.Position}."); + Logger.Info($"Created tabletop session number {tabletop} at position {session.Position}."); return session; } diff --git a/Content.Server/Wires/WireLayout.cs b/Content.Server/Wires/WireLayout.cs index 621992c915a..ecafba013e0 100644 --- a/Content.Server/Wires/WireLayout.cs +++ b/Content.Server/Wires/WireLayout.cs @@ -28,13 +28,11 @@ public sealed partial class WireLayoutPrototype : IPrototype, IInheritingPrototy /// initialization) /// [DataField("dummyWires")] - [NeverPushInheritance] public int DummyWires { get; private set; } = default!; /// /// All the valid IWireActions currently in this layout. /// [DataField("wires")] - [NeverPushInheritance] public List? Wires { get; private set; } } diff --git a/Content.Server/Worldgen/Systems/Carvers/NoiseRangeCarverSystem.cs b/Content.Server/Worldgen/Systems/Carvers/NoiseRangeCarverSystem.cs index f2e051669a2..aed32bc89c3 100644 --- a/Content.Server/Worldgen/Systems/Carvers/NoiseRangeCarverSystem.cs +++ b/Content.Server/Worldgen/Systems/Carvers/NoiseRangeCarverSystem.cs @@ -9,7 +9,6 @@ namespace Content.Server.Worldgen.Systems.Carvers; public sealed class NoiseRangeCarverSystem : EntitySystem { [Dependency] private readonly NoiseIndexSystem _index = default!; - [Dependency] private readonly SharedTransformSystem _transform = default!; /// public override void Initialize() @@ -20,7 +19,7 @@ public override void Initialize() private void OnPrePlaceDebris(EntityUid uid, NoiseRangeCarverComponent component, ref PrePlaceDebrisFeatureEvent args) { - var coords = WorldGen.WorldToChunkCoords(args.Coords.ToMapPos(EntityManager, _transform)); + var coords = WorldGen.WorldToChunkCoords(args.Coords.ToMapPos(EntityManager)); var val = _index.Evaluate(uid, component.NoiseChannel, coords); foreach (var (low, high) in component.Ranges) diff --git a/Content.Shared.Database/LogType.cs b/Content.Shared.Database/LogType.cs index ba94b0f3738..70a6119130e 100644 --- a/Content.Shared.Database/LogType.cs +++ b/Content.Shared.Database/LogType.cs @@ -98,5 +98,4 @@ public enum LogType ChatRateLimited = 87, AtmosTemperatureChanged = 88, DeviceNetwork = 89, - StoreRefund = 90 } diff --git a/Content.Shared/Anomaly/SharedAnomalySystem.cs b/Content.Shared/Anomaly/SharedAnomalySystem.cs index c335cd7b858..a3bb1e14679 100644 --- a/Content.Shared/Anomaly/SharedAnomalySystem.cs +++ b/Content.Shared/Anomaly/SharedAnomalySystem.cs @@ -129,7 +129,7 @@ public void StartSupercriticalEvent(EntityUid uid) if (HasComp(uid)) return; - AdminLog.Add(LogType.Anomaly, LogImpact.Extreme, $"Anomaly {ToPrettyString(uid)} began to go supercritical."); + AdminLog.Add(LogType.Anomaly, LogImpact.High, $"Anomaly {ToPrettyString(uid)} began to go supercritical."); if (_net.IsServer) Log.Info($"Anomaly is going supercritical. Entity: {ToPrettyString(uid)}"); diff --git a/Content.Shared/Audio/SharedAmbientSoundSystem.cs b/Content.Shared/Audio/SharedAmbientSoundSystem.cs index 5f17261825c..6318ba25573 100644 --- a/Content.Shared/Audio/SharedAmbientSoundSystem.cs +++ b/Content.Shared/Audio/SharedAmbientSoundSystem.cs @@ -5,19 +5,16 @@ namespace Content.Shared.Audio; public abstract class SharedAmbientSoundSystem : EntitySystem { - private EntityQuery _query; - public override void Initialize() { base.Initialize(); SubscribeLocalEvent(GetCompState); SubscribeLocalEvent(HandleCompState); - _query = GetEntityQuery(); } public virtual void SetAmbience(EntityUid uid, bool value, AmbientSoundComponent? ambience = null) { - if (!_query.Resolve(uid, ref ambience, false) || ambience.Enabled == value) + if (!Resolve(uid, ref ambience, false) || ambience.Enabled == value) return; ambience.Enabled = value; @@ -27,7 +24,7 @@ public virtual void SetAmbience(EntityUid uid, bool value, AmbientSoundComponent public virtual void SetRange(EntityUid uid, float value, AmbientSoundComponent? ambience = null) { - if (!_query.Resolve(uid, ref ambience, false) || MathHelper.CloseToPercent(ambience.Range, value)) + if (!Resolve(uid, ref ambience, false) || MathHelper.CloseToPercent(ambience.Range, value)) return; ambience.Range = value; @@ -42,7 +39,7 @@ protected virtual void QueueUpdate(EntityUid uid, AmbientSoundComponent ambience public virtual void SetVolume(EntityUid uid, float value, AmbientSoundComponent? ambience = null) { - if (!_query.Resolve(uid, ref ambience, false) || MathHelper.CloseToPercent(ambience.Volume, value)) + if (!Resolve(uid, ref ambience, false) || MathHelper.CloseToPercent(ambience.Volume, value)) return; ambience.Volume = value; @@ -51,7 +48,7 @@ public virtual void SetVolume(EntityUid uid, float value, AmbientSoundComponent? public virtual void SetSound(EntityUid uid, SoundSpecifier sound, AmbientSoundComponent? ambience = null) { - if (!_query.Resolve(uid, ref ambience, false) || ambience.Sound == sound) + if (!Resolve(uid, ref ambience, false) || ambience.Sound == sound) return; ambience.Sound = sound; diff --git a/Content.Shared/Chemistry/Components/InjectorComponent.cs b/Content.Shared/Chemistry/Components/InjectorComponent.cs index 437c5e327d2..188028c8f8f 100644 --- a/Content.Shared/Chemistry/Components/InjectorComponent.cs +++ b/Content.Shared/Chemistry/Components/InjectorComponent.cs @@ -30,7 +30,7 @@ public sealed partial class InjectorComponent : Component /// Whether or not the injector is able to draw from containers or if it's a single use /// device that can only inject. /// - [DataField] + [DataField("injectOnly")] public bool InjectOnly; /// @@ -39,26 +39,28 @@ public sealed partial class InjectorComponent : Component /// /// for example: droppers would ignore mobs /// - [DataField] + [DataField("ignoreMobs")] public bool IgnoreMobs; /// /// The minimum amount of solution that can be transferred at once from this solution. /// [DataField("minTransferAmount")] + [ViewVariables(VVAccess.ReadWrite)] public FixedPoint2 MinimumTransferAmount = FixedPoint2.New(5); /// /// The maximum amount of solution that can be transferred at once from this solution. /// [DataField("maxTransferAmount")] - public FixedPoint2 MaximumTransferAmount = FixedPoint2.New(50); + public FixedPoint2 MaximumTransferAmount = FixedPoint2.New(15); /// /// Amount to inject or draw on each usage. If the injector is inject only, it will /// attempt to inject it's entire contents upon use. /// - [DataField] + [ViewVariables(VVAccess.ReadWrite)] + [DataField("transferAmount")] [AutoNetworkedField] public FixedPoint2 TransferAmount = FixedPoint2.New(5); @@ -69,7 +71,8 @@ public sealed partial class InjectorComponent : Component /// The base delay has a minimum of 1 second, but this will still be modified if the target is incapacitated or /// in combat mode. /// - [DataField] + [ViewVariables(VVAccess.ReadWrite)] + [DataField("delay")] public TimeSpan Delay = TimeSpan.FromSeconds(5); /// @@ -77,6 +80,7 @@ public sealed partial class InjectorComponent : Component /// right SolutionCaps to support injection/drawing. For InjectOnly injectors this should /// only ever be set to Inject /// + [ViewVariables(VVAccess.ReadWrite)] [AutoNetworkedField] [DataField] public InjectorToggleMode ToggleState = InjectorToggleMode.Draw; diff --git a/Content.Shared/Construction/Conditions/WallmountCondition.cs b/Content.Shared/Construction/Conditions/WallmountCondition.cs index fe4336e6fc7..bf3016d4974 100644 --- a/Content.Shared/Construction/Conditions/WallmountCondition.cs +++ b/Content.Shared/Construction/Conditions/WallmountCondition.cs @@ -19,9 +19,8 @@ public bool Condition(EntityUid user, EntityCoordinates location, Direction dire var entManager = IoCManager.Resolve(); // get blueprint and user position - var transformSystem = entManager.System(); var userWorldPosition = entManager.GetComponent(user).WorldPosition; - var objWorldPosition = location.ToMap(entManager, transformSystem).Position; + var objWorldPosition = location.ToMap(entManager).Position; // find direction from user to blueprint var userToObject = (objWorldPosition - userWorldPosition); diff --git a/Content.Shared/DeviceNetwork/Components/DeviceNetworkJammerComponent.cs b/Content.Shared/DeviceNetwork/Components/DeviceNetworkJammerComponent.cs deleted file mode 100644 index 75de0cb8a25..00000000000 --- a/Content.Shared/DeviceNetwork/Components/DeviceNetworkJammerComponent.cs +++ /dev/null @@ -1,24 +0,0 @@ -using Robust.Shared.GameStates; - -namespace Content.Shared.DeviceNetwork.Components; - -/// -/// Allow entities to jam DeviceNetwork packets. -/// -[RegisterComponent, NetworkedComponent, AutoGenerateComponentState] -public sealed partial class DeviceNetworkJammerComponent : Component -{ - /// - /// Range where packets will be jammed. This is checked both against the sender and receiver. - /// - [DataField, AutoNetworkedField] - public float Range = 5.0f; - - /// - /// Device networks that can be jammed. For a list of default NetworkIds see DeviceNetIdDefaults on Content.Server. - /// Network ids are not guaranteed to be limited to DeviceNetIdDefaults. - /// - [DataField, AutoNetworkedField] - public HashSet JammableNetworks = []; - -} diff --git a/Content.Shared/Examine/ExamineSystemShared.cs b/Content.Shared/Examine/ExamineSystemShared.cs index f792862be14..5a3fb872293 100644 --- a/Content.Shared/Examine/ExamineSystemShared.cs +++ b/Content.Shared/Examine/ExamineSystemShared.cs @@ -144,7 +144,7 @@ public bool IsOccluded(EntityUid uid) return TryComp(uid, out var eye) && eye.DrawFov; } - public bool InRangeUnOccluded(MapCoordinates origin, MapCoordinates other, float range, Ignored? predicate, bool ignoreInsideBlocker = true, IEntityManager? entMan = null) + public static bool InRangeUnOccluded(MapCoordinates origin, MapCoordinates other, float range, Ignored? predicate, bool ignoreInsideBlocker = true, IEntityManager? entMan = null) { // No, rider. This is better. // ReSharper disable once ConvertToLocalFunction @@ -154,7 +154,7 @@ public bool InRangeUnOccluded(MapCoordinates origin, MapCoordinates other, float return InRangeUnOccluded(origin, other, range, predicate, wrapped, ignoreInsideBlocker, entMan); } - public bool InRangeUnOccluded(MapCoordinates origin, MapCoordinates other, float range, + public static bool InRangeUnOccluded(MapCoordinates origin, MapCoordinates other, float range, TState state, Func predicate, bool ignoreInsideBlocker = true, IEntityManager? entMan = null) { if (other.MapId != origin.MapId || @@ -171,7 +171,7 @@ public bool InRangeUnOccluded(MapCoordinates origin, MapCoordinates othe if (length > MaxRaycastRange) { - Log.Warning("InRangeUnOccluded check performed over extreme range. Limiting CollisionRay size."); + Logger.Warning("InRangeUnOccluded check performed over extreme range. Limiting CollisionRay size."); length = MaxRaycastRange; } @@ -207,7 +207,7 @@ public bool InRangeUnOccluded(MapCoordinates origin, MapCoordinates othe return true; } - public bool InRangeUnOccluded(EntityUid origin, EntityUid other, float range = ExamineRange, Ignored? predicate = null, bool ignoreInsideBlocker = true) + public static bool InRangeUnOccluded(EntityUid origin, EntityUid other, float range = ExamineRange, Ignored? predicate = null, bool ignoreInsideBlocker = true) { var entMan = IoCManager.Resolve(); var originPos = entMan.GetComponent(origin).MapPosition; @@ -216,7 +216,7 @@ public bool InRangeUnOccluded(EntityUid origin, EntityUid other, float range = E return InRangeUnOccluded(originPos, otherPos, range, predicate, ignoreInsideBlocker); } - public bool InRangeUnOccluded(EntityUid origin, EntityCoordinates other, float range = ExamineRange, Ignored? predicate = null, bool ignoreInsideBlocker = true) + public static bool InRangeUnOccluded(EntityUid origin, EntityCoordinates other, float range = ExamineRange, Ignored? predicate = null, bool ignoreInsideBlocker = true) { var entMan = IoCManager.Resolve(); var originPos = entMan.GetComponent(origin).MapPosition; @@ -225,7 +225,7 @@ public bool InRangeUnOccluded(EntityUid origin, EntityCoordinates other, float r return InRangeUnOccluded(originPos, otherPos, range, predicate, ignoreInsideBlocker); } - public bool InRangeUnOccluded(EntityUid origin, MapCoordinates other, float range = ExamineRange, Ignored? predicate = null, bool ignoreInsideBlocker = true) + public static bool InRangeUnOccluded(EntityUid origin, MapCoordinates other, float range = ExamineRange, Ignored? predicate = null, bool ignoreInsideBlocker = true) { var entMan = IoCManager.Resolve(); var originPos = entMan.GetComponent(origin).MapPosition; diff --git a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Pickup.cs b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Pickup.cs index 20e08b2767d..bbae03e45b3 100644 --- a/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Pickup.cs +++ b/Content.Shared/Hands/EntitySystems/SharedHandsSystem.Pickup.cs @@ -114,7 +114,7 @@ public bool TryPickup( && (itemPos.Position - xform.MapPosition.Position).Length() <= MaxAnimationRange && MetaData(entity).VisibilityMask == MetaData(uid).VisibilityMask) // Don't animate aghost pickups. { - var initialPosition = EntityCoordinates.FromMap(coordinateEntity, itemPos, TransformSystem, EntityManager); + var initialPosition = EntityCoordinates.FromMap(coordinateEntity, itemPos, EntityManager); _storage.PlayPickupAnimation(entity, initialPosition, xform.Coordinates, itemXform.LocalRotation, uid); } } diff --git a/Content.Shared/Interaction/SharedInteractionSystem.cs b/Content.Shared/Interaction/SharedInteractionSystem.cs index 0e390ecea45..7d5e390b6f0 100644 --- a/Content.Shared/Interaction/SharedInteractionSystem.cs +++ b/Content.Shared/Interaction/SharedInteractionSystem.cs @@ -459,7 +459,7 @@ protected bool ValidateInteractAndFace(EntityUid user, EntityCoordinates coordin return false; if (!HasComp(user)) - _rotateToFaceSystem.TryFaceCoordinates(user, coordinates.ToMapPos(EntityManager, _transform)); + _rotateToFaceSystem.TryFaceCoordinates(user, coordinates.ToMapPos(EntityManager)); return true; } @@ -612,7 +612,7 @@ public bool InRangeUnobstructed( Ignored combinedPredicate = e => e == origin || (predicate?.Invoke(e) ?? false); var inRange = true; MapCoordinates originPos = default; - var targetPos = otherCoordinates.ToMap(EntityManager, _transform); + var targetPos = otherCoordinates.ToMap(EntityManager); Angle targetRot = default; // So essentially: @@ -785,7 +785,7 @@ public bool InRangeUnobstructed( Ignored? predicate = null, bool popup = false) { - return InRangeUnobstructed(origin, other.ToMap(EntityManager, _transform), range, collisionMask, predicate, popup); + return InRangeUnobstructed(origin, other.ToMap(EntityManager), range, collisionMask, predicate, popup); } /// diff --git a/Content.Shared/Spawning/EntitySystemExtensions.cs b/Content.Shared/Spawning/EntitySystemExtensions.cs index 507a0f4aa27..14b171baeb1 100644 --- a/Content.Shared/Spawning/EntitySystemExtensions.cs +++ b/Content.Shared/Spawning/EntitySystemExtensions.cs @@ -16,7 +16,7 @@ public static class EntitySystemExtensions SharedPhysicsSystem? physicsManager = null) { physicsManager ??= entityManager.System(); - var mapCoordinates = coordinates.ToMap(entityManager, entityManager.System()); + var mapCoordinates = coordinates.ToMap(entityManager); return entityManager.SpawnIfUnobstructed(prototypeName, mapCoordinates, collisionLayer, box, physicsManager); } diff --git a/Content.Shared/Store/ListingPrototype.cs b/Content.Shared/Store/ListingPrototype.cs index 25245327ce9..2f067afbeeb 100644 --- a/Content.Shared/Store/ListingPrototype.cs +++ b/Content.Shared/Store/ListingPrototype.cs @@ -98,9 +98,6 @@ public partial class ListingData : IEquatable, ICloneable [DataField("productEvent")] public object? ProductEvent; - [DataField] - public bool RaiseProductEventOnUser; - /// /// used internally for tracking how many times an item was purchased. /// @@ -123,7 +120,7 @@ public bool Equals(ListingData? listing) Description != listing.Description || ProductEntity != listing.ProductEntity || ProductAction != listing.ProductAction || - ProductEvent?.GetType() != listing.ProductEvent?.GetType() || + ProductEvent != listing.ProductEvent || RestockTime != listing.RestockTime) return false; diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs index 91aad895821..a8f7ee23956 100644 --- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs +++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.Ballistic.cs @@ -261,7 +261,7 @@ private void OnBallisticAmmoCount(EntityUid uid, BallisticAmmoProviderComponent args.Capacity = component.Capacity; } - public void UpdateBallisticAppearance(EntityUid uid, BallisticAmmoProviderComponent component) + private void UpdateBallisticAppearance(EntityUid uid, BallisticAmmoProviderComponent component) { if (!Timing.IsFirstTimePredicted || !TryComp(uid, out var appearance)) return; diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index fc0b5c906c7..ba49523cfde 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -4094,27 +4094,3 @@ Entries: appear on low-pop servers. id: 6112 time: '2024-05-28T23:44:39.0000000+00:00' -- author: FoxxoTrystan - changes: - - type: Tweak - message: Better wall sprites. - - type: Tweak - message: Better window sprites. - id: 6113 - time: '2024-05-28T23:59:19.0000000+00:00' -- author: FoxxoTrystan - changes: - - type: Tweak - message: Radio Resprites, Talkwalkies, Beacon, Headset... - - type: Tweak - message: >- - Radio and uplink radio looks the same, make sure to check what freq the - radio is on! - id: 6114 - time: '2024-05-29T00:00:50.0000000+00:00' -- author: FoxxoTrystan - changes: - - type: Tweak - message: New Tools Sprites! - id: 6115 - time: '2024-05-29T01:06:42.0000000+00:00' diff --git a/Resources/Locale/en-US/paper/book-authorbooks.ftl b/Resources/Locale/en-US/paper/book-authorbooks.ftl index ae886e835af..b1981d9e152 100644 --- a/Resources/Locale/en-US/paper/book-authorbooks.ftl +++ b/Resources/Locale/en-US/paper/book-authorbooks.ftl @@ -253,11 +253,3 @@ book-text-inspiration = As a freelance writer, Sarah was always in search of ins Without a moment's hesitation, Sarah took out her pen and notebook and began to write. She wrote about the beauty of the scene, the peacefulness she felt, and the surreal quality of the moment. She wanted to capture this feeling and share it with others through her words. As she finished writing, Sarah heard the snap of a twig and looked up to see a man approaching her with a camera. He introduced himself as a nature photographer and asked if she had seen the waterfall. They struck up a conversation, and soon they were both laughing and sharing stories of their adventures. As the sun began to set, the two of them packed up their gear and said their goodbyes. Sarah felt grateful for this unexpected encounter and the inspiration it brought her. She knew that this moment would stay with her forever, and she felt a sense of serenity knowing that there was still so much beauty in the world waiting to be discovered. - -book-text-janitor = [bold][color=black][head=3]The Tales of a Tired Janitor[/head][/bold] - Cleaning a space station as a janitor is like being trapped in a cosmic custodial nightmare. You'd think floating through the vastness of space would be glamorous, but no, I'm stuck scrubbing space grime and extraterrestrial goop off the walls. It's a thankless job in a zero-gravity abyss. - First off, let's talk about the mess. Space dust, alien gunk, and who knows what else accumulates faster than a rocket launch. It's not just about sweeping up the crumbs; it's about battling interstellar filth that seems to have a life of its own. You'd hope for a sleek, futuristic space station, but you get a swirling vortex of space garbage waiting for you around every corner. - And the tools they give us! You'd expect state-of-the-art cleaning gadgets, but nope. They raided a dollar store on Earth before launching us into the cosmos. Mops that barely work in microgravity, spray bottles that run out in one use, and don't even get me started on the space janitor jumpsuit. I feel like a reject from a sci-fi B-movie. - Speaking of jumpsuits, the lack of respect is astronomical. The scientists and astronauts zoom past in their sleek suits, utterly oblivious to the fact that I'm the unsung hero keeping this place from turning into a cosmic trash heap. I bet they don't even know my name. "Hey, Space Janitor!" That's what I get. No appreciation for the elbow grease I put into keeping their precious station spick and span. - And let's remember the hazards. Cleaning up alien slime? Yeah, that's a regular Tuesday for me. One wrong move and I'm dealing with an intergalactic biohazard. It's like playing Russian roulette with space critters that could burst out of some hidden nook and cranny. I signed up to mop floors, not play host to extraterrestrial invaders. - Being a janitor on this so-called Space Station 14 is a cosmic joke. Where did the other 13 stations go? It's not all spacewalks and futuristic gadgets; it's scrubbing toilets and battling alien goo. If anyone thinks space is glamorous, they clearly haven't seen the mess we space janitors deal with every single day. It's time they appreciate the unsung heroes of the space station – the custodians of the cosmos. \ No newline at end of file diff --git a/Resources/Locale/en-US/prototypes/catalog/cargo/cargoproduct-categories.ftl b/Resources/Locale/en-US/prototypes/catalog/cargo/cargoproduct-categories.ftl deleted file mode 100644 index f2451527b09..00000000000 --- a/Resources/Locale/en-US/prototypes/catalog/cargo/cargoproduct-categories.ftl +++ /dev/null @@ -1,16 +0,0 @@ -cargoproduct-category-name-armory = Armory -cargoproduct-category-name-atmospherics = Atmospherics -cargoproduct-category-name-cargo = Cargo -cargoproduct-category-name-circuitboards = Circuitboards -cargoproduct-category-name-emergency = Emergency -cargoproduct-category-name-engineering = Engineering -cargoproduct-category-name-food = Food -cargoproduct-category-name-fun = Fun -cargoproduct-category-name-hydroponics = Hydroponics -cargoproduct-category-name-livestock = Livestock -cargoproduct-category-name-materials = Materials -cargoproduct-category-name-medical = Medical -cargoproduct-category-name-science = Science -cargoproduct-category-name-security = Security -cargoproduct-category-name-service = Service -cargoproduct-category-name-shuttle = Shuttle diff --git a/Resources/Locale/en-US/speech/speech-chatsan.ftl b/Resources/Locale/en-US/speech/speech-chatsan.ftl index 6ce575e648d..4c8cf5db54c 100644 --- a/Resources/Locale/en-US/speech/speech-chatsan.ftl +++ b/Resources/Locale/en-US/speech/speech-chatsan.ftl @@ -114,6 +114,3 @@ chatsan-replacement-41 = what are you doing chatsan-word-42 = ofc chatsan-replacement-42 = of course - -chatsan-word-43 = ig -chatsan-replacement-43 = i guess diff --git a/Resources/Locale/en-US/traits/traits.ftl b/Resources/Locale/en-US/traits/traits.ftl index 7a3564edf66..c097a689dd8 100644 --- a/Resources/Locale/en-US/traits/traits.ftl +++ b/Resources/Locale/en-US/traits/traits.ftl @@ -29,6 +29,3 @@ trait-frontal-lisp-desc = You thpeak with a lithp trait-socialanxiety-name = Social Anxiety trait-socialanxiety-desc = You are anxious when you speak and stutter. - -trait-snoring-name = Snoring -trait-snoring-desc = You will snore while sleeping. diff --git a/Resources/Prototypes/Accents/word_replacements.yml b/Resources/Prototypes/Accents/word_replacements.yml index 92b3d7de9b3..147aebb5c5d 100644 --- a/Resources/Prototypes/Accents/word_replacements.yml +++ b/Resources/Prototypes/Accents/word_replacements.yml @@ -1,4 +1,4 @@ -# Accents that work off of word replacements. +# Accents that work off of word replacements. # this is kind of dumb but localization demands it. # i guess you could just specify the prefix ('mobster') and count and let the system fill it @@ -263,7 +263,7 @@ accent-pirate-replaced-30: accent-pirate-replacement-30 accent-pirate-replaced-31: accent-pirate-replacement-31 accent-pirate-replaced-32: accent-pirate-replacement-32 - + - type: accent id: cowboy wordReplacements: @@ -366,7 +366,7 @@ accent-cowboy-words-97: accent-cowboy-replacement-97 accent-cowboy-words-98: accent-cowboy-replacement-98 accent-cowboy-words-99: accent-cowboy-replacement-99 - + # For the chat sanitization system - type: accent @@ -409,9 +409,8 @@ # chatsan-word-35: chatsan-replacement-35 # chatsan-word-36: chatsan-replacement-36 chatsan-word-37: chatsan-replacement-37 - chatsan-word-38: chatsan-replacement-38 - chatsan-word-39: chatsan-replacement-etcetera - chatsan-word-40: chatsan-replacement-etcetera - chatsan-word-41: chatsan-replacement-41 - chatsan-word-42: chatsan-replacement-42 - chatsan-word-43: chatsan-replacement-43 + # chatsan-word-38: chatsan-replacement-38 + # chatsan-word-39: chatsan-replacement-etcetera + # chatsan-word-40: chatsan-replacement-etcetera + # chatsan-word-41: chatsan-replacement-41 + # chatsan-word-42: chatsan-replacement-42 diff --git a/Resources/Prototypes/Actions/types.yml b/Resources/Prototypes/Actions/types.yml index 22f16bd9568..b91b26e3570 100644 --- a/Resources/Prototypes/Actions/types.yml +++ b/Resources/Prototypes/Actions/types.yml @@ -120,7 +120,7 @@ priority: -20 icon: sprite: Objects/Devices/communication.rsi - state: radio + state: old-radio event: !type:OpenUplinkImplantEvent - type: entity diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml b/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml index 6341042bf89..399181b4fab 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_armory.yml @@ -5,7 +5,7 @@ state: icon product: CrateArmorySMG cost: 9000 - category: cargoproduct-category-name-armory + category: Armory group: market - type: cargoProduct @@ -15,7 +15,7 @@ state: icon product: CrateArmoryShotgun cost: 7000 - category: cargoproduct-category-name-armory + category: Armory group: market - type: cargoProduct @@ -25,7 +25,7 @@ state: implanter0 product: CrateTrackingImplants cost: 1000 - category: cargoproduct-category-name-armory + category: Armory group: market - type: cargoProduct @@ -35,7 +35,7 @@ state: training-bomb product: CrateTrainingBombs cost: 3000 - category: cargoproduct-category-name-armory + category: Armory group: market - type: cargoProduct @@ -45,7 +45,7 @@ state: icon product: CrateArmoryLaser cost: 4800 - category: cargoproduct-category-name-armory + category: Armory group: market - type: cargoProduct @@ -55,5 +55,5 @@ state: icon product: CrateArmoryPistols cost: 5200 - category: cargoproduct-category-name-armory + category: Armory group: market diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_atmospherics.yml b/Resources/Prototypes/Catalog/Cargo/cargo_atmospherics.yml index c85210adf6a..0aa49383992 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_atmospherics.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_atmospherics.yml @@ -5,7 +5,7 @@ state: grey product: AirCanister cost: 1100 - category: cargoproduct-category-name-atmospherics + category: Atmospherics group: market - type: cargoProduct @@ -15,7 +15,7 @@ state: blue product: OxygenCanister cost: 1100 - category: cargoproduct-category-name-atmospherics + category: Atmospherics group: market - type: cargoProduct @@ -25,7 +25,7 @@ state: blue product: LiquidOxygenCanister cost: 2500 - category: cargoproduct-category-name-atmospherics + category: Atmospherics group: market - type: cargoProduct @@ -35,7 +35,7 @@ state: red product: NitrogenCanister cost: 1100 - category: cargoproduct-category-name-atmospherics + category: Atmospherics group: market - type: cargoProduct @@ -45,7 +45,7 @@ state: red product: LiquidNitrogenCanister cost: 2500 - category: cargoproduct-category-name-atmospherics + category: Atmospherics group: market - type: cargoProduct @@ -55,7 +55,7 @@ state: black product: CarbonDioxideCanister cost: 2200 # Until someone fixes it co2 can be used to oneshot people so it's more expensive - category: cargoproduct-category-name-atmospherics + category: Atmospherics group: market - type: cargoProduct @@ -65,7 +65,7 @@ state: black product: LiquidCarbonDioxideCanister cost: 4000 - category: cargoproduct-category-name-atmospherics + category: Atmospherics group: market - type: cargoProduct @@ -75,7 +75,7 @@ state: yellow product: StorageCanister cost: 1010 # No gases in it so it's cheaper - category: cargoproduct-category-name-atmospherics + category: Atmospherics group: market #- type: cargoProduct @@ -87,7 +87,7 @@ # state: water_vapor # product: WaterVaporCanister # cost: 2600 -# category: cargoproduct-category-name-atmospherics +# category: Atmospherics # group: market - type: cargoProduct @@ -97,7 +97,7 @@ state: orange product: PlasmaCanister cost: 4000 - category: cargoproduct-category-name-atmospherics + category: Atmospherics group: market #- type: cargoProduct @@ -109,5 +109,5 @@ # state: green # product: TritiumCanister # cost: 15500 -# category: cargoproduct-category-name-atmospherics +# category: Atmospherics # group: market diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_botany.yml b/Resources/Prototypes/Catalog/Cargo/cargo_botany.yml index a6671ff0998..4a80b76a3fa 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_botany.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_botany.yml @@ -5,7 +5,7 @@ state: seed product: CrateHydroponicsSeedsExotic cost: 1000 - category: cargoproduct-category-name-hydroponics + category: Hydroponics group: market - type: cargoProduct @@ -15,7 +15,7 @@ state: seed product: CrateHydroponicsSeedsMedicinal cost: 500 - category: cargoproduct-category-name-hydroponics + category: Hydroponics group: market - type: cargoProduct @@ -25,7 +25,7 @@ state: icon product: CrateHydroponicsTools cost: 500 - category: cargoproduct-category-name-hydroponics + category: Hydroponics group: market - type: cargoProduct @@ -35,7 +35,7 @@ state: seed product: CrateHydroponicsSeeds cost: 550 - category: cargoproduct-category-name-hydroponics + category: Hydroponics group: market - type: cargoProduct @@ -45,5 +45,5 @@ state: jug product: CratePlantBGone cost: 750 - category: cargoproduct-category-name-hydroponics + category: Hydroponics group: market diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_cargo.yml b/Resources/Prototypes/Catalog/Cargo/cargo_cargo.yml index fb3b2da41a8..9dac47b6f15 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_cargo.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_cargo.yml @@ -15,7 +15,7 @@ state: orebox product: OreBox cost: 500 - category: cargoproduct-category-name-cargo + category: Logistics # DeltaV - Logistics Department replacing Cargo group: market - type: cargoProduct @@ -25,5 +25,5 @@ state: icon product: CrateCargoLuxuryHardsuit cost: 15000 - category: cargoproduct-category-name-cargo + category: Logistics # DeltaV - Logistics Department replacing Cargo group: market diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_circuitboards.yml b/Resources/Prototypes/Catalog/Cargo/cargo_circuitboards.yml index a96780fc3ed..0af5b5db016 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_circuitboards.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_circuitboards.yml @@ -5,5 +5,5 @@ state: cpuboard product: CrateCrewMonitoringBoards cost: 2000 - category: cargoproduct-category-name-circuitboards + category: Circuitboards group: market diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_emergency.yml b/Resources/Prototypes/Catalog/Cargo/cargo_emergency.yml index 2715e0c3501..2777f859a07 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_emergency.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_emergency.yml @@ -5,7 +5,7 @@ state: icon product: CrateEmergencyExplosive cost: 650 - category: cargoproduct-category-name-emergency + category: Emergency group: market - type: cargoProduct @@ -15,7 +15,7 @@ state: fire_extinguisher_closed product: CrateEmergencyFire cost: 1500 - category: cargoproduct-category-name-emergency + category: Emergency group: market - type: cargoProduct @@ -25,7 +25,7 @@ state: icon product: CrateEmergencyInternals cost: 500 - category: cargoproduct-category-name-emergency + category: Emergency group: market - type: cargoProduct @@ -35,7 +35,7 @@ state: icon product: CrateEmergencyInternalsLarge cost: 2000 - category: cargoproduct-category-name-emergency + category: Emergency group: market - type: cargoProduct @@ -45,7 +45,7 @@ state: radiation product: CrateEmergencyRadiation cost: 1000 - category: cargoproduct-category-name-emergency + category: Emergency group: market - type: cargoProduct @@ -55,7 +55,7 @@ state: item_wall product: CrateEmergencyInflatablewall cost: 500 - category: cargoproduct-category-name-emergency + category: Emergency group: market - type: cargoProduct @@ -65,7 +65,7 @@ state: icon product: CrateSlimepersonLifeSupport cost: 300 - category: cargoproduct-category-name-emergency + category: Emergency group: market - type: cargoProduct @@ -75,5 +75,5 @@ state: icon product: CrateGenericBiosuit cost: 800 - category: cargoproduct-category-name-emergency + category: Emergency group: market diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_engineering.yml b/Resources/Prototypes/Catalog/Cargo/cargo_engineering.yml index 754e30f133a..b5468fd982c 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_engineering.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_engineering.yml @@ -5,7 +5,7 @@ state: coillv-30 product: CrateEngineeringCableLV cost: 300 - category: cargoproduct-category-name-engineering + category: Engineering group: market - type: cargoProduct @@ -15,7 +15,7 @@ state: coilmv-30 product: CrateEngineeringCableMV cost: 300 - category: cargoproduct-category-name-engineering + category: Engineering group: market - type: cargoProduct @@ -25,7 +25,7 @@ state: coilhv-30 product: CrateEngineeringCableHV cost: 300 - category: cargoproduct-category-name-engineering + category: Engineering group: market - type: cargoProduct @@ -35,7 +35,7 @@ state: coilall-30 product: CrateEngineeringCableBulk cost: 750 - category: cargoproduct-category-name-engineering + category: Engineering group: market - type: cargoProduct @@ -45,7 +45,7 @@ state: icon product: CrateEngineeringElectricalSupplies cost: 4500 - category: cargoproduct-category-name-engineering + category: Engineering group: market - type: cargoProduct @@ -55,7 +55,7 @@ state: icon product: CrateEngineeringStationBeaconBundle cost: 500 - category: cargoproduct-category-name-engineering + category: Engineering group: market - type: cargoProduct @@ -65,7 +65,7 @@ state: icon product: CrateEngineeringJetpack cost: 1000 - category: cargoproduct-category-name-engineering + category: Engineering group: market - type: cargoProduct @@ -75,7 +75,7 @@ state: icon product: CrateEngineeringMiniJetpack cost: 750 - category: cargoproduct-category-name-engineering + category: Engineering group: market - type: cargoProduct @@ -85,7 +85,7 @@ state: icon product: CrateAirlockKit cost: 1100 - category: cargoproduct-category-name-engineering + category: Engineering group: market - type: cargoProduct @@ -95,7 +95,7 @@ state: icon product: CrateEvaKit cost: 5000 - category: cargoproduct-category-name-engineering + category: Engineering group: market - type: cargoProduct @@ -105,7 +105,7 @@ state: ammo product: CrateRCDAmmo cost: 2500 - category: cargoproduct-category-name-engineering + category: Engineering group: market - type: cargoProduct @@ -115,7 +115,7 @@ state: icon product: CrateRCD cost: 800 - category: cargoproduct-category-name-engineering + category: Engineering group: market - type: cargoProduct @@ -125,7 +125,7 @@ state: base product: CrateParticleDecelerators cost: 15000 - category: cargoproduct-category-name-engineering + category: Engineering group: market - type: cargoProduct @@ -135,5 +135,5 @@ state: sheaterOff product: SpaceHeaterAnchored cost: 300 - category: cargoproduct-category-name-engineering + category: Engineering group: market diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml b/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml index bd00b0c2d4c..ece817b746e 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml @@ -5,7 +5,7 @@ state: jar product: CrateEngineeringAMEJar cost: 2000 - category: cargoproduct-category-name-engineering + category: Engineering group: market - type: cargoProduct @@ -15,7 +15,7 @@ state: icon product: CrateEngineeringSingularityGenerator cost: 4000 - category: cargoproduct-category-name-engineering + category: Engineering group: market - type: cargoProduct @@ -25,7 +25,7 @@ state: icon product: CrateEngineeringSingularityContainment cost: 1000 - category: cargoproduct-category-name-engineering + category: Engineering group: market #- type: cargoProduct @@ -37,7 +37,7 @@ # state: emitter2 # product: CrateEngineeringSingularityEmitter # cost: 3000 -# category: cargoproduct-category-name-engineering +# category: Engineering # group: market - type: cargoProduct @@ -47,7 +47,7 @@ state: ca_on product: CrateEngineeringSingularityCollector cost: 1000 - category: cargoproduct-category-name-engineering + category: Engineering group: market - type: cargoProduct @@ -57,7 +57,7 @@ state: completed product: CrateEngineeringParticleAccelerator cost: 2000 - category: cargoproduct-category-name-engineering + category: Engineering group: market - type: cargoProduct @@ -67,18 +67,18 @@ state: solar-assembly-part product: CrateEngineeringSolar cost: 500 - category: cargoproduct-category-name-engineering + category: Engineering group: market -- type: cargoProduct - id: EngineTeslaGenerator - icon: - sprite: Structures/Power/Generation/Tesla/generator.rsi - state: icon - product: CrateEngineeringTeslaGenerator - cost: 4000 - category: cargoproduct-category-name-engineering - group: market +#- type: cargoProduct +# id: EngineTeslaGenerator +# icon: +# sprite: Structures/Power/Generation/Tesla/generator.rsi +# state: icon +# product: CrateEngineeringTeslaGenerator +# cost: 4000 +# category: Engineering +# group: market - type: cargoProduct id: EngineTeslaCoil @@ -87,7 +87,7 @@ state: coil product: CrateEngineeringTeslaCoil cost: 1200 - category: cargoproduct-category-name-engineering + category: Engineering group: market - type: cargoProduct @@ -97,5 +97,5 @@ state: grounding_rod product: CrateEngineeringTeslaGroundingRod cost: 400 - category: cargoproduct-category-name-engineering + category: Engineering group: market diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_food.yml b/Resources/Prototypes/Catalog/Cargo/cargo_food.yml index 1a6f8380961..e5069959296 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_food.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_food.yml @@ -5,7 +5,7 @@ state: margherita-slice product: CrateFoodPizza cost: 450 - category: cargoproduct-category-name-food + category: Food group: market - type: cargoProduct @@ -15,7 +15,7 @@ state: margherita product: CrateFoodPizzaLarge cost: 1800 - category: cargoproduct-category-name-food + category: Food group: market - type: cargoProduct @@ -25,7 +25,7 @@ state: nutribrick product: CrateFoodMRE cost: 1000 - category: cargoproduct-category-name-food + category: Food group: market - type: cargoProduct @@ -35,7 +35,7 @@ state: flour-big product: CrateFoodCooking cost: 750 - category: cargoproduct-category-name-food + category: Food group: market - type: cargoProduct @@ -45,7 +45,7 @@ state: tin product: CrateFoodDinnerware cost: 750 - category: cargoproduct-category-name-food + category: Food group: market - type: cargoProduct @@ -55,7 +55,7 @@ state: icon product: CrateFoodBarSupply cost: 750 - category: cargoproduct-category-name-food + category: Food group: market - type: cargoProduct @@ -65,7 +65,7 @@ state: icon product: CrateFoodSoftdrinks cost: 1200 - category: cargoproduct-category-name-food + category: Food group: market - type: cargoProduct @@ -75,5 +75,5 @@ state: icon product: CrateFoodSoftdrinksLarge cost: 2400 - category: cargoproduct-category-name-food + category: Food group: market diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml b/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml index c29458a1ee5..d84fedd543f 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml @@ -5,7 +5,7 @@ state: icon product: CrateFunInstrumentsVariety cost: 2000 - category: cargoproduct-category-name-fun + category: Fun group: market - type: cargoProduct @@ -15,7 +15,7 @@ state: tuba product: CrateFunInstrumentsBrass cost: 2500 - category: cargoproduct-category-name-fun + category: Fun group: market - type: cargoProduct @@ -25,7 +25,7 @@ state: icon product: CrateFunInstrumentsString cost: 2500 - category: cargoproduct-category-name-fun + category: Fun group: market - type: cargoProduct @@ -35,7 +35,7 @@ state: icon product: CrateFunInstrumentsWoodwind cost: 2500 - category: cargoproduct-category-name-fun + category: Fun group: market - type: cargoProduct @@ -45,7 +45,7 @@ state: icon product: CrateFunInstrumentsKeyedPercussion cost: 2500 - category: cargoproduct-category-name-fun + category: Fun group: market - type: cargoProduct @@ -55,7 +55,7 @@ state: icon product: CrateFunInstrumentsSpecial cost: 10000 - category: cargoproduct-category-name-fun + category: Fun group: market - type: cargoProduct @@ -65,7 +65,7 @@ state: box product: CrateFunArtSupplies cost: 500 - category: cargoproduct-category-name-fun + category: Fun group: market - type: cargoProduct @@ -85,7 +85,7 @@ state: birthday product: CrateFunParty cost: 1000 - category: cargoproduct-category-name-fun + category: Fun group: market - type: cargoProduct @@ -95,7 +95,7 @@ state: display product: CrateFunWaterGuns cost: 750 - category: cargoproduct-category-name-fun + category: Fun group: market - type: cargoProduct @@ -105,7 +105,7 @@ state: plushie_h product: CrateFunPlushie cost: 1000 - category: cargoproduct-category-name-fun + category: Fun group: market - type: cargoProduct @@ -115,7 +115,7 @@ state: plushie_lizard product: CrateFunLizardPlushieBulk cost: 500 - category: cargoproduct-category-name-fun + category: Fun group: market - type: cargoProduct @@ -125,7 +125,7 @@ state: d6_6 product: CrateFunBoardGames cost: 1500 - category: cargoproduct-category-name-fun + category: Fun group: market - type: cargoProduct @@ -135,7 +135,7 @@ state: implanter0 product: CrateFunSadTromboneImplants cost: 1000 - category: cargoproduct-category-name-fun + category: Fun group: market - type: cargoProduct @@ -145,7 +145,7 @@ state: implanter0 product: CrateFunLightImplants cost: 1000 - category: cargoproduct-category-name-fun + category: Fun group: market - type: cargoProduct @@ -155,7 +155,7 @@ state: icon product: CrateFunBoxing cost: 500 - category: cargoproduct-category-name-fun + category: Fun group: market - type: cargoProduct @@ -165,7 +165,7 @@ state: crate_icon product: CrateFunPirate cost: 400 - category: cargoproduct-category-name-fun + category: Fun group: market - type: cargoProduct @@ -175,7 +175,7 @@ state: crate_icon product: CrateFunToyBox cost: 900 - category: cargoproduct-category-name-fun + category: Fun group: market - type: cargoProduct @@ -185,7 +185,7 @@ state: implanter0 product: CrateFunBikeHornImplants cost: 1000 - category: cargoproduct-category-name-fun + category: Fun group: market - type: cargoProduct @@ -195,7 +195,7 @@ state: fig_box product: CrateFunMysteryFigurines cost: 4000 - category: cargoproduct-category-name-fun + category: Fun group: market - type: cargoProduct @@ -205,15 +205,15 @@ state: icon product: CrateFunDartsSet cost: 900 - category: cargoproduct-category-name-fun + category: Fun group: market -- type: cargoProduct - id: FunCrateGambling - icon: - sprite: Objects/Economy/cash.rsi - state: cash_1000000 - product: CrateCargoGambling - cost: 10000 - category: cargoproduct-category-name-fun - group: market +#- type: cargoProduct +# id: FunCrateGambling +# icon: +# sprite: Objects/Economy/cash.rsi +# state: cash_1000000 +# product: CrateCargoGambling +# cost: 10000 +# category: Fun +# group: market diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml b/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml index 922e2951b6c..6ef0ab4e211 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml @@ -5,7 +5,7 @@ state: 0 product: CrateNPCBee cost: 7000 - category: cargoproduct-category-name-livestock + category: Livestock group: market - type: cargoProduct @@ -15,7 +15,7 @@ state: butterfly product: CrateNPCButterflies cost: 4400 - category: cargoproduct-category-name-livestock + category: Livestock group: market - type: cargoProduct @@ -25,7 +25,7 @@ state: cat product: CrateNPCCat cost: 1200 - category: cargoproduct-category-name-livestock + category: Livestock group: market - type: cargoProduct @@ -35,7 +35,7 @@ state: icon-1 product: CrateNPCChicken cost: 4000 - category: cargoproduct-category-name-livestock + category: Livestock group: market - type: cargoProduct @@ -45,7 +45,7 @@ state: crab product: CrateNPCCrab cost: 3000 - category: cargoproduct-category-name-livestock + category: Livestock group: market - type: cargoProduct @@ -55,7 +55,7 @@ state: icon-0 product: CrateNPCDuck cost: 6000 - category: cargoproduct-category-name-livestock + category: Livestock group: market - type: cargoProduct @@ -65,7 +65,7 @@ state: corgi product: CrateNPCCorgi cost: 1200 - category: cargoproduct-category-name-livestock + category: Livestock group: market - type: cargoProduct @@ -75,7 +75,7 @@ state: puppy product: CrateNPCPuppyCorgi cost: 1200 - category: cargoproduct-category-name-livestock + category: Livestock group: market - type: cargoProduct @@ -85,7 +85,7 @@ state: cow product: CrateNPCCow cost: 3200 - category: cargoproduct-category-name-livestock + category: Livestock group: market - type: cargoProduct @@ -95,7 +95,7 @@ state: goat product: CrateNPCGoat cost: 1200 - category: cargoproduct-category-name-livestock + category: Livestock group: market - type: cargoProduct @@ -105,7 +105,7 @@ state: goose product: CrateNPCGoose cost: 2100 - category: cargoproduct-category-name-livestock + category: Livestock group: market - type: cargoProduct @@ -115,7 +115,7 @@ state: icon product: CrateNPCGorilla cost: 1100 - category: cargoproduct-category-name-livestock + category: Livestock group: market - type: cargoProduct @@ -125,7 +125,7 @@ state: box product: CrateNPCMonkeyCube cost: 2000 - category: cargoproduct-category-name-livestock + category: Livestock group: market - type: cargoProduct @@ -135,7 +135,7 @@ state: box_kobold product: CrateNPCKoboldCube cost: 2000 - category: cargoproduct-category-name-livestock + category: Livestock group: market - type: cargoProduct @@ -145,7 +145,7 @@ state: icon-0 product: CrateNPCMouse cost: 4400 - category: cargoproduct-category-name-livestock + category: Livestock group: market - type: cargoProduct @@ -155,7 +155,7 @@ state: parrot product: CrateNPCParrot cost: 3000 - category: cargoproduct-category-name-livestock + category: Livestock group: market - type: cargoProduct @@ -165,7 +165,7 @@ state: penguin product: CrateNPCPenguin cost: 2100 - category: cargoproduct-category-name-livestock + category: Livestock group: market - type: cargoProduct @@ -175,7 +175,7 @@ state: pig product: CrateNPCPig cost: 1100 - category: cargoproduct-category-name-livestock + category: Livestock group: market - type: cargoProduct @@ -185,7 +185,7 @@ state: snake product: CrateNPCSnake cost: 3000 - category: cargoproduct-category-name-livestock + category: Livestock group: market - type: cargoProduct @@ -195,7 +195,7 @@ state: icon-0 product: CrateNPCHamster cost: 2800 - category: cargoproduct-category-name-livestock + category: Livestock group: market - type: cargoProduct @@ -205,7 +205,7 @@ state: lizard product: CrateNPCLizard cost: 1100 - category: cargoproduct-category-name-livestock + category: Livestock group: market - type: cargoProduct @@ -215,7 +215,7 @@ state: kangaroo product: CrateNPCKangaroo cost: 2800 - category: cargoproduct-category-name-livestock + category: Livestock group: market - type: cargoProduct @@ -225,5 +225,5 @@ state: mothroach product: CrateNPCMothroach cost: 5000 - category: cargoproduct-category-name-livestock + category: Livestock group: market diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml b/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml index 6f945001d93..e3b07af13ba 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_materials.yml @@ -5,7 +5,7 @@ state: glass_3 product: CrateMaterialGlass cost: 1000 - category: cargoproduct-category-name-materials + category: Materials group: market - type: cargoProduct @@ -15,7 +15,7 @@ state: steel_3 product: CrateMaterialSteel cost: 1000 - category: cargoproduct-category-name-materials + category: Materials group: market - type: cargoProduct @@ -25,7 +25,7 @@ state: plastic_3 product: CrateMaterialPlastic cost: 1500 - category: cargoproduct-category-name-materials + category: Materials group: market - type: cargoProduct @@ -35,7 +35,7 @@ state: brass_3 product: CrateMaterialBrass cost: 2500 - category: cargoproduct-category-name-materials + category: Materials group: market - type: cargoProduct @@ -45,7 +45,7 @@ state: plasteel_3 product: CrateMaterialPlasteel cost: 3000 - category: cargoproduct-category-name-materials + category: Materials group: market - type: cargoProduct @@ -55,7 +55,7 @@ state: cloth_3 product: CrateMaterialTextiles cost: 1000 - category: cargoproduct-category-name-materials + category: Materials group: market - type: cargoProduct @@ -65,7 +65,7 @@ state: plasma_3 product: CrateMaterialPlasma cost: 2000 - category: cargoproduct-category-name-materials + category: Materials group: market - type: cargoProduct @@ -75,7 +75,7 @@ state: cardboard_3 product: CrateMaterialCardboard cost: 750 - category: cargoproduct-category-name-materials + category: Materials group: market - type: cargoProduct @@ -85,7 +85,7 @@ state: paper_3 product: CrateMaterialPaper cost: 1000 - category: cargoproduct-category-name-materials + category: Materials group: market - type: cargoProduct @@ -95,7 +95,7 @@ state: fueltank product: WeldingFuelTankFull cost: 1500 - category: cargoproduct-category-name-materials + category: Materials group: market - type: cargoProduct @@ -105,5 +105,5 @@ state: watertank product: WaterTankFull cost: 1000 - category: cargoproduct-category-name-materials + category: Materials group: market diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_medical.yml b/Resources/Prototypes/Catalog/Cargo/cargo_medical.yml index 1addf523e4b..01a7192b35b 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_medical.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_medical.yml @@ -5,7 +5,7 @@ state: firstaid product: CrateMedicalSupplies cost: 2400 - category: cargoproduct-category-name-medical + category: Medical group: market - type: cargoProduct @@ -15,7 +15,7 @@ state: beaker product: CrateChemistrySupplies cost: 750 - category: cargoproduct-category-name-medical + category: Medical group: market - type: cargoProduct @@ -25,7 +25,7 @@ state: vial product: CrateChemistryVials cost: 1000 - category: cargoproduct-category-name-medical + category: Medical group: market - type: cargoProduct @@ -35,7 +35,7 @@ state: burnkit product: CrateEmergencyBurnKit cost: 700 - category: cargoproduct-category-name-medical + category: Medical group: market - type: cargoProduct @@ -45,7 +45,7 @@ state: toxinkit product: CrateEmergencyToxinKit cost: 600 - category: cargoproduct-category-name-medical + category: Medical group: market - type: cargoProduct @@ -55,7 +55,7 @@ state: o2kit product: CrateEmergencyO2Kit cost: 600 - category: cargoproduct-category-name-medical + category: Medical group: market - type: cargoProduct @@ -65,7 +65,7 @@ state: brutekit product: CrateEmergencyBruteKit cost: 600 - category: cargoproduct-category-name-medical + category: Medical group: market - type: cargoProduct @@ -75,7 +75,7 @@ state: advkit product: CrateEmergencyAdvancedKit cost: 1200 - category: cargoproduct-category-name-medical + category: Medical group: market - type: cargoProduct @@ -85,7 +85,7 @@ state: radkit product: CrateEmergencyRadiationKit cost: 600 - category: cargoproduct-category-name-medical + category: Medical group: market - type: cargoProduct @@ -95,7 +95,7 @@ state: bag_folded product: CrateBodyBags cost: 700 - category: cargoproduct-category-name-medical + category: Medical group: market - type: cargoProduct @@ -105,7 +105,7 @@ state: icon product: CrateVirologyBiosuit cost: 800 - category: cargoproduct-category-name-medical + category: Medical group: market - type: cargoProduct @@ -115,7 +115,7 @@ state: implanter0 product: CrateMindShieldImplants cost: 3000 - category: cargoproduct-category-name-medical + category: Medical group: market - type: cargoProduct @@ -125,7 +125,7 @@ state: icon product: CrateChemistryP cost: 850 - category: cargoproduct-category-name-medical + category: Medical group: market - type: cargoProduct @@ -135,7 +135,7 @@ state: icon product: CrateChemistryS cost: 750 - category: cargoproduct-category-name-medical + category: Medical group: market - type: cargoProduct @@ -145,5 +145,5 @@ state: icon product: CrateChemistryD cost: 750 - category: cargoproduct-category-name-medical + category: Medical group: market diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_science.yml b/Resources/Prototypes/Catalog/Cargo/cargo_science.yml index 756a223e74d..f370155e075 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_science.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_science.yml @@ -5,7 +5,7 @@ state: artifact_container_icon product: CrateArtifactContainer cost: 500 - category: cargoproduct-category-name-science + category: Epistemics # DeltaV - Epistemics Department replacing Science group: market - type: cargoProduct @@ -15,7 +15,7 @@ state: ano13 product: RandomArtifactSpawner cost: 2000 - category: cargoproduct-category-name-science + category: Epistemics # DeltaV - Epistemics Department replacing Science group: market - type: cargoProduct @@ -25,5 +25,5 @@ state: icon product: CrateScienceBiosuit cost: 800 - category: cargoproduct-category-name-science + category: Epistemics # DeltaV - Epistemics Department replacing Science group: market diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_security.yml b/Resources/Prototypes/Catalog/Cargo/cargo_security.yml index 2ad7628ddb3..a616202bdba 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_security.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_security.yml @@ -4,8 +4,8 @@ sprite: DeltaV/Clothing/OuterClothing/Armor/platecarrier.rsi # DeltaV - resprite state: icon product: CrateSecurityArmor - cost: 800 - category: cargoproduct-category-name-security + cost: 1000 # DeltaV - raise price for buffed armour + category: Security group: market - type: cargoProduct @@ -15,7 +15,7 @@ state: icon product: CrateSecurityHelmet cost: 550 - category: cargoproduct-category-name-security + category: Security group: market - type: cargoProduct @@ -25,7 +25,7 @@ state: base product: CrateSecurityNonlethal cost: 4000 - category: cargoproduct-category-name-security + category: Security group: market - type: cargoProduct @@ -35,7 +35,7 @@ state: icon product: CrateSecurityRiot cost: 5500 - category: cargoproduct-category-name-security + category: Security group: market - type: cargoProduct @@ -45,7 +45,7 @@ state: box_security product: CrateSecuritySupplies cost: 500 - category: cargoproduct-category-name-security + category: Security group: market - type: cargoProduct @@ -55,7 +55,7 @@ state: handcuff product: CrateRestraints cost: 1000 - category: cargoproduct-category-name-security + category: Security group: market - type: cargoProduct @@ -65,7 +65,7 @@ state: icon product: CrateSecurityBiosuit cost: 800 - category: cargoproduct-category-name-security + category: Security group: market - type: cargoProduct @@ -75,5 +75,5 @@ state: idle product: DeployableBarrier cost: 1000 - category: cargoproduct-category-name-security + category: Security group: market diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_service.yml b/Resources/Prototypes/Catalog/Cargo/cargo_service.yml index f27adb65a4a..a2c0af9ce7f 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_service.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_service.yml @@ -5,7 +5,7 @@ state: cleaner product: CrateServiceJanitorialSupplies cost: 560 - category: cargoproduct-category-name-service + category: Service group: market - type: cargoProduct @@ -15,7 +15,7 @@ state: normal product: CrateServiceReplacementLights cost: 600 - category: cargoproduct-category-name-service + category: Service group: market - type: cargoProduct @@ -25,7 +25,7 @@ state: mousetrap product: CrateMousetrapBoxes cost: 500 - category: cargoproduct-category-name-service + category: Service group: market - type: cargoProduct @@ -35,7 +35,7 @@ state: icon product: CrateServiceTheatre cost: 1800 - category: cargoproduct-category-name-service + category: Service group: market - type: cargoProduct @@ -45,7 +45,7 @@ state: closed product: CrateServiceSmokeables cost: 1500 - category: cargoproduct-category-name-service + category: Service group: market - type: cargoProduct @@ -55,7 +55,7 @@ state: closed product: CrateServiceCustomSmokable cost: 1000 - category: cargoproduct-category-name-service + category: Service group: market - type: cargoProduct @@ -65,7 +65,7 @@ state: pen product: CrateServiceBureaucracy cost: 1000 - category: cargoproduct-category-name-service + category: Service group: market - type: cargoProduct @@ -75,7 +75,7 @@ state: default product: CrateServicePersonnel cost: 1000 - category: cargoproduct-category-name-service + category: Service group: market - type: cargoProduct @@ -85,7 +85,7 @@ state: book0 product: CrateServiceBooks cost: 1000 - category: cargoproduct-category-name-service + category: Service group: market - type: cargoProduct @@ -95,7 +95,7 @@ state: book_engineering2 product: CrateServiceGuidebooks cost: 1300 - category: cargoproduct-category-name-service + category: Service group: market - type: cargoProduct @@ -105,7 +105,7 @@ state: icon product: CrateServiceSodaDispenser cost: 850 - category: cargoproduct-category-name-service + category: Service group: market - type: cargoProduct @@ -115,7 +115,7 @@ state: icon product: CrateServiceBoozeDispenser cost: 750 - category: cargoproduct-category-name-service + category: Service group: market - type: cargoProduct @@ -125,7 +125,7 @@ state: box product: CrateServiceBox cost: 400 - category: cargoproduct-category-name-service + category: Service group: market - type: cargoProduct @@ -135,7 +135,7 @@ state: icon product: CrateJanitorBiosuit cost: 800 - category: cargoproduct-category-name-service + category: Service group: market - type: cargoProduct @@ -145,7 +145,7 @@ state: icon-hot product: FoodCartHot cost: 2000 - category: cargoproduct-category-name-service + category: Service group: market - type: cargoProduct @@ -155,7 +155,7 @@ state: icon-cold product: FoodCartCold cost: 2000 - category: cargoproduct-category-name-service + category: Service group: market - type: cargoProduct @@ -165,7 +165,7 @@ state: icon product: PetCarrier cost: 500 - category: cargoproduct-category-name-service + category: Service group: market - type: cargoProduct @@ -175,7 +175,7 @@ state: icon product: CrateJanitorExplosive cost: 1000 - category: cargoproduct-category-name-service + category: Service group: market - type: cargoProduct @@ -185,6 +185,6 @@ state: icon-cart product: JanitorialTrolley cost: 300 - category: cargoproduct-category-name-service + category: Service group: market diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_shuttle.yml b/Resources/Prototypes/Catalog/Cargo/cargo_shuttle.yml index 278104caed1..96a193881ef 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_shuttle.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_shuttle.yml @@ -5,7 +5,7 @@ state: base product: CrateEngineeringThruster cost: 1500 - category: cargoproduct-category-name-shuttle + category: Shuttle group: market - type: cargoProduct @@ -15,7 +15,7 @@ state: base product: CrateEngineeringGyroscope cost: 4000 - category: cargoproduct-category-name-shuttle + category: Shuttle group: market # - type: cargoProduct @@ -25,6 +25,6 @@ # state: avionics-systems # product: CrateEngineeringShuttle # cost: 3000 - # category: cargoproduct-category-name-shuttle + # category: Shuttle # group: market # locked: true # only the QM has permission to order by default diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml index 3e303c32127..d0ae444bf77 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml @@ -13,7 +13,7 @@ state: base product: CrateVendingMachineRestockBoozeFilled cost: 3500 - category: cargoproduct-category-name-service + category: Service group: market - type: cargoProduct @@ -24,7 +24,7 @@ state: base product: CrateVendingMachineRestockChefvendFilled cost: 680 - category: cargoproduct-category-name-service + category: Service group: market - type: cargoProduct @@ -44,7 +44,7 @@ state: base product: CrateVendingMachineRestockDinnerwareFilled cost: 2000 - category: cargoproduct-category-name-service + category: Service group: market - type: cargoProduct @@ -55,7 +55,7 @@ state: base product: CrateVendingMachineRestockCondimentStationFilled cost: 300 - category: cargoproduct-category-name-service + category: Service group: market - type: cargoProduct @@ -65,7 +65,7 @@ state: base product: CrateVendingMachineRestockEngineeringFilled cost: 3200 - category: cargoproduct-category-name-engineering + category: Engineering group: market - type: cargoProduct @@ -75,7 +75,7 @@ state: base product: CrateVendingMachineRestockGamesFilled cost: 750 - category: cargoproduct-category-name-service + category: Service group: market - type: cargoProduct @@ -85,7 +85,7 @@ state: base product: CrateVendingMachineRestockHotDrinksFilled cost: 1200 - category: cargoproduct-category-name-service + category: Service group: market - type: cargoProduct @@ -95,7 +95,7 @@ state: base product: CrateVendingMachineRestockMedicalFilled cost: 1750 - category: cargoproduct-category-name-medical + category: Medical group: market - type: cargoProduct @@ -104,8 +104,8 @@ sprite: Objects/Specific/Service/vending_machine_restock.rsi state: base product: CrateVendingMachineRestockChemVendFilled - cost: 3820 - category: cargoproduct-category-name-medical + cost: 6300 #Delta V - was 3820, see rebase PR #53 + category: Medical group: market - type: cargoProduct @@ -115,7 +115,7 @@ state: base product: CrateVendingMachineRestockNutriMaxFilled cost: 2400 - category: cargoproduct-category-name-hydroponics + category: Hydroponics group: market - type: cargoProduct @@ -125,7 +125,7 @@ state: base product: CrateVendingMachineRestockPTechFilled cost: 1200 - category: cargoproduct-category-name-service + category: Service group: market - type: cargoProduct @@ -135,7 +135,7 @@ state: base product: CrateVendingMachineRestockRobustSoftdrinksFilled cost: 1200 - category: cargoproduct-category-name-service + category: Service group: market - type: cargoProduct @@ -145,7 +145,7 @@ state: base product: CrateVendingMachineRestockSalvageEquipmentFilled cost: 1000 - category: cargoproduct-category-name-engineering + category: Engineering group: market - type: cargoProduct @@ -155,7 +155,7 @@ state: base product: CrateVendingMachineRestockSecTechFilled cost: 2200 - category: cargoproduct-category-name-security + category: Security group: market - type: cargoProduct @@ -165,7 +165,7 @@ state: base product: CrateVendingMachineRestockSeedsFilled cost: 3375 - category: cargoproduct-category-name-hydroponics + category: Hydroponics group: market - type: cargoProduct @@ -175,7 +175,7 @@ state: base product: CrateVendingMachineRestockSmokesFilled cost: 1200 - category: cargoproduct-category-name-service + category: Service group: market - type: cargoProduct @@ -185,7 +185,7 @@ state: base product: CrateVendingMachineRestockVendomatFilled cost: 1200 - category: cargoproduct-category-name-service + category: Service group: market - type: cargoProduct @@ -195,7 +195,7 @@ state: base product: CrateVendingMachineRestockRoboticsFilled cost: 1600 - category: cargoproduct-category-name-science + category: Epistemics # DeltaV - Epistemics Department replacing Science group: market - type: cargoProduct @@ -205,7 +205,7 @@ state: base product: CrateVendingMachineRestockTankDispenserFilled cost: 1000 - category: cargoproduct-category-name-atmospherics + category: Atmospherics group: market - type: cargoProduct @@ -215,7 +215,7 @@ state: base product: CrateVendingMachineRestockHappyHonkFilled cost: 2100 - category: cargoproduct-category-name-service + category: Service group: market - type: cargoProduct @@ -225,7 +225,7 @@ state: base product: CrateVendingMachineRestockGetmoreChocolateCorpFilled cost: 1200 - category: cargoproduct-category-name-service + category: Service group: market - type: cargoProduct @@ -235,7 +235,7 @@ state: base product: CrateVendingMachineRestockChangFilled cost: 1200 - category: cargoproduct-category-name-service + category: Service group: market - type: cargoProduct @@ -245,7 +245,7 @@ state: base product: CrateVendingMachineRestockDiscountDansFilled cost: 1200 - category: cargoproduct-category-name-service + category: Service group: market - type: cargoProduct @@ -255,5 +255,5 @@ state: base product: CrateVendingMachineRestockDonutFilled cost: 1200 - category: cargoproduct-category-name-service + category: Service group: market diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml index bb21bc36d47..92e4032b0cb 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml @@ -87,7 +87,6 @@ ClothingShoesBootsCowboyBrown: 1 ClothingShoesBootsCowboyBlack: 1 ClothingShoesBootsCowboyWhite: 1 - ClothingMaskNeckGaiterRed: 2 emaggedInventory: ClothingShoesBling: 1 ClothingShoesBootsCowboyFancy: 1 diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index 1e81cdf2dd1..7f64ebbd23c 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -428,7 +428,7 @@ name: uplink-reinforcement-radio-name description: uplink-reinforcement-radio-desc productEntity: ReinforcementRadioSyndicate - icon: { sprite: Objects/Devices/communication.rsi, state: radio } + icon: { sprite: Objects/Devices/communication.rsi, state: old-radio } cost: Telecrystal: 16 categories: @@ -444,7 +444,7 @@ name: uplink-reinforcement-radio-name description: uplink-reinforcement-radio-desc productEntity: ReinforcementRadioSyndicateNukeops - icon: { sprite: Objects/Devices/communication.rsi, state: radio } + icon: { sprite: Objects/Devices/communication.rsi, state: old-radio } cost: Telecrystal: 16 categories: @@ -476,7 +476,7 @@ name: uplink-reinforcement-radio-monkey-name description: uplink-reinforcement-radio-monkey-desc productEntity: ReinforcementRadioSyndicateMonkey - icon: { sprite: Objects/Devices/communication.rsi, state: radio } + icon: { sprite: Objects/Devices/communication.rsi, state: old-radio } cost: Telecrystal: 8 categories: @@ -492,9 +492,9 @@ name: uplink-reinforcement-radio-monkey-name description: uplink-reinforcement-radio-monkey-desc productEntity: ReinforcementRadioSyndicateMonkeyNukeops - icon: { sprite: Objects/Devices/communication.rsi, state: radio } + icon: { sprite: Objects/Devices/communication.rsi, state: old-radio } cost: - Telecrystal: 6 + Telecrystal: 8 categories: - UplinkUtility conditions: @@ -724,7 +724,7 @@ id: UplinkUplinkImplanter # uplink uplink real name: uplink-uplink-implanter-name description: uplink-uplink-implanter-desc - icon: { sprite: /Textures/Objects/Devices/communication.rsi, state: radio } + icon: { sprite: /Textures/Objects/Devices/communication.rsi, state: old-radio } productEntity: UplinkImplanter cost: Telecrystal: 2 diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml index c845d7cc4a0..43d6c7c9b70 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml @@ -809,8 +809,8 @@ - type: entity parent: ClothingHeadBase id: ClothingHeadHatMagician - name: magician's tophat - description: "A magician's tophat." + name: magician's top hat. + description: "A magician's top hat." components: - type: Icon sprite: Clothing/Head/Hats/magician.rsi @@ -827,7 +827,6 @@ - type: Item size: Small sprite: Clothing/Head/Hats/magician.rsi - storedRotation: 0 - type: Storage grid: - 0,0,0,0 diff --git a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml index ad738792a73..1f70211caa8 100644 --- a/Resources/Prototypes/Entities/Clothing/Masks/masks.yml +++ b/Resources/Prototypes/Entities/Clothing/Masks/masks.yml @@ -514,16 +514,6 @@ tags: - WhitelistChameleon -- type: entity - parent: ClothingMaskNeckGaiter - id: ClothingMaskNeckGaiterRed - name: red neck gaiter - components: - - type: Sprite - sprite: Clothing/Mask/neckgaiterred.rsi - - type: Clothing - sprite: Clothing/Mask/neckgaiterred.rsi - - type: entity parent: ClothingMaskClownBase id: ClothingMaskSexyClown diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml b/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml index d1f6e083f40..ee1708caef6 100644 --- a/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml +++ b/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml @@ -47,9 +47,6 @@ collection: FootstepDuck params: variation: 0.07 - - type: Construction - graph: ClothingShoeSlippersDuck - node: shoes - type: entity parent: ClothingShoesBaseButcherable diff --git a/Resources/Prototypes/Entities/Mobs/Species/vox.yml b/Resources/Prototypes/Entities/Mobs/Species/vox.yml index a271e9d0846..5e40254e3a8 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/vox.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/vox.yml @@ -14,8 +14,6 @@ - type: HumanoidAppearance species: Vox #- type: VoxAccent # Not yet coded - - type: Inventory - speciesId: vox - type: Speech speechVerb: Vox speechSounds: Vox diff --git a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml index a8489866fc7..f6d57f53a50 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Syndicate_Gadgets/reinforcement_teleporter.yml @@ -7,7 +7,7 @@ - type: Sprite sprite: Objects/Devices/communication.rsi layers: - - state: radio + - state: old-radio - type: GhostRole name: ghost-role-information-syndicate-reinforcement-name description: ghost-role-information-syndicate-reinforcement-description diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml index edad2b40631..8c3aed0d069 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_misc.yml @@ -89,7 +89,6 @@ program: 125 - type: Item size: Small - storedRotation: -90 - type: entity parent: BaseHandheldInstrument @@ -119,7 +118,6 @@ - type: Item size: Small sprite: Objects/Fun/Instruments/gunpet.rsi - storedRotation: -90 - type: Tag tags: - Sidearm @@ -143,7 +141,6 @@ - type: Item sprite: Objects/Fun/Instruments/bike_horn.rsi size: Small - storedRotation: -90 - type: Clothing sprite: Objects/Fun/Instruments/bike_horn.rsi slots: [Belt] diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_percussion.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_percussion.yml index b09ea96f7b4..a255ab4a32c 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_percussion.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_percussion.yml @@ -98,8 +98,6 @@ - type: Tag tags: - KeyedInstrument - - type: Item - size: Small - type: entity parent: BaseHandheldInstrument diff --git a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_wind.yml b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_wind.yml index e99f825d483..3b89d1075be 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_wind.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/Instruments/instruments_wind.yml @@ -141,7 +141,7 @@ sprite: Objects/Fun/Instruments/panflute.rsi state: icon - type: Item - size: Small + size: Normal sprite: Objects/Fun/Instruments/panflute.rsi - type: Tag tags: @@ -160,9 +160,8 @@ sprite: Objects/Fun/Instruments/ocarina.rsi state: icon - type: Item - size: Small + size: Normal sprite: Objects/Fun/Instruments/ocarina.rsi - storedRotation: -90 - type: Tag tags: - WoodwindInstrument diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml index 67c6e1194b7..6697aa711e0 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml @@ -643,9 +643,6 @@ requiresSpecialDigestion: true useSound: path: /Audio/Items/Toys/mousesqueek.ogg - - type: Tag - tags: - - ToyRubberDuck - type: entity parent: BasePlushie diff --git a/Resources/Prototypes/Entities/Objects/Misc/authorbooks.yml b/Resources/Prototypes/Entities/Objects/Misc/authorbooks.yml index 70d984240ea..c3f5170001a 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/authorbooks.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/authorbooks.yml @@ -387,17 +387,3 @@ - state: book6 - type: Paper content: book-text-inspiration - -- type: entity - parent: BookBase - id: BookJanitorTale - name: the tales of a tired janitor - description: A clean looking book, smelling vaguely of soap and bleach. - components: - - type: Sprite - sprite: Objects/Misc/books.rsi - layers: - - state: book0 - - type: Paper - content: book-text-janitor - diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml index 9fde67afb44..bd789214f99 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml @@ -786,7 +786,7 @@ # Syringes - type: entity name: ephedrine syringe - parent: PrefilledSyringe + parent: BaseSyringe id: SyringeEphedrine components: - type: SolutionContainerManager @@ -799,7 +799,7 @@ - type: entity name: inaprovaline syringe - parent: PrefilledSyringe + parent: BaseSyringe id: SyringeInaprovaline components: - type: SolutionContainerManager @@ -812,7 +812,7 @@ - type: entity name: tranexamic acid syringe - parent: PrefilledSyringe + parent: BaseSyringe id: SyringeTranexamicAcid components: - type: SolutionContainerManager @@ -825,7 +825,7 @@ - type: entity name: bicaridine syringe - parent: PrefilledSyringe + parent: BaseSyringe id: SyringeBicaridine components: - type: SolutionContainerManager @@ -838,7 +838,7 @@ - type: entity name: dermaline syringe - parent: PrefilledSyringe + parent: BaseSyringe id: SyringeDermaline components: - type: SolutionContainerManager @@ -851,7 +851,7 @@ - type: entity name: hyronalin syringe - parent: PrefilledSyringe + parent: BaseSyringe id: SyringeHyronalin components: - type: SolutionContainerManager @@ -864,7 +864,7 @@ - type: entity name: ipecac syringe - parent: PrefilledSyringe + parent: BaseSyringe id: SyringeIpecac components: - type: SolutionContainerManager @@ -877,7 +877,7 @@ - type: entity name: ambuzol syringe - parent: PrefilledSyringe + parent: BaseSyringe id: SyringeAmbuzol components: - type: SolutionContainerManager @@ -890,7 +890,7 @@ - type: entity name: sigynate syringe - parent: PrefilledSyringe + parent: BaseSyringe id: SyringeSigynate components: - type: SolutionContainerManager @@ -903,7 +903,7 @@ - type: entity name: ethylredoxrazine syringe - parent: PrefilledSyringe + parent: BaseSyringe id: SyringeEthylredoxrazine components: - type: SolutionContainerManager @@ -916,7 +916,7 @@ - type: entity name: phalanximine syringe - parent: PrefilledSyringe + parent: BaseSyringe id: SyringePhalanximine components: - type: SolutionContainerManager @@ -929,7 +929,7 @@ - type: entity name: saline syringe - parent: PrefilledSyringe + parent: BaseSyringe id: SyringeSaline components: - type: SolutionContainerManager @@ -943,7 +943,7 @@ #this is where all the syringes are so i didn't know where to put it - type: entity name: romerol syringe - parent: PrefilledSyringe + parent: BaseSyringe id: SyringeRomerol components: - type: SolutionContainerManager @@ -956,7 +956,7 @@ - type: entity name: stimulants syringe - parent: PrefilledSyringe + parent: BaseSyringe id: SyringeStimulants components: - type: SolutionContainerManager diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml index ae4aaed7d21..ab65940fabc 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml @@ -364,13 +364,6 @@ - Syringe - Trash -- type: entity - parent: BaseSyringe - id: PrefilledSyringe - components: - - type: Injector - toggleState: Inject - - type: entity id: SyringeBluespace parent: BaseSyringe diff --git a/Resources/Prototypes/Entities/Objects/Specific/syndicate.yml b/Resources/Prototypes/Entities/Objects/Specific/syndicate.yml index 883f66816de..2b5762aaef2 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/syndicate.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/syndicate.yml @@ -57,10 +57,10 @@ - type: Sprite sprite: Objects/Devices/communication.rsi layers: - - state: radio + - state: old-radio - type: Item sprite: Objects/Devices/communication.rsi - heldPrefix: radio + heldPrefix: old-radio - type: UserInterface interfaces: - key: enum.StoreUiKey.Key diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml index d07a73b022e..51f121c64ff 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/access.yml @@ -6,8 +6,6 @@ components: - type: AccessReader access: [["Service"]] - - type: Wires - layoutId: AirlockService - type: entity parent: Airlock @@ -16,8 +14,6 @@ components: - type: AccessReader access: [["Lawyer"]] - - type: Wires - layoutId: AirlockService - type: entity parent: Airlock @@ -26,8 +22,6 @@ components: - type: AccessReader access: [["Theatre"]] - - type: Wires - layoutId: AirlockService - type: entity parent: AirlockScience # DeltaV - Chapel is in Epistemics @@ -36,8 +30,6 @@ components: - type: AccessReader access: [["Chapel"]] - - type: Wires - layoutId: AirlockService - type: entity parent: Airlock @@ -46,8 +38,6 @@ components: - type: AccessReader access: [["Janitor"]] - - type: Wires - layoutId: AirlockService - type: entity parent: Airlock @@ -56,8 +46,6 @@ components: - type: AccessReader access: [["Kitchen"]] - - type: Wires - layoutId: AirlockService - type: entity parent: Airlock @@ -66,8 +54,6 @@ components: - type: AccessReader access: [["Bar"]] - - type: Wires - layoutId: AirlockService - type: entity parent: Airlock @@ -76,8 +62,6 @@ components: - type: AccessReader access: [["Hydroponics"]] - - type: Wires - layoutId: AirlockService - type: entity parent: Airlock @@ -86,8 +70,6 @@ components: - type: AccessReader access: [["Captain"]] - - type: Wires - layoutId: AirlockCommand - type: entity parent: AirlockExternal @@ -104,8 +86,6 @@ components: - type: AccessReader access: [["Cargo"]] - - type: Wires - layoutId: AirlockCargo - type: entity parent: AirlockExternal @@ -114,8 +94,6 @@ components: - type: AccessReader access: [["Engineering"]] - - type: Wires - layoutId: AirlockEngineering - type: entity parent: AirlockExternal @@ -124,8 +102,6 @@ components: - type: AccessReader access: [["Atmospherics"]] - - type: Wires - layoutId: AirlockEngineering - type: entity parent: AirlockExternal @@ -150,8 +126,6 @@ components: - type: AccessReader access: [["Kitchen"]] - - type: Wires - layoutId: AirlockService - type: entity parent: AirlockFreezer @@ -160,8 +134,6 @@ components: - type: AccessReader access: [["Kitchen"], ["Hydroponics"]] - - type: Wires - layoutId: AirlockService - type: entity parent: AirlockFreezer @@ -170,8 +142,6 @@ components: - type: AccessReader access: [["Hydroponics"]] - - type: Wires - layoutId: AirlockService - type: entity parent: AirlockEngineering @@ -180,8 +150,6 @@ components: - type: AccessReader access: [["Engineering"]] - - type: Wires - layoutId: AirlockEngineering - type: entity parent: AirlockAtmospherics @@ -190,8 +158,6 @@ components: - type: AccessReader access: [["Atmospherics"]] - - type: Wires - layoutId: AirlockEngineering - type: entity parent: AirlockCargo @@ -200,8 +166,6 @@ components: - type: AccessReader access: [["Cargo"]] - - type: Wires - layoutId: AirlockCargo - type: entity parent: AirlockCargo @@ -210,8 +174,6 @@ components: - type: AccessReader access: [["Salvage"]] - - type: Wires - layoutId: AirlockCargo - type: entity parent: AirlockMining @@ -220,8 +182,6 @@ components: - type: AccessReader access: [["Salvage"]] - - type: Wires - layoutId: AirlockService - type: entity parent: AirlockMedical @@ -230,8 +190,6 @@ components: - type: AccessReader access: [["Medical"]] - - type: Wires - layoutId: AirlockMedical - type: entity parent: AirlockMedical @@ -248,8 +206,6 @@ components: - type: AccessReader access: [["Medical"]] - - type: Wires - layoutId: AirlockMedical - type: entity parent: AirlockChemistry @@ -258,8 +214,6 @@ components: - type: AccessReader access: [["Chemistry"]] - - type: Wires - layoutId: AirlockMedical - type: entity parent: AirlockScience @@ -268,8 +222,6 @@ components: - type: AccessReader access: [["Research"]] - - type: Wires - layoutId: AirlockScience - type: entity parent: AirlockScience @@ -278,8 +230,6 @@ components: - type: AccessReader access: [["Research"], ["Medical"]] - - type: Wires - layoutId: AirlockScience - type: entity parent: AirlockCentralCommand @@ -308,8 +258,6 @@ components: - type: AccessReader access: [["Captain"]] - - type: Wires - layoutId: AirlockCommand - type: entity parent: AirlockCommand @@ -318,8 +266,6 @@ components: - type: AccessReader access: [["ChiefMedicalOfficer"]] - - type: Wires - layoutId: AirlockCommand - type: entity parent: AirlockCommand @@ -328,8 +274,6 @@ components: - type: AccessReader access: [["ChiefEngineer"]] - - type: Wires - layoutId: AirlockCommand - type: entity parent: AirlockCommand @@ -338,8 +282,6 @@ components: - type: AccessReader access: [["HeadOfSecurity"]] - - type: Wires - layoutId: AirlockCommand - type: entity parent: AirlockCommand @@ -348,8 +290,6 @@ components: - type: AccessReader access: [["ResearchDirector"]] - - type: Wires - layoutId: AirlockCommand - type: entity parent: AirlockCommand @@ -358,8 +298,6 @@ components: - type: AccessReader access: [["HeadOfPersonnel"]] - - type: Wires - layoutId: AirlockCommand - type: entity parent: AirlockCommand @@ -368,8 +306,6 @@ components: - type: AccessReader access: [["Quartermaster"]] - - type: Wires - layoutId: AirlockCommand - type: entity parent: AirlockSecurity @@ -429,8 +365,6 @@ components: - type: AccessReader access: [["Security", "Command"]] - - type: Wires - layoutId: AirlockSecurity - type: entity parent: AirlockCommand @@ -439,8 +373,6 @@ components: - type: AccessReader access: [["External"]] - - type: Wires - layoutId: AirlockCommand # Glass Airlocks - type: entity @@ -450,8 +382,6 @@ components: - type: AccessReader access: [["Service"]] - - type: Wires - layoutId: AirlockService - type: entity parent: AirlockGlass @@ -460,8 +390,6 @@ components: - type: AccessReader access: [["Lawyer"]] - - type: Wires - layoutId: AirlockService - type: entity parent: AirlockGlass @@ -470,8 +398,6 @@ components: - type: AccessReader access: [["Theatre"]] - - type: Wires - layoutId: AirlockService - type: entity parent: AirlockGlass @@ -480,8 +406,6 @@ components: - type: AccessReader access: [["Bar"]] - - type: Wires - layoutId: AirlockService - type: entity parent: AirlockExternalGlass @@ -498,8 +422,6 @@ components: - type: AccessReader access: [["Cargo"]] - - type: Wires - layoutId: AirlockService - type: entity parent: AirlockExternalGlass @@ -524,8 +446,6 @@ components: - type: AccessReader access: [["Engineering"]] - - type: Wires - layoutId: AirlockEngineering - type: entity parent: AirlockExternalGlass @@ -534,8 +454,6 @@ components: - type: AccessReader access: [["Atmospherics"]] - - type: Wires - layoutId: AirlockEngineering - type: entity parent: AirlockGlass @@ -544,8 +462,6 @@ components: - type: AccessReader access: [["Kitchen"]] - - type: Wires - layoutId: AirlockService - type: entity parent: AirlockGlass @@ -554,8 +470,6 @@ components: - type: AccessReader access: [["Janitor"]] - - type: Wires - layoutId: AirlockService - type: entity parent: AirlockGlass @@ -564,8 +478,6 @@ components: - type: AccessReader access: [["Hydroponics"]] - - type: Wires - layoutId: AirlockService - type: entity parent: AirlockScienceGlass # DeltaV - Chapel is in Epistemics @@ -574,8 +486,6 @@ components: - type: AccessReader access: [["Chapel"]] - - type: Wires - layoutId: AirlockService - type: entity parent: AirlockEngineeringGlass @@ -584,8 +494,6 @@ components: - type: AccessReader access: [["Engineering"]] - - type: Wires - layoutId: AirlockEngineering - type: entity parent: AirlockAtmosphericsGlass @@ -594,8 +502,6 @@ components: - type: AccessReader access: [["Atmospherics"]] - - type: Wires - layoutId: AirlockEngineering - type: entity parent: AirlockCargoGlass @@ -604,8 +510,6 @@ components: - type: AccessReader access: [["Cargo"]] - - type: Wires - layoutId: AirlockCargo - type: entity parent: AirlockCargoGlass @@ -614,8 +518,6 @@ components: - type: AccessReader access: [["Salvage"]] - - type: Wires - layoutId: AirlockCargo - type: entity parent: AirlockMiningGlass @@ -624,8 +526,6 @@ components: - type: AccessReader access: [["Salvage"]] - - type: Wires - layoutId: AirlockCargo - type: entity parent: AirlockChemistryGlass @@ -634,8 +534,6 @@ components: - type: AccessReader access: [["Chemistry"]] - - type: Wires - layoutId: AirlockMedical - type: entity parent: AirlockMedicalGlass @@ -644,8 +542,6 @@ components: - type: AccessReader access: [["Medical"]] - - type: Wires - layoutId: AirlockMedical - type: entity parent: AirlockMedicalGlass @@ -662,8 +558,6 @@ components: - type: AccessReader access: [["Medical"]] - - type: Wires - layoutId: AirlockMedical - type: entity parent: AirlockScienceGlass @@ -672,8 +566,6 @@ components: - type: AccessReader access: [["Research"]] - - type: Wires - layoutId: AirlockScience - type: entity parent: AirlockScienceGlass @@ -682,8 +574,6 @@ components: - type: AccessReader access: [["Research"], ["Medical"]] - - type: Wires - layoutId: AirlockScience - type: entity parent: AirlockCentralCommandGlass @@ -702,8 +592,6 @@ components: - type: AccessReader access: [["Command"]] - - type: Wires - layoutId: AirlockCommand - type: entity parent: AirlockCommandGlass @@ -712,8 +600,6 @@ components: - type: AccessReader access: [["Captain"]] - - type: Wires - layoutId: AirlockCommand - type: entity parent: AirlockCommandGlass @@ -722,8 +608,6 @@ components: - type: AccessReader access: [["ChiefMedicalOfficer"]] - - type: Wires - layoutId: AirlockCommand - type: entity parent: AirlockCommandGlass @@ -732,8 +616,6 @@ components: - type: AccessReader access: [["ChiefEngineer"]] - - type: Wires - layoutId: AirlockCommand - type: entity parent: AirlockCommandGlass @@ -742,8 +624,6 @@ components: - type: AccessReader access: [["HeadOfSecurity"]] - - type: Wires - layoutId: AirlockCommand - type: entity parent: AirlockCommandGlass @@ -752,8 +632,6 @@ components: - type: AccessReader access: [["ResearchDirector"]] - - type: Wires - layoutId: AirlockCommand - type: entity parent: AirlockCommandGlass @@ -762,8 +640,6 @@ components: - type: AccessReader access: [["HeadOfPersonnel"]] - - type: Wires - layoutId: AirlockCommand - type: entity parent: AirlockCommandGlass @@ -772,8 +648,6 @@ components: - type: AccessReader access: [["Quartermaster"]] - - type: Wires - layoutId: AirlockCommand - type: entity parent: AirlockSecurityGlass @@ -782,8 +656,6 @@ components: - type: AccessReader access: [["Security"]] - - type: Wires - layoutId: AirlockCommand - type: entity parent: AirlockSecurityGlass @@ -792,9 +664,8 @@ components: - type: AccessReader access: [["Detective"]] - - type: Wires - layoutId: AirlockCommand +#Delta V: Removed Brig Access #- type: entity # parent: AirlockSecurityGlass # id: AirlockBrigGlassLocked @@ -802,8 +673,6 @@ # components: # - type: AccessReader # access: [["Brig"]] -# - type: Wires -# layoutId: AirlockCommand - type: entity parent: AirlockSecurityGlass @@ -812,8 +681,6 @@ components: - type: AccessReader access: [["Security"], ["Lawyer"]] - - type: Wires - layoutId: AirlockSecurity - type: entity parent: AirlockSecurityGlass @@ -822,8 +689,6 @@ components: - type: AccessReader access: [["Armory"]] - - type: Wires - layoutId: AirlockSecurity - type: entity parent: AirlockCommandGlassLocked @@ -873,8 +738,6 @@ components: - type: AccessReader access: [["Salvage"]] - - type: Wires - layoutId: AirlockCargo - type: entity parent: AirlockMaint @@ -883,8 +746,6 @@ components: - type: AccessReader access: [["Cargo"]] - - type: Wires - layoutId: AirlockCargo - type: entity parent: AirlockMaint @@ -893,8 +754,6 @@ components: - type: AccessReader access: [["Command"]] - - type: Wires - layoutId: AirlockCommand - type: entity parent: AirlockMaint @@ -911,8 +770,6 @@ components: - type: AccessReader access: [["Engineering"]] - - type: Wires - layoutId: AirlockEngineering - type: entity parent: AirlockMaint @@ -921,8 +778,6 @@ components: - type: AccessReader access: [["Atmospherics"]] - - type: Wires - layoutId: AirlockEngineering - type: entity parent: AirlockMaint @@ -931,8 +786,6 @@ components: - type: AccessReader access: [["Bar"]] - - type: Wires - layoutId: AirlockService - type: entity parent: AirlockMaint @@ -941,8 +794,6 @@ components: - type: AccessReader access: [["Chapel"]] - - type: Wires - layoutId: AirlockService - type: entity parent: AirlockMaint @@ -951,8 +802,6 @@ components: - type: AccessReader access: [["Hydroponics"]] - - type: Wires - layoutId: AirlockService - type: entity parent: AirlockMaint @@ -961,8 +810,6 @@ components: - type: AccessReader access: [["Janitor"]] - - type: Wires - layoutId: AirlockService - type: entity parent: AirlockMaint @@ -971,8 +818,6 @@ components: - type: AccessReader access: [["Lawyer"]] - - type: Wires - layoutId: AirlockService - type: entity parent: AirlockMaint @@ -981,8 +826,6 @@ components: - type: AccessReader access: [["Service"]] - - type: Wires - layoutId: AirlockService - type: entity parent: AirlockMaint @@ -991,8 +834,6 @@ components: - type: AccessReader access: [["Theatre"]] - - type: Wires - layoutId: AirlockService - type: entity parent: AirlockMaint @@ -1001,8 +842,6 @@ components: - type: AccessReader access: [["Kitchen"]] - - type: Wires - layoutId: AirlockService - type: entity parent: AirlockMaint @@ -1019,8 +858,6 @@ components: - type: AccessReader access: [["Medical"]] - - type: Wires - layoutId: AirlockMedical - type: entity parent: AirlockMaint @@ -1029,8 +866,6 @@ components: - type: AccessReader access: [["Chemistry"]] - - type: Wires - layoutId: AirlockMedical - type: entity parent: AirlockMaint @@ -1039,8 +874,6 @@ components: - type: AccessReader access: [["Research"]] - - type: Wires - layoutId: AirlockScience - type: entity parent: AirlockMaint @@ -1049,8 +882,6 @@ components: - type: AccessReader access: [["Research"], ["Medical"]] - - type: Wires - layoutId: AirlockScience - type: entity parent: AirlockMaint @@ -1059,8 +890,6 @@ components: - type: AccessReader access: [["Security"]] - - type: Wires - layoutId: AirlockSecurity - type: entity parent: AirlockMaint @@ -1069,8 +898,6 @@ components: - type: AccessReader access: [["Detective"]] - - type: Wires - layoutId: AirlockSecurity - type: entity parent: AirlockMaint @@ -1079,8 +906,6 @@ components: - type: AccessReader access: [["HeadOfPersonnel"]] - - type: Wires - layoutId: AirlockCommand - type: entity parent: AirlockMaint @@ -1089,8 +914,6 @@ components: - type: AccessReader access: [["Captain"]] - - type: Wires - layoutId: AirlockCommand - type: entity parent: AirlockMaint @@ -1099,8 +922,6 @@ components: - type: AccessReader access: [["ChiefEngineer"]] - - type: Wires - layoutId: AirlockCommand - type: entity parent: AirlockMaint @@ -1109,8 +930,6 @@ components: - type: AccessReader access: [["ChiefMedicalOfficer"]] - - type: Wires - layoutId: AirlockCommand - type: entity parent: AirlockMaint @@ -1119,8 +938,6 @@ components: - type: AccessReader access: [["HeadOfSecurity"]] - - type: Wires - layoutId: AirlockCommand - type: entity parent: AirlockMaint @@ -1129,8 +946,6 @@ components: - type: AccessReader access: [["ResearchDirector"]] - - type: Wires - layoutId: AirlockCommand - type: entity parent: AirlockMaint @@ -1139,8 +954,6 @@ components: - type: AccessReader access: [["Armory"]] - - type: Wires - layoutId: AirlockSecurity - type: entity parent: AirlockSyndicate diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml index 4bc43b5559e..5fca0819984 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml @@ -131,6 +131,9 @@ - board - type: PlacementReplacement key: walls + - type: IconSmooth + key: walls + mode: NoSprite - type: PaintableAirlock group: Standard department: Civilian diff --git a/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml b/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml index 644976eb9c4..4b6f72de934 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml @@ -52,6 +52,9 @@ behaviors: - !type:DoActsBehavior acts: ["Destruction"] + - type: IconSmooth + key: walls + mode: NoSprite - type: Occluder - type: BlockWeather diff --git a/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml b/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml index 7d3af93a64d..e38ba1fd667 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Shutter/shutters.yml @@ -73,6 +73,9 @@ behaviors: - !type:DoActsBehavior acts: ["Destruction"] + - type: IconSmooth + key: walls + mode: NoSprite - type: DoorSignalControl - type: DeviceNetwork deviceNetId: Wireless diff --git a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml index 0b3c291af25..518ff2f066e 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml @@ -4,7 +4,7 @@ abstract: true description: You sit in this. Either by will or force. placement: - mode: PlaceFree + mode: SnapgridCenter components: - type: Clickable - type: InteractionOutline @@ -65,8 +65,6 @@ id: ChairBase abstract: true parent: UnanchoredChairBase - placement: - mode: SnapgridCenter components: - type: Physics bodyType: Static @@ -89,8 +87,6 @@ id: StoolBase parent: OfficeChairBase abstract: true - placement: - mode: SnapgridCenter components: - type: Physics bodyType: Static @@ -120,7 +116,7 @@ - type: entity name: stool id: Stool - parent: UnanchoredChairBase + parent: ChairBase description: Apply butt. components: - type: Sprite @@ -245,7 +241,7 @@ - type: entity id: ChairMeat - parent: UnanchoredChairBase + parent: ChairBase name: meat chair description: Uncomfortably sweaty. components: @@ -289,7 +285,7 @@ name: web chair id: ChairWeb description: For true web developers. - parent: UnanchoredChairBase + parent: ChairBase components: - type: Sprite sprite: Structures/Web/chair.rsi @@ -353,6 +349,8 @@ parent: ChairFolding id: ChairFoldingSpawnFolded suffix: folded + placement: + mode: PlaceFree components: - type: Foldable folded: true diff --git a/Resources/Prototypes/Entities/Structures/Windows/window.yml b/Resources/Prototypes/Entities/Structures/Windows/window.yml index ee2ad6bc28f..fca0b975e98 100644 --- a/Resources/Prototypes/Entities/Structures/Windows/window.yml +++ b/Resources/Prototypes/Entities/Structures/Windows/window.yml @@ -69,7 +69,7 @@ acts: [ "Destruction" ] - type: Airtight - type: IconSmooth - key: walls + key: windows base: window - type: InteractionPopup interactSuccessString: comp-window-knock @@ -242,4 +242,4 @@ sprite: Structures/Windows/cracks_diagonal.rsi - type: Construction graph: WindowDiagonal - node: windowDiagonal + node: windowDiagonal \ No newline at end of file diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/books.yml b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/books.yml index 59e3690b6bc..28340ead40a 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/books.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/books.yml @@ -45,7 +45,6 @@ - BookMap - BookJourney - BookInspiration - - BookJanitorTale # Guidebook Books - BookSpaceEncyclopedia - BookTheBookOfControl diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/boxes.yml b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/boxes.yml index 181bacca45e..a75f31cf0f7 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/boxes.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/boxes.yml @@ -36,7 +36,6 @@ - BoxCandle - BoxCandleSmall - BoxDarts - - BoxCartridgeBB chance: 0.7 rarePrototypes: - BoxHugHealing @@ -50,7 +49,6 @@ - PresentRandom - BoxHolyWater - MysteryFigureBox - - BoxCleanerGrenades rareChance: 0.05 @@ -102,8 +100,6 @@ - BoxMagazineCaselessRifleRubber - BoxMagazineUniversalMagnumPractice - BoxMagazineUniversalMagnumRubber - - MagazineBoxSpecialRubber - - MagazineBoxSpecialPractice chance: 0.15 rarePrototypes: - BoxMagazinePistolCaselessRifle @@ -125,8 +121,4 @@ - BoxShellSoulbreaker - BoxMagazineUniversalMagnum - BoxSpeedLoaderLightRifle - - MagazineBoxSpecial - - MagazineBoxSpecialIncendiary - - MagazineBoxSpecialUranium - - MagazineBoxSpecialMindbreaker rareChance: 0.015 diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/devices.yml b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/devices.yml index abd4d86a1ef..c8efdbdc8cf 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/devices.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/devices.yml @@ -1,7 +1,7 @@ - type: entity parent: MarkerBase id: RandomBoards - name: random device & board spawner + name: random machine board spawner components: - type: Sprite layers: @@ -71,16 +71,6 @@ - HotplateMachineCircuitboard - ElectricGrillMachineCircuitboard - FatExtractorMachineCircuitboard - - SpaceHeaterMachineCircuitBoard - - StationMapCircuitboard - - Igniter - - IntercomElectronics - - DoorRemoteFirefight - - RadiationCollectorFlatpack - - ContainmentFieldGeneratorFlatpack - - SolarAssemblyFlatpack - - StationBeaconPart - - HandheldStationMap chance: 0.8 rarePrototypes: - TraversalDistorterMachineCircuitboard @@ -117,26 +107,4 @@ - ShockCollar - GlimmerMonitorCartridge - PotatoAIChip - - CargoTelepadMachineCircuitboard - - FlatpackerMachineCircuitboard - - OreProcessorIndustrialMachineCircuitboard - - TurboItemRechargerCircuitboard - - PowerCageRechargerCircuitboard - - HellfireHeaterMachineCircuitBoard - - HellfireFreezerMachineCircuitBoard - - BiofabricatorMachineCircuitboard - - SalvageExpeditionsComputerCircuitboard - - RadarConsoleCircuitboard - - RipleyCentralElectronics - - RipleyPeripheralsElectronics - - HamtrCentralElectronics - - HamtrPeripheralsElectronics - - HonkerCentralElectronics - - HonkerPeripheralsElectronics - - HonkerTargetingElectronics - - RemoteSignallerAdvanced - - SignalTimerElectronics - - LogProbeCartridge - - HoloprojectorField - - DeviceQuantumSpinInverter rareChance: 0.25 diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/hats.yml b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/hats.yml index f0dd4709034..b9def15132e 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/hats.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/hats.yml @@ -42,18 +42,6 @@ - ClothingHeadCage - ClothingHeadHelmetKendoMen - ClothingHeadBandMerc - - ClothingHeadHatCowboyWhite - - ClothingHeadHatCowboyGrey - - ClothingHeadHatCowboyBrown - - ClothingHeadHatBrownFlatcap - - ClothingHeadHatGreyFlatcap - - ClothingHeadHatPartyRed - - ClothingHeadHatPartyYellow - - ClothingHeadHatPartyGreen - - ClothingHeadHatPartyBlue - - ClothingHeadHatWatermelon - - WaterDropletHat - - ClothingHeadHatRedRacoon rareChance: 0.03 prototypes: - ClothingHeadHatAnimalCat @@ -110,13 +98,5 @@ - ClothingHeadHatFlatBrown - ClothingHeadTinfoil - ClothingHeadHatStrawHat - - ClothingHeadHatCowboyBountyHunter - - ClothingHeadHatCowboyRed - - ClothingHeadHatCowboyBlack - - ClothingHeadHatGladiator - - ClothingHeadHatMagician - - ClothingHeadHatHetmanHat - - ClothingHeadHatTacticalMaidHeadband - - ClothingHeadHatPirateTricord chance: 0.5 offset: 0.2 diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/machineparts.yml b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/machineparts.yml index 61a99faa2f1..7785e5aaa82 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/machineparts.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/machineparts.yml @@ -36,5 +36,5 @@ - MatterBinStockPart - CrateMaterialSteel - CrateMaterialGlass - chance: 0.50 + chance: 0.45 offset: 0.0 diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/seeds.yml b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/seeds.yml index 0c3370890c8..9f183dcefbd 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/seeds.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Markers/Spawners/Random/seeds.yml @@ -48,7 +48,6 @@ - PeaSeeds - PumpkinSeeds - CottonSeeds - - LilySeeds chance: 0.95 offset: 0.0 rarePrototypes: @@ -65,6 +64,4 @@ - LemoonSeeds - SteelcapSeeds - KoibeanSeeds - - SpacemansTrumpetSeeds - - LaughinPeaSeeds rareChance: 0.05 diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/clothing/ducky_slippers.yml b/Resources/Prototypes/Recipes/Construction/Graphs/clothing/ducky_slippers.yml deleted file mode 100644 index e017096fa90..00000000000 --- a/Resources/Prototypes/Recipes/Construction/Graphs/clothing/ducky_slippers.yml +++ /dev/null @@ -1,22 +0,0 @@ -- type: constructionGraph - id: ClothingShoeSlippersDuck - start: start - graph: - - node: start - edges: - - to: shoes - steps: - - tag: ToyRubberDuck - name: a rubber ducky - icon: - sprite: Objects/Fun/ducky.rsi - state: icon - doAfter: 1 - - tag: ToyRubberDuck - name: a rubber ducky - icon: - sprite: Objects/Fun/ducky.rsi - state: icon - doAfter: 1 - - node: shoes - entity: ClothingShoeSlippersDuck diff --git a/Resources/Prototypes/Recipes/Construction/clothing.yml b/Resources/Prototypes/Recipes/Construction/clothing.yml index f1eb270af73..4fe2c474bb4 100644 --- a/Resources/Prototypes/Recipes/Construction/clothing.yml +++ b/Resources/Prototypes/Recipes/Construction/clothing.yml @@ -85,14 +85,3 @@ description: Two huds joined by arms icon: { sprite: Clothing/Eyes/Hud/medsec.rsi, state: icon } objectType: Item - -- type: construction - name: ducky slippers - id: ClothingShoeSlippersDuck - graph: ClothingShoeSlippersDuck - startNode: start - targetNode: shoes - category: construction-category-clothing - description: Comfy, yet haunted by the ghosts of ducks you fed bread to as a child. - icon: { sprite: Clothing/Shoes/Misc/duck-slippers.rsi, state: icon } - objectType: Item diff --git a/Resources/Prototypes/Recipes/Reactions/drinks.yml b/Resources/Prototypes/Recipes/Reactions/drinks.yml index 7608369b2ce..e5afdbd6def 100644 --- a/Resources/Prototypes/Recipes/Reactions/drinks.yml +++ b/Resources/Prototypes/Recipes/Reactions/drinks.yml @@ -454,11 +454,11 @@ id: IrishCoffee reactants: Coffee: - amount: 1 + amount: 2 IrishCream: - amount: 1 + amount: 2 products: - IrishCoffee: 2 + IrishCoffee: 4 - type: reaction id: IrishCream diff --git a/Resources/Prototypes/Traits/disabilities.yml b/Resources/Prototypes/Traits/disabilities.yml index 2f1a7f92d26..064b34adbaf 100644 --- a/Resources/Prototypes/Traits/disabilities.yml +++ b/Resources/Prototypes/Traits/disabilities.yml @@ -60,10 +60,3 @@ description: trait-frontal-lisp-desc components: - type: FrontalLisp - -- type: trait - id: Snoring - name: trait-snoring-name - description: trait-snoring-desc - components: - - type: Snoring diff --git a/Resources/Prototypes/Wires/layouts.yml b/Resources/Prototypes/Wires/layouts.yml index b30e68545df..338bf188ba0 100644 --- a/Resources/Prototypes/Wires/layouts.yml +++ b/Resources/Prototypes/Wires/layouts.yml @@ -15,26 +15,6 @@ - type: wireLayout parent: Airlock - id: AirlockService - -- type: wireLayout - parent: Airlock - id: AirlockCargo - -- type: wireLayout - parent: Airlock - id: AirlockEngineering - -- type: wireLayout - parent: Airlock - id: AirlockMedical - -- type: wireLayout - parent: Airlock - id: AirlockScience - -- type: wireLayout - parent: HighSec id: AirlockCommand - type: wireLayout diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index c6a0ab3f8fd..2694cbeaf39 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -1190,9 +1190,6 @@ - type: Tag id: Torch -- type: Tag - id: ToyRubberDuck - - type: Tag id: ToySidearm diff --git a/Resources/ServerInfo/Guidebook/Engineering/TEG.xml b/Resources/ServerInfo/Guidebook/Engineering/TEG.xml index 9e8697a9e13..a2a04e03ef0 100644 --- a/Resources/ServerInfo/Guidebook/Engineering/TEG.xml +++ b/Resources/ServerInfo/Guidebook/Engineering/TEG.xml @@ -1,18 +1,18 @@ - + # Thermo-electric Engine (TEG) - The TEG generates power by exchanging heat between hot and cold gases. On the station, hot gas is usually created by burning plasma, and an array of heat-exchanging pipes in space radiates away heat to cool down circulated gases. + The TEG generates power by exchanging heat between hot and cold gases. On station, hot gas is usually created by burning plasma, and an array of heat-exchanging pipes in space radiates away heat to make a cold side. - The TEG relies heavily on atmospherics piping. The only truly special component about it is the generator core and circulators; the rest is all off-the-shelf atmospherics equipment. Note that while the exact layout may vary significantly depending on station, the general components and setup are usually the same. + The TEG relies heavily on atmospherics piping. The only truly special component about it is the generator core, the rest is all off-the-shelf atmospherics equipment. Note that while the exact layout may vary significantly depending on station, the general components and setup are usually the same. ## Generator - The main generator itself is a machine made up of 3 major parts: the central generator and two "circulators", in this arrangement: + The main generator itself is a machine made up of multiple parts: the core generator and two "circulators", in this arrangement: - - - + + + The circulators take in either a hot or cold gas, and pass it through the machine to exchange heat. The gas then gets output on the other end of the circulator. The generator produces the actual power and outputs it over an HV wire. @@ -21,172 +21,19 @@ There is no preference for which side must be hot or cold, there need only be a difference in temperature between them. The gases in the two "loops" are never mixed, only energy is exchanged between them. The hot side will cool down, the cold side will heat up. - ## The Pipes - - There are 2 major pipenets to worry about here: The Hot Loop (where gas will be burnt for heat), and The Cold Loop (where circulated, heated waste gas will either be removed into space or cooled back down). Make sure that [bold]both pipenets do NOT mix[/bold], as only heat should be transferred between the two through the TEG. - - # The Hot Loop - - As I'm sure a wise person once said: the best way to make something hot is to light it on fire. Well, depending on context, that may not be very wise, but luckily your engineering department has just what's needed to do it wisely after all. - - As stated above, there are many different layouts one can follow to heat up (or cool down) gases; this part of the guide will cover 2 common methods one will often see for the hot loop when the TEG is setup: The Pipe Burn, and the Burn chamber. - - Side note: Plasma fires burn relatively cool compared to, for example, Tritium fires. It may be viable to extract Tritium from an extraction setup (using a 97/3 ratio of O2/Plasma) and react it with Oxygen to get truly hellish temperatures for power. Although, this is just a recommendation; I'm not ya mum. - - ## The Pipe Burn - - Also known as the naive method, this is generally discouraged when working for efficiency. However, if all you need is a smidge of power to run the station, and you don't feel like setting up the burn chamber, this method will do. - - TODO: Remove this section when atmos pipes are updated to have pressure/temperature limits in a future atmos refactor. - - Most (if not all) pipe burns follow this general layout: - - Gas input -> High-pressure pump -> Pipe segment (with heater) -> Low-pressure pump -> Circulator - - - - - - - - - - - - - The Gas input is pretty self-explanatory; this is where you will input the O2-Plasma mix to be burnt. A 2:1 (67/33) ratio of Oxygen to Plasma is recommended for the hottest burn. - - The High-pressure pump serves 2 purposes; first, it prevents the burn from backwashing into the supply pipe, which would be.. bad, for many reasons. Second, it maintains a positive pressure in the following pipe segment, which is important to allow the burn to continue, especially since hot gases expand. - - The Pipe segment is where the burn actually occurs; to start it off, one can use a heater to increase the temperature up to the ignition temperature of Plasma. Afterwards, the reaction should be self-sustaining, so long as the Pressure and Moles supplied remains high enough. Be warned; if you wish to remove the heater, it will carry some of this superheated gas with it, transferring it to the next pipenet you connect it to. Best to space the gas through a space vent, if you must. - - The Low-pressure pump (whose pressure should be [italics]slightly lower[/italics] than the input pump) prevents [italics]all[/italics] the gas from passing through the circulator, which could result in the loss of the Moles required to sustain a burn. - - The Circulator is where this generated heat will flow to the cold loop; afterwards, feel free to space the waste gases. - - Note: Pressure pumps are used here as, while they pump on pressure (not flow-rate, which is comparatively faster), they are a bit easier to control when it comes to the limited Plasma supply on-station. However, the steps shown can be followed with volumetric pumps too. - - ## The Burn Chamber - - The burn chamber is the preferred method for heating up gases, and it is commonly used for other purposes too. (see: Tritium production) - - Most (if not all) stations have the burn chamber separated from the main atmospherics block by a 1-wide spaced grid, presumably to prevent conduction. The chambers consist of 3(+1) important parts: - - The Air Injector/Passive Vent - - The Space Vent - - The Radiator Loop - - Most normal burn chambers don't come with Heat-Exchangers; instead, they have air scrubbers (and optionally, an air alarm) to help filter for Tritium, which is a highly reactive, hot-burning gas that can also be used to heat the TEG efficiently. - However, this is a slightly more advanced setup than just burning plasma, as it needs 2 burn chambers instead of 1 (one for tritium production, one for burning said tritium), so remove the scrubbers and retrofit the burn chamber with a parallel array of heat-exchangers instead. - - The air injector (or Passive Vent) injects air (or allows air to flow) into the burn chamber. Either should be supplemented with a pump before it, to keep pressures high. - There is a notable difference between the passive vent and the air injector; the air injector can only keep injecting air up to 9MPa, which can be reached very easily with a good burn. Ideally, switch out the air injector for a passive vent connected to a volume pump. - - The space vent (designated as a blast door to space on one side of the burn chamber) allows waste gases to be expelled and destroyed. Open this to keep the pressure under control. - - The radiator loop collects heat from the burnt gases and brings it to the TEG. To maximize efficiency, hook up the heat-exchangers [italics]in parallel to each other[/italics], with a pressure pump at max pressure after the array and a volumetric pump before the array. - The pressure of the volumetric pump should be set to ( 200 / number of heat-exchangers ) L/s. For example, having 2 heat-exchangers would mean you should set the pressure to 100 L/s. - Finally, fill the whole loop with (ideally) a high heat capacity gas, like Frezon or Plasma. (Yes, Frezon =/= Cold. Frezon has one of the highest heat capacities in the game; so long as it isn't reacting with Nitrogen, it can actually be heated and can store heat really well!) - - # The Cold Loop - - As with the Hot Loop, the Cold Loop must also be setup in order to operate the TEG. However, the Cold Loop is usually a lot more low-tech than the Hot Loop; in reality, the Cold Loop only has to be "relatively" cooler -- hey, room temperature is technically cooler than the surface of the sun, right? - - There are 3 main methods you will see used for the Cold Loop: The Water Cooler (see: Liltenhead's video on the TEG), the Coolant Array and the Freezer Loop. - - ## The Water Cooler + ## Burn Chamber - An equally naive method as the Pipe Burn, this simply involves taking some useless gas (in this case, Water Vapour) and flowing it through the TEG and into space. It's dirt-cheap and simple, at the cost of efficiency and permanant loss of gas. + As I'm sure a wise person once said: the best way to make something hot is to light it on fire. Well, depending on context that may not be very wise, but luckily your engineering department has just what's needed to do it wisely after all. - Setting this up is so simple, even Hamlet could manage it. Just take an output of a gas (here, Water Vapour), send it through the Cold side of the TEG, and then vent it into space. - - - - - - - - - - - TODO: Remove this section when gas miners are removed in a future atmos refactor. + TODO: somebody fill this out once we settle on a general mapped layout for burn chambers. ## Coolant Array - This is the default method for the Cold Loop you will see on a variety of stations. Being of moderate complexity and having no losses of any resource, this [italics]should[/italics] be the main method of cooling down the TEG. However, every station at the moment somehow has their heat exchangers hooked up wrong, reducing efficiency greatly. (Thanks a bunch, NT!) + A whole bunch of heat-exchanger piping in space. There's not much to say here: gas goes through and cools down. - To use heat-exchangers properly, they must be setup in [italics]parallel[/italics], not in series (like what you see on most stations). A gas pump at max pressure should be placed after, and a volumetric pump before the heat-exchangers. - The flow-rate of the volumetric pump should be set to ( 200 / number of heat-exchangers ) L/s. - - Simply speaking, the Coolant Array consists of 3 major parts: An input connector port, a few pumps and the heat-exchanger array out in space. It can be setup like so: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Connector Port: Use this to input a gas with high heat capacity; most of the time, Plasma or Frezon is used to do so, as they both have very high specific heat capacities (although most any gas will do). (Yes, Plasma =/= Hot. You can cool it down, and it acts as a really good heat exchange medium.) - - Input/Output Pumps: Used to make sure gas keeps flowing through both the Circulator and the Heat-Exchanger array. As the gas cools down and heats up (and as it flows through the Exchanger), pressure must be applied for it to keep flowing. - - Heat-Exchanger: Basically, just a bunch of heat-exchanger pipes in space. Not much to say, besides the fact that it cools down the gas inside it. Make sure the heat-exchangers are placed on lattice, not plating! Otherwise, the heat-exchange efficiency will be greatly reduced, as the heat-exchangers aren't directly exposed to space below them. - - ## The Freezer Loop + ## The Pipes - Most of the time, you will see this method being used in efficient TEG setups. It's basically just the Coolant array, but replacing the Heat-Exchangers with a freezer. Even though the freezer does use power, it is only a small fraction of what the TEG can generate, and it's better than the default Coolant array at the moment, so go fish. + TODO: somebody fill this out once we settle on a general mapped layout for burn chambers. - Just follow the steps for the Coolant array, but use a freezer in place of the Heat-Exchangers. As so: - - - - - - - - - - - - - - - - - - - - Once again, use Plasma or Frezon in the loop for max efficiency (although most any gas will do). diff --git a/Resources/ServerInfo/Guidebook/Science/ArtifactReports.xml b/Resources/ServerInfo/Guidebook/Science/ArtifactReports.xml index a377c980e55..b7ba3d4c8b4 100644 --- a/Resources/ServerInfo/Guidebook/Science/ArtifactReports.xml +++ b/Resources/ServerInfo/Guidebook/Science/ArtifactReports.xml @@ -14,7 +14,7 @@ A large portion of Xenoarchaeology gameplay revolves around the interpretation o - [color=#a4885c]Edges:[/color] the amount of nodes that are connected to the current node. Using this, you can calculate the total number of nodes as well as organize a map of their connections. -- [color=#a4885c]Current value:[/color] the amount of research points an artifact is currently worth. Extracting will set this to zero and traversing new nodes will increase it. +- [color=#a4885c]Unextracted value:[/color] the amount of research points an artifact will give when extracted. Extracting sets this to zero and traversing new nodes increases it. Reports are a helpful tool in manipulating an artifact, especially in the later stages where you are traversing nodes that have already been activated. diff --git a/Resources/Textures/Clothing/Ears/Headsets/base.rsi/icon.png b/Resources/Textures/Clothing/Ears/Headsets/base.rsi/icon.png index 76cf88f02e7da24dc4e0c870d0f97c23a378dec1..44e093f26ad03f1554ba2c82804912058ee2d74b 100644 GIT binary patch delta 282 zcmV+#0pB!B!#L_t(|ob8l7io-AvM!#%2gIozT7f4vL2^iGn7Os32pTHN$ zjRs88smL~)PL~50j)JYH!EnZ0RX8G(+OB>A*Do;B#=_VT8nen^%i(~kC%&u|5~rF=kMbYKc~}O zyi)4AmTlV(@=@JEL_W`R|7ib}QvO!r8G>dY6#{i#|M~W#RDR2&3PUR&RH9Gvm)kY^ gz(pdF$W&Yae-qKP6n_}ZAjqfBaOluhu$-iX zB#0u*5md3W+k0tX%N*+gApVWeiB60pf$iVHOjcE=YC&)ZqW1YzK7&+)>Y8 zJSRCpk`)3lN8k`A36Nb7QIhqj;s9!aQ3s4VVAKHv?f?L_T728mW+AZv00001voPmKM zQAYJLkm4x`@(cct01QI+&z%E`a~60+7BevL9R^{>JPl&6RcZ9f@RAy%7ocSy3GfOt5R29e05fPQr*4AtF3A>w_tgCBm zVQ!Zc5b0y-E3cr&z`)R{tneO436=!;1^-6_4618qCIKZm3p^r=85sDEfH31!Z9ZwB zV5_H#V~B~+I)TxIG^i9L3_v-{Zr2-X>E~x;dy!b zgqnWNhKMhkb3O}Z=qTO!W6Lbj^mVuId!-j9o4&qbUo$u1%5Uzu|7_&yI^B5dflgxZ MboFyt=akR{06h$KCjbBd diff --git a/Resources/Textures/Clothing/Ears/Headsets/base_syndicate.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/base_syndicate.rsi/meta.json index 687531cde51..774e33fbe70 100644 --- a/Resources/Textures/Clothing/Ears/Headsets/base_syndicate.rsi/meta.json +++ b/Resources/Textures/Clothing/Ears/Headsets/base_syndicate.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Edited by Flareguy for Space Station 14. Originally from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428 // Icon edited by FoxxoTrystan and Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi", + "copyright": "Edited by Flareguy for Space Station 14. Originally from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Ears/Headsets/cargo.rsi/icon.png b/Resources/Textures/Clothing/Ears/Headsets/cargo.rsi/icon.png index fa790f7e9908db0be117835f39c7dcf37e749983..671111e4bc651c86eee58143c75981fba5a05cea 100644 GIT binary patch delta 300 zcmV+{0n`4H1I7Z7BYy!6Nkl}HVG^<>yGDV{+>LgGJN8~_7p9lIII%E}nL zql+lDmpli2`}U1t&6+g~-@bht7zfY-3@r!bx(YH}xpIXe*MC)zfq{X6fsdD$Vh6Ag ztMKIELktokTnt=XKN%!MxEM|zKE&|p^Jj`3Ky*G5)%LGqjdh`%Kzfx;{TByK@1=%4e;^uGR)Zf8gJaw#OKHW ymk&wxIaM7&i6!M^2N%r~+$b0YqhJ)!3jhFIX;GoKhVf|t0000VQ!P zj5=V{0VF#>UeMq_GXLTG3ygGg0Lb#b0%17+)TuWND~=ibr^FFNI{;?6yom{t=oz2` z-ZD@ENREP@Wu{=dBPfYztOm+*Kwf|qgeqrF|=3xNQ#DomViSR4S zD+U!M6^7?8UvV%zd~gfJa!GLshLntKFu$U#kSO!W$^~D)ePsYy1_bcX0P#WMFpG&z z7bH6XYVdzhwu3qX?x^Q4o|Bv)$qE6OBXEe51jsIkD9L(MaR9Zzr~^hFFzSE-cK`sL Wa(=4DC}uVQ00009;h!d-uLy-@Cg4ks?Ly9I;c5Qb^OFim@-`q9d}S5*`y z3IYJ2)9s>BDSy~=C)bY<1;JM(JS*TPtNc#$%e!an9~`4mDZnsIUwKvru*_c`u59yC zsf5$>TL3_#QUD>uvlXELtQJh^7?e^}t5r}+1LX(>005uwZwq5nI^G-rN%5f|LIboq zBajr2VlDwq(@@MM0!rFZ6mn&tvErAW4$F zll%St()f%lv$LaJsOcnHoe`cseggj!JRzJQ%R~ra_ZNrE&(U+rH>D&=Y)=%IewlUk rejA2sl|lpjHFIjM<&G37(x&wb&nUgko0fn-00000NkvXXu0mjfMLO2r delta 336 zcmZo+dB-$CvYwfNfx%@-*D)Z)SRCZ;#IWw1%u67LCEd~2k%3`jKlh(RRv=$Dz$e62 zSJzlxLCwP4&dW1UL{v&%(BRCf^0kf5p1!&Dv4$ZbAuCp_C@O21Gk+ye$IjaiL5A~} z1o;L3M*$31?#x&Sl;SM#n5ZsT&#>Op#WBRf|Ln!re1{b{SQ7#+Y`t6a|M=aDH$~sP zeO@+6&9r8t$cj5p_!$MiZ#R_-;7AnUyYj1|mEBN?{}5B3pm+>(l3?K>hSZV;U2bb` zG^jE7RSLu}c*#7=f-Q1}>ilLMewR-rjL()beqYX~^O^U>d<(|lV?6=x{LA(=s=2MW zc3!K0x=MVf0wHk3|Jf)u#;oa z)`$qci>2@3W9)lea}OX~VO}8k0NF}dF@=a@rD&mS-0Z?}`MN+R^Gz}tAQFlEcRD_s ziHJqFi*mn*wbm=PHblfK2df;6jbb9=5a%XUllNB^0KoYeOMeB}?><6ER1&zt`50Pj zY*diq{RNzJ=wJfp9F*4W3pBys5;#r`hNAcJBBmHUY>y_MqUj6jpYRmbajoD;+W(W)aJ}z2~;aRyJ9Pl;w=gC3;vG; z7;IlCwE-nK3p^r=85sDEFfi2f9bufR%_j{Mt?_hm46*Qkdm&n=L4kucU`LwN&i`NA z`lU9kG`sLO;Ns&G9#56+UlcZ&Bv&5I6EHU54i;_~m=-RuxXCj@;QEmTZ;r|;^zS-u zJ8@CdOI~iXG_m?O4PCx*2Y&`SwN)})4BYVEU%}aBLhgLN5Jp@1&~Em%-7jU%&5-}x cJS&K=d96{up_7o5U@^g~Ey6jJ3u$f0C8@gPw}eaXzVDas zyGwwQl9GQ$$-1Cnnj8Qssv6yU9*r``$tBRVEFK?!u2!h1YJYUiBO<+^VVYbd8&4)m zl8|_IPyvxBDM8b+c)S`}BvL1K9EY>z5_8|*>N~LAdm#ZJlfY5hg#KWl99OG9lIxm= zj^jivnEO70FhmfB(MFXa_wH?47S}Zm05F}+P=9biZ5seU?q8v6np7oHE0BaJzeo-M ztu9B`2Haj9L4O!Z#mOzOo18zkKqLdz@))?qet*gz&Em4**bG-C=z*1OTx9 zIb7FGjh{NfFpQ|ip6BhI-!M)7b~=s5XN$|s|AbVDxIf4~2qC=IR=CX3iz97m7zRJl w^}TNO>_%)r10RLFOPajG_-G*HI|PZ!4!3;(khU-LB^ zaIhw1I9iv!{=NUL-)^gg_v-T04L3gYc3n_2*`CGa&b@0D4vH;)76GsRipm}FxWmb9 z;TBWC+u?eIlX=R;MlGq0Nz7IZ9}LPKahLpP(CRy=amHv~vkJe_FWj7tCj diff --git a/Resources/Textures/Clothing/Ears/Headsets/centcom.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/centcom.rsi/meta.json index 84f02032366..1e84b43d94d 100644 --- a/Resources/Textures/Clothing/Ears/Headsets/centcom.rsi/meta.json +++ b/Resources/Textures/Clothing/Ears/Headsets/centcom.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428 // Icon edited by FoxxoTrystan and Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Ears/Headsets/command.rsi/icon.png b/Resources/Textures/Clothing/Ears/Headsets/command.rsi/icon.png index 9023333660826fa40f4c0b68a142dc4e12b17aa6..30e1697c3ce082b64e96a81d29505423503e98e7 100644 GIT binary patch delta 299 zcmV+`0o4AC1H}T6BYy!5Nkl1Ka)7S2 zH-koDA%m{9HvK=4 z)-4qM;^N})Z29u#OX`;q5)u;sJwlRj=6`W<@&Cw2Ke~+7|tKwiZ||Q;&Wtx x%ZH@;oT`qX#3XXEgNx<~ZWN4yQ7{VV1pxH%RrLglhgbjr002ovPDHLkV1gqYlHC9R delta 370 zcmV-&0ge8}0*nKYBYyx1a7bBm000ie000ie0hKEb8vpVQ!P zj5=V{0VF#>UeMq_GXLTG3ygGg0LXHWoLo5n_St(3496M%Q{o7s9RRaj#zGNA{O)lE ziU7$`VAh`xrcV`4go}xYO8tNH`WacFK#~K3j!$4PsZeF8kAJ_-@cYDlNE85pq=Y1h zBFhm}$pze8++arl9YC^Pk{qzkvVdW8`~(JHO&}Xd{LZ~Q4CDfm8~_S()uaLx%RzwL z_$SE$;H(DBatsXK4AcZ9g#f}4Xkt(xub}q->(?&~+}u12AexwvAvqC#WqHM*qNKv` z{N)RVhYxO{SZgjRF2RtJkqzcolob+X9$C5I>$k5AAj^ON9vUD%NE~J{vFUN5CER{Ka#U6C_z70CNNmagqSp1ra4#k17tJ78rHFr~^hFFyIaV01k3`k;tpE Qi~s-t07*qoM6N<$f>a=vmjD0& diff --git a/Resources/Textures/Clothing/Ears/Headsets/command.rsi/icon_alt.png b/Resources/Textures/Clothing/Ears/Headsets/command.rsi/icon_alt.png index 51a87cef7994958a1e61f7f23301d9c5201d84ef..a01e0c6c13e9e939597ff9f756a3fcaa3073a6d2 100644 GIT binary patch delta 479 zcmV<50U-Xs1o#7xBYy$ENklf+?$q%IC31;IZ-S{%A`?ocTXZLyB6ElLweD-O@0T&UWbOQX2tTaLTj-TQLy z-2ovXA^(ixcR|!J2mq#3)g8MpmwoRumO#ujX|UgWd&88fx_|9BBGL<@hCw1&rCL=+ z35jpNDj))l3J^0*8axd@5}p&2i3B;_E}q-%Pk9GE=Uzwv@Fg(eHQ_FwSEeJ8Z^3m< zLo$(YQ}Enw!?JByw(S%li`D=Wk~ zr~UIQN?%-4JbxZ15D~Ij;+#vJf@cbTqE@eC`|ub5P`Erru~N-2x5{ z`mGNF2~?_8#j=JZ}D6A|=ODoFO zj<#=bY$d~)RrBH(mf4*-d_QmA+j(O~kJSh00~iJf2B)huet(q9$lhI<{uO}C6^p{& zYh%?YgfxKOoTOG%v?D`1;B*eN@gaB5Qed~);2rlF+65^9G8y%ZvG>>47j!~~i;%XS zqF2>V_HaPiT@VKF4ozuQUulf|-2w#`*gXT#)rAy<5CEA+Qd`(ti`M5T`ba8?-03Zj zceVkK${^e$E`KSAmH^!RFL^=}m`AJuLPo+Vphzj#`KJQ=rgxenfOaGVKt_kjIA%iO zhIyI`BZ2F)o9+VWwf=R2!1g3oHeA2fs4lt=K;{>*OJLB2PDmPnMcyHEVF1c;IGSKN z*Nf)#`KKdUwmY^2$iAJMkcM^$E!H92E;nYESL^1P^nVdl^D|JkqAMpMhsdP0_Uo{+ zf1UmJ`gKjEBBUi;1Kh;x@Ue>s9ly=Co7y$+kRs`jE<)CPDnBQlz5(&O!ra0V0)9Ud zn{l*~G(f5NNM=>40}jEjXY@^Q2m8BF6tQ|R)Q+1$kjOk=$g_3PdN6z+;1CpP9Y9M@ qZC+SyT_MY5BJB!5C)5Y%Ilwm%yYQoVR*XFW0000)Yu~@d^1_r`e2H1rglmGw#07*qoM6N<$ Ef-{zO?EnA( delta 378 zcmV-=0fqjW0+j=hB!3BTNLh0L01m_e01m_fl`9S#0003;Nkl0)rX8-T4EK0tNS%Wi?Qio5Ap$ftrA%5P&%XT@1#SS5W)^_3IY~Zf+h15KTBo4Ef z*mOa%1E2=~2W2~`BjApD{^B{w36iW3fH?w(I7xu)f{2o=M->N93yeBo)B&Ro7;pyw Y09Yn{%O~)p!vFvP07*qoM6N<$f~V4+{Qv*} diff --git a/Resources/Textures/Clothing/Ears/Headsets/engineering.rsi/icon_alt.png b/Resources/Textures/Clothing/Ears/Headsets/engineering.rsi/icon_alt.png index 98259eb0700d261983bb1064ac563b845e8e7af4..f1559927e0c2fbfda565987acf5bcf246f14b74e 100644 GIT binary patch delta 475 zcmV<10VMwJ0_p>h8Gi-<0047(dh`GQ010qNS#tmY4#WTe4#WYKD-Ig~00EpyL_t(o zh3%9vPr^VH$N$JsC}~Yd%pD(~Obr7}h;it^#J4aZeijEE^&>Da>f*rQ%w#%&k;w?y zMH-47$aBD6K*9DX=+ghv^zPmLfA`+I0}>@l^v_DkE+`rX0e?V7QN-AzZAU_fwmIg1Man1V)<-N~TH6*^q$<4Xj%hd9xYDjivp>vrO+($XL%=*y%d=zY`yZK-F-C{FzV>9n)B8S|Y|K(@fbV9@+WV86C{dz)>JuxN!21^- R>ka?_002ovPDHLkV1ks9*^~eP delta 336 zcmaFG{ElgYWIZzj1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU$hQfKQ04 zuCB4Xf|`Z7otI~zh^UmjpuyYw36FQXdHUvVFVda#@cW7tD~ie*=FDFS)M01)Zx@i_ zFA4Gs{*M9}uH2ci5Gci2;4x8Mu%2PPr;B5Vh5y-$ulWuuaIhu>T-bWI=Kt}#7jKHb zdHcLDyz<1?WMJv0Z5dR^jK0)yq<|M(wLky`U3%cCa z+-Oi^@T(MvU+|K7mIYhn4AuF~I{Yr5N*JFlW&FOJPvQbcRxoK#ty?AOaM13?wep1N_nU+6 YRo~TDe>w4bJkSpep00i_>zopr0Oin(B>(^b diff --git a/Resources/Textures/Clothing/Ears/Headsets/engineering.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/engineering.rsi/meta.json index 84f02032366..1e84b43d94d 100644 --- a/Resources/Textures/Clothing/Ears/Headsets/engineering.rsi/meta.json +++ b/Resources/Textures/Clothing/Ears/Headsets/engineering.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428 // Icon edited by FoxxoTrystan and Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Ears/Headsets/freelance.rsi/icon.png b/Resources/Textures/Clothing/Ears/Headsets/freelance.rsi/icon.png index fa790f7e9908db0be117835f39c7dcf37e749983..0ff3f2c989362d67e30f45835f939895d8ce6e62 100644 GIT binary patch delta 777 zcmV+k1NQuq1D^(vBYy#IX+uL$X=7sm04R}lk-JO7P!z_0ZG99UDCi*K&_TsPK@`MM zD(F%j+6q=(l9;qYTSJl};wrc}2o9o)ufhL7SHV?55EMbg&E3}`63=Z4710}R&X4cj z?{M-3!il_5aBIe(Q1qPSWIQ&TnTypw(?BD2v=Y?}*PcpEq<{H$ecTdK^=3fz`v2aa zt8vkE4G2YrM-1EXgk>5ME1s=*Q@Gv8X^X-K!u^g6D151OJ>VzB*?`{^JL%*&gjLU2 z_6O@f*vL5r;XdK+LcU~F=22hLWEN*qQafdL;gV#MI5BieERn}!Kx$Dk``b5I_D!=a z9z)(Xt2pAwl7AC#zo;eYYD%?4H|5E*s&fCGr)v!l1>KwCQ2XfnuRTz|4PRTn|9R;9 zUq=vmfb(M2zbrY8zKgz9)w=hgWgSj0s+zt7XB*IQZ)=WLmLjslmIW^-(42v`YiO7c zvZ|bOde+{CvC&A3uF&c=6%|NqR}K2di3jMd|+s zI?Vr{Y`6OV^ZbN#1Mv=kTF1o5 z3T81gP$vx%?Esi}S^jBIeT~7$ zM2CT!i;Kb3M33Rv*^3OHK7AtFVwgsvBT`LG?SFr^?sIU!|6=^lF!!<~!}XiDQS^(8 zi^H?V%a<=v|>}zz}$2I0000VQ!P zj5=V{0VF#>UeMq_GXLTG3ygGg0Lb#b0%17+)TuWND~=ibr^FFNI{;?6yom{t=oz2` z-ZD@ENREP@Wu{=dBPfYztOm+*Kwf|qgeqrF|=3xNQ#DomViSR4S zD+U!M6^7?8UvV%zd~gfJa!GLshLntKFu$U#kSO!W$^~D)ePsYy1_bcX0P#WMFpG&z z7bH6XYVdzhwu3qX?x^Q4o|Bv)$qE6OBXEe51jsIkD9L(MaR9Zzr~^hFFzSE-cK`sL Wa(=4DC}uVQ0000(VDLS diff --git a/Resources/Textures/Clothing/Ears/Headsets/freelance.rsi/icon_alt.png b/Resources/Textures/Clothing/Ears/Headsets/freelance.rsi/icon_alt.png index d943c6341894bbb5e80d5364580876e348130608..d3be4bc4972bb24a3d83d698ce2839f951ffa86d 100644 GIT binary patch delta 980 zcmV;_11tRQ0^bLa8Gi-<0047(dh`GQ0d8qSLr`gBV*mgsk#&(hOT$nUh97ISVigA+ zL>xL)aZnKjag++Ws6$)9uO*31E2J?bEmB+s7YD&Xbn$EOALuH$DhPrih`71?wTQ%X zn?gnOhMV*7-uoU--au&5GV)${6!Lb#O->|Yvvc#Y$TN*ZsedO-zh-#ORBAlUzw6_c z8dY!lRImT<{kft`8P9;42H|1DaSOsS4U?+{NAad`n~~F&gb##!T^UgLQt5iYPl~ev zzbSUp$uS72p0Vr?)_<^(bMwMI!tuOSG%E9`FKNoyGbyPZvODoeGC_hEIz^VTD9|U> zmdyV44U~P;tbd5dkhen#R~%V#;_Vf+C|xsBP0=&*Sd>)mzw`9Wp~0YgQv&K9egCx! zBHQq_<@=w9zW;RuwGVJ^SN$uJ)5yE%TU9N-4=w9(dQsK%9XQ*7_IpQjwX#$zJ7k*h zasthB(0UDx3qe+ubB^yIy(Yit3U>FPTkf|kegpOfXnzHIGe))m000SaNLh0L01FZT z01FZU(%pXi0006PNklkcjm+6F}|#GItin2kon2K!Ja(fT$L~r@PytoQ6oGoVtH-P<0(nt}3yww^xF5^468>^l`vC1(;e zUyTZNlu)VtOr=C)H0l74H8p|AaV`-o-Q38J4}U8ADp_9zypn0fM1tDyY!=^>T^RWE zS&myLmO(xpC43c-6bgosE5Ge+7uFrM0txG$gdM&FNe-N$(%ni(9zxo(=>6lH7D)v&JRSakWLBI zq<;V*M1(;8G$+AY9>b^)2{hQ?x`(S~0>*jK277_C#EarIdV1|kW)*%l6ClXEO=4-} z0fV#aSR67dz&Twt5uj_fu-ypDW|1{6aQWPfs0iUKcZRW*V;F|vyA!?v@p!y^k_&}` zYdk$X^B)SJKnnP>7uR|NoO*c75DArtTTK{Uxv%3fOXupT`K~Kc1GrBFnqx87mGRSi zT`Iv#C9dLRPF;QB>A2XZ}i{j-9t3f(+*` z3Gxg6j{+F3+?lZuD8*UeQ6E{%z`%C|gc+x5^GO3m*L%7+hFJKYz4)5%umT5bLcoQs zcWeG1zkBhf=$p6C%Ok#$@~MRJ*;2;u%lX1}KJ&hqZ^0OR ztS7*of7!l9wH4RSt9J&j%CcW;$Z-0_>21=*4l6jh&R;joX!A9J zuCX|1d3dCRrqTp@S=554P4iP#ohJ<#$=3IPZ6FW`d^%rqikVsC!vX!}g0^jE^)7~) zwP~91F|)oTJV_EAhG8{{?>WU;mf?8*MVh8dbDtCN-lM82czo|)Bd`VUC19<^-{}X| zS^z*C$NLF5=U|LM6h$z`z&VG$?-vU^d`v_{^E@B_Wm%%G>zjTe8rQPxy7dngGiy;4 zllxCZdM&X!BBDg3A~GqkS@^w>UBairmV`e&D4P#lAP@-b#Xm6GU!qP=N>~5@002ov JPDHLkV1m(#b}|3} delta 365 zcmV-z0h0co0*C{UB!3BTNLh0L01m_e01m_fl`9S#0003xNkl7o?(cJei;0U#{eSuD8Cjt~k^^SXdBI@S=FPAuFqq-mHGc_k6o7!SsU5@F(}&1% z1XXf@yqqGK-nMlG$$Ck0Kx&EvLpjj*Dw;_s;_KEfWFQxih*8BhF^&18eQ4t0ZO-#s;oCtrgzG4Upj%PS@Xe-0j ztCvtLx3lwRFlIJ00Q0NM3yCt1tX%N$(R~JxWk3KA4GL(=$bEbnVR&x{wy$;tU=3c4Gr zmPG(iDi+n)$7G^?&P4(>+ot{ZuiXx%Vo^OW5lOwFYFQKq^M9t(!a1RM?y3TDpmPCg zwoUul(2+=7*lx8bj3O*otAn}&hqaF-0B8x^B`tUz4hxlX`6#$)7-+Xzsszi`3Y+Z~ zo9$LLY8o!?-kNQbX&3;2&)E#)@mS5(>vfohq1_MKJTw}_IVUM4Nh!&39Ezfdq?E)t zPo0H};hdA_d4DSS^V^yn$5BFQBocezH{ucmL4Ys}F&d2!hN0FOnFIh}Fc=(-1wrt4 z0z!yP5}5^j--i$auIu9cYHe*e060Aq~yMNYvvr*5~a{Wbrmwq%Uay=k8OviRyut%+>&qQ6VQ*LWGm7D0000VTo; z0C_=!{~-F|`wNT%;s8-aDF#t#Wrl~FFHp;V(j4&m{xb$@gQ1lM2HXL#G{A6f02~0y z0iZMh!m!)`0+i+mq8wmi^UzOtlGR876k?~T)QR# zjsg%cHnn3od-@Prj-X05l$TQk)7!SLAXzU-4oFRrU?>OrUPUtrMSR`bg$(2Zk{kdE z^3L8W3~_SfpMN9=fU+7W%hmQ(GEftc6ap|upo_uS+S+>m-@JaqAR;Ql0HTQr8Ilv> z57t)^3I0kx?hJi%FP z?a2#{^?eNtrf2ZgByA01#o9q!xNxEey|!!E&;7|x{!h#-kVqu{I~PM96OkyT;JruN zwu5H-xEfNvSv31_4LspSrjWQCTE3Mf?pA`$q5%;}6oGHHvVX+G%Pa18w_|(H69^%o zsw#vK;tPCy%E>&tz~ftUGS4mm0M=T(Kd)h}1pp|e;t4qCV2nYQWiZCTIS23kXn{Z9 zF*8e^=Z9RDCF;69n%7z%7NhIBNj|D0h)9Z}kiPrZTFXy~$zf*ES_?Dx3d~miTS=7i ozOpgpXD`a^3mcb6BoeXs0x@t}GjErB1ONa407*qoM6N<$f{v_)_W%F@ delta 393 zcmV;40e1ep0-^(uBYyx1a7bBm000ie000ie0hKEb8vpvHul4>cW2iy=LN|7Z{ZLE%~lh-VgcOy4>-R#`sM5P zp9MgxcCvjYkAE)@k)>D_P!K;o^<11TOCdgBS)-scNoCkWC~{A5OD=+L2W`LcEx9vk z!`s-5;)A`dME7ZJf%p`lWTE0}P)xo`oOCYO0KJPPtz8cyh6*|XdmyzcpdkM6S>ucb1jw2+SqM1{G#knKWBq~Y$6a%G@AK}xy8;z4 zD72J9OBJ>McHD&HBMs-qUQzMm1%wb_jQyWL(NqFEX(khq(tkO}-1p&m-c~6BQc5t! zKtyUd=!DLzR4WCDK)f&i9fAqawU1m501a%r@U1}8Z= z38=0?(-xq*hHI%a!QA&V3nZ>_v(Zo&hd)21uTMNYFYq#(t*jS9gx69^nScKfk-ELy zSL^P-5JD|WBq3E3>YU?l{2E#NLNZ@wU505h&s8Ez@QshF@P@0XsHiB5ZxOg<)UVlL Qz5oCK07*qoM6N<$g7S;1RR910 delta 444 zcmV;t0YmVTo; z0C_=!{~-F|`wNT%;s8-aDF#t#Wrl~FFHp;V(j4&m{xb$@gQ1lM2HXL#G{A6f02~0y z0iZMh!m!)`0+i+mq8wmi20S&o5W9|JW3Ng;r61gaQ}Ew7;V z|LfN;4BXs23?Q1AkRdq{er0*ZprWM0@ciWqhKCPsp;#^{F2RtJkqzcolob+X9$C5I z>$k5AAj^ON9vUD%NE~J{vFUN5CER{58dMk`p9ZApmm(4sntI*#!|L mS&u3XpcWW)z^DU89RL7+LYE1kW>c;J0000R7XW`#M776bQn-e~{QGVWV e7K_EQ6nDZmQxRY1InSElpxFf9#ih`af`IAdyJ?ckZSbX36vX zoa?$q+qM_;TI=&-48yRiBdjRHmCgN iMOl5}5{X1278NIywOTV4Lxu|g0000t|$z0!a=y#&n*+s?D2WQGZ}C!!30~a1?-mq=Y1h zBFhm}$pze8++arl9YC^Pk{n?5&k*c;70o0DhJOh0JNND|kPAq104T`g)F-1@4g%!H zKS>S%Wi?QiV=(Mype7(G1mKQ96N9nk71aKJ{rZK0o12FLL=zJ-BqzeJEUy?;lvEg= zzkI>)@WCw<%W5UXB^XjNvcdd{vO=QFBP$nt{q~gsWEl{^Lj%MIiNh==HeHbH0I0$L zLD>%K2)Lu3zj#h^f+Q;hV2;2cP7)xyAfhDeQN;n&0;3KXb-<_t2HXJvQigqU&FZ8y P00000NkvXXu0mjfY~7m2 diff --git a/Resources/Textures/Clothing/Ears/Headsets/science.rsi/icon_alt.png b/Resources/Textures/Clothing/Ears/Headsets/science.rsi/icon_alt.png index c935e5a13b7f8be499b366732f8364b81b156f69..c86c128c245c261460adbc2a919580c5a1a36759 100644 GIT binary patch delta 464 zcmV;>0WbdP0`dcp83+ad0047(di0Tw7k>eyNkl#H4*dX(rc*I=srDtLiI7kmhjY3MwI#eYy6`N7 zyZ_zuW3S_J=6!MjGz^1A@4vQNR78%pnj#EC*tU%@ z3^VOf2mk=S?;iHXX6w{vus8rAq!2`50M~Uv2!Ul;==FNAEGyIcLI4xT5&Hc;hma(R zC-Ss8$6~Qad<_!|R8{3!E|<%L^>tmRx2+ZkA#hz6&% z^`c5msj4bHRg{BI#y-8Dz8{-XVSwLeQ5`kzQl(1$wSE9vn7)JLv0%CY0000RJo2OT9xiv>M=As0Ku zr7v(cs7oIafANLUSB6C)#?o>>Yu>v}m>9q?K@KZ`A31OKFVdQ&MBb@0KzAXEdT%j diff --git a/Resources/Textures/Clothing/Ears/Headsets/science.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/science.rsi/meta.json index 50f9fe3394b..1e84b43d94d 100644 --- a/Resources/Textures/Clothing/Ears/Headsets/science.rsi/meta.json +++ b/Resources/Textures/Clothing/Ears/Headsets/science.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428 // Icon Edited by FoxxoTrystan and Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Ears/Headsets/security.rsi/icon.png b/Resources/Textures/Clothing/Ears/Headsets/security.rsi/icon.png index 195117997db22a6b1c73cab9c4749c2bb21e1da8..cced512164758d3551c213d943a0c03ba3395d0f 100644 GIT binary patch delta 255 zcmVui$OO8+rgeK()JB zmAa-wQFO2v|DZI_k^~ao=gS{pu~_~c$7C`QX^$~9ZHv0Djn>X_F$oXD5WbX1k_1Gg zPZQ|F0YE8*D2jHISiA#$c%C~*({yX@I)Se10O!+YS$4j_5qSKTfDi)r+Y3Sn0D#BX zxdH&-y6(_#+IF+R;?Lw71lpH!7(c5DkFuPs=bR7EQYp2|M>T delta 381 zcmV-@0fPRU0+<7kB!3BTNLh0L01m_e01m_fl`9S#0003>Nklt+19Tw>f(u2T!H3X=g6P7X52Ho=0jEXBl^HA)VsF|^?LwHF z4DBXoleu?D&NnwVnF3}k58wejfCpd$ECn_7H~##1pPL#0nSb9d?&#;!(vL|i7l_ON z#(a5u7++!@2R#8iwc#T67VN$br(Cb}C*W+Wzydfb7I1eZ&}=;7Eh*!x6zhCg4Qa4~ z$mJA>qRPOwI!+#G5+4 z5fSnbs{$zmNp_BN=Kbp0mXh)tLM(vBES0fp!um#Cm;dGYVZuDDRMFbo*YU~mVWzdL z0AwOTW&@?yGR2fP###G<4KP|*(Xksrq)<^OVmG8!1q{SLd6uj%BGt5vZpBW&I!4>Z+{hViOwY$g`v$?ql!df z;N5g;w`t1jW^>ecIPSfZ04fP|iUR)L-+R5QtN)VwLU1>oW-WN#Y)FhDF(x~xWvG36 zM`37vApm$@F40&*!XGtHS*Y1EiGMNnWqlC*ub}VE^3Q0MO}l zc!}f6|Aaz`yvQk(QdVni%e;DdN?S@P?X~Zpd@}dxeJ4wjvsG#=@Ncp_-&*dLmX@F9 Y1IM`6pHRCt{2mcL5^VHn3B zNie!p^1u|%bV)K4gvN%3XeelCXt$}qp`jrf+S_U=8g*}TYm{Bh5=%+tv;^roqrA#3whhW0-$kWNg&U| zwQm%H8$fRyrF0cABSR7Jcto<6$}c1ZE~gWMp|GJSZ~>r^fV4)QTP+!;A;U$8p-1l( z<%9evAa4|y0fH-Wwd%WLJ@@f?f#2tbYhrGLN%z&&_JAb7-_0`wGfU8z;cJ3iwc0+ns+X0R%H#{G;f1P1nSPp>dowZGQZ3^J#X*!0v0MOf%7$rH^3-|Pq zz?RHA9VY@5-!ir&HX+%qL15##{uDLi$*(pjcJ(vtEPsO~osdE#Yiie%23;?auaBJL z+H3%~m}`I<3A)2%9J{22vEjyXO(!HvI=G9F44>{#$I}lWdRN%nKZMOl1THVmC;lHd zK(q0R#`^jJM6YM~j&Kimw;%{?^h2m1I!%Y8)Jd0eyhJPp{Ih7?(l@7!Ts<_MrD3c>_0F(=G z6U23L0=8MYsgf;;a7t4kMNoh+d2F%%BugG?tog<-z~k}!cP1{$L}WuDaIR~VW$CoG zGel&WxgA7g|D<>v$F^yj-Xx|j$!VHmvp*n7lCE_>6EMbL`+r-)7&E>=p64&)!3Cly zx=nWL$9OCO0MJ@varuJQ8UPRqF`fW3LrRGt2q2{dGvi#>odw?hOy;whU9MJb{Czy) z=X82luas(^WmQ%Ee^f+dvn+f1{*_YpUg8~`?m#F6ilTUV_JeeO&$A9)JMUGZOYx7l iYw!!_@pwFAaTNvIA7Z2|dw$jc0000;U>K17H9QfB|3wxOQ3m^!=z=_x(r2PBVGj=z3 zL@yAT0c7!oN*Q^IJ%aVM+tluzEUMV>NKt&ehgw}=0h}EMnAl&zO?4S}o|BG%RB}pW zv>>#vV5x8kcs|_ZZ4X%~L;}Fh!veUdH&Ce_V{Wzv4-FM>Jv~5IybfIZ@DAp?ij#Eb z&jO%RbI&1sEe!Db^4L{;wCG^9 zR!{xyt&L3iw5}lfib2H^scw)@aalO)Ua$c=i3Ocq2SP!$gEo61wK^an{)n@r{SozY mdbt4PB?Djp3_#xjz5#i+fJ79`{QCd^002ovPDHLkU;%>a!mXeH diff --git a/Resources/Textures/Clothing/Ears/Headsets/service.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/service.rsi/meta.json index 9c2f13fda0b..df6ee47d086 100644 --- a/Resources/Textures/Clothing/Ears/Headsets/service.rsi/meta.json +++ b/Resources/Textures/Clothing/Ears/Headsets/service.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428 // Icon Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Ears/Headsets/servicesecurity.rsi/icon.png b/Resources/Textures/Clothing/Ears/Headsets/servicesecurity.rsi/icon.png index 87d994febb8eb12e10c6ab112d6dde73e9de1b1b..0b1f751416654df08f1a601633bc0a7b0a355984 100644 GIT binary patch delta 267 zcmV+m0rdW&1EvCyB!BHmL_t(|ob8l74}vfdhF=^>%G9Jcv1v3q(UCs^zl49u=BA5o zH^B-K#=01y1BA+lgME^wx#XIAu3vz|;rMqvn`9y~fe@(b8bwi9t(^=J8D{PV5t*M9 zkD|!5Z9AL9#wIyQ5}eN-;y9jK_d9{6X#npvuPu;e*E z8UPRov7P`kLrMwX_aUVOGoz~O$pWK4lihY}j;B)>UoRKj?)Q)NN~!KymSs8rM@2*? zP1D}@uaq+H5@WEs1A!38^L+5^7wP<+z7B0WpH*T?@vpaQ@eAj0I2>#71p4-0q*qZX RE&u=k07*qoL;U>K17H9QfB|3wxOQ3m^!=z=_x(r2PBVGj=z3 zL@yAT0c7!oN*Q^IJ%aVM+tluzEUMV>NKt&ehgw}=0h}EMnAl&zO?4S}o|BG%RB}pW zv>>#vV5x8kcs|_ZZ4X%~L;}Fh!veUdH&Ce_V{Wzv4-FM>Jv~5IybfIZ@DAp?ij#Eb z&jO%RbI&1sEe!Db^4L{;wCG^9 zR!{xyt&L3iw5}lfib2H^scw)@aalO)Ua$c=i3Ocq2SP!$gEo61wK^an{)n@r{SozY mdbt4PB?Djp3_#xjz5#i+fJ79`{QCd^002ovPDHLkU;%>Ax~-1@ diff --git a/Resources/Textures/Clothing/Ears/Headsets/servicesecurity.rsi/meta.json b/Resources/Textures/Clothing/Ears/Headsets/servicesecurity.rsi/meta.json index 62fac00b4eb..dd2fdcc360a 100644 --- a/Resources/Textures/Clothing/Ears/Headsets/servicesecurity.rsi/meta.json +++ b/Resources/Textures/Clothing/Ears/Headsets/servicesecurity.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428 // Icon Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Clothing/Ears/Headsets/syndicate.rsi/icon_alt.png b/Resources/Textures/Clothing/Ears/Headsets/syndicate.rsi/icon_alt.png index 892f6d12f0e391ba8a708a1639f624d60de62ad1..f7cddb85c006bad87732439467c85c78cf62e1b3 100644 GIT binary patch delta 460 zcmV;-0WMGyU5N}J@pAMYh8P*G9w$5=%dG#d>G z0H?OCzdbG%h2xYGXuGb=zJDYMPHkI1%ZL~+Xf_&BC3{*ft$#y8YV1b^RH8!(+O8|J z)hHs7JF(a8%J(?Ndb8Q-JFwe(B>|w2KrL^={lkNGes=aPxkCtg-L7uIdb2?oMF^uv zZ&VXX@7}iSN{0{tz_agzbFRl`vl$#hj4F{^fkUYBKl?s9oettS)?=J=gi&M^r?fye zxgw5Z3`Qd@!G9RbZN*Un4k1X>6lt0Q0B&w?F&+*J#W+d;0Fv#_A9x z5ah-`$(uka)jN5$T73%`1cBucA}{N82qBOp30_}bj75?gLn)P6k$o`6BR{fNNVWLb*-f-5R2{uQ5fOvV4I5VPU{00000I&vVHg_Y8AAR02$okp_&-?uzWg+V#MCjpt7=H32fTmH<23TIH za@D7K?p9n<>cR*@3joIV_YSCi+fLTteWTuBpw4|KfpAwVMi65G#P}$oAia20Axxy5 z0(gpC2d`az$A27avLkGz1t4K|oCUg?tMOWkd|re10+k!UU$wsd)OFNF?f@{3D2#&0 z9Y9i$m9zkmV{gmjoS%d@$vW25{NqSA?T%vs-rrv0pH(9jLbjW_BOsgBtQ7%)P>o~$ z`#VN5mUaz@k$5X|I|fLa$7t8mA$1~RT!h?w;zlGVo@3g8nX|KM5h52X@ebpCp@BY?F y7w^xTCu(n6=qDVID!sz*$hw}A@!`Oc`yTz+vR@9N{n zE*^&rKbI-pQF$g3n4qU=WUkEKs%MLD#Z zZk_o0`oia5kLkHKS_HqDeqhys2_MZT2w$kTPmxIHy1kW`;j4=Agpkx^x%5@WZ}UID zjAQ(8i~ZJ${@{7Z^|qVerL6bcJLT7dS=>zue^~vm@kOwi|M*%B^e}^`tDnm{r-UW| DT{(Is diff --git a/Resources/Textures/Clothing/Mask/neckgaiterred.rsi/inhand-left.png b/Resources/Textures/Clothing/Mask/neckgaiterred.rsi/inhand-left.png deleted file mode 100644 index 5a37ace23e68bc693b636d6409220d71466ae9ba..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 332 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9F5M?jcysy3fAQ1G9p zi(^Q|oVT|Oxehr9v_1^f*}}mcrWA2RFSJNJdi})iincBHT(!B6T7@c1Ez91j;K6ct zX2yg6zxH^hi3gqO02%=T9UEur|Cvy9{8r=Zmp;~)Ov3jv?ko<{3)UB^&wBW?Xy&gw zmc7@j4L5R}ojduIXkE2cPg2o0U)xoi4n29r{>nUIs)~|QQBL&KJrjhBwyrc+*l{nv ze(Gh{y^On0M*@wz-ttZV^eb@=h-C~60!!a3y5;OW_=Y{=YH)7DQxIFTBvW=g7$k77w1alox)LiaTPwqe^_Pj7i_IlP#X+b7olx zXaq!g{@X9=w13Z*)CzwVpvgesF!O9qT+6wH#hK?OzU@AJa!chbhFQBhZt7VRp}?mu98-qj^V@HpS1 zujikb?0kJi?7_dva&M82+`QM`1@*hP@jVXKw`~8!ZPGSP9AYs815d+yHW&HVk=u`* z`Y})PMe^QbtQ?lcA8!9HUs`0hz~{xxMxW3p58qXW$lX3IB)3Fy;F)U1Hi&=O7 qrO+2!;}7A+Tnno{eEG+CV4?o;F1P-kci&%v4EJ>Pb6Mw<&;$TKbd<9I diff --git a/Resources/Textures/Clothing/Mask/neckgaiterred.rsi/meta.json b/Resources/Textures/Clothing/Mask/neckgaiterred.rsi/meta.json deleted file mode 100644 index 9094fa918f0..00000000000 --- a/Resources/Textures/Clothing/Mask/neckgaiterred.rsi/meta.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Originally sprited by belay5 (Discord) then recolored by Nairod (Github)", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "icon" - }, - { - "name": "equipped-MASK", - "directions": 4 - }, - { - "name": "equipped-MASK-reptilian", - "directions": 4 - }, - { - "name": "inhand-left", - "directions": 4 - }, - { - "name": "inhand-right", - "directions": 4 - } - ] -} diff --git a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/prisoner.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/prisoner.rsi/icon.png index b6f68da96e1cc4016112b717a63d53ca7f79e94b..354b1eee71dbb1607d5667604e7fc502e768f105 100644 GIT binary patch delta 346 zcmV-g0j2)E0)_*S83+ad0047(di0SYAb$yPNLh0L01m?d01m?e$8V@)00032NklyfcoYiDiy%p`gqHw=!0-ZfbR-yN=0>h`qgyi4 zuAQQv`Fl;e`>(evcs!oJrzcelLP#D20c2SQoO7eIO=y1vli!zIMgYStablt`^?xU7 z@_0vuVvPGDut3W|0VZD`j-?3~7#ToTk8c}Xpl#rMl?zEdZi}{o$yhEnQz2z+iBSvo zBL?&t3q=NDDAWd{78F&ZV*E`Az_~xo zAa9y~G@zQ$!RQ~rXLx>zgf`Jhhf8f8 sQ-PZR000hUSV?A0O#mtY000O800000007cclK=n!07*qoM6N<$f~e4lZU6uP delta 272 zcmZo;-pe#Wl7pFnfx%@-*RhF;3iVn6J|V7N-Vx$rQb&9l{?{`^M6VGMmD1MMGcodF z*uGs?*Vw|`PF_K6&is`?Z4DaH4nT^pB*-uLKQdr&J#gm)P=>R>BeEE%;0OpaPSxg< z1`0NLx;Tbd_`f|L$ah$QqapFgBH>ei*ITbinOr+_7x$O?4AsAj#J>3RORzF9oSZ&C zjiF;l2Pea`IfdMPhZ%mp@Lg~v{OF`85$y-hK4-8+STDFO8?oqB!3xnMObuGZ)S9NVRB^vL1b@YWgtmyVP|DhWnpA_ami&o0003M zNklY2nSUm{stSstz`l35{=!y( zk_SNmYtMr?j^*`aN6;jvD9aMUFdPj+sRk(d_HcnDNv1Et)AIL+a_;d8R5}9{1%74jyU$fX8K5g!7ZewOU4(rQ qU9xlA5cO}l2G9T+U~Yi700RI8zZHRui_7r<0000Nklt+19Tw>f(u2T!H3X=g6P7X52Ho=0jEXBl^HA)VsF|^?LwHF z4DBXoleu?D&NnwVnF3}k58wejfCpd$ECn_7H~##1pPL#0nSb9d?&#;!(vL|i7l_ON z#(a5u7++!@2R#8iwc#T67VN$br(Cb}C*W+Wzydfb7I1eZ&}=;7Eh*!x6zhCg4Qa4~ z$mJA>qRPOwI!+#G5+4 z5fSnbs{$zmNp_BN=Kbp0mXh)tLM(vBES0fp!um#Cm;dGYVZuDDRMFbo*YU~mVWzdL z0AwOTW&@?yGR2fP###G<4KP|*(Xksrq)<^OVmG8!1q{SLd6uj%BG-rJANMF6ZIh}diCGe za}1YMn*qKd;#p>Khj^YiyX9Dd_lU<>MJ^Ga5GObtkoZ>UipOt)%N~CT=7rn>;1@lm zau+LI%qrXU zjJ_7?;N&QyLVw-_sWs}VQq@RTY3itp-2dlkYctbc_i!2*e0AN=Ng%inG#jq_d+NH) zGa&E+T$>$#m2#T6jWNfgIywO;=?cPt`XP9pGK$Au#R^2Wn-+Bj*oevupPHiJ0ALSVSr@P~d> zn#+rY4rGC`V~D_bTQ1prJ{P6^exG4Z#|Z(}Nq?>fgTyq=#PdA<^m@G{j$@wVyUtpr zYC$p@jRg7q<5L0=BuGU>;Xjb43^rSq#m3_?i=v3#t$ZHyF#B_r1khp-QFc@o@NM^w zdvd$W6|>3$zylGEu zNOrBq#dB%fV$(0Kd)PYwB4ib!QKcHqzsd;!33!ID2?rX&CW01jnXNoGw=04e|g00;m800000 T0Mb*F00000NkvXXu0mjfu5^_h delta 552 zcmV+@0@wYM2fzf7BYyx1a7bBm000ie000ie0hKEb8vp=JZ}D6A|=ODoFO zj<#=bY$d~)RrBH(mf4*-d_QmA+j(O~kJSh00~iJf2B)huet(q9$lhI<{uO}C6^p{& zYh%?YgfxKOoTOG%v?D`1;B*eN@gaB5Qed~);2rlF+65^9G8y%ZvG>>47j!~~i;%XS zqF2>V_HaPiT@VKF4ozuQUulf|-2w#`*gXT#)rAy<5CEA+Qd`(ti`M5T`ba8?-03Zj zceVkK${^e$E`KSAmH^!RFL^=}m`AJuLPo+Vphzj#`KJQ=rgxenfOaGVKt_kjIA%iO zhIyI`BZ2F)o9+VWwf=R2!1g3oHeA2fs4lt=K;{>*OJLB2PDmPnMcyHEVF1c;IGSKN z*Nf)#`KKdUwmY^2$iAJMkcM^$E!H92E;nYESL^1P^nVdl^D|JkqAMpMhsdP0_Uo{+ zf1UmJ`gKjEBBUi;1Kh;x@Ue>s9ly=Co7y$+kRs`jE<)CPDnBQlz5(&O!ra0V0)9Ud zn{l*~G(f5NNM=>40}jEjXY@^Q2m8BF6tQ|R)Q+1$kjOk=$g_3PdN6z+;1CpP9Y9M@ qZC+SyT_MY5BJB!5C)5Y%Ilwm%yYQoVR*XFW0000pGs7XXYR9Hvtl`(6=Kp2M4TdW1sG1lF>NXM*#LlG3A&|lcqLP0D@ z2f=?J#i^O+{GMupZm_ch<}unl)vI$NWz%xgZ8AI~r*u7q}tZfZ6EYqb&|^ZDMo19j~o$xE_WE`^oP@5x4?t-y1? zpE=Lv4#E)txqsl61QE>Ppin4itD!ZF0yE~Ix5-3Qt5xcQ!C*iVkeSV9M>AsW0u?Sl z!X3vEtKBj&kU_W!Ckp@$XCTpNx2dmI>tn=QlbX z3P-ChhmOPo01}V&I)y*ATJ)Q#L}G!>W<%F)uSXKR9CD_dybT%b^>VpPeJQ2L2Is|a zIMi-IpdDb__RnGBx^C!r9KV;vBK0BhKAjq!g2q5X6$t~C*lj)EDiryi^hqBIBy#)EFa-*xN3`aU2K@H7F4(<8N_tBJ1VCZ6U3 fkcA3>sRR4~DJ}D_3S&RE00000NkvXXu0mjfWXR_b diff --git a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/syndicate_listening.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/syndicate_listening.rsi/meta.json index c5495e43df0..9879138a5c9 100644 --- a/Resources/Textures/DeltaV/Clothing/Ears/Headsets/syndicate_listening.rsi/meta.json +++ b/Resources/Textures/DeltaV/Clothing/Ears/Headsets/syndicate_listening.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Resprited by DangerRevolution (github) from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428 // Icon Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi", + "copyright": "Resprited by DangerRevolution (github) from tgstation at commit https://github.com/tgstation/tgstation/commit/f8f4aeda930fcd0805ca4cc76d9bc9412a5b3428", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Devices/communication.rsi/beacon.png b/Resources/Textures/Objects/Devices/communication.rsi/beacon.png index cd94b9738a05ffbf12b4527479336fabaf91a047..fa3d280d0b74a373b33d68983e1d8ea66e8da22a 100644 GIT binary patch literal 317 zcmV-D0mA-?P)F)n?n`R1vLw1LN;PQ>vMY>q!((6a8 zzTbLxdC9vw2tY(cM0BQNyk6$4zsP-oo7+juea5jqKmIYdge+B6jaC2vJU?wl%^$sh z-2Ch-aPIzn0h6H%y!YQ8xwdTwKX2^(%c0>S0sy$0ejJ(-ElaS-A5?&<0sxw(!D2qc z{oQImwtm>|$E{f8C%5IjkE)8gt^ok=efMR~%j+A8qAs(Ea{at7j^j|V_vPv8cl7foDVn=TiUVzBXyAHK zl&BT6>h3cm<|)y+uZ#ab*DaXy(%_$c1@ErxefN#_@g8Hy4AGhP>zd8?IaS%mIFt{# zB&zNDbZ-0Ct6O{bojLs1H_0XG!1Jl=1wOMr{oL9pnYQSu>&X(K_bpeA3yzvz(t5o; z;rHF;H}{@=SNQlvUtjy&FN~YM&XacWw+)UIyY~3KeSPYTV1^T`)uQ)rj{a$=E_rel z^O9MmVJ9OP=f%$}+RK(WX^z!_ZH-nAyFo67fDneauMeM{`19{(ABIbF?!CJDVtS51 zJ)6hnQ`cg?KDcr^jeUvV9rxG8hVlkXJ-vPWe>6JJv#TV3dYfP&ukqJPUchI{!5Rfw mhG)z(_-~j5uxEfn;{bbL<^G@f$87F_Z1HsUb6Mw<&;$VXyS-!p diff --git a/Resources/Textures/Objects/Devices/communication.rsi/beacon_dead.png b/Resources/Textures/Objects/Devices/communication.rsi/beacon_dead.png index 7e25d7455d6d2c667c15b2b5ab706ef64d00e9f2..64e7a30d49f2bb604e4d85d41e7eb2748b1fec65 100644 GIT binary patch delta 236 zcmVW`mv2M5cL85{RdDgsbpCnMgFbw10S+0xxRe`#$-x3&o zO2hF9hT3+280s3t zw%+^9%xIbh0MMs+lR2KwD9ci{3eg0dbD4+`LO=-NX_kn<%sIv=k`S*TrG%=gL^%!O mQ90+tKc2LE!!QivC%6JIdp+WT|L-;c0000+oKjKTG!89e+_{puG&9u6{1-oD!M<{Fqr2 diff --git a/Resources/Textures/Objects/Devices/communication.rsi/meta.json b/Resources/Textures/Objects/Devices/communication.rsi/meta.json index e9350caad8d..bfd0e069f3e 100644 --- a/Resources/Textures/Objects/Devices/communication.rsi/meta.json +++ b/Resources/Textures/Objects/Devices/communication.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from cev-eris and modified by Swept at https://github.com/discordia-space/CEV-Eris/commit/efce5b6c3be75458ce238dcc01510e8f8a653ca6 // Radio, Beacon, Signaler Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi", + "copyright": "Taken from cev-eris and modified by Swept at https://github.com/discordia-space/CEV-Eris/commit/efce5b6c3be75458ce238dcc01510e8f8a653ca6", "size": { "x": 32, "y": 32 @@ -31,28 +31,7 @@ "directions": 4 }, { - "name": "radio", - "delays": [ - [ - 1.8, - 0.1, - 0.1, - 0.1, - 1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 1.8, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1, - 0.1 - ] - ] + "name": "radio" }, { "name": "radio-inhand-right", @@ -89,6 +68,17 @@ { "name": "off-walkietalkie-inhand-left", "directions": 4 + }, + { + "name": "old-radio" + }, + { + "name": "old-radio-inhand-left", + "directions": 4 + }, + { + "name": "old-radio-inhand-right", + "directions": 4 } ] } diff --git a/Resources/Textures/Objects/Devices/communication.rsi/old-radio-inhand-left.png b/Resources/Textures/Objects/Devices/communication.rsi/old-radio-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..e1cb184a79c41bc605c32bdce52bfbcf245ce02a GIT binary patch literal 215 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=^E_P~Ln`LHy|t0|kbwYeKyyS3 zZ-jz#OJUFk3D(x*iq;OUlZEcPTE5)NxKHPI`Myx^~S{`^VmO?PqT7 za$)zoJmpi={yX=6YZ{p^W!(OJt4mtf8n%?wO5pWdm=~oB~#qq=_go#`WYA& z%$oSu;g(&3zw+tkko)+uPHG3uZsRYhO2c z^3|9F%EvaD$X1*JIS&jr)XU|w1)W*F(H}&2aZk86JAz;Oar`Q-4<*JI&MZ_vaQW;3 i^HA0e?d%K;4e|PtD|HXgzpeHHq}kKe&t;ucLK6U7i(c{o literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Devices/communication.rsi/old-radio.png b/Resources/Textures/Objects/Devices/communication.rsi/old-radio.png new file mode 100644 index 0000000000000000000000000000000000000000..23315c58a2c7b98d3587c7696fd24ef507461066 GIT binary patch literal 401 zcmV;C0dD?@P)vTFwg z6_IF42&F1$9ZG}9%gZB0>hQklcz5saOgla~JrC`xEYKP5xejB=6acBr94Upr zvJLdB3WzpPEtja4OVSwra0By8t3f_2jzUSG+3+!~GytZRrrGcTsNGxvkX={~jiZnr vqRt&K#w}Ty6tC{!xlZUY>iH$qXf&E{dy$VBeQ!MQ00000NkvXXu0mjfVjZ)E literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Devices/communication.rsi/radio-inhand-left.png b/Resources/Textures/Objects/Devices/communication.rsi/radio-inhand-left.png index e1cb184a79c41bc605c32bdce52bfbcf245ce02a..ddd9d320f9dea2333626c80bd1963fb726f77038 100644 GIT binary patch delta 284 zcmV+%0ptGH0k;B>B!B)%L_t(|obB2%3IZ_@K+(zS5$tU&1-IJL188AwYbEgjf(P*= zdJ79rB7(4$FtVOtC1c32|G~CdGMOYW836zQ001COj8UyZsH(lbRF&nLw{2@VTo%Fd zC-Y-#u)bGkeOI`QyK zPXC-t1Ms-1Y*wq{C;d0GU8R#Im|TUqwm`9|>hc!wXz&3500000000KYv?}~dnL4$a zYi007QP%;m=tpoJ0E>PE*Jpr5KZ5HFD6Su&?}Mhrqox@3Be=f>Qu`5H2cWoqgxp)e ivL68e004s`A{8IGP~iJo-Tf*600003Gx97D) zW{Ru^WM!u`;IS;>2hGTAE$ISYy_d)Y000000HB(Y{Xp72U^Gu7`+@L%z@8$0i_15l p%x)lq2DI_rK=})>8vp>{KVOAWEDy%&U1k6P002ovPDHLkV1oSMQ)B=D diff --git a/Resources/Textures/Objects/Devices/communication.rsi/radio-inhand-right.png b/Resources/Textures/Objects/Devices/communication.rsi/radio-inhand-right.png index ac3ef8ab79fb3fb4c6b95711cfdc62173f490985..fc5fdee22a317165e292d6dafffaf9aa41bf236d 100644 GIT binary patch delta 235 zcmey&*v>RTrT(0!i(^Q|oVT|OxeghK9Q%0vmhz6>J8rLB%)X*|^Xkb<%wIU#G<1t! zh%WiS73a|6q-OX?Z_>6YlcxXA=Tq5JlX6m>0R;Y}_Y~f8n^G2;vsU)Kitx#rZFlb& zmD}%MI&tzY#tPL3lh&u)l}p+9T13KjAE!Y0?nf5gpLusYTc2_yA zdUrAWm@VEJ{qAxH#8{Bgi^Qwa6F!vZznIIozV3j2loj({VTW`F&-4Y~zh=JV;W?#0 im(hwDsE}iFM-9Wl-L~6zy0`U%bb7k_xvX@0{lu2Lqd!C(ZW}ctcKkszV^kvN1&kp`NEO1E6)9_eu;lTLx!c>*gbQXrziVGNdGghm1IouXnFPpIoZ N-_zC4Wt~$(69Cc*TqOVi diff --git a/Resources/Textures/Objects/Devices/communication.rsi/radio.png b/Resources/Textures/Objects/Devices/communication.rsi/radio.png index bbc73c505e5646dcea0c096c3b08b25513dcee3d..eb57264b858e705554298b886911a667fa507548 100644 GIT binary patch literal 536 zcmV+z0_XjSP)Px$(n&-?R9J=WR=rOGF&uqYhzcwOS#DyGgaL5i%Y@zK28oM_D}$qn6N`(6zraD` zVjPW&VPSDq5(z;J#KZ_L4wZmNBoZZrI^gl)SFQyyQQp#P@7MQxef{0Fz!+ov1vs5f zCOVf4LxA7!7oIy50Y;;7^a6Tquh;9s0`wx2ToJ;2ML&wBOJ;USKnt)2Bvwu`iIqBML0Dyi-ktI5??6gsVe3|^+c z*CSzj#6yOmd|gMQ(Ez0slu|rRlrT9h;rR}zoU;wByqX=z&Q$yQ7K;T2g8{W#O)JHx z5c&@Qz~XTf2h9vj0H!V~D6VY+;4ebW0%i*Z$sQ)m5hS?TZ;vHS#r8uGu)f6+&Lwe$ zTYTNm`)Gb0)|ZnHF+b+Odnk$m_pQ6rKTPci@eFhth7_f*t)v+D76=RQxZQ}w;|M7V zV)3{rjkthxHrq+AIxtcJUpY|C@g0cV0!oQ?f?so>_dHNnK1dC4-(c)v!oIUv4nJ@ErkR#;MwT(hLl& z?4B-;Ar*7p&fS}LIY6SV_sFfK_6n&BSdTDFW#GKAXv2mnOw2ktdwKO5t6v;B#^lW^ z%pGd(z_er=GgDNX*M<4gD*{ebCuR_x<}BlEU+^X8%nd1MBjm{0dx*|8n+6GHly! z*0ex?!?yIDO;JjRqXG&br!YtGroLX{d{Rq z|NUe0B^jn~y1mx=;bT%X+q8E01BhuiY1BP%rl^ynOWbRr86n+xnV+ zOU_dYR;a74zt3ZE+wy(MIqA8Yi@&qWwC}yU_fY@Q{MYX}8>%0C>wo|8FSq>l#lNRp zH}5hNeSiDk7WuU~ZWp(|{`}F-{DFyi-quIAFB@O}m-hSl`nh+)m;QMBx7CiL=#tHz zJDztKf2_Uzp8cVH>#f_dy{8H+F7}mO<7@hvE~d8lyZ?Tc&*7DSY#9q)e#n=$F`pmv z>i4p#OYgCVqI0r$(N-E1WGf4$syczNN4pX(>oZ?2cx z@@4t_%4`3$`sx!H>g;z+|9|vI_tYgi-A3$v;P9^3J5^O`sg=qnw|}mEIh)4pTZN7H zkDXUdd?dh7h!O9K4Cumj42AZ886MUBVm$Kq3vWkzV>P!FK`p%rvs~BSMps`=sl5J&OLt^rVH|!iQ&r3Il*)#mxh++thobrWv4#WS4 zF1vra^2J13&w(q+=^v-X4qh65gp?}`|HM_^UVE&u@0=wobbWeVx5A+M$#O;1} zvugLuXLR~1ta4o7(0p^Y$#o4sB&TomyPH${r|6qh<>tDEIfgU738(Zl)-n9~!u&x0 zJt)qI4sLf~Tz;DPlD#1(Q`f}%pth@XSSA$R2F>F}8?Jq+D^YoTZU@?Rm+UMj0^L`eYx;{Ms QEGHQ}UHx3vIVCg!04W4|3jhEB diff --git a/Resources/Textures/Objects/Devices/communication.rsi/signaller.png b/Resources/Textures/Objects/Devices/communication.rsi/signaller.png index d6b68cba775e1dabde93e46de284f49f0b30a35e..1b14a3a13605242c53b964bc4f02b43a768acc79 100644 GIT binary patch delta 343 zcmV-d0jU1S1MvcoBYy!nNkl1t&6U1T%w^Az9NvM+rp@NfxE)K5J zC5w}P!AblFE{+BNKnI85;G_=XAR=xRTExvEjcG`{I|rvq1@8!oa_{&Z-+K@5-F*jE zR#tyeK@g~-yxgLUepJfo zp=#c^(I96w_q740bO8WV&Es`HAFGuPJm|rR>#DYt--a*(a0dCuhM#KS^Pu!bgb_e{ zXKP};+X*>TO6v%Wo?#NFbUPt&ln_S=XXn=>aZ0qHKOl_~kW#X~y#~P5%{@u~g$wQ| z_Z^0sUPcLwrcfhpk52(;H5<&#&(Uf&j1n*c@JA(}f9BYyx1a7bBm000ie000ie0hKEb8vpVQ!P zkmUd`?}-1~wyt0tFb6z*aE*alU}#3cpmTs_jNN|_eSFCwlG6pr4p5CZ`Ok3X7u-@1 zaBxwFG5?e52$CECvedy*onhYgtqguH=5TReV_h(PV9!kkQhxziQIOQ-jl$o2_A&#x zfFuXlc(XG2>geK>|HFO{m=0*@fFoOfGd#Su9jE-``@b1T1w=dGu$}Jz*mGYQWEHs? zo;`G8Fi-G+%bi@XgF#AuAH#E?Jk1<%@;(y-122UA^3G+Tr3g6?UrL^VEI_maN*-Ti zRM0X8XT6X#c7Gsw3nA&m&T#iGjU502l1AKM`tIE)IOR#LCWcN?tgWs0ADj63N3R(S z)B&Ro Z001=ZcCSkjr3wH5002ovPDHLkV1lbQyT$+j diff --git a/Resources/Textures/Objects/Devices/communication.rsi/walkietalkie-off.png b/Resources/Textures/Objects/Devices/communication.rsi/walkietalkie-off.png index 50f3927824f1ac568ddb6af0bad43f9201e8623c..70e2b3a2a56ff9d446ed8f379c3fad5ab524ab40 100644 GIT binary patch delta 274 zcmV+t0qy?W0-^$t8Gi-<0047(dh`GQ0O?6YK~#90?UXT&!axi~|E#!xPccm*QTiC0 zBWxPZFx854P;dnbE`daW6qFNew}mAd%D)973LWu86zn`{3Xk;duNm7wp-`BC7$d#f zk2#GL1OLZBjFCBwH)fF|R#gIkna$zl`Jz06whzPM5xkq3N`IIt=(d4XO{`C!!`=6C zhjSNDe{pg?_ZM93>Xqi9s_eFbs>;6aIgUN~++&zhLff`TDS1=)P*vLg@dfU&C!eba zetvJG*EG!#d&$~_B9bHb8Q822sA@t)U}g{zR5h_#9kR_l#oUX?ZDKrrFD+gu6yAoG&CqGDt30x(Kj#yDld#U_76z$l?3?( z|3?N4t_SX%0LpL{ctjR6Fx2xM0jfH}I8~cZ8YsHZ)5S5w!hi3CgF=TCcwC%?S{MEK z|9;oP>W07<2QQX4=G@l_$Q1wMG~vkEle-rbfBD`vql{NAZCR3x_2LA*ck3Q4Hst1P zTGHzvcIfQ;BQseRPbfU`h z@<`CMad|8t@w)AYp7+C(Y!yCDne}FGSbEd-^ecb*{LwtL(U^1okFboltSjehm$L5+ RT@Q3EgQu&X%Q~loCII{0gVO*2 diff --git a/Resources/Textures/Objects/Devices/communication.rsi/walkietalkie-on.png b/Resources/Textures/Objects/Devices/communication.rsi/walkietalkie-on.png index da72f40e03f66d37d06b52899e1eb9f189c64367..0bf04a782db0e0813899de8605f0cd665fea2f42 100644 GIT binary patch delta 86 zcmV-c0IC1a0d$ZgP&-LPK~z|U?a(0#03Z~D;faDr_6*+jWx*ht1oNu@msYkg0RZs5 s*8o|0J>k`J4qFk;M!Qe1}1p@p%4< z6rf;=r;B4qgnP0C>*55Fo~A$pF1LdY%x)UKLMQD0zuMo;CO(Cou{y6Nc}A9o+onpN zfLSUZwmlcP;grH7q|81+l7DA zt~~$}8>klmF~E?G1%w$;t9EOhiUIPZ3_p^cpTss02m}Ve7$e%)(U3-hf&VdJj1iy0 zYclZ(W@Z5Z=iCrpx*sZgh|8mT$sSUf=}Xi%;E+Xfnols_ynpJwVm-pNcp_d(?|iB+ zSX>{t+{Z0_?0**>%q)j25@wdNETyS6`P6M_twoxqu-0l*=wN1XdHV$_t;wgVf%EOt zdP$PhT8q~tBqE=1oq_FYhgmEjA~@$jM3}{b?P}+3rV~RCBDINT`+fEBKp^mQyaC~7 Wcnq&YI#>Vz00{s|MNUMnLSTX_8hg+H delta 483 zcmV<90UZ9T0{sJ!B!3BTNLh0L01m_e01m_fl`9S#00056NklBXCP)ttWfmlPw3cYyTs=Zqe*(%_W;u6#3tiv|~p{GJ=%7=$`~8At_WrGd9ShZy#h z*kOnXkzp2D4u5!lYZC)Q52l!^GMyYy7z9jc3=>cVb%5o;MH)Nc{DWrWtatM&q`=P1>s0{|( Z0RZRCzZ#?z%#r{A002ovPDHLkV1gl*$^ZZW diff --git a/Resources/Textures/Objects/Devices/jammer.rsi/jammer-on.png b/Resources/Textures/Objects/Devices/jammer.rsi/jammer-on.png deleted file mode 100644 index 987e571b263f8b1a1c863755865ddbb5f496cfbb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 537 zcmV+!0_OdRP)5+Iv#X1vlY<|@&)`S! zGYHPzoE%+>n}Z;fT1C;N2el0}Q3@%fXY$I0APU|k*E4W`NZ;KBdcT*;y(IqvD3%7$ z09*j=_8uLNr{FkGh7tf7(g67axH=ue-OUh=FBAd%B(^h{cy~x@fKquqZYM#c034n* z!`~*@_LQ=*muC{67pV_i0Lg5>E6RS~-bS#l^YCYo)Jw2y)}gm}$9BUqfcO-6lp26d zE~-rHK!^0@-UBj}Ux4JEuhlAe0JNyoLUiOf81H8Rbi#?)wrhBwI8I;JEOWTu=I|@du*GPpnNi_usHzD~4BO&i5aw0HVyJ$)hMLVSqVZIw3v{;<1(c z0}KK|7GhT+UzLz4$~^gX)U0nnsag(OTU2Tx`qdwBKX9B-6A17rpG%+&K>GvQACMsp bpd8=}cvi=k6xZ2A00000NkvXXu0mjfjHTr1 diff --git a/Resources/Textures/Objects/Devices/jammer.rsi/jammer.png b/Resources/Textures/Objects/Devices/jammer.rsi/jammer.png index 99e0246bfb1acdddf9df6c748233bfd2b808c0bf..6de27ba924f109e4b6bcf08e517a0ec822575e90 100644 GIT binary patch delta 449 zcmV;y0Y3i80`CKmIDY}5Nkl6vkf-K{idOLjAg~(YO|O zcmb~<8!d*Vn=aY8GU*vum9SPC5@~{93W-+UglPr?GBs@oreD&`zjnUgn|U*7%rFet zq++mPMF0^%1hBmT2i~0_G^}6tLtX8YJSS}k21OUx%o_|gup98q6R$Z;p@QkQA zt*?Xd4Sh#@!^&v8Jj2NQi*FDe4PR` z-AkoN-5v~9zK7Y5iMTESeF0#WtBOMQ{G?ETR;x8z6-~Ify!N7Ik0L_QzCZv_G~v3P zj@L(*e;GtzHzAGweLRM2Ham}AUpYCCu`d7=8$C_LAUebaAPC$6g#&P}Y2*lsqDb1! rW-~A%U-tlnpzZx3i2x#ie*^Fhk4mZEqh?^5kDm)JkL(bdIKZbv8c0e*E&70ADXG3E*#XGDMF-^g zo@57L13FA%3|IcWB3nPj4xq$xsyF}{*b8g^2hj)LUMD&&P=D0{QtXTj&wl%mgsHgxK?*fX^v>*z4`xZ=J{Pve&InW|loJ)QB0v3P9z|3%vfiy65qhLTBuufPQ zOn+ke#vuGt?f(^qzhM4LJ^?UI^SS^TfD#=w07(w`^zj>*Cb!(D*a0_goFcilqpAaF g0Y)7#;0^!)$P*M&!Hni>ga7~l07*qoM6N<$g7i9kt^fc4 diff --git a/Resources/Textures/Objects/Devices/jammer.rsi/meta.json b/Resources/Textures/Objects/Devices/jammer.rsi/meta.json index c5cc9f56d24..2923d9ac636 100644 --- a/Resources/Textures/Objects/Devices/jammer.rsi/meta.json +++ b/Resources/Textures/Objects/Devices/jammer.rsi/meta.json @@ -1,23 +1,15 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/93d9c70530c7299ef0af96fe2178096b2a62e036/icons/obj/device.dmi", + "copyright": "Taken from https://github.com/tgstation/tgstation/commit/c65da5a49477413310c81c460ea4b243a9f864dd", "size": { "x": 32, "y": 32 }, "states": [ { - "name": "jammer" - }, - { - "name": "jammer-on", - "delays": [ - [ - 0.8, - 0.2 - ] - ] + "name": "jammer", + "directions": 1 } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Devices/signaller.rsi/meta.json b/Resources/Textures/Objects/Devices/signaller.rsi/meta.json index 0f259d9b457..cefaeebebfd 100644 --- a/Resources/Textures/Objects/Devices/signaller.rsi/meta.json +++ b/Resources/Textures/Objects/Devices/signaller.rsi/meta.json @@ -2,7 +2,7 @@ "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from Paradise at https://github.com/Henri215/Paradise/blob/27087670280de99e2fceb47194aad29a7b99b280/icons/obj/radio.dmi, signaller2 created by TheShuEd", + "copyright": "Taken from Goonstation at commit https://github.com/goonstation/goonstation/commit/354d9635460c296dc7dce23ab39481dc4de6dc00, signaller2 created by TheShuEd", "size": { "x": 32, @@ -18,4 +18,4 @@ "directions": 1 } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/Objects/Devices/signaller.rsi/signaller.png b/Resources/Textures/Objects/Devices/signaller.rsi/signaller.png index d6b68cba775e1dabde93e46de284f49f0b30a35e..37a47342a6a0fadd153c1abb049caefe51b50e43 100644 GIT binary patch delta 264 zcmX@XJcDV1WIZzj1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU$g*fKQ04 zd8nt5s(4_oPs_BbAQqAH!or5PT!E6d+7mN@6h}#rU+{kjV7S-3HxekuS>O>_%)r2R z7=#&*=dVZs3YL1hIEGmGU!CAx&)1;928{u)8H0aHR=D5Vkpy%BgQu&X%Q~k7#wGyW CcVF!Q delta 441 zcmV;q0Y?6q0>}f98Gi-<0047(dh`GQ010qNS#tmY4#WTe4#WYKD-Ig~00DYQL_t(| zoMT}aU@+={Q3sIa059)||J$~%U>q<9JbZACfm&c_M!}$SfMtx`e-M3q$sv-{1<4Lj zjW_wvaOM}>QV?)(QHL@Alj;bP900P^!BL%I-uA5welF&4aerT9T`+xM&rJqW0a;Oy z)a8xB-+cBm1G#`C2iSPCGWhD~;*|fxeh-)qXy||=TYob=ytW;u{Nww-8At_0JK(UL z?*G_xUm0W-xfz~4bYd`1@PNymT(E;dN`4>1bD%uU9B}eJ69WS;g#Gf)WuT=9IS^k; zo`Ebtv;#^WUw>p&&@u*Ry^u6^AbATR>BP=(_b!bc00NRm++h0d-6uHZNv$S^PEo9_ zt@j_B`1wb#84Tq_Y43nHuir56F$jR!W(%G%oJx=aTmEVLGluh?3}ickXa~G}^^8%8 zK?NKN`m(CI{*Path7KUt j5~@0Y+F;ZHqYeN7H12kP%@jeom;=LYOsz~-U3H|W)iH{a6!f4<6pSRmxU z&cBZT8J^29ELfMFv6hjccK_kWzZh%xHy888URS-{B=XNy+F;$?2!>>yYqxIRm@(hk z>;HOQ0jG+kB0Yu~x65p-yDBSdt!>0z8+A@UnDaU6_2k(TZtc%t?lIhOt*N+g)he~e z7SAV7wrrj9&sA8+se(b{bWzv=32PtCV_*Isk`H+jaYDvW|KI&TFrR&7-DtCOrf8kX RKVUdAc)I$ztaD0e0st59p{oD@ literal 447 zcmeAS@N?(olHy`uVBq!ia0vp^3P9|@!3HF&`%2dVDb50q$YKTtz9S&aI8~cZnt_3_ z(9^{+q+-t78}{CZ69m{kXmivtI38RXG^gp2f}WH5NB+Ad#Vck%Ps(Ea{at7j^j|V_vPv8cl7foDVn=TiUVzBXyAHK zl&BT6>h3cm<|)y+uZ#ab*DaXy(%_$c1@ErxefN#_@g8Hy4AGhP>zd8?IaS%mIFt{# zB&zNDbZ-0Ct6O{bojLs1H_0XG!1Jl=1wOMr{oL9pnYQSu>&X(K_bpeA3yzvz(t5o; z;rHF;H}{@=SNQlvUtjy&FN~YM&XacWw+)UIyY~3KeSPYTV1^T`)uQ)rj{a$=E_rel z^O9MmVJ9OP=f%$}+RK(WX^z!_ZH-nAyFo67fDneauMeM{`19{(ABIbF?!CJDVtS51 zJ)6hnQ`cg?KDcr^jeUvV9rxG8hVlkXJ-vPWe>6JJv#TV3dYfP&ukqJPUchI{!5Rfw mhG)z(_-~j5uxEfn;{bbL<^G@f$87F_Z1HsUb6Mw<&;$VXyS-!p diff --git a/Resources/Textures/Objects/Devices/station_beacon.rsi/icon.png b/Resources/Textures/Objects/Devices/station_beacon.rsi/icon.png index 15c1e94221d6ad947744547dfc7b4a8634b81917..67f3f53eb5010a9b612cd02ec21f1d09fb71a651 100644 GIT binary patch delta 286 zcmV+(0pb3V0tpxz|{T;`{9({iY5uxk4q!ywY7;7H|gb?uFFJ@!En+a delta 257 zcmZ3-G>K_~WIZzj1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU$hWfKQ0) zP8VHqF)3|rz0Ax?MP-A|&N*J*5pVYd0p(5Zn;h-1sVbgC1MVN2M)YY zX;{?Y=pq=($gDhz$wWIq)|5kpW0AH%prdhPpg`zBaRo+(5;2aK5l{#&5lX!-nn|g9 zhv#!v(AOGG7z7F90u1grCDQBmX~$%sdnAxBDj>seublQUwmTi#m8%uu8Dj$cYiDq_ z%A)P~um^N8BA{EjyxAbz-G;~_u?1eOoX^-D(*ANj2}d)Q01ux{rcdE~XY3e;g}+NA z0aNfu0w&=f3tgCoelQ)B~wG&!lQ;BpBG j5H&F1TBIeR!oaZTJ&*r8>HKp*s~9|8{an^LB{Ts5G#oeh delta 432 zcmV;h0Z;zO0lou}7=H)`0001UdV2H#000SaNLh0L01m_e01m_fl`9S#0004SNkliBuElru`WV*><}y)L~30k z4<#P@G3^_7WcEk7>KldF?`4<=%jYw@GxIh9D^4sB3;b_^2-kES z(wP*WzrGBh+kIfRb?1>#A|S)JvzbZ#sBnUVM}l0SlH6jC4%{&EaB*JeH6epFHxmg` z0fg`6lCbW=ombB5I2KDKUfVxB@H|5%AmFLZGz`lX_#TbGW^a6zySl+}4}^t8K)`o& z4Qh>BFdg`{3xAjM^xOx($if2h%Kw62nN7g&{`L9cIhqRz$naLD_bXi9^<>8|Dtubz z5}<<5B|r(ES%4ZolYk0%WC2z1NCGP10Reyi#$aQ4cN)n?^^6=I5Wr|sClg())4t(% zJ2gC1;NG(MD7qHHv76Zn-~j>rWx~!i78%z#+;@E{6Dh#BFy@;pOXw+34V@~m%)|mK a7x)1^VdyatfcNqM0000InD(2OxQ zts!k}GcG1G$z&$U#4L2-x4Gw@Iro0woO|vA{^LLXGK5Bg`+xiU)zdp3HB55+%5qg6 zj}ube_WS)D9r9X(@>4bE2oY1OiSU#Y0LZc|loR{?ek4gE9*+a?>-(L0nk_hTR3L=g zR)hy&aB#5Pr|Q0NI7~DerK_upa5xM=!LR8Zy57g=#R*eeiP1|Fph8}7b2zYUE5ZXH zNs{3R1Oj9-8Gj^6LQxa|W@cs#yYRD=Fx@Wqm7_3U@-O1zVAnFCVY3KNDwSe#a?&&~ zm&-9eHin`oh@!~1A~`@|4vSrwgOPJjtpdtoQ*)5Xx=FoRHpO@VlF6juh(scQw)W|C z8i3y3USe=qX&srY=8FX-YBqcvxKX?g{8$$#;mT~dS*Yw zdGuHtT5U_#6%ZPBs|Wga*?w~^CCTT$*iNce*bnb6HGUM|I^kA#?s3t+23EJisuozt z*WKDC6jXui0%WrA^11ags#^nDMWuBCR;5WT~U1=C8HLw5x002ovPDHLkV1kCMo$vqv delta 678 zcmV;X0$Kg`2EGN5B!3BTNLh0L01m_e01m_fl`9S#0007TNkl)_bF+d?TN9| zXCVqj7NK~!dG(LJ``Kvk8X=?s_?Sh6RES6}L^dv$QJ@>J_~gUkF+>cALVP1Xp$m~b zwg6d3vFf)?)AZ8mG=@h_w*K^tfB$G>>CrS>F1oZ)9)DIAAj5TCRt}Hq+ejp!*=(jV znT+?@c}I@m6|A7dyii>1cme*hMR_4{G^8SEdEV;2MdPAx;h4se0!XA(^uoWF4}_t- zJj>i)SnoYYD<6n5NHLZ3kAbym68B%nufaTtn81zs4C{B;95*~4NJ=WAxVTO3fo)Q= zS^Lhk|9?edm3upfA!lo9<69D6YO4JR`bL|w@Yp#T5? M07*qoM6N<$f`msr{Qv*} diff --git a/Resources/Textures/Objects/Tools/drill.rsi/drill_screw.png b/Resources/Textures/Objects/Tools/drill.rsi/drill_screw.png index 0951ee8d9b7a5d07f776e4d62489a86da62cd2a9..c51ae6332b212cb66cd2b9d58ffe841152d0d747 100644 GIT binary patch delta 864 zcmV-m1E2h}1@{J!B!2;OQb$4nuFf3k0009qNkl1uos%^ax>0(fl z;B6z_h^Vzgu~6D7-l4V@Z@6^bT@_tO1^o$L7a~O(NUY$-Si2~c3L;`9A-eEJg7z3= zZ5!IgHsfMC(`06nOw2+TzMFH-%zM7?nKS1G|Mg#gSyDOXj(?60_4JNMWhXg)d9h%g zDkn+xx}qo??eE6p0XI0PzWBsYiK7i}S2dh(v09$H&l z@pwEmG&JDz`F{{XAcSCabkwM4XH>E?8icttD?6=uv(qZ`lP(T6La@)BXRZQBCXDB;PFNd8z?y~^gKOSacQmg-%hJQDaEawCHzo6jqXl`y+0TPJ> zot>Qw4{I}h@Z_r;R87?@wem}9`PqiLrM9Gf{kzYqC3#T*I}m^y`#)Md+qY=tJ@q<) zKmdSLDrI=zC$UWq4)%ei-(!HhPijG@c5BJbcwP{Fr+K6PsFB?3^%~wn$sGZhK}MF^ z9SdVBz<<^)%bsvT?}wy4(GPb(?*#eu7{xOn!*dbY)}7evU3A=6?euS4|rw)@}CT@>H`h|H+8znqAN2 zhd7TOYh4R1$&vuUKDTdrkbJZoTe4Xmn$ zxlGBWou{lSk)DH}X?XeEdKi_Q18JdBGY2bbAX8RqT`Kc)ke;@GTNI%GYZGhJYmHf5 zUs+%OM+kvI?SQJStz~&LcK`qoi^UK^Fm&m4-gAA~IhB4undNvHS~nYE>nm4|?gRQ= qpb~k#UgJb93qXgc6u>U|KcU}Fxn=bu4hl8^0000TD1rg8#IW}-YVV{Jb3ojv!@(9dhnEUZ=O9wkY1J*3Z;}D6dNfNwM|$B z8%b1huq*`H?aZvZZno=YXEsF&ez2Lp&3xayH*ep&k6Xr_0DoZtV-wTn>TFq>aAr9l z6BfWo?fzssg`w0(De`-5T~JqGxXg z`HsN{(gKb?yoL6@=8PQyWMI@}g!_jD=*4}I{%5>@T0Z0J?DTej#8efI3v4R{fe?lMmYr56I_fOIM0nP@pzfYW*1CRd%_iZCH+$oM z&AmBN~ID@BogL{{+Wj0bF3oA zt&m;3vH~o(1z90-He@1L`-H%R1e%tP^V?c11DYuXt?>WV1Ab6f#<=-2n~mR*st1BL zWEe_WVLk5;PX0v#}Kav!jQU=T|A)Qfdksp_;_yEdKegaT$uzu zf-iK|z>m7sBp$_1!1wsi}dNtxp?k3$`&p{SKE@&31uz>R)HU40? zIix}YHi|8HSM9qhI-0fhe31FHj&Ie%SAL_t(|oMT}aU@+={Q3s4VVCXu)+(`F7jD7OlWk$L>0A#tc zf((PQqAbJR`;S3F|H*X($qv|9!}s4SR*AtT@*czi51ud_S+2yeZSlkZ{w<$Kb_7Wd zfLQJbwj2a@?LQ8tLHr}j9T_$<>?hd~B!>Xl=fL2{CSK*mKz}kAdbwb6?G1+5X6)kE z&vMe%0igH=rGrB=o-i=++rh>EeLTdlV-qI>%@ZLEfGlsCB@WJlpqx;b26D`Pa*QHB z4Ztjilml$!8biJVV3vbu28NgPb-;opTN$oh_{Y$m!^}`Q{|4DTONe+1a>N!JKhO*_DAplC8AbFZPVBI}thKgyy3>%CfsU8Mkxgul!D%v_gKuD6o z%wrY9zR3b$OOXLc93;vs4?tfV3_}bwhp-P@F&BR{d@(jyho2IRF5fzm3J^`Cjn= O00004uk@Q5sCVBk9f!i-b3`J{n@ z>?NMQuI$e^S%i!%Lb7dM0EG%YT^vI)?!CS4%hjMD(DqQUN$-Iqlk)p|fyF0`cknB2 zsI}*A*XZ~jS!W>6yh~D$;lOd9w+=5;cIf(a8(sTmdg|z5*Jq}#t5~01n`bnA@}6xC zr%!&aW(1ndus_kndGhwBGrlUW+!gZt=cYUxSq6p!$z`2|0#Z`ZHy?u3c)I$ztaD0e F0szMUPVoQ$ delta 243 zcmaFD*upeHvYwfNfx#!Bbqb|fr6=?E{-7{-fw#y`4|*Aa+tdp{jdMj^@T}ox8Y6Y;*Gw?ntnQRo?FV$JhO!> zbFJsE!{y8!9vT2 diff --git a/Resources/Textures/Objects/Tools/geiger.rsi/geiger_on_high.png b/Resources/Textures/Objects/Tools/geiger.rsi/geiger_on_high.png index 7b160b48d7b2c8cc6397a18f7b7ac306120d6d78..15edc91e52938302e7edd8e02013a69dd0304f09 100644 GIT binary patch delta 159 zcmcb`xPftkWIY=L14D6D)fXVemgMd3!tfsi7wla=87RV8;1OBOz`%C|gc+x5^GO2* z*-JcqUD=;;vIyx)UX4)F01DZ9x;TbJ98OM4rj@Q5r1N*@7X#;MwT(m+9H zPZ!4!3;(xg9Jv@2I9vkV_x_*hJlCmL(6#!$TI>8r{K8YtJ20hZt#%0A`1j%LBMdiG rH|$Bc<8}TsQ~Ile2U${^9_(Y#pTWP@hJh;c#Cm@WIZzj1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstUx}0fKQ04 zRHRA5{=|hZW=q$a0L2y_<+%r>SWANZg8u^n!|!c;!9W4d0*}aI1_r((Aj~*bn@<`j z=wzucY)XHkaDv_x3l~-)9aVawq}%IV9;TYP-H!5vESq{&?E*=S3j3^P6~ t8>$=jB;4^j|CuTM)xm=-sZ9^|G3d|WUu(m_6$>*M66Z9+7 zHcnXl@|bs`&Z2zx#l>I+Ty6(7fT|@LbQlgTe~DWM4fY=JY) delta 201 zcmdnMc#Cm@WIZzj1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstUx}0fKP~P zmn6@#0?Yrid^bDE0>#WLC0c}brt@5zopr0P09Y!~g&Q diff --git a/Resources/Textures/Objects/Tools/geiger.rsi/meta.json b/Resources/Textures/Objects/Tools/geiger.rsi/meta.json index 11fbd436814..10968b47768 100644 --- a/Resources/Textures/Objects/Tools/geiger.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/geiger.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from Paradise https://github.com/ParadiseSS13/Paradise", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/bfc9c6ba8126ee8c41564d68c4bfb9ce37faa8f8", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Tools/hand_labeler.rsi/hand_labeler.png b/Resources/Textures/Objects/Tools/hand_labeler.rsi/hand_labeler.png index 77fbcef30da736b4008b8a3c372a3bc43424dda2..9938103840821ec610fa3ff217b4c8a3965985b5 100644 GIT binary patch delta 257 zcmV+c0sj8q1Caud7=Hu<0001iRA0W=jG90004WQchC>1bUyXb7osrRTWf8T3TAh z%$aRnU0rPu+4l1C&c#Y*vu4ej1`z delta 465 zcmV;?0WSWL0^b9W7=H)`0001UdV2H#000SaNLh0L01m_e01m_fl`9S#0004zNklemU<3GDd$a17H9QfPVo<4NzIH`SS1PK|S+p z05HGt8cI(GA~67)JI+#|@4AgZDp4?r0bo8cIi>W`!?p58o!+l6BNItI1Fn0n0I;&9 zc>xh71%Tt*sqE5rb8}E%I;UjiSHvEyd#@fnKRt>km36gO(|UlB34nZV?TE77VYT{w z2@T0M^3ds*gcK z#QB+7>U8hL;OUBwObYLBY7ytuc0MhCc1U29O3BXS800000NkvXX Hu0mjfc3aR= diff --git a/Resources/Textures/Objects/Tools/hand_labeler.rsi/meta.json b/Resources/Textures/Objects/Tools/hand_labeler.rsi/meta.json index 3c793a97322..216140cec3c 100644 --- a/Resources/Textures/Objects/Tools/hand_labeler.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/hand_labeler.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/. Inhand sprites by Macoron.", + "copyright": "Taken from https://github.com/tgstation/tgstation at commit 44636483b7b2868b3e42c92205539f11f6d7968f. Inhand sprites by Macoron.", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Tools/multitool.rsi/green-unlit.png b/Resources/Textures/Objects/Tools/multitool.rsi/green-unlit.png index d0bac8b61eb217c36e109147a9aef63d1eee1b10..fccc17e9193e7371d0b0630e1eb19d25699ad886 100644 GIT binary patch delta 93 zcmdnMSUo`{+{x3$F(jfjS%P(Of=EwOpaB<~ltEC+|NpE07nmhWN2VF_mT+tcSQPo; rl(@xjThkb0F1LdkP}LLJB_t#mk}_B?1f4VtV*mnAS3j3^P64z&Jsrp0PN{-HBn{IhmIX3=Aykj=qiz3>*8o|0J>k`J4qFk;M!Qe1}1p@p%4< z6riB1r;B4qgnP0C>*55Fo~A&9M~uo-)Fe;LH~OJp_1SXD@dF>CVkbRZc$0O~+2p26 r%xr9T7@;b;+zx6;url*VNHBa4V`uyJH9ReWB7cQ1V z2*l1|m^ej{VaE>A%pp4wQVUR&1_ZBsq1YK@Ibh?)_Y4!K++kqIQGttr_#knbJ3wB3 zCL<^z-napE1QdYy_wV0iaBw)l$iP5{f{0pxYzJs)K(b>VQ!P zknI2k6Nmr)-u?^|8w(lp>-+z2+`5tB!I=Y$baMa*IM|poYy>(4OamQ24j|b9AfLn7 zGv+Knp+R!L?!04o_TduIAwiM@Ko<13w=oQ1VBm+atXRtgeU}zRZprF2sL!2%S zaIdFoI+uEIRNu9ENg<~)QlJyQVO2Y#sQ#22C@ufvA`rThFdnDfl(0*wj2a(qCPSl zS;kL_k>r&FAaLg7KA?^AU_K~Hl6wAuEx&c{GwmGEw|x5=u!7P04+?6Pr8;nNP@+7t zi~($U*P_o1`)=K(O>GDQ>)wkoTwSP!QXzpVDFomq$vm>MVMa;N@Ij92f!S`KqW9VE2B{dj5>gt002SGvy^e9L(~8O002ovPDHLk FV1oM6-}(Rm diff --git a/Resources/Textures/Objects/Tools/multitool.rsi/meta.json b/Resources/Textures/Objects/Tools/multitool.rsi/meta.json index c5c4ed87cb9..bf4315734b7 100644 --- a/Resources/Textures/Objects/Tools/multitool.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/multitool.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/94f27c7b25bbde39c1412e24fb32bf6470fcc394 // Icon Taken from https://github.com/ParadiseSS13/Paradise", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/94f27c7b25bbde39c1412e24fb32bf6470fcc394", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Tools/multitool.rsi/red-unlit.png b/Resources/Textures/Objects/Tools/multitool.rsi/red-unlit.png index 71a6ee8f67b5927c7f206be27be23abaa61c00b5..a141fec4bf9b5deaf39c994e771dbe07e8da5698 100644 GIT binary patch delta 87 zcmV-d0I2`30dKfnzk|bp- tk^2+Y$^CLy&Hg}(43Bp`BuUb*fDJgg0_WdhT?zmI002ovPDHLkV1lX&C6oXF delta 146 zcmXS2&p1J)p0PN{-HBn{IhmIX3=Aykj=qiz3>*8o|0J>k`J4qFk;M!Qd`Cc-ajG_- zG*HmR)5S3)!aZ4nb#a17Pg9`5BSz&ZYLa^z?$ xv&{X75ht6?t6i=713feBzTPzf004iIv;nEo2J8>CYB~S_002ovPDHLkV1gJ+CH4RS delta 145 zcmb*8o|0J>k`J4qFk;M!Qd`Cc-ajG_- zG*Hml)5S3)!u{BlG!?8#U|^qcponco-h=&1UtS7fXn4ljQ6oo${78KPehM{Q?n4v8l3~IZQVyS|O zOe`f+7Pk5iutfX@vmhjtF$*lsT5uay7lDV!K>`m{S-_DTMU`00@Ng2>aS~7 z=RPOz%elvnCCjpyr!LHO_XWTLU;zMJOj`&}^e{R;Q>p-5@_)<7TbA@+08T!^<6T(W zfNt(S084E+IM%~iLZku!w7!YjJNp7a#)IOHfRLs{SlS#9n*cBjBLsM~J^qW=t_pW1 zsov1TaS$UN&@>JEhYIci0C`pPduoGLv+&!6fkTm2uZep6QPiC~@USo*B5@U%rYSj& zgXej?wl!=QPJiDQ`s+Ql(Lc7``0Mi!(33p@;x+|D_roC66CE&3Ge&Dw^$-f=?~2X4 zxl2wH!fFKCaG%XSCnE>cz zOR610WnVviOaMU;jOZ@QHjT^!83fy{-4Czb({zh|uBwGM10Ok(x3+A2KBmwPTod5s;07*qoM6N<$f>`(+ A5dZ)H delta 835 zcmV-J1HAnH1lb0VBYyx1a7bBm000ie000ie0hKEb8vp^i_2mJfr(;6A1|>z^dX3m50yQvLg7P@y-9%zefhAF1R)VdzC?^5 zSRh!stPCt@D4R(_pc$J{!ZO`+W@mIAcXza~9`?X;@7%q2&VTRz&$;K$Cj4Vd1Ec}c z00{w_j+UrW#TM>&j+SwIsdN~}ZUk)`0zl3^XHIj!p|YCW(wsuP2GqX^ku(I~KgirF zW4pO^9FQ5RX<*S%CzYjwH37H}N~+fTl5i0@cY5sDv0q9FkV>&t6(}kyKyxopH89Q3 zli9V*2qXOb09N)%R;>qj+ z9Iy6cWJF}l*Ln`yatK`wxxE{eCqiiJvj9LzNI4LWJ?kKbLINVXph+JL3?UqrV)KSj zSFT{PBMa~q8}plcbNC%?jj)yjG!sct0;o!pX~9D=)f;v|&g?8z=fGc(cB1zTX> zX4U&xQ-3UbXD*D*Oem|q(*$78G*8Of8{$0BjhvH_yp&|_!mUDHg?AYKGz+^c50M|* zX2>}~h{LM}-^-2e4&;k4ycrx8@=kHgDdTaaTW#wL*}M=^iv>lFr9@6< zmMQqqbFmVW_WKKIi?wf4N1A*dyzaOg!xWC^Q4 z-r!eh$^Q;CFy}~9;1^$O1KkLJTj@G$8AIEMm%7|7681arT;-RBP%yt?Emkt zC~BCwL>WFDEMr7g|M_$`R`c)y7HpR1xIl!>jCA1Qr_P;)v*$exMR6#XW+cPU#|OxY zObi$ESvCA;lQ4luvT(u0|Nr@h(-3AJDTcpao-zD-afZQ?_hUF*Tv%8bMV*+K7=xsw zBtv<5Iow{15C8>rs`^nd+sw!qE{-h(zFl7qra>X_=lv~)PsbVsu2pa1{> delta 283 zcmZo;+Qu|NrJl3EBeIx*f$smm{q4U4bWFDzvA+^c ztoZqhcg8WMf6CTOM;Ytw?b$9X#OGGFO0wR!-{TN?oF{~xsbAi{VRhx6PmIiV1<$XQ z-ckJU_nMQN-`0wP0=s`bnHS>O40l)w@CJA1X=pMib0xIhKe+0TRoK=k4F{+5y2~Pb d^o5NJ5WIY=L14D6D)fXTY@9E+g649D0!MZp>q^Bv+fXnTm1G8JsxA3sAf9x02 z+>RA&41Rv@(9O4R-$s0$$h;y=fM>_<-T&J+wzjqgJ~?vah=hu&s^qEDryqXftKfi| jpdrDkEMs6`z`(HczYt4S{^YMfs~9|8{an^LB{Ts5L&Y`} delta 208 zcmbQi_>ggeWIZzj1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstUx}0fKQ04 zqqApOZG(!MX78jaK(R#+|Ed5f){-E<;Qv6t@Ov9yFi?QAz$3Dlfr0M`2s2LA=92~r zdU?7yhFJK&?eXMdP~c&H`{}=V_AD(=r4Dz&Il;61qW>HaKjH1f*u#C3D>6HtKd&A^y^Ls8q476>gTe~DWM4fk7GtS diff --git a/Resources/Textures/Objects/Tools/screwdriver.rsi/screwdriver.png b/Resources/Textures/Objects/Tools/screwdriver.rsi/screwdriver.png index 9e1369973418dd4a0e681f2cb730f43b07e17418..9d0d820ddaa8a7610582061de5121e0fe779d51c 100644 GIT binary patch delta 210 zcmV;@04@LD0pkIX8Gi-<0047(dh`GQ0IEquK~z|UV;BXaU=)mkQ7{TdJYd8Y06jfD z|3Ne_FE3o|^XJbfY9u8k8KR@38IjeOl$2mKk0byy3?KOZ{ri6q2B`&M5PQ|CRRr~6 z0~juzIdkTJJ3Bitn}>%7F8<}q7o3JDC@3&Ic<_MX(4j*N=}YP9B!vPCx&SDsH8nNy z8Upe$h@LuiDwv<0oy~Ch@@0}O2Z6zt21das7zLwX6pRA80tN;K0N&L{g44@Iu>b%7 M07*qoM6N<$f+sjqKL7v# delta 206 zcmaFNc%N~CWIZzj1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstUx|bfKQ0) z%$YNLdV0Qp{|*$WEwRm-86?~2mhKo zJtkXy***r!t=_<$R9@M)^z82^?VLw`9{9`1SIWKo>C=$^K!X`PUHx3vIVCg!0Na^N AF8}}l diff --git a/Resources/Textures/Objects/Tools/seclite.rsi/meta.json b/Resources/Textures/Objects/Tools/seclite.rsi/meta.json index d466ad62d59..86f25b0b7a1 100644 --- a/Resources/Textures/Objects/Tools/seclite.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/seclite.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/blob/master/icons/obj/lighting.dmi", + "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/52cbeaf94322209d4c6596818dda9fb3654729d3 and modified by Swept", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Tools/seclite.rsi/seclite-on.png b/Resources/Textures/Objects/Tools/seclite.rsi/seclite-on.png index e02d6ee077424adc4cbf9fc449925864a056d150..317e638c18c679b0a0ee848973c731e7a901d786 100644 GIT binary patch delta 271 zcmV+q0r38W0-pkq8Gi-<0047(dh`GQ0OmeLU~vc%BofpuCFuov+nQ`66ZA9f9mn#jx=re6cX@>w!K4|ULenNn5Jp{$nv$Hz#H)d5Pw)4U5KK{3F*4dxf6yV zG)=P^zl->8S(Z>$m0gQCOHGgv+z7$EzSZs%VN8-ljIR&{NT5U5ofMIIp1s{f0mc|- zBZ7HxEu166Ff6$g$xY7YK;SLlhmZD%PDHLkV1mdxcBlXV delta 243 zcmbQw)WS4DvYwfNfx%@-*D)Z)SRCZ;#IWw1%u67LCEd~2k%3`jKlh(RRv=#@z$e62 zT3Xu5%F4^jD<~-F>(}Rzk&!q&P}~{DS{O0K>iJy^%mM&H|6fVg?4j zBOuH;Rhv&5D46K!;uvD#|F+*Thwp#_2TS?ZY5)K4P*4qYezj4&eTQOV6W7fGmgnw_ zUFNpo44ZZ&CVuPb(_SZV;eZgUwbeD5)?*qUmU&JNI4CuhtM+~LP0`!#YC8ANY_Pre h<`ECTATm? diff --git a/Resources/Textures/Objects/Tools/seclite.rsi/seclite-overlay.png b/Resources/Textures/Objects/Tools/seclite.rsi/seclite-overlay.png index 7ea22fa4c673b9069203b7c9aea6b79030624493..a5e9f773ed55bfbc12fbbdce978c3733689ff043 100644 GIT binary patch delta 91 zcmbQvR5?K<)WOrmF(jh(?L|W_1_d6LgWdn@m(11os7=aN_HbyC^{CHbVPGhmd3amt vF0Hp;+1IhT^lxIR7mE;#<7Z%4(6)rL*jZtbwErhd1|aZs^>bP0l+XkK{`Vjk delta 250 zcmV!4MC`~i)=g%J~3jsh5bb&Id;{c!k3?v077q=rL zhz5lU%|iemU<3lHIA9AS1K3BT09YcVc?htuus~U;fQ?-V>}Z-h;PmO63@cY1W%&N> z0K=q7YeDfpgKk+684OrKGzvz+C>RBU9565d0A?&i+Z#0Exc~qF07*qoM6N<$f>26Z A(f|Me diff --git a/Resources/Textures/Objects/Tools/seclite.rsi/seclite.png b/Resources/Textures/Objects/Tools/seclite.rsi/seclite.png index 1064101c28a568b4dc9acf68e1ff423b8e473014..d8ace36de984710ee0aa9095539bc689fc209fa8 100644 GIT binary patch delta 258 zcmV+d0sa2L0-gepB!A^eL_t(oh3%BF3WG2ZhOfoJQ78q$!AEd(^UXT-&3pqN!9fs8 z!BMA_zi=VFv^{7m9lUS3ON_byeiO+s48zzwJ83{s6fPVO!w{|cCCRhmRaMb6O+4+^ z6q3k^vMj0VI;!iM=6MbuIl1-|WFwIP2F2k*p66aj-}l~~EPKoDLc{U9hTthCr);0Y5kH|0#W8)Cf4X&f3j7@3uSO5S307*qo IM6N<$f@ZpRga7~l delta 294 zcmV+>0oneZ0>J{1B!3BTNLh0L01m_e01m_fl`9S#0002JqVK_WqId6ylbqZBq4mXUkrwWQbkUH{NP{a6AZ00JNY0&s4C zIF9ere$zCULjX8&k|flRqDYlxN#9=~0$1Q(O%sPIn^;r%VKxW6EsV3o%90*43z$rVDlCJPdOAY==Jjf};z>twU@!=w@14}_h}yf^PV z@4eXsa&mG$I^MjFzVA!jS`Y-z`#KqB1q+5taBu^sUuK?u?SI)>lu#lY zLL_Tp7;61gyDVE(%(5x?(f4TFzK))yQpuz@LA4u?#{kspbpQr~!IW)g2IAn}?`S

R+>SW-=sx=Xa~}X{6Y(iMk*>dmL`1h2O*FP( z??*K5T@|bwSTkTay($8L&YuE82+HL$#bOcYTLsKyU|x0_vvZAa6RV#!197cyA3`qv z{ZF5Miv8UQ)yf1>98s-6yJL;-)`X^@i?Yx)RO$AhP-d9!f&Nt=u$N(mRud@?(f-;Q zkg1OqV-wCH!jp&4YDQxhhs+ZE`ulpnRS~*(gKBepnfN=Q?Ez(zWOH3cjxRI)oOqLQ j{Qn@$TZ880yenP+m)WPJs1y#N00000NkvXXu0mjfMi}PH delta 749 zcmVA5 zY33`l*SfKbr#7o;zIo2<+im8(=lWLZ55xDq@j2gbzWL^RyMGlnS^p2f;NUenJbWj# zDF7IJDzymJkSBl$e(8Ka^mR4`o&{F`XYhj^hMWr$LJQywj+#!Bsz4|KL~xdJAcTNn z7*&H%0u&dH(P~4u)N4r0RqR1iWz^akIZP(TPjZ_UEZTSG9m&fc)5 zZ-EVAtM^!pW`DkA*PR6|z?F9ca<>x+3y$_Qa$9@1na^Pc2x;OLVGs^29uo?|oWN@W zz~C3dy~T;1IB=iY8WzAVM7u%ZGuB1k>f*smi!?@mUR~hOIv6FuliQzRqTiB!ZghqF zXs;hSDf>XVFu3>|TEif4_*4#FFEwbtBT9g}=f9yg-G2%qov@9Km$tqCV3f7z()Td~ zs#?Hzr%(Ta8nRD&eU$+9jr-x>bQX6hf;xSbaE(9kNy7LB@T2m;Sd1VtwhH)kBS$b03dk^2@w- zH(#4uA;U7zu$lpr^?^(-!a!%hO%-JT(|_-HH)btAhDucNH4GxSD?ow%km>g$adpKt z?CT`HzLZ*k)S?xtOKhjn@NVde*7IRzTd1xM#MKpwkNX4nJOaFWI1mH}1Arjq3gFyr f(1CpcY=r&-6d`W^T{1fl|v8Gi!+002a!ipBr{06$PnR7C&)02vt>AS*y7CMGH=DJv=}F)=Yc zJv~H1LPtkONHzdSNJvyvR8><`X=!O{Pyu&$cYIz1jQ{|db`H;<52tCijsO4v0d!JM zQvg8b*k%9#0Fg;VK~y-)-IGZYLLm%9L7PYm%^$-3&*}lbhJS?%tIW1vCFu+){Zjx7 zy?4a=^bRw#Pk@`bk)n~j&FPm6?wyoG@{!&Bxm|lOqgYBQ`8bZZE{rNA^io@_r=0U* zSP18ZI;s>D!PtjzE;8Ue1E30#4X`S-2{z#y03aK}lVJ-14z;iX_i>MbQL$Rpk3Q-J YRQd(HNLK_J01E&B07*qoM6N<$g5soRH2?qr delta 554 zcmV+_0@eMZ0=NW_8Gi-<0047(dh`GQ010qNS#tmY4#WTe4#WYKD-Ig~00HVrL_t(| zob8p%O9D|8#=oFIf}qkxp*=|37@~_7NiL-RfFPj=H}xM_%c4!vI>ANKCO0(%*`|F+ zCAnx}2||#NIHg1?B!s)$Tx+IreB@)ajK0;mkKy~BJLlfhiGLr~Kfpi0?*`}|G!Z_2 zON2UF3P8N;N*D=^RqTYxOvN=6{h}J z!Cv#Ul}Nu|H28(s;Xy^fvL}!Y0=I4-mbTqsHhg%^+Vk_NR0c|ApRi9H^Xt~Bukmtd zAP?vbCQE{p1%J4B0_JQsFg_m^*4EKw&p{U7_%A0638Y0eGYF?`< zUPEent<{prXjCwl?xAyyKz#cUQF96r&gHPljh%#GZ+~=LST9urvI6iBG*jN3uY7Sa zHWh%19`hy#VdBh<20hOFfqeE9YNZtbRDAV|Wl$)vuU31}G)^1~l3SY6g%y`>Fvx-g{laSdQ$g s2KY21k|VJ!s;L*C32L8r;LifQ1C@uwSxGc<%>V!Z07*qoM6N<$f+Q9AIRF3v diff --git a/Resources/Textures/Objects/Tools/welder.rsi/meta.json b/Resources/Textures/Objects/Tools/welder.rsi/meta.json index 407f85d4cf6..5f876da9ae0 100644 --- a/Resources/Textures/Objects/Tools/welder.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/welder.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/199fffd989d6f7fd6ea9c5188c875137df4f34b8 // Icon Taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/3c5cb36e811725e1479c4c025b04220027230632/icons/obj/tools.dmi", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/199fffd989d6f7fd6ea9c5188c875137df4f34b8", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Tools/welder.rsi/welder_flame.png b/Resources/Textures/Objects/Tools/welder.rsi/welder_flame.png index 6c8ef525ccd7a64c212523ae35c1a3adda12ddf2..20aa48abf68c85cebc135633200b994f8efd9c66 100644 GIT binary patch literal 181 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!N$PAcy*Sa5Rk)J;1OBOz`zY;a|FVdQ&MBb@089@=M*si- literal 255 zcmeAS@N?(olHy`uVBq!ia0vp^3P9|@!3HF&`%2dVDb50q$YKTtz9S&aI8~cZ8YsBY z)5S5QV$RzedwH1*dD;@AlX$jqcsm>wIqCCJB;>fr%_iHPUY4VsR^d-dC(4^wiYz@@ zKB<`-s56_fs$5?=TuoK%md|p=RmUG1PES)pcW)hV4?82an}9MKV(uae0%BFqJXu-b)bDx3)Jzf1=);T3K0RU-PTd)8C diff --git a/Resources/Textures/Objects/Tools/welder_experimental.rsi/icon.png b/Resources/Textures/Objects/Tools/welder_experimental.rsi/icon.png index d33656a0be4000ed43d259b1404726e98595ca41..446d4b21bf7742ce04c265fb06bf89a17c91643c 100644 GIT binary patch delta 550 zcmV+>0@?kG2ebr`8Gi!+005o0f$RVP08UU$R7JqRz$hpvXlQ6qP*5;1FhD>+I5;?F z0A@1)W@Z4)nE=e0GtA60%v4lVASghY0A>I){{R60005a77#IKmW=Kd#W&i-0007JY z03aYB+w%7O00001bW%=J06^y0W&i*HczRS=bVOxyV{&P5bbo1YZU6vyoKseCa&`Cg zQ*iP1gNKs3ILmWA5}ybnxFsx z0T4+PX{)+vJ9T=g>(?`H=YazU{q6mulxZ_iS9E<@mi~FFw5w0VjRI69F*t|PSe-O8yu7o0LP%gW4;bd5rc4oVR)P%#?1x-3T=pSQ0}A{ z+7RQQ{F@{~pDD&ccXIx3?{FY={#Txql=MvfpqZcFP(PR-?<&|27K2bfSPX*wU`-I{ o2Wx`V4uT5Pz~WJ2P+g&Fp+L$x{$; zumA`+SO5eZEP%XFRaK+!EnB-q`t?*IWVcb-Rwk3FyA8ki6i4GrM) z+{e1h`pK_I@?WV!MrW)S$@U4oBNDI1r_dGIjy_irfXIIyy@{1?Nj&*Ji{Y<>NMb@1Fn7c% zsACc{3x!dAyR?3K`^hf^*boOcKEHy)c_o2OVg&4vXS2DIyxT8E^lS5jOZdsJ(DWms zY&@r{F3G7udY5+X?h|?Gr4QosIDHowgPteT5w&SuLB6xO8IL+Tv}|&*H!z=WN{fAvGLs=p64g ze@y{8-}hn~381}@Hpf`%#8Y{lCwFoW;01qG0mSySAL3mj_05et{jh%U*PH>3{5IzV z+~((Bg%NPD00=l(00bN?00Isc009RJATQV-!2W`LW|=eE~8Z`R%ShfcPqT69|zx_6M*(z$(}u zQ0*rB1Hk@(vS5FJ0qhT8e*pUf;1<{)-~m7T18Nmue*pUf*dOp;g9Sjq!2%%Q_zV29 V_Xtar;P3zd002ovPDHLkV1nJ;q!a)E diff --git a/Resources/Textures/Objects/Tools/welder_experimental.rsi/meta.json b/Resources/Textures/Objects/Tools/welder_experimental.rsi/meta.json index 1e4258956e3..75650c19288 100644 --- a/Resources/Textures/Objects/Tools/welder_experimental.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/welder_experimental.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/199fffd989d6f7fd6ea9c5188c875137df4f34b8 // Icon Taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/3c5cb36e811725e1479c4c025b04220027230632/icons/obj/tools.dmi", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/199fffd989d6f7fd6ea9c5188c875137df4f34b8", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Tools/welder_experimental.rsi/welder_flame.png b/Resources/Textures/Objects/Tools/welder_experimental.rsi/welder_flame.png index c4cac4606ac872e32a0a3b4df7fdb4540bc5087e..1efc7aaa60d236c09804dc0a9323648015d16b1c 100644 GIT binary patch literal 295 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!VDw>HYaZfQYryHA+84w9GEfV$B6_Wn(<>s z!Ve&skdW}>$B7?5egGvrBz~NjaoNPu7pR`GB*-tA!Qt7BG$5zCDkP%BCAB!YD6^m> zGe3`kp<+&OSV2+g_bJZhXNCOYs3r?@pfj{QT^vI!PA4ZwutqdY;M9sYVVrvYo)P!d`?lO? mSuTp02=lr*mx}OMGBDhmz`?N3ItWQ<|33|HvxvXV=-0C=2JR&a84_w-Y6 z@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+(=$pSoPXky#FA7XQz{V5ArtmH< c^elw{0LzCCj!+{7kpKVy07*qoM6N<$g4gVLr2qf` delta 448 zcmV;x0YCoP0?q@F7=H)`0001UdV2H#000SaNLh0L01m_e01m_fl`9S#0004iNklV=>FAqk0`zoGDgNa-_7|Uz2 zF~Xt{nD(OvvzZa7umZUGdV5FbSI>_Mf(%TW&ttWIe!M~8dHVOE@2d)q<2VOW2!Q6g z0$x%9y1A`x7k>*K7a1D?IOlk=m>wOgd@nbQV1B-4UiVL z=S{mUmJJ!_01rfRz9=13AimjGO^ft@Q^;MsD|4?&?cu q1wj7~GPyHZJp$LJr2(o`1Mm&4YnlqU^tWXI0000HYaZfQYryHA+84w9GEfV$B6_Wn(<>s z!Ve&skdW}>$B7?5egGvrBz~NjaoNPu7pR`GB*-tA!Qt7BG$5y@DkP%BCAB!YD6^m> zGe3`kp<+&OSV2+g_bOFCU9!Sn=np2f6s_}>U~@8 nvn&@yOoVyeoJ&P`EEyQ?O<+FpeccaPpe_baS3j3^P6uG literal 247 zcmeAS@N?(olHy`uVBq!ia0vp^3P9|@!3HF&`%2dVDb50q$YKTtz9S&aI8~cZ8YsBZ z)5S5QV$RzeYXzAV1==3=&*V7en8!I$lhM;tUGt%eszUIwsSUdwj`*svHtZ;8-H`?N3ItWQ<|33|HvxvXkc z%p)V88yj&E5kd_OCI<(5dwZxf7Hj|j00DGTPE!Ct=GbNc003`#R9JLGWpiV4X>fFD zZ*Bkpc$`yKaB_9`^iy#0_2eo`Eh^5;&r`5fFwryM;w;ZhDSycTa*U0*I5Sc+(=$pS zoZ^zil2jm5sk9(7FQq&+CndE=iHkEOv#1y-YRJWzR+N~V3SlcNxca$(4F>=PKOC-y ziw-XU005XtL_t(2k)@Ea5yCJGMHNqA8^fms-X36Yd=KD&eb zbE9`(Uy_Ob5O(*+s_qbz??~SYdc+J<+Q4+po2H9_nQnmAX;>Z#P79c=XVjV^5D{3l zW;pTYpe^6&;>e*4F%QD?_2#l0EWsDxB(&Pz??{i(=5;!D~Q# zP>hJ|u=Li1TBif|whh&OAFN&vjP*QJ?rvZlDO<4^5q~-7JKZiogs{fre9rz^6QltR z1rQ;`CMCj*<17#Wle-Sg0TAr~sFmdI9}~lJAl~X zLIGgmXYy*R+5mKF3g8JKA5dOrfHr`zG+6-j5BZnQ0AB$4A3=xnp#Tg5G;6YI;9mlK Z0T=1hN)URuay9?}002ovPDHLkV1hy&?hpU~ diff --git a/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/meta.json b/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/meta.json index 87568bcddbd..ab4744aaa63 100644 --- a/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/782006a07ef7f16f70128489b3e78b210ee4bbbe // Icon Icon Taken from Paradise at https://github.com/ParadiseSS13/Paradise/blob/3c5cb36e811725e1479c4c025b04220027230632/icons/obj/tools.dmi", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/782006a07ef7f16f70128489b3e78b210ee4bbbe", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/welder_flame.png b/Resources/Textures/Objects/Tools/welder_industrialadv.rsi/welder_flame.png index 809abc51eeb836157923b69ffbb551e0bd64a5b3..d8ba3f28bdc7cc71fd50d8352f699f748e44cd3f 100644 GIT binary patch literal 297 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!VDw>HYaZfQYryHA+84w9GEfV$B6_Wn(<>s z!Ve&skdW}>$B7?5egGvrBz~NjaoNPu7pR`GB*-tA!Qt7BG$5z0DkP%BCAB!YD6^m> zGe3`kp<+&OSV2+g_bQ)bPd;iXEW7W+oBs3CF9Gw|9WyWl-B<8QnmON7l zYicRw**Qft=5Ne_X^adU=M#*h`=$22WQ%mvv4FO#pr8dXWGC literal 247 zcmeAS@N?(olHy`uVBq!ia0vp^3P9|@!3HF&`%2dVDb50q$YKTtz9S&aI8~cZ8YsBZ z)5S5QV$RzeYXzAV1==3=&*V7en8!I$lhM;tUGt%eszUIwsSUdwj`*svHtZ;8-HWk XIQ~%k!X785D3GY9tDnm{r-UW|X0lPz diff --git a/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters-cutty-thingy.png b/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters-cutty-thingy.png index 09cfe9a497ae2b589ee05b3495f7618f3e1e0ec4..f331df4390e4cd2193af7bf878126a071b8badc7 100644 GIT binary patch delta 200 zcmV;(05|{d0oehN8Gi-<0047(dh`GQ0H8@kK~z|U?UOMM!ypVrosKNbNZi0P_df+U z-~ueHRF2ZfaS|k&sp@|c!XVine}Di00Dxbo>yc9GcF&9x%d7!0#>+y2_kNh0b0(|# zniVgl>;-fz;?B8|_`=LYH%>f)nOFNm24rj@Q5sCVBk9f!i-b3`J{n@ z5uPrNAr}5``w#Lp7;rc*eEffZWYm>#m+h(Q!u-|d$FyJSh~+H&u{7aOYues83qL8w z-u4F*SNbrWGoIrnyQXmM+2|GA2J_=~Sg&xo-)Jz)r_L~e`{;A0BaA;D@_pa9B$p9r O34^DrpUXO@geCwJRZhYH diff --git a/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters-map.png b/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters-map.png index 4ad153c1068e8f52696f5ef2a280a419dde4aba9..a68f4c12577f44b8d8cce23be32ec1556b0f85ca 100644 GIT binary patch delta 305 zcmV-10nYxL1Iq%CBYy!BNklZq}6o!9jvcSL;DQ{AyrhZ6db(>kO|<5cF2(TEzbu0-v54VgJBqkxqAZFfH%Mz0207& zadox!ue3?lfPIbUSc*p+PZbsqp*Ozo_9UW%)*4xs`K0tjw|@_)`{#I$Llr=Tb})W? z{a_>IX!ayYyguZ4-V@Q8kPANhskkvFkWyOu-W^l%D2h;)-i)Hwo0{~xLq~t8wZM_==IdNWsK?6oxBG~gpZ-(j)-2JsBZVP}jRTHAe>k$yi00000NkvXXu0mjf DU3ih> delta 385 zcmV-{0e=3=0-FPnBYyx1a7bBm000ie000ie0hKEb8vpVQ!P zj5=V{0izBWd=5z9=l)NO#=F1&FdY8&laZrUn>d7k^G)U~qKy{EzGi6bC?q z6mJx;SUQ1y0Wt{0M`nWn$YCI`W#d+c$B!SN=)H66I#?~TBQVkc!Fb)fodISsObEnQ zQPcdNnUjrSG00Mo9Eir|V4@NsC~63W0LbUlr%VOMy`{M|!;@!E!43gg4pIkm1hVBA z4#1rVk(8Y|#Cia;5CmdlQ{V=IEQSG)ypO*(iYdS}@E_zboN0jAL?{n*1WY}yTmS+f z%g_PdTmXuHrtfS(9}&)q|2Tg^(#x&uIMv+2BZt)iAaL;iXW|N%ZwyocgRdwab-<_t fMjbHf0D1!eas!}p`@|`?00000NkvXXu0mjflbE8u diff --git a/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters.png b/Resources/Textures/Objects/Tools/wirecutters.rsi/cutters.png index 68c8a3ed715738ad6d3cff7bf54aece317ffea32..3f79cb157cacf02c6412154c488d2af8c68a7928 100644 GIT binary patch delta 211 zcmV;^04)FK0ptOY8Gi-<0047(dh`GQ0INwvK~z|U?UcO@10f8BeNjp}W}v5Y#|+HC z0Ia|cHwkMn12aHHPvl4^CDP?ja&(d6uX(P(etrOgAPB`b@Tf^&}7`lI>Cfe->H zrM|NQ3Kb$kt@XO|J*5nAr~kASG$rA^f2h+4URJP8yqdpyAaq^=~$FZloe{|pXVE588woCO|{#S9F5M?jcysy3fAP%y;P z#WBRf|82h^AAB)v%UIhk){-2IL>zexHfcTVfCSHk!OF2W>c3))C+bh4f zy~o-^Y|$iUrgQ4zB`KQ{`*{9!PV!^n(7hOXTzpEj;}RyP``k`{6Lo@t7BG0a`njxg HN@xNA?kPvt diff --git a/Resources/Textures/Objects/Tools/wirecutters.rsi/meta.json b/Resources/Textures/Objects/Tools/wirecutters.rsi/meta.json index 826b1c44ca9..cd294908267 100644 --- a/Resources/Textures/Objects/Tools/wirecutters.rsi/meta.json +++ b/Resources/Textures/Objects/Tools/wirecutters.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/1cdfb0230cc96d0ba751fa002d04f8aa2f25ad7d // Icon Taken from Paradise at https://github.com/ParadiseSS13/Paradise", + "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/1cdfb0230cc96d0ba751fa002d04f8aa2f25ad7d", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Objects/Tools/wrench.rsi/icon.png b/Resources/Textures/Objects/Tools/wrench.rsi/icon.png index 1b8a2697e25e78a3b62154d3f105b4882a5027f5..4d24ac7fae1286a77c92964bdfbec03ca4e806ae 100644 GIT binary patch delta 214 zcmaFD{ETseL_G^L0|P^2NcwRgr4`^4;`+bgznYp_NJz-cnKR|&>hUko)TsK3$9r$#! zIADr_LBTnz)+9sb=F3thsyb23%TsjqX9=;2g)p+kPv>62q_dC5go)ury8OIUQ5Ghk OwG5uFelF{r5}E+v*+~`v delta 470 zcmV;{0V)3G0ptUa7=H)`0001UdV2H#000SaNLh0L01m_e01m_fl`9S#0004&Nklk`N04-hD4~e|x7+if6O6{Bc1P;s*e`oecm21{q>F7>PnedZ1Lkm@^Os zAvGcaJnxMT9A^e`=(sAE+o#voGcg46BNYI=cxqgqgSj@2Yq{{`T;Q>S2@@GX$4yvyZFWiXw}U~)Ug!6>d! z5acGraC2po-hwAKlUM@w^b0yjICj`hFkH;2xyWFVv`~1;;mOPl@A`Git&-N=1e(s^ M>FVdQ&MBb@0K5S)Jpcdz diff --git a/Resources/Textures/Structures/Doors/secret_door.rsi/closed.png b/Resources/Textures/Structures/Doors/secret_door.rsi/closed.png index 0f60f5243cc68934e4abaaa02445eb6b1b36b864..b68b06f10df2173eed99cb28d5f2e1b887e0b5f8 100644 GIT binary patch delta 154 zcmXS2%{W1#o`a2nfuXpn>I;x!EDmyaVpw-h<|UAm>gnPb64Cnh`bJ&`MFHl6yN^qn zDg?6ro!;cao1(C<$M+3eSmWi2xfq_qCQaX_03GfMVH83!6c6PR~u<-Tu)m`y&Ay8b!)5S4FVrp_i zLt}tO1GmANCZ?L6{{amb>^vk2+65nT-)UrEI59QLQE#eD4NyIUr>mdKI;Vst07cCm A)&Kwi diff --git a/Resources/Textures/Structures/Doors/secret_door.rsi/closing.png b/Resources/Textures/Structures/Doors/secret_door.rsi/closing.png index 9dd42badabf989bf60e5806b1583651ff77a9a75..0bb895b050f0d11e75d4ceed4e62cdac855c6d56 100644 GIT binary patch literal 516 zcmeAS@N?(olHy`uVBq!ia0vp^2|(ofA8$SVG)Q<`o&VHXi(4;R@40u;x@yn28awv$nd*l(uDafL z{PB_CG9#JQRk^pF>YlAmu?YKm>t)HTic@}V$)W4_-hbb@{0&I(pYI-LlLZV0Tnvke zB$CsnDb9QsaW#AW_3THQ){=dpd%yi{JE#6%6=bp9{PR$Y-`3cP+wZxXC-_|^t53}B z{f8>|_b)!)di+tsX8By6>uX>B0a2 delta 549 zcmV+=0^0qA1hWK?8Gi!+007eJf;<2K00DDSM?wIu&K&6g000DMK}|sb0I`n?{9y$E z000kAOjJcMFfc#`a=(`^UCv)SO8ZadN?voT!dC=Kv&z0gDHJ zP*SPRDM0R76tH?EKu>7SF+gllz~-p|S^}M^bmW;U0e@5*il+r&l4v2f^E0N#!a%j5 zczOU@j@-`SJ!L1MFE?q1}Ocza|%E$3|Ku9p!TP84tQhZwSZI}Nmw75JmJ=nW7WZZU}oXkrgXR4=*V@O2n+lz)=&58mofxVY2 z+vIIpzrSy>ZG9m5M&$A_&!Bf<)^nBi@b_%JCTypsWT??+J0)lxyV9bU?B5KI1+Z4W zQCylLbwDmD&Sa>L$eziz;k(h*`ZLTn2bgVKfEbJz4oK}eU+j08;akDE zpPxh0-z2`z1!|r5e5YPi_A16V3%{@9`gEh3S>&(Ynl|UXZ9o??c)I$ztaD0e0sxb=ZN&^=a>}IR_^M|M)jI(J%3XaQkgp6o;ec)3?=6WWL@`mnpgbeX^Bdhe7*MNB!yD&8I4q&LkFI z$o%#FxsI&hvkew6zE+h6Ncy)}>hM*`v_s{86n;?PHDHinV>rx^Ai==H+>pp%z{AkS zcmTKH;#FN`FPy;U?7uG?a!fdpue;f9zGk@de*rL4j-P$%N0%9gA1(N7W4+?X=5?=c ze?MXQYWsPM7u#~xOOrsV4qw@H`Cq2~zGdIn{oDTj+qVt-Za=zMBL4wR=wXq(Kw@~j zN_+e1T8Ea{+KDo9dfyoZ%f7l6RqVLK?sDU*_{oQGMeP51S&8=tSY;0}=DJ_5J+OT5 qk6HJ2|GK~L_U*&J^12c3(Vtkmw&2XHnTvsu%;4$j=d#Wzp$P!4QQz+X delta 568 zcmV-80>}N51jYoA8Gi!+007eJf;<2K00DDSM?wIu&K&6g000DMK}|sb0I`n?{9y$E z000kAOjJcMFfcecI7352O-)Sz005htS1JGi00neXPE-H?|Nj8{whmJO000SaNLh0L z01mF{QA$e1}c8~hLdECMYJCvWn1Jp(KsU)bdI0Gwt$pvL7X@{BNcRyZ}XjkoU$!Q zGtOg+b9~MB3cmf|rO-uZ)IllRf~-(E;{y-Bw_sZk9DhInVS=az=hzFLkJf%Ri0#-@ z-}&o6Y%h5C`hwVwJq0?0puo3dp9}0e^a}zz_NhPgu8Qu>}+l)8z_?Bq}HscpWcI-d&*rJ)J z;L(FuK{01RR1@0^UjGLPeUC&nu^sz-0vVzj+|9@LZTkYbqCGG~gOK_F00001|$&BdkPQM-t|B}jt=b|J^FjzueKrwY~^zK+c^{;@Is*=2N6JcyWI|7 zfDVsDBH;=!;n8R`JOO@iDVx7Xdo_`szwPdOff_aQwFO5D<<{29^VUo=*G1cP_w$+uRN?+s-_&2^=DJ zk^_Ll-D<&rgi{|F-PQsK&*$?}uh*^FZg7{cTM01XxolQ?-L5s^-rwGqU_NXtzz^PP zwdCURQku;s*MDD*fR{=oF-2@7APD~S_~-!0d zj%UI-(i8tGL&CYqpw1C1NJZ2^981Q>feV$OwO zEkKT2j+snG0Fayy8C+mp$pvVJfa zsHsFEArL?jgkv%=2?<|yq$%WG>Wpz-= z{FcDC#Yi}^J?^^n*-f&bBNcEYVYOOSfY+B78M-hugn_PSg5ujoqamqON<0E|IBzm> z*Anw4vwP60EN2DyiI`5OG8vCOWr))4x_5;?N$3X$$OgBGKz-9%e8Xo7<-T!reEch5 zQ+SXFW;;U!VLH56EY1aN3-=R2xISmXv4J@@IR3cG^;}#ZVXX<)Dt6U68-pdx(Tq7{kn_Yi7opWVGw+Ns%#4|r8Ip<)QtPlCwxq+B z(qT*Kgd$~0TT)AOAe5+-zG^pZk?)-$>D#{c>-YQizszsUJkN98*L^?NbKm#lwI(>w zcdCxD4g!Ig%JlOJg+Ecsx3(7iTb7pgI|88*n-(4kg#vPvL@MS95(q-`8$-`FV*(Zb>txgXwm8^7+V3IvX`|XTKeG>ToN! z(~yQpnPi(hht^0Y!7d}V@^#m}M{VAHR_&dQr~B1_9LvYA(Rx6vg z%Qu%#=T-L9{)x)VdOAP5Q_-7|TD^70h5L804KKIK3@Cj^BT5LC#SddzW^4nwxvTPD zq+xynhcxb;iSl-scJubREC1@C95;_gT_t+zTE%Vdjx1X}ExTaaulZiv6pb^kgzrBl z@3M`WvYr@W9#a#ItXj9A^2mz&r?7H{0o7csa9>$qJ)PE{v3p5eT%iA-dg&Ex%@{6I z+pxaqkE`mIz@6uQ^OuRA41;Hgh8t$|W@;V~-}YKB>D_c+AGgaWN4??_x+lrlJ-aI! zq4lSER?u>r;x4CU49sO+nVxjC07_ZSd66}GGQ_vTzK~jHJ!?-`P6}U1|9`5h^E~a!La;o_aTOZ@p z4I!(|yWQ>0p5NRd{=J$t$%tRQ!tkO|a{ZRl8@-X*c6AL#=L{!hJ=3;!ifJEiYBv*O z>n)!7PJpu)z7+^ecMAaf~h&7A+uY)+capQveMO**C)C%1j+RTdS)`jYq=DAgt zzjkQ9(wEl2yS6mC*L$hG@Q)Kf<1)5IS#Q|m(q@no4W$*$FXL}?EJ&`XjtaME z$zMF*s}$SPp;cNu$S3z~pLuQVZ&lk~>0Uo(EDc)wKp6cbH-%E#6l5OfGka}PR+@YEt<)!c*YHZC>%+*!)^|@;wEI6nAk@qHm6Qt;sU}!QdO;b0@mGF0ikkt6LC( zjF_W0gh)zG3WW;38u`&6>KBEiJx@MpE`Pdg(eCr4gF@4*(CvUaPN?%K`#;WjxErFs zMKxR|e)X_UH~m5zLp{A}?Q_Qw+0tBBvY3EE={FH-kFTL*^PLm3Ubr4@m|HeCJNC4ESDANZl1rzmGg-ez52iRk+bu*s=a> za6`X?;Bd34kEy>OYVu^Ac)Q)|CLvMDp^n9IZoT&`q{B?0excr4~uPlZJ zTI~Z^X-p5@2N_94dHOr~-^8_=^}V@~RA}q|z^MGU+i&A1Z63C+y3>mGbsuq-Bz3fI zV01~5hUr9ZSjrx~#zj9N&g{5GxxZ|A^iFwW|Dh9k%}A8zLQE$Dxw3ZQeuiCBOuW`kHoq6EGg5C|7Hg#_RTK?ubL z`2rCG{q*!%G)ll_pd-jEJWJvU#tHn=q+nQDU^pjD$f0r3Zmv2m3OY=X2toi#k(eNo z(G?7|ikA+5S5D*5C=~<}GSHE%V3em=3Zh6@5*Cl~RtQpvXjdJSiFt$-)T94N;sdKtvUG2sCT-VY4G5%G8`22aEgX}F2@@G6Tn zZY`3HsR-+dQvebi0gJ~aCVpTcgS=DT`}?ScEF8XpaiO40oGj&l-YK96vYO~rl8`K$ z=rdUcDyLL&CvbT22a5*?I0ZfDg zk-^M_5AcwH_x^xB*pG7MFM+`B#`!-$ztc+EBu(<#M12|JiG#-scr8-e2P%%X^2oP~VB^6AL6~H`rHk(M{ z07MLlOy*%oL=K1nNE|$T#uO)zLgA8V&b$c}K~e!+2|&WcsFYM(n2P8`BNOplGKSzp zV`E5cyb}iC0bC4+3gF2E9+3dzX(}q^Ind_>GZ|-~WRORs(%`(ukexspoXAu*hROvf7!ICC<*?z5;gLrVc${4( z=0S2m3eMrfIRKwCTwJPiM%j(!->eU#k;j3`!7ZiGUtGZIla6 z*IqSdt1? zaU2vR7k$$GM}VUY0Rj#vl8HYR`b5a6EE6swIOfqg_=1D)OWgQ{IhG~LLiz`P#m@qhCodDTKQH(6c!o6lSqik@<#UQYJW4u;)s{cS@=IL zmQ1fX;gPjoSvhwy*VP%vw>VztX=G2YgaMd+6BfXapxqa=7f6x`bpUh$(pU*S7?Y;z|Qi*g~F-J2wI$g*Rzkf zRm2GPhjE=`Da_ckA{iG6Ho>US)2hZzY#Y*0bg62>Xh$JaDpmib~N zD;T$Qa?5=6skIrEH49#bIb@&9h(yhN^OHK^ro0s8{06(+;PKWe#q7@GnHwGh>j-XB zih0w!S3GhH0^|eh8*_px0rK HMVbEwwkFzU diff --git a/Resources/Textures/Structures/Walls/reinforced_diagonal.rsi/state1.png b/Resources/Textures/Structures/Walls/reinforced_diagonal.rsi/state1.png index a0ce5d516e8da1f72bed5c044fcf8019a2aac9c8..814483e1a6e32d29bd6c9a5648a3496337be5677 100644 GIT binary patch delta 615 zcmV-t0+{{9E&l|NBYy%$Nkl2VKoI`XOqY?LaSAW18jfT)g#1aq$fA9A_Ai}%duE%z^0KoAl!<-}R^qg>jURo{bE#NpN zoGT-7RvQw|mkjzGIY-!a_-nf@9iy4V<8}v?{Qo8J z?6?w+YR@_${cwsb=#vUKim=n^NWkZGDmD%b18HFBS)jOgI2?++lPXUHR5<@+qQKc& zC_;c3iD1=gW$Xa7E`*;Hp$QHz^xr64QwJkJ5m@Oh?&C3AmG6y{HjE3W5R(X2yJ}P6 zcveQ>Qn*P3;i^rCO96gx7{fx(&D9m&>Tudkwm*9L?c6Kb8H@k`002ovPDHLkV1m-p B8B+iN literal 5829 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 X_sHm<;lFx500000NkvXXu0mjf_TU|m diff --git a/Resources/Textures/Structures/Walls/shuttle.rsi/shuttle_construct-3.png b/Resources/Textures/Structures/Walls/shuttle.rsi/shuttle_construct-3.png deleted file mode 100644 index 7098ec309a42368ab631fc9bca706b12cd0010e4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 690 zcmV;j0!{siP)9K}pVm;=nMt*LGqJ_Ao4JqnfvI{;?+{d@NqCQh9MmXMYb z$EpA6vzJ)qh|!auoyVZ4qy*Lvas=D~Aj@+L3mC3my2PNZrw67%0K~=yVDd0ILh4{< zg6PTp6TprDJHXV!@jr-DP+Y*Uaoq;E$PtuS4s$Wg5wNISxnU23y`3dt2iVyA5cGLxYb`^0 zbu+=x0XgEx!7X5QRC55#a$+1omIGoFfdz)50^D~?7tUgM^5ij`kL+`hBVa&AMwTHu zJ`E*Q?%#jFuy{VCfFn8t&>ev6V_?~V5$vZ=><32&wh$r80ic2iR1UxrAvOoVYz0{a z3RYO|0I@+1K$b^#A-V&wmIJVo5R?r;0Gk6qK1a3`oegscdcs6@04N*cED1qHF*XOl zf)!)|GC+0!OdKSJ9t{*Z0NF6)V8@pCkmZr}QRD!SMaUt5uT+FNfb0+;lnBvNKei}< z0S9K}pVm;=nMt*LGqJ_Ao4JqnfvI{;?+{d@NqCQh9MmXMYb z$EpA6vzJ)qh|!auoyVZ4qy*Lvas=D~Aj@+L3mC3my2PNZrw67%0K~=yVDd0ILh4{< zg6PTp6TprDJHXV!@jr-DP+Y*Uaoq;E$PtuS4s$Wg5wNISxnU23y`3dt2iVyA5cGLxYb`^0 zbu+=x0XgEx!7X5QRC55#a$+1omIGoFfdz)50^D~?7tUgM^5ij`kL+`hBVa&AMwTHu zJ`E*Q?%#jFuy{VCfFn8t&>ev6Q;?6)0W6_n3lX9m04j(; zaRAnG09F!$vLOgya{#c^#A+$b0U-MHiTxM}6FCGx*$`(*2r7!PIRNG>^q@x$0a%oP z#Lz>5A_t(yJ-$K-S5#2s0Fcj+Lx30ukR1Yq5+NuJAOmbsKqw7>vLVjO2)QVxWiBA9 zD5iTk0ICgk^x&qAOLGl z6KVjE)g*&eMg!I;9k6COtY9K}pVm;=nMt*LGqJ_Ao4JqnfvI{;?+{d@NqCQh9MmXMYb z$EpA6vzJ)qh|!auoyVZ4qy*Lvas=D~Aj@+L3mC3my2PNZrw67%0K~=yVDd0ILh4{< zg6PTp6TprDJHXV!@jr-DP+Y*Uaoq;E$PtuS4s$Wg5wNISxnU23y`3dt2iVyA5cGLxYb`^0 zbu+=x0XgEx!7X5QRC55#a$+1omIGoFfdz)50^D~?7tUgM^5ij`kL+`hBVa&AMwTHu zJ`E*Q?%#jFuy{VCfFn8t&>ev6Q;?6)0W6_n3lX9m04j(; zaRAnG09F!$vLOgya{#c^#A+$b0U-MHiTxM}6FCGx*$`(*2r7!PIRNG>Y(bALD$qlL zA_t(yJ+@#+4gqXwfg%The25$Z#5jQL5FnHYL1};xAe06`*$`)Cgj^KUG8Yh46w|#N z0M&-bA%I>NP*M_-RTLAdjA&jL5K|o!TM>a8CPY=opw`NOHb`(b$$+gQ5P&tO31vmH znq;ubXuuk!1J*2u^^69rV=^eZW}rkhpq*3XR88;hIRKrH<)7+hcJTn6dzS z>i+l8E}#+@009((JnrC13AYvKj_K}!e^P;PUVl!(Uk9<vNx(1+>blm~N3bkQ`?qa7&N0RMS(wW8kid80 zMc_r?_Ye?5=zj&wiqL1!b=|1OYPHffEkv&C-dGt1m&;{VUYDY}T#!N~zlxWLbt~Sr~?a z5CSRX^E$9vQI;iL*U`2uP16tr0q|XC!9*v2&u91|@P8ukKb|VZ6SfaCVcWKtritJ- z%RNF>Rjk)*eSL)fBfKZYqY7z~5QHIrq+B$XODQSKlFeqramL?u9P*+dO_I@AuD77b zbKbUF(j*}-3c9YFT|>Hwv=0lZN&o-=07*qoM6N<$f)tJY#sB~S delta 152 zcmZ3?vVw7fL_HHT0|Nt}$fR^2#S`EY;%Z=EU}0h5?Ck98>nnU|+kc>VxTlL_h{V+7 zga*cqp$P`9j!cKb69c$doB7y|u2ir()9h#{dZdHJNXfA$L_s;{KM*Wyl2{+MHi|c? zrMYLPRRGTp;|F}r)}rq!W|TjWYpIr$<1k=gIJh}S&|aRg? BGI{_2 diff --git a/Resources/Textures/Structures/Walls/solid.rsi/meta.json b/Resources/Textures/Structures/Walls/solid.rsi/meta.json index 246ebe31b94..85b809570de 100644 --- a/Resources/Textures/Structures/Walls/solid.rsi/meta.json +++ b/Resources/Textures/Structures/Walls/solid.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/ and modified by FoxxoTrystan", + "copyright": "Taken from https://github.com/discordia-space/CEV-Eris/blob/c34c1b30abf18aa552e19294523924c39e5ea127/icons/turf/wall_masks.dmi and modified.", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-0.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-0.png index 1e2da3352b75d4ada2d78b93cfa36e15d6fefaf6..828730d9f3d82e3f4e25ee4b0e4f0dd50970d037 100644 GIT binary patch delta 880 zcmV-$1CRXS0s97!7=H)`0001UdV2H#00TlvL_t(|oXuC=PunmM|0Sd}EQv`Lfk3Ke zMRa+9zE=GIkGvNiI#A>h4XG$mU_Z$^w`bp7&Ua^@G8_&wd?K`b zLMeT5F=Gsr(iiD#z!=*YKq*BShFHWgEJ9j0QA#l$kKy}%D}N2c@L9#Vj@)3i$QTR; zSi~_@Rc#y>=jU)7rJAlq^>i1>b!ick49( z;LFZVjoP-2D2k9}^{^tA1ppY0MkOz6#YMZe{pgJ(0kJGp#jKx{f1?yx16{AzFio?j zTzQh2>kvXT8-D-*s`_{;8Gwg}hnleWK+`lSyQmz%CI+fd{)+0CWwjdcQTRU%I5;?{ z{io|XZfW_=jQ-`Zns-=S^i~&5EzC5!!R~qm!<#!&N+f0z~SLx z&A_Y6OIb&bPfnxVdDW3q{#vaNF5d(d2=<`}?_B;mKJis}} z&97gL9%#*iBuPql!JlM-wzUP*vKq5M)&bx5aXXn{yW2&YB(?gT=Q-yblgXquIOnZ( zKv5K=NrLTe7q^p%R1Oqk;QIO+w&Ng*A{Y%Nq|*!E`!prAPgK>s}#5NkaWak4ml12lVI9d_X*1v<=D| zToX_p2aKM+K!H1;?kfuX>kZMm8t!9!wII1dwPYEC3`#|*!j`%L;+izORVftD00000 LNkvXXu0mjf(}+4VpU;txy%4xSt632YMy)9HA?*Yeg z3Ke+QZhxaFFEb79A0D`zOrBqXmzsn}M@KJPfh0*vJ+KRRcXxdI`t{E$kbUPt5YXv# zN~A#$5QZVH>y{ev&Ees%SKx!=ki>Cmey@M$K@gOla@QPC6on*?c~h(5d0wFc%3v@^ zg%Dg_U2$-5fU2tbBz&l-!0$}LLrp`k*YSNHDSstWN={BrRu#xpX7GIr^P({6Wbtdz3Ak)g05*@wSz eI8|Qzc>V*Yqj)Xq?1mr!0000X&{1 delta 250 zcmVn+avq?ljR49>ckxdGOFbsubboRdD0n(y-!3(H(fT1w=zsjW54yBowMZ*XAX&zCl z&V@>Tq)wEseF{x@BxV3CDKrrw?mXap3Vp`}955Xz0G|OorgMGRhXW2baPyUQ`U1{- z=3Ky3wm33aYtSp;`3fQJ9Kve%>&x{ul}aVkPA8MhwW_KfaYTqefo>R#$74$6G9|-cv)vvk zR}_U$mc{*k55R{)Az{nqGPk$4gkiF*3|$9cJRToqId}L_sa*b%4bQ{SbxyJjIMSf*?p20HCTrzDfu@K0YRby#={kE{=Uj4m{VuDU@GA{d%lS z0ly3HE+A0@0QGtu|EXvqj7B3|*TpnV+U<5?&1?R8z0Q0-PZtnPu<2yNMYc+%rG@8xC5QF2Af*E4W_ex4c7_x+fBFc`c@4sdaC@#`|M+wB+(2K0J8G);>?hi%)L z0`Bha`1{+p)C?${PA5F0=QPg#O&*S@U z$8x!h3o(&_PnL!6d5QUb*yq#fH1$oh=76Fo_@2if`8-m}^bFkG+;DbwhN`OZBz#E8 zz*{Eac`k=mEHax19%2uC%rUajK$Fbt0_ zfNHf0JfCV#ZRAf|o5pb@z}s$VwOXuKE7qG$B1jMf{N*@&-|YZW?N=!Yf*`Rr3`5qN z4eQk^aWIJmLn+au}MThR49>ckxdGOFbsubboRc|1Ej^-3tm8_2N;C8|5YZfR-~Et77ZVy`6Fu8 zx%f~RsS~AhpRECp#0-EXTLTf|E&wiM>pN!P0Ka7ep#TK_n}}dDFqM diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-3.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-3.png index 2b48ffb696b72a8846a07c9bbd5e2d124112e184..ee44f0d40055ab2a033294a3def8d84ed4a8fa1c 100644 GIT binary patch delta 946 zcmV;j15Nyf0=x&17=H)`0001UdV2H#00V+^nXyFeb#NL-}+eQen*S-g~ZEph*LNK4tS$}yRC0)-QB!plxnP8e` zuAR^4JBdS%Fkm&>(Q36=c^;~&WCcxJ{`wNwX5)|O7(i3r^iRC)oO|yz;#`^-L51#KYu@$k6{=9bi3VHkWoCW*Ho)j zo*o~m*XvRVRoE(=UM};z*>IS#lmIR+E&!<4>i{$w4H}I`sy_>d#Ujs}4SKoEWHOPG zEi+)6ChqMmwrw+;PBWbthC#dCmR}sj+1XiUdx+U|if!Atx3`$4nVkXS_!uDsjb<}8 z*s?4+=YRA0oXgA06hYWF7z{ECv(aoKgupmHj%7fLX5h#5H2{S|fm*F5$@~5O)=?zo z$+p>S20*{xXEYko>-Az82$l5v$;tiEXc~^=d@KV|xUP%qy0qKv+<(42trT?kjld&qa;Q`_-p$suPql%3kn z?tfo`oeb-YUGXDG*3-@aeBY<6>+%r!U!3KQS$ZC2U1u3Nj)#cVz;dyWzk?u%Jpk2e z71-Wtk~Zv5j*YIcC`T-S^=d_{)nd6=u=Ko?6W{mwdotni=?Ngy{$tztzMmQ!1OZFW zW4TzQE+#U7@M2QZbtx9f=ljVC_xJa?wky$W=8pA!KgJOvwi)fi|8Y50e)skKUr6y> UQ2<)w+5i9m07*qoM6N<$f*;z|)c^nh delta 246 zcmVn+auSrBfR49>ckzEdiAPj_S@c<6-0EM{kBwhfGCotLjUu6r5F?44hXuhQMkEqw+ z<4a+pL6jy}tN~BN41lFr0}Lw_i9N^|U9KWp(ekcN87=H)`0001UdV2H#00W9iL_t(|oW+;VZsJG~#(%b$v1S7XgdA}| z(+5}|2vWo$Z-8>*&NFi7Xyp}9B$5M*4@`Wp(n8^1cI0ei?_tsgW1D1>8OovNrXFj(#H&m zS#LH8&oxcsZ`M7gm4QMpq25smE@vsB{H zOz=YfRS2RC8Gi%;#bPlTMp%B~NCkJ*pa0u;} zP`_>~*MYadah#8+f6M{Lap?E^A9f;@0|51UoyV7?QMkUoMoJm~9}EVu91e%^d&{yo zKR?g3>HB`R1FD0$vl(B7NRb0bDY?A7L`sS0d0bsxC4Wezlv=mjjmG0~=1d>ATWYl$ z-{y0gtybI#b=Y+{vs~sW2sp_oCFO)=Su`3A48x$=Y|?BtF${xlw;NfOm8l1CQY`Wm z1eoPA)9EyB*>MDH+vfJ>1^~k_sMqT$BdX25%s4S-Sr&P-2XJSzxR12Y&axw5ot`3u zpxJ6Alz$z^iPv08$?ffJia@;^3!0L(qlLzKNbN^9Y}-_sR;bH*NPp-!Llq2!${3sQ@@I_Y>8#dk%BIO`?>MfI$br>z8UK!= zDDeQ)YBgYYt2vZv{7`ql!uB~54s16YI-L%y<&xEUoiY-JA^%LL{QLboK&JdQpA&{* zN;irkR_isZn+avPnciR49>ckzEdiAPj_S@c<6-0Htx?NxXm>Phhh5zseSrje^q$nlI_lAEH{F z*PFsXofwTSg(W-?GXRzpmWU8{0q`M(y+Z;X7}pd)$N&N3(sD2T3Xc=`Y0uh10o(cK zRKQreSTl%s;0*AztEQe+_f0M!vy1a_fr#FK>Ch#YWI!%b0Zqxf$Gzk<{T%btgXQ6& zUz7els@9v~UdC@0RIjjEa(#ySP|YcuW7qltZ6P+1f5Ab700000NkvXXu0mjf277AT diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-5.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-5.png index bbff6b658403c39270cdfb3c43bbc20a2e67602e..be5832d69d35ac0c3660ec69bd4e9d2cf3f15dcf 100644 GIT binary patch delta 1006 zcmVXWQ7tY_Zr z?9A-0(Cv0J{6k3eg%EP`W6$$I2stS~0?+ey4iG}%`##oD1b;@a5v7AZxW6=JPqSte94+q5uFUlSwYh(*8%)TJ1d=aST;aaA+pk zl7A%x8Am2bf`3Y-QXm($HYrD%rhEqgKos9sB?IvG_Es?VJCG!a+1@7yu*-o%2!Dk7 zw5?JHJ_5&a&QU+l0mpIB@AuDkqL2ds&}cNU*(MFe{rx?{Fl4_6g8`GaZL|M%UB}JM z4cBH61bhc*2YYl~d?lnn4gg^o;_mJaVHm>qeT+t<9DivThC-*)$;RU`ccz;-M!jCg zH_wC7YOziz0=o{UR;zeT5?pdhi8`U{I-1QUWLbt~S+Fb%vMi(1>14XDbM*k=vQoio zl0dCiF`La;%VrTUO%v0H2LOO9%V;zj1tYZ0ZfBeu({&wXvj>1j*JXXgy1r%+5W3xN zMkAnU8h^fAT;Q@&!6uIJW7`KD$H8DQz-TmrEX$=NNs{39_7=8nqu1-P|366*v-$ny z1&hT3rfKf>0vdtv`5B();n8)OGR<}h!!TeN2KSwUR~?V83(xZqK0h;Z;2;O|t1A#f zV6RevrA1bQGLgcNe%$6hOT90$6tpIm}4 z3=8C+Bnd$faC6{f1ojbzp`hzJEX#VI)!q_VmW5`sS?XL_1PVFuS(dShV{ZSZr8XXq zkt7MG(FEhIO~ZUX=XS!wGNYXk0BqZ4Wm)FLWu<~3 z2!Bx1H2A*HPDHE~3&L*BK@dPWXhw(a)wXT)`+aW0@xW`tz}{xWJH;FWt&We7AH!MO z@wwzc$!^F7rK7`t1Vt{9E?KW1+C00>XFp{Pz{-4e8{pAG!xbmCl zAx+bQZkAuEdT%j07*qoM6N<$f~?Qn#sB~S delta 242 zcmVn+at4TybR49>ck?ReGAPj{oIDm&Z05lFj;sQXNz{LGmxdr9MP|x{6^Cc~P5RIA~ zzZ4dlywGT?B`^ya1Hkxd3A`sW1;B-Bd6xz3NYKjTzh6dihqFLZQRcXM9cz2C#ROu0NF?#sFd#-?-W(^vj$%x{?`~< sSHpdbuNE|}P%U{p!+0olN_Ff}KWq;+kt06!Pyhe`07*qoM6N<$f+Ip+rvLx| diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over0.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over0.png index f6b33bcb1896a6421fb770b714c9f611c4ea85ea..8141637bd69025bf356c13441bf9d5b704d9f3b7 100644 GIT binary patch delta 1118 zcmV-k1fl!k1Lz2l8Gi-<0063Kaozv`1TRTMK~#90?OWSUB0&%>$RfDFFvKkJMTuFL z#Kl+RPx!h1gyB{8!MHJq4+cU|F3X^aY)&slniddK&CmmTl1||;0##GfbvZRLS~Jeh z&PI}7P^nZzI(%8T0T{(%@xya!wVFClmr^)k04VeD@Ic*8hkvr3xA451n;R;XN)uVB zR7Bq$7yY+IK>5?tQzhf^_{{aITBUqGKP9Db#sIkT*VosS^L@&B9>rp@sRaZ4D3$2z z?yfqYr4-KW0RWT-y1gEG+3eJN=}d?u17&ZNRfa(>_5 z(qXYkFT)|-*X!@jJvus~ySuxoW7TRk`l&Eyc(~$F9wF}J=54(;%4pgP(Gbbt7QXDdBC?qL4Rd<@BkWzJ~BK2fb#u*-^zDK z&I4>iya`@hT#Rr<8jXfp=jZ2>_kzJd$(PqxC6UVh84Rf1ZYzbMxU`;^LhJ#iJF=Ua zfID;Q`mkAIKp?d@&uV)A1V{S`LEdjRM3ESDiU zN$c@P-T(2{=So#crD-e5t z&e!|CPpww#T`EjkI=pdVQ0MDW4}jL{*mAAlJENPTAU43Nc>A!hlBOuy<79M&u}Pv?;u^%XRJmN9#JpMjJ%f3H z`&vy^jhqBUo*F9@3QB?*g7P0RLtZYoSpUh#slj0 zx|$t8KLI5*Hp*EZV9p~*;moKk9*STfWzJ?Y)Y3|6POojlnQCxW7by%xrW{_?9D2@ct(No;p+nbt4*vLm_6p5P2C^i}U0xukIHk;}=@>d0x zQaELRb<7SpV}M?_t4I?VVcsOkQ@c%xL_*CYu$02N2PYxt%@^<-f-a?SCKX=x;c0Uo kK?-N0z_Q9%okJj^zuW-DBb&$^4*&oF07*qoM6N<$g7GUA2mk;8 delta 466 zcmaFC@sN3fWIZzj1H;_yjcNS%G}f0G|+7 z0|NsK3kzpwXLWUTUteD%BO{>9flrG5K#IL2$S?Rm7%)hAGrIwWI14-?iy0XB4uLSE zsD@Vq&=Mz47srqY_p8&p`I;4Y>Rl_({{R1E>lZJP1uh~c%iZ2 zail=9RZ~H-!-Nm_BjaYSP-qp=R_yFrq2S4z=JDwyXM%?7Jr46@ENL35EMW>y#hD)- z+pyrm<%}lV`GP5?6)Z;ojmnhQ}Ybs|o3VO_%x}METVRn0|p`iiO-F+qE ztCx6$6sQO>{rTP(UGQ_?^GuG-4m@ANac?etk30vjG9OyC0tj z{w&+BclvpM?TPEW?Uoh0`u9csVr-E<-^AB)aNA!-&f|WuI_X?_z))uJboFyt=akR{ E0L$CGF#rGn diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over1.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over1.png index a7800d9dcc3075ae1afa8be8f379d8627587d222..6f2bcb665a352d0023c9ef17c2fc5fb6c7cb60d9 100644 GIT binary patch delta 983 zcmV;|11S891L6me8Gi-<0063Kaozv`1F1SqHAKuN_~d)9HxwRp!ET0q*bb9e+B{NCqOhB72dwv>#hBk&*!ODtBKE&xiC%u#Ce3cVzIbp0qArj z5}~*fI-AVNkZ}Sa)FHkj#BK8O=sc_hhYlDg0OtF!0NUUKq}hvMGMQ+(pYJR{H`x0D z<#Kt6C(`ft#c_9cxB6{9n+bk?c@YffCTDdL)oPX127mjSVOOv%z;2Eod1sh2p6b`j zOYSYTf-L}^IxrfI1n+7AUPGGzWQ)^w=w7 zYytj^Mt_t{r3CvCTAX0WTC^Oc0OrwL#SAd?k#J{kcMiNw}(FfaH!9*fU%cx1C#Bg8sQg$-zfr#K0~ zy#U7duZIW0y0)tK3AO-gz8*;pnbtZQ0Z7TyZ+}W>nGUu9YQCP7WX915;CHYEa4T=W zFSxRGlgs4ktmAMo6^)l*GeX;%{~fkn;>g8(lEQ0(!lk$S@5C1IlDF!clIr0DC4iW delta 379 zcmaFF-pxEgvYwfNfno0U#y3EUu{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU$g*fKQ04 zk&%&sfq|2gle4q4y1KfBg@v!LFHrL2()T_H%&Z+J4{$blSa2D>4IJX_mstQ4?(A)eM#Lg1F=4FMenJDLn60i$b(gN!7B} znqJR>tKTR6Vqvhps+<=zpCMuOeEWlS%ol%7Z7N|FN@GcTDK(vIS@e&Ik{MsuuUT^W zP|(2=?s}W%NlzNyawZuma8w(6vtHJ{V_Z-dWpMKlJB#>?#@pB5Y-hRsjp57wgsm2j Su4n>%&EV$RfDFFvKkJMTuFL z#Kl+RPx!h1gyB{8!MHJq4+cU|F3X^aY)&slniddK&CmmTl1||;0##GfbvZRLS~Jeh z&PI}7P^nZzI(%8T0T{(%@xya!wVFClmr^)k04VeD@Ic*8hkvr3xA451n;R;XN)uVB zR7Bq$7yY+IK>5?tQzhf^_{{aITBUqGKP9Db#sIkT*VosS^L@&B9>rp@sRaZ4D3$2z z?yfqYr4-KW0RWT-y1gEG+3eJN=}d?u17&ZNRfa(>_5 z(qXYkFT)|-*X!@jJvus~ySuxoW7TRk`l&Eyc(~$F9wF}J=54(;%4pgP(Gbbt7QXDdBC?qL4Rd<@BkWzJ~BK2fb#u*-^zDK z&I4>iya`@hT#Rr<8jXfp=jZ2>_kzJd$(PqxC6UVh84Rf1ZYzbMxU`;^LhJ#iJF=Ua zfID;Q`mkAIKp?d@&uV)A1V{S`LEdjRM3ESDiU zN$c@P-T(2{=So#crD-e5t z&e!|CPpww#T`EjkI=pdVQ0MDW4}jL{*mAAlJENPTAU43Nc>A!hlBOuy<79M&u}Pv?;u^%XRJmN9#JpMjJ%f3H z`&vy^jhqBUo*F9@3QB?*g7P0RLtZYoSpUh#slj0 zx|$t8KLI5*Hp*EZV9p~*;moKk9*STfWzJ?Y)Y3|6POojlnQCxW7by%xrW{_?9D2@ct(No;p+nbt4*vLm_6p5P2C^i}U0xukIHk;}=@>d0x zQaELRb<7SpV}M?_t4I?VVcsOkQ@c%xL_*CYu$02N2PYxt%@^<-f-a?SCKX=x;c0Uo kK?-N0z_Q9%okJj^zuW-DBb&$^4*&oF07*qoM6N<$g7GUA2mk;8 delta 466 zcmaFC@sN3fWIZzj1H;_yjcNS%G}f0G|+7 z0|NsK3kzpwXLWUTUteD%BO{>9flrG5K#IL2$S?Rm7%)hAGrIwWI14-?iy0XB4uLSE zsD@Vq&=Mz47srqY_p8&p`I;4Y>Rl_({{R1E>lZJP1uh~c%iZ2 zail=9RZ~H-!-Nm_BjaYSP-qp=R_yFrq2S4z=JDwyXM%?7Jr46@ENL35EMW>y#hD)- z+pyrm<%}lV`GP5?6)Z;ojmnhQ}Ybs|o3VO_%x}METVRn0|p`iiO-F+qE ztCx6$6sQO>{rTP(UGQ_?^GuG-4m@ANac?etk30vjG9OyC0tj z{w&+BclvpM?TPEW?Uoh0`u9csVr-E<-^AB)aNA!-&f|WuI_X?_z))uJboFyt=akR{ E0L$CGF#rGn diff --git a/Resources/Textures/Structures/Walls/solid.rsi/reinf_over3.png b/Resources/Textures/Structures/Walls/solid.rsi/reinf_over3.png index a7800d9dcc3075ae1afa8be8f379d8627587d222..6f2bcb665a352d0023c9ef17c2fc5fb6c7cb60d9 100644 GIT binary patch delta 983 zcmV;|11S891L6me8Gi-<0063Kaozv`1F1SqHAKuN_~d)9HxwRp!ET0q*bb9e+B{NCqOhB72dwv>#hBk&*!ODtBKE&xiC%u#Ce3cVzIbp0qArj z5}~*fI-AVNkZ}Sa)FHkj#BK8O=sc_hhYlDg0OtF!0NUUKq}hvMGMQ+(pYJR{H`x0D z<#Kt6C(`ft#c_9cxB6{9n+bk?c@YffCTDdL)oPX127mjSVOOv%z;2Eod1sh2p6b`j zOYSYTf-L}^IxrfI1n+7AUPGGzWQ)^w=w7 zYytj^Mt_t{r3CvCTAX0WTC^Oc0OrwL#SAd?k#J{kcMiNw}(FfaH!9*fU%cx1C#Bg8sQg$-zfr#K0~ zy#U7duZIW0y0)tK3AO-gz8*;pnbtZQ0Z7TyZ+}W>nGUu9YQCP7WX915;CHYEa4T=W zFSxRGlgs4ktmAMo6^)l*GeX;%{~fkn;>g8(lEQ0(!lk$S@5C1IlDF!clIr0DC4iW delta 379 zcmaFF-pxEgvYwfNfno0U#y3EUu{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU$g*fKQ04 zk&%&sfq|2gle4q4y1KfBg@v!LFHrL2()T_H%&Z+J4{$blSa2D>4IJX_mstQ4?(A)eM#Lg1F=4FMenJDLn60i$b(gN!7B} znqJR>tKTR6Vqvhps+<=zpCMuOeEWlS%ol%7Z7N|FN@GcTDK(vIS@e&Ik{MsuuUT^W zP|(2=?s}W%NlzNyawZuma8w(6vtHJ{V_Z-dWpMKlJB#>?#@pB5Y-hRsjp57wgsm2j Su4n>%&EVh{)#>2w7rQg?KSx zxx+8u#?SSpe*o_6!MHJ^ZVbc#E(nN$&Fj#UVVsrOt;Xpd=OvSu;Cyt|yy>p4DkH?i zYPDkBpjNA`%H=ZM-Q7_%8WjidC6l4W>+9C*FD@=vHbglW2Y&&f12h2#W6 zdwcZj{@!9PjB!9Nm!p^YoYI*L#p7{{xiCrrH#awe=kxgnb6|`E_G2-MM5Aw*i*ORu zU<{s+NG8Q;PUd1yM`I5T4g^EyMCy!ngBGDM7~$~Gt1Bv%%VM_g-rl}B_vGY+uCK2* ze(Q8PEE}{?0Dp|Xyu74*K5s2`l}hD}0$QyWB@zkBX0z6{olb}KY%Lss5@d$`;sDM@q_*yJdDwz}tAeT7+3ZQjFIGIe8Jli-0s0MoyY&M%Kypdk7 zCysi(ZvAaGoeF+gECf%+V|t!WX)qWFgJF2P-DZs;5`W>Dz*c}$j#8#hK+ZCB{a&qF zVXfa_I{_q|i-lYNp;{aN((|=Py>G+uT<8fhhpcH^N4x{ZX;Z(rG!vp2= zd6ECa%pV8^xS`waZv2Ym#qaTW7ms2i+zoPXAZ6}kQxGbEdjmPaIoT8_QGkruvDBFc zwgV8{Ab-LGW1Sxkheo-8y$qs$_wDddu$Nk%ZU`qq4aVRrKD`6jbHHdc`mgH(vl)_` z8atZ=wgcqeUNUxipUMG9Wh0k|geLO($y7?s$UX>c2c*^+TQEx4kB^V8#S(4-Wmn+m z1a0+tM1v@6O*Gy6yFp1pL?$~?&O$}Uq==9m2Y=Y>^<>)^nSxIr2(cZotGfM1VJAt^ zQmG`^nHAP?tIRHqRjXBNeRHedOUSx_v#5D~er|SYtXM1xMr8=bZ>tRH1|<%VZ*?}C zZLJL=d7=~84uJ9Y0_ipd=oTX=p9D=)fbUIGjYebR1}LMw*CB#W&i>h*ot>HABxMJ3 z3V+)=MC50u0@^tM36=L0Ao~yk)gxqwh!w_Tp#-M_WSoK3MisPk0NyO}3TUEmQ-HG{ zfeS5LW!*w%8D6VKxEs`944$y7J_O%C0j&F8fM^mMDlp~-$z1sEfYEwcbAx@ShaRIs zp|DYn4*b8&Aj*`-a=D~_zb_ny6ue|E!c9p~gE4rcvYwfNfno0U#y3EUu{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU$g*fKQ04 zk&%&;laqyog|Dx#v$M0hy1IdZ0Z@|nAH!cD#ZeOE7yKUr816OijRcBu7I;J!GcfQS z24TkI`72U@g3ml%977`9-%h(&&vjUV$JI3J*Z=xGQ{r+~u>_uOIm=vm@|N=?$DneP zf_oDMlpL%+^ExIe%@Zu>QPdIj*}kEQO=dakWZgXqH;iB8F`kcof8w^s>>Ev+KWqsx zxO-?GBg?*DdzV~16m+nJ`*nK3ypWx1JZA6FPk6v^NiB_4P9Zlae1gz@!yv}fd}oRr zTef)WDs*Z6Vm11^Aj#o?%sUA|5ulRu3m7sd>;CX{AIp{5k zDzs6m(7CDD829G|-~%`#DBS}m7J&+-g4K%%3L&(x&fui*q>(G2ldqB8y9Yo~+hxOGFp!@vm&-j# zK`=|;E|n6AC_0c-1Qi3~KrjZ#+}~Rz73@LK1_V5@b$cP)DQkmw20*Gqv>(2{9(-3W zmqoYRm47Qqg@1Pj_*gDwimOyA2Oa>WGntIYX{oc<>ygIu&HzYt$nQvTwkQwf;U&0S zz&itAa|90%mKdPiUM`dQ+{t*sd4Ow>&jXsx<_0q|9*^Z!uh)0qE#BXy{8+7|L~t{! zymq@ydWJ-TrUKamOm{pMo#D=y)u-oY>X1%BHUMTFn14>EQl9Gp+;C<9VdQBO#g`Xx zmrnmY17OCXv@R7)5133Q)Zv^XmMkzF4tcdY1Gn8E^#;n#O&JOl{fyDsaoB$ot2Gm9_{fMdJ?^To+icnJT4pkjdHAGkbz3&sG*45~&@e1xldX-aHs1f7rIVq?V~ u19YwcN5_cW1HcpDIg-i% delta 336 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 diff --git a/Resources/Textures/Structures/Walls/solid.rsi/rgeneric.png b/Resources/Textures/Structures/Walls/solid.rsi/rgeneric.png index 1e2da3352b75d4ada2d78b93cfa36e15d6fefaf6..665f36c54ef14702a9b79f040faa3732bb015eb6 100644 GIT binary patch delta 853 zcmV-b1FHPt0pJFZ7=H)`0001UdV2H#00SpUL_t(|oW+;TZ{j)>#ebxQ&`Ai1sv;I` zqiXuHXxSqE|7G`d7QBus4=f_8DiD%a0#Z7Q)&}wcnR(OBk*t&4*uGaM*VlHf-|xTj z7jY~fT-QC=SqOpax(B%mgbe=auqgGTG}``j7!@ z+aG$p9*ZzU)3n0&?fxFeaZ367!$av4RttdPaJZxL@ph-SZNI4zMQVVAVVcBIgkhTKx?ad} z6w&Q=iK8el{eQcyZQG=2s_a^}qo!?4%Op_^Hi?tGzi0W!c$^z2$7bg)4WJB-dYzi4 z?Pb~TS5P^Ck3!`Dn(xV0m8;^o$k^?60dO4WwJ?wgLcg6!G873qcUzc^*QDT?M|~-vglQI!TgH zD_Az2P6xvvRq(0ALsfaU843x8JKM zAomR+#D7}=LI^z1tE9jo$RIydfqnQC1>!i)<-n&Y5Wa7v+fD&x|5XKYt3YnKLWrCK zf1(cjI~wgMpz6SQJm%==2u;&eB`i{4Fc=)+T z^1QW`%JNzTSrwYPuFeBlD2biPft=C*$T(DZNY1He5 zEWdA$`(FWUA50ff#OdiNaTJjxNg+3M9pCqJzcYKj+#5iernD`K`PR`H-g4yW=?Q?d zPKS9Ia@Oe(%w~$q5X@#cww;?3GC45cGs&Mq)`topS}f@Gddz3D!bkyTK|sA;=V>}s ztWN8?;$*ojy_C$ukojzuyO^i|kBs#fR__ fm($wczMlUCaU6w_?t%9p00000NkvXXu0mjf@qezW delta 209 zcmV;?051RF2H^pa7=Hu<0001iRAaWak4ml12lVI9d_X*1v<=D| zToX_p2aKM+K!H1;?kfuX>kZMm8t!9!wII1dwPYEC3`#|*!j`%L;+izORVftD00000 LNkvXXu0mjfy?s#@ diff --git a/Resources/Textures/Structures/Walls/solid.rsi/solid0.png b/Resources/Textures/Structures/Walls/solid.rsi/solid0.png index 3849504b6ff74b96092fbd1ca668480707dba2e7..fe570c054fac195b1de49c70d9a0856eb79ebc8f 100644 GIT binary patch delta 769 zcmV+c1OEJn1C9oe8Gi-<0063Kaozv`0@X=GK~#90?VDe2qc9N0KN|vgfe4=R$^p{X zoFK=}33%Ne04WCu0umy^pMA)ZW>?!luxoo8eiBk!*_q+%I36HM&5Prh%dQpzL{WtOevdrM;4hb>=lQ7{;he z1lkDTFPHfF{*E9F;d>qkA%m9)v{(W?K^Ou6PGt$tbuskqSXC9bO|1j~07|bx*#W5Q zdem4hd)%M!MTiOTVYC%M7PA1V9Z=0IfNBR+GYg>Ffu6rJJgy_+6KInNd7gLsnNo_& zP@bYFzip5)hN`OI{=UI~L2#}4 z1J@paF@HIOEVu=z>l&2OhqZjuyqckuYIh!x^Gr~Nk%_!~9xw}_+5y$f0;qOCHM0OR zjPzCEzW%>hEM%A+g_PoGb-92srd<*QXpp1y?+Y--Zhs?$z;T?xPEi2Z?RNkF`vOrE zAx+cU?=m|?v=9IQvMhsXnxK?|5CX>7s0iRi+j?DK?iH5AEP!eUR5J^p+5y#QE5OUO z%J#Hv3&Su#@bN71GrrwRQ|aM=APn(?F%$#+2Ed=`^Hj810!5zVZM{Z%I3O>I!G44L zzGEJ=iGcgw0hx6JEd)rCL|OB+76Jh3s>Qzm*(C^1fyPf~00000NkvXXu0mjfg`Q$I delta 375 zcmeBUYiFJySC^ma`xE7FNEeY}q{tpBUzqj!P0|ht>JR*x382Ao@Fyrz36)8Z$ z51uZLArbCxr@!TEHsEmm{q^5@8;$b%9uvdV4Jos}{Mj=xd1_bGv9?VO5jVNBa>b5x zIbSHqW8An&e9NU(j2j;bhGaXe*}-zHA>t!v50EbspuVdiqL904N3T-Fb$Q0dh@A@= zj&D7e8nV~=u;87@3(q+^ISkCBA`X-an=N6NU1Zt+Xg1$K76c%X8{?TXRO-YIuaU2NCS_WPHh6Z$L{O@pKmvRWpw;?eY$mm!{H{nil{7 diff --git a/Resources/Textures/Structures/Walls/solid.rsi/solid1.png b/Resources/Textures/Structures/Walls/solid.rsi/solid1.png index 9ac2271692b8f0116025dbc2b68c5e44b53d8e06..4374ed1e1011027c4388033aad7d9985000188ba 100644 GIT binary patch delta 400 zcmbQlG@p5bWIY=L1H-D!!g~x1jA@=Ojv*Cu-p=ywYB3ODSiHZ=!HT&UYt2 z#VWSt;<;yZ(yZ+(CUO19%Jm4;nl<6rffj*HDK$MCC-!WgbTItEUh&?3!>(hG8Moy+ zKR?b~65D>RpFKnBqP7kj|Ap_iR`zlaEci1WWu29u(+NvgHejtf%`%RLsWy? zA7#6~#TmBtzQVgCcKj7yfFj9!fyv~Ntz-7bTvx%Q-?jJGe>fn(ej;*<$N@oi56#$z zjf#8^<_P!Be;&C?!AT||avHaZ#SzA~#2=q$wQqg)_^Xj+dhxvFo|=-+V?;mZ{g(%u zUJtTcgfrmt{-lWvZxmyE#j&+um&(4*h)t$Cfb zX6v%t{qH>g*Ub8E?>Euwy!f4eoELx^e5W#c)#NS%G~10G|+7 z0|NtRXJ-ow3twMfpjd%duQ-rmEeY}q{tpBUzqj!P0|ht>JR*x382Ao@Fyrz36)8Z$ zYEKu(kO=p;R}HxiC?!luxoo8eiBk!*_q+%I36HM&5Prh%dQpzL{WtOevdrM;4hb>=lQ7{;he z1lkDTFPHfF{*E9F;d>qkA%m9)v{(W?K^Ou6PGt$tbuskqSXC9bO|1j~07|bx*#W5Q zdem4hd)%M!MTiOTVYC%M7PA1V9Z=0IfNBR+GYg>Ffu6rJJgy_+6KInNd7gLsnNo_& zP@bYFzip5)hN`OI{=UI~L2#}4 z1J@paF@HIOEVu=z>l&2OhqZjuyqckuYIh!x^Gr~Nk%_!~9xw}_+5y$f0;qOCHM0OR zjPzCEzW%>hEM%A+g_PoGb-92srd<*QXpp1y?+Y--Zhs?$z;T?xPEi2Z?RNkF`vOrE zAx+cU?=m|?v=9IQvMhsXnxK?|5CX>7s0iRi+j?DK?iH5AEP!eUR5J^p+5y#QE5OUO z%J#Hv3&Su#@bN71GrrwRQ|aM=APn(?F%$#+2Ed=`^Hj810!5zVZM{Z%I3O>I!G44L zzGEJ=iGcgw0hx6JEd)rCL|OB+76Jh3s>Qzm*(C^1fyPf~00000NkvXXu0mjfg`Q$I delta 375 zcmeBUYiFJySC^ma`xE7FNEeY}q{tpBUzqj!P0|ht>JR*x382Ao@Fyrz36)8Z$ z51uZLArbCxr@!TEHsEmm{q^5@8;$b%9uvdV4Jos}{Mj=xd1_bGv9?VO5jVNBa>b5x zIbSHqW8An&e9NU(j2j;bhGaXe*}-zHA>t!v50EbspuVdiqL904N3T-Fb$Q0dh@A@= zj&D7e8nV~=u;87@3(q+^ISkCBA`X-an=N6NU1Zt+Xg1$K76c%X8{?TXRO-YIuaU2NCS_WPHh6Z$L{O@pKmvRWpw;?eY$mm!{H{nil{7 diff --git a/Resources/Textures/Structures/Walls/solid.rsi/solid3.png b/Resources/Textures/Structures/Walls/solid.rsi/solid3.png index 9ac2271692b8f0116025dbc2b68c5e44b53d8e06..4374ed1e1011027c4388033aad7d9985000188ba 100644 GIT binary patch delta 400 zcmbQlG@p5bWIY=L1H-D!!g~x1jA@=Ojv*Cu-p=ywYB3ODSiHZ=!HT&UYt2 z#VWSt;<;yZ(yZ+(CUO19%Jm4;nl<6rffj*HDK$MCC-!WgbTItEUh&?3!>(hG8Moy+ zKR?b~65D>RpFKnBqP7kj|Ap_iR`zlaEci1WWu29u(+NvgHejtf%`%RLsWy? zA7#6~#TmBtzQVgCcKj7yfFj9!fyv~Ntz-7bTvx%Q-?jJGe>fn(ej;*<$N@oi56#$z zjf#8^<_P!Be;&C?!AT||avHaZ#SzA~#2=q$wQqg)_^Xj+dhxvFo|=-+V?;mZ{g(%u zUJtTcgfrmt{-lWvZxmyE#j&+um&(4*h)t$Cfb zX6v%t{qH>g*Ub8E?>Euwy!f4eoELx^e5W#c)#NS%G~10G|+7 z0|NtRXJ-ow3twMfpjd%duQ-rmEeY}q{tpBUzqj!P0|ht>JR*x382Ao@Fyrz36)8Z$ zYEKu(kO=p;R}HxiC2133TFEdd|lF(lMRc zgB91>1-5W$U16*b@=C8rSivk49`#S_6@zbc-O}Z5vJ2k-HnuUi!YH@%WT>%zJ>Lef z(GX8KB!e9MN8$g8zfI9M{D?=Ne|tq!NP9xz@jb$$Mr@x|%M6%BKY tt>pP1>7V?sTyq!PdPL6pGB6GpJYD@<);T3K0RWGKt~USx delta 264 zcmZ3^JcDV1WIZzj1H;_yjcNS%G~10G|+7 z0|NtRXJ-ow3twMfpjd%duQ-rmEeY}q{tpBUzqj!P0|ht>JR*x382Ao>Fr%o3R|8P6 z(bL5-B*OjeRY$G{10I))SHAsAzjmO$e1g{tr|`^sMHl>C1EjgHz1i`FEp4R(YYb}< z+m3am``_-GZ5h(YwS(&k&y5yKk$De}$^81y^6!QJnT0)#c8Pp@nfBNw@`Wm-C%C!K zSjtq*@?#yxW*z35n=O%L93R?+(<0d_st@VN`x_kNJXvJQ7%IJ^8R!}YPgg&ebxsM4 FO#r~nUo8Lt diff --git a/Resources/Textures/Structures/Walls/solid.rsi/solid5.png b/Resources/Textures/Structures/Walls/solid.rsi/solid5.png index 3c0b42ddbf73d53c54c8da7192a85975e452677a..d4f50d419fb8f69add5073a70b824eeec4e1212c 100644 GIT binary patch literal 448 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU~KnvaSW-L^LDm(UbBIS>v}`k zB_-V3B3QLgY>MQWtuUGCor0Ih)=V$g-+n6hB;B08zdG?O+1k+{_WIOqxu!hLNjmkNB3{?q}CCb}dPixKI=0&?9*EIBU!^n`!;ayt8Jp z0XaU}@4o!!{3o)Ykgt28V6IN!=6vGhPaE$c=YX+R* zbB*QY)cfu;Or?)s)Or;@gOlUopHusFx4 zPiAnjcrKkYo%dPgH_d`ZJ86Z+>gMwXe^i|rmri-Tc!Hg9LHEz<1Dp4X&f2>0JY!9J zXM^eTy&7fzOG`z>;30v)7^ds6o-SoQq%eE=|QcHN28SV5^Uz~ z`y=Lb;q}9WN&VbEYT_2G%1Kw%d+;s4_{cKOI^i>x+RuBQ0!{V3#J^F=Exq`bBrh;# O7(8A5T-G@yGywqjI>0*s delta 336 zcmX@W{D5hKWIZzj1H;_yjcNS%G~10G|+7 z0|NtRXJ-ow3twMfpjd%duQ-rmEeY}q{tpBUzqj!P0|ht>JR*x382Ao@Fyrz36)8Z$ zlb$Y)ArbCxr$_TO8}P8aRrzjT{5GXNb!&*4R(H#kG&}J!mkO51TP%T^ZlMhpGq^&! zC9bnRs(r?_=Dcnq#}vVuFY7t){o2pHs(Dj0Q2GM50DJU?Wem?*JA$_*R65@G7Fa%q zW0lzL^8(ACFugZ!x|q&#EuHnB|8J{074aYXTLt2133TFEdd|lF(lMRc zgB91>1-5W$U16*b@=C8rSivk49`#S_6@zbc-O}Z5vJ2k-HnuUi!YH@%WT>%zJ>Lef z(GX8KB!e9MN8$g8zfI9M{D?=Ne|tq!NP9xz@jb$$Mr@x|%M6%BKY tt>pP1>7V?sTyq!PdPL6pGB6GpJYD@<);T3K0RWGKt~USx delta 264 zcmZ3^JcDV1WIZzj1H;_yjcNS%G~10G|+7 z0|NtRXJ-ow3twMfpjd%duQ-rmEeY}q{tpBUzqj!P0|ht>JR*x382Ao>Fr%o3R|8P6 z(bL5-B*OjeRY$G{10I))SHAsAzjmO$e1g{tr|`^sMHl>C1EjgHz1i`FEp4R(YYb}< z+m3am``_-GZ5h(YwS(&k&y5yKk$De}$^81y^6!QJnT0)#c8Pp@nfBNw@`Wm-C%C!K zSjtq*@?#yxW*z35n=O%L93R?+(<0d_st@VN`x_kNJXvJQ7%IJ^8R!}YPgg&ebxsM4 FO#r~nUo8Lt diff --git a/Resources/Textures/Structures/Walls/solid.rsi/solid7.png b/Resources/Textures/Structures/Walls/solid.rsi/solid7.png index b4bc95f4f0d177ba63d815287f9152514b148456..a880e87e0e001365eb01e4fbc7bcacb119635fcf 100644 GIT binary patch literal 261 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=XFOdTLn`LHopq46*+AgHy3qF1 zCvvXy6?$yz`pa*4t(K|s?4;sz-vsZUee`-)*!vInbpEk(DHJ$pHXLAF%D}`vg^5EZ z07c+D@9g#GJ{xcTr?&CoN8td5MrJQY7CsGD0gDA94i6fFNE5hIXrJ)AUVd-R_YvYwfNfno0U#y3EUu{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstUx|nfKQ04 zv$Hdhxhqn{9Y`^i1o;L3XL!2ZzzfLZEbxddW?S0SpXW57Z1cPqtBK eU|=m^cu_a?JrASQvTl2zX$+pOelF{r5}E+rfH=Yc diff --git a/Resources/Textures/Structures/Walls/solid_diagonal.rsi/state0.png b/Resources/Textures/Structures/Walls/solid_diagonal.rsi/state0.png index 5976a6c5c8cddc3e0ce7cd57b773685b44112b56..fe95c81ed3254839a2b29b07e5556fdc599f2ab1 100644 GIT binary patch delta 300 zcmV+{0n`4x0=xo{8Gi-<0047(dh`GQ010qNS#tmY3ljhU3ljkVnw%H_008buL_t(o zg~ivs4TCTchT#tr(vd1G-~~`5_8)@OGz?&*(8YyQL`Xmk@z0%o3p}ql#EHTfgIv>f zoe?>4DJ8N5EciH%=>s;n5NQMUcv+U|0&F;dGyz9A09-f$S_5EQ!Gb^g z{t#yiSmTej#iW!K2Y`b5Q@nrdlTx@hjTI*kaM}5O$W{=7lLdt0BmpsabU-W~6+nRp z2T yq{e~OJCFm{S|xu2a^X@+h_jyt%CX_YFyI5HZw?UUZBdHi-m-=zuCEe#l;%t)I3q2aD>@YnDx{W%%*Ncl9!C?|(X8u;i$cXMXPd;4XXf?u0LP4EI=1 z+-9f}PWaz+;QoW%@#f_h?yQ&QK2`VT+ml6~ufATaoEpdU>etsD@00qP9{nz4v|KJL T)$qsD3*=-^S3j3^P6>Ndj8%=73hbDS!g64xqxT z0x0p~0BXD_fCJAC;KH*4IPt#$xhIt+pyZ^sO!69*o>bBR?w!XItUwwM0(#)zfL=HN fsH;bV#C!lqTN3j#Z6XfW00000NkvXXu0mjf9&&e` delta 255 zcmZ3BdH3sBPRm&{)v#ZeOE7yKUr816Oijhv_`QQzq4;uvD# z-+Iwe=zszTi=)q!KmU(AZd6jr`DPUxvw*$7jzN@XMT~&Qe!&-enGCELZWS-syOrn6 zxj774q18-FPFM9GEVpOe=AQ7H@y2h?82g6zax!-tH@{bSA>FZyHPKw*9kYoyg$n>gTe~DWM4fZKYy6 diff --git a/Resources/Textures/Structures/Windows/plasma_diagonal.rsi/state0.png b/Resources/Textures/Structures/Windows/plasma_diagonal.rsi/state0.png index 84f71e4833af719f7573047e0912d80edf61c378..60d1c0421b3fecf74c453715810e8e5ffcf32774 100644 GIT binary patch literal 15748 zcmeI3e{2)i9l(z?OG82z5E7&lYF#rby6$}Ev(G=Sj`_jFzd0QSnQR(GoVYcXnbs zFV0i6R@y)BB>Vh*-}n7~-}`*u_v`!Tp0BN0a!=6@iU@+Zr@G2h2kr*_Q&<4L)y~cv z;5Ic<)ua+c@l5?Qg?P2MlpweRa($!L==}*NC?OLsDn7{+4@JOif^aQ}M|h!C(hNQ+ zAcxD0SKr-dG{|C^v4Qo{-blIBB3E@rrKO!U^+IQ>;1rDu+(oW92ONYXjW@(Y!LZ83 z%Zy3C9QdsdQ$|B_iq=|YT%-pyG&PsDu#xQaj-9_M+D=PZAI#1B^sd2PN$Qi8H!;@ zFoRS(!WthZ!|L3WlTkk&Nfn}UM3a@ULHEo1ls2u*Xw(CxuaSL)BI!V3b%Y(DNX7XG zWj4`NE+bJ$+eF%;!Q|3Jfs%q!ND6Bzuruehi?k@3qP8d#giNa^3=DGO^`>LzTyH3p zGqkEzv;zbqNOM}M^&Jt3s*_ZuEh=4)Fnrii86$Dl?chGkvPKawVul!LlT`#YN>B&S~XQgf{(H zFA58i3X-8_B?+V|S-6Y&z}V4IMNoF9+J>kIvdCqEI;?(&)hYQ&J1sg$vssczr@-1s ziFJs))9-NF^jzr03tVK@rTa~ej*XbT9n^aDW8n32)nQfR!FH-WZZKey!O8@QcKFRs zmUPgdM~P0Wll0jvHqvT!SRGD*w$cofJR4)pGbY`beI&SnRy$V`*L*-AfKP z<3d%*dfq#rH0ZfmDyJ8aiRG@T8s+8F? z9W@5tJH5+)|8DTkszIo#^AbeoJc4-US%SDV4DJ^RqKzhqubRQ@uCEZpY-RJ$4pkCF z-XqnXMfLH)gUg<7Jylz}@~r*niGjbo$cXc2iYJ%9>%4R*(!K0jN&I4W>8cz3-roMc zf|MVvDkM7AyO#`~XA)QL+hJ;O&_Akde&<+l)0TXycj5KleRlTr zf`W!EwkN+_ecv45Vv^LhTup{}U7yZ21~K=Gf0;_f-B_x#4^+xPT;@Jajk z_BXZM-dr00+pjG<*DPllbK}r&?W^7%e1Ds^=aDy;B^sXbUs=egU)MgpYtGi*!~2Ri z%;q+BCDiQ&#MJZu>Mz{9^|PAGiO*lJyt`ts?{MAh!W&hW?#+|WZ(Z`>+$qB**P6BW z@7;Lkf!eynVPad^ild%l;^5(hhSMFtfB#VaqruzppWohjqJyzB91x_`0>zZhF=aZ|^e=T{wGR;a|V**|lMK8ZrOGfdb#NbU!$9M0G`t Kr*Cods{aE2tbMlt delta 687 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 delta 661 zcmV;G0&4xSdcXycBYy#eX+uL$Nkc;*aB^>EX>4Tx04R}tkv&MmKpe$iQ$>+VQ9BfI z$WWauh>AE$6^me@v=v%)FuC*#nlvOSE{=k0!NHHks)LKOt`4q(Aou~|>f)s6A|?JW zDYS_3;J6>}?mh0_0Yam~RI_UWP&La)#baVNw<`9$B7iW07=OT^#7sSrUd+IAeBHyx z*Sjds@;>+H=vVS41AHR!9McVpc!PLm)6zNb6NgwyQi#uq#|^q5@gvt|m)|%S9Ts?I z$jGGTi9^ITl3X&m%3$PJKou$^#}EDozq>UHQ{5*!IUL z(6b9P>$d%UY}?Hf!2b+fX>EVC0nC1qUT4l)$$E+a0rYQDSO@H-6Or7z5RQp)!z?k5pttbR*U}t z000JJOGiWi8UPvq8b846fRP~=e*gz`Nliru=L{GV3IPN_*4_XB0KG{>K~z}7#na0P z0znXj;c75}Wdu)pGJuKCB#gtf+@lOKw*?P+6UAM39^GA?!1q(o0P$jsPhsLA1PBvP zDftI{;^)ofBuqSwcfSSZZ~#65OL*812Vvs7;g*goby$fXSm51)Zpr0 zP>ZVuwBTw1t++}+58fTni+2TR;LQPAcvFBTULBx~R|Qz$#Q|1$QGg}B8eon84e-Dh v1HACr08jiUz#IPxVBqfn77hTy!~x(14wUkwK{{2*00000NkvXXu0mjfpVcXg diff --git a/Resources/Textures/Structures/Windows/plasma_window.rsi/full.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/full.png index 41d24e9d2c47761eb99532452d5d92a59c25810a..b20d5ebd5efacbed1185a649c410e9eee61d80c5 100644 GIT binary patch delta 1581 zcmV+|2GaSi1HBB8BYy@2NklZ@qG_2qqxZnY} z;0bvJZV(TExaStMf*lEI(b^t%);pe4Rb@tSkyYJ2?HO~3R;#FbPyg^c z9udbK(0r+b+cFHtF>JXPkL=~({#G);&wlvxw~`9bK?JBv$A9KNIiTv36J>iw2kIXjGv zWO!Gm;k-^;TYu-@)r-^t4Ci%Py-3~aW$pmd#&X_R0vO(u{_4wNjWq-Ee1w4f5%z8s(U zZTOafh~~T5@;)8w65_SGz>-#==H*#@Xt9(xdy6f?LVv^v5U!Oh1_%Om%948v!g}jT zozhl;yf$07z=J@i^)k+YQ^JRtq%H^(I*epLxXwfrV0o@5d`zFEp6cWN#>@I%+3`AE z`dvEKDnGFtjgB)SUL!d$sKX#8HCKHsfueG>y`FUdw*L7nN|U(NM}U6NKezB0W9hGL2%mx27HL#NAJdq+UR&_P`oyQ07Vs&i z37}HC{k=-9Iw?oYEX>|9Ofs!r=8hme3jBz_>updz)Gb& zq5p%`hv19l(5T-B58nk|I%+WaX-WV$^-7sQfGbD3dsANiFW}=vnV{2w zRex6Aivf>V!b^s4(uwDpvyW&Gu~JYE*L{e-Tvy76dJi0SKJT^4htB~-#g(95*MdYxV9NyVt~UV)Y_*B;63Lf-bpl07tL#J49_YT@fV` za5saWj2C4*1P3TFl}~{085rKWXl&PZRDa2Qe)1#h$BS~}LySIpe+d35%ahs7ZVh4D zwQ$odurb3}=x9}HQMPrp{|DTpX&)R~8bX^Hly-_(vsoFByn2~Cd~u68k1xJeVzxcfE*1d^$&Py1scJRAgs4m`1({9)a4{~&y$XRlvn+W^iknie4b=S zhu~$ZclW@h5kN_|`?QM~eQH6Ij#aE{ie?~`6y?$dFnwQdtg{W$*F>D=r|FA4w}$|w zM$1xOr~WuC9WJ*1o@uuuJBnc`a(_BgjxKL3`4pj~Z7-0uiJ+EiFZ~aaK@3E^7K~{3 zF)2*?O46BNY_oa$SZ6DlzL7|RPSC{=|5&nVW<~jl zYKeKOwNBnVf~#Y)tWs_RWgo(MmX6Fo1yDXQx0S|vQ_rD|eby;OVK@?vsxHr{rdPj~FiFZyo3kgZSq?I^drlmLw9b!{t#Iv483z!ao4L?!<9 z$Lr6d1eipdp!z7xlMKPb(|^+C-J8;U?NOCfhx2OI>069v)&c1I`F-Mqx!GO%d&@xd z&vG5#m#TzGlC6vY#TfVyV>k|Ys}0dvpYX8)st}{33J{f|q%i{0N{SkulD)T;6jPWo zPooe%x~H{uC-%&9Z!7-#_rILXmfUMZK4;bZ8Xmy0Ve(yd-Li4xS0=W$&31k;cCPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi z!vFvd!vV){sAK>D0YgbdK~z{r?U%ud!Y~kqtGH0;p-9-HK0_bFH}JkEuU>tCy?XWJ z-8b-gy2m9*4~4=Cnt!%aZNxUQE%A^ahS+v8^JOArGD?!<5`Q=p0fb>l4^b4+IJELS zr?DuC8vv3^De1$|5<(C}1%MYwz8A+`mSyls$+LgW<2Vk!}%OWgHY)J_YzqhgVhAYw z{GicR#qS@DoPQj@bpU+}9)#ow^op5)Hv({SwF3M%tjz?XwE`?`jg6Vg7+@%Q01w~+ zJb(u<2EZ|DW2R~Z;L}X?1?UZ|jZf1iwN`*3Ua_|1(EGJy%D+mE3I8FwNn23b)ROg{ z96~I_L~Ny6w_U4%vx|xItC{o5DLpw+5L^KS;%bH*st!1P00000NkvXXu0mjf?ijG! diff --git a/Resources/Textures/Structures/Windows/plasma_window.rsi/meta.json b/Resources/Textures/Structures/Windows/plasma_window.rsi/meta.json index 888b3527fb6..4a033410903 100644 --- a/Resources/Textures/Structures/Windows/plasma_window.rsi/meta.json +++ b/Resources/Textures/Structures/Windows/plasma_window.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/ and modified by FoxxoTrystan", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/9c7d509354ee030300f63c701da63c17928c3b3b and modified by Swept", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow0.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow0.png index a4adc74bb5e0771858117099462f9ab51715dd47..fe379e2fef50ab07c64a4f9ff75b663ada0ee10f 100644 GIT binary patch delta 2050 zcmV+d2>ti^1&`We zmmu&Vd4(WvkoU+r$SWiVBZnM=+;a<($chChP+*y~WtpZ(&P;b#4l_%xNRfy<6YoYJ zvEb}X@6^=SRoz`xJz~Z9?K^+?-Bs5Lr2rbf>cV9i#xEZJ^nYh#AUVayNzSwIHDHQQ})4 z-pHSR^mPq{uz!hrr`{6iKdLMU5$00Zl+sZtV$s)#e7tfMWM6#{R)$xNcsL&E5>m- zGN4xU(CnwKbnXsU4|EeM-`{Q>V3=f@-H8=WxT4L*MdeH5^?1>10IPKUbG)F}OXGEE zOEp^d*nb<0h9jUTx=tUbJD09sqkQ`$jb09~d=>z}{gTQqUx^{1g~Xz>9ibT2j!TcY(3;rp9E`;6izmI;8ge(-R<&OlfPc z-o(AQ`zhD0_`W5KCZMXSxUBr5_Z2y{nZ8`Kb8xH80IUva3fWU&^g1AQ`4pCvms$XY z#eX2@1%&W6cQgQDQ>nDmCN{n)MiWr)gtz)5`I)~DW^Ws|;mu-^qX&v!#kqyjxht#( z0i(@O!=F_)lj&25AgBbDH~tX!_N;A?;)md$8#Vl6P5fM!3v2OOS0PQ9-e z&kD-TK{l)O1;#C_0QA+6&);DP!Vb&Rl~0AE2`F9pTv7(`Oj1zm4q+yF_7Z|UwSSr9 zotq*zJmIA+C2U!>W4BiB2BQhM|M|V!(C7BHY0%#6$H`@)>>`trz z!rbCwDr_F7`siM>g-x@;VJyZIQ2gD+Ve?r6_2WRZpJ)y;s)R+%``sV;wI6OhIl9+w zmy`9#4U8rrY}?l2*uh1=_V=Qh%o}hVRfHU27eKycj1Pwo%YVhxb?j@s zEb96-UfOUo)a24GH$2Qw|NmV;ky9LbUMgS=o0}YjJCbUFN{2O%Q&T!OI?wa4v+{v( zd^C6?++Y5FUbX2BBW~MwhtpPWzpo-Y?eR)I;^;!7nf0NUp*9!kH%tKSQ_9+<2& zmcGv0`NYX5eb1jOFEJ!P-G7UppIZ+O#s@<~ub0lde3C1G&btn%GU>V6okG7lQgrwH zsu0kYYUuehW!?Rf@(!-pFOn#dg4SXkFnSDFHhbtze_44i=l&ixdU5ea2mr_VXyw!3 z1O)WTXV29|#h8TS#nk16DyJOHN*%C}EayR7`e^2T62w#Wd;7FDH7R@pvDJEifqw54W3 z=jB)Z;4hATQs!(b(y~W?tXU);p;#EB~ilWqL3g1&EidKK##8Z*>%_cYpe$W zZP6lV%Fle?6II*^ZBYyw^b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi z!vFvd!vV){sAK>D0*^^VK~#8N?VB-612GiGPf;jzC~}IEodnko4zAM04P#3DrzAo)h4fo3y#ev9&mizovWJ#9j~vC^b#Gew#KxT|9(OcH&~8F2;x z(*$UJb2U?3M1LA!Qd?V&MlbJ~;v(7roxJJ|=n+=YN1YMh12pEyZ;DH4444(c0E*rc z44~*O>|*F<{r-fSW2jXc7BNjsW&NjDjM(Xvh3m&32WPqf;#PB9!XrS@TY>=;y(Jhx z(HV^DHkAdo0hsEtq^mi}unjkr%PL@=?{(rsEsUC~D?D0(t+W@TaCP}gh zYyGFMuitc?0?>Fx2HA$$%9H5Q1tOO zm$?jrk_nFhMQ6Mp1n;&Vty^Llphk!elf9$LY>BBwPA)0ZjhL z^rp%J+kmnY44~*O!2pWhQfMIp%$KDvmab3r41yIT7E_o?F{NhBEc^YP>bxvn1i=7` z-VzL;=q;r&K+OtPaS?5Rt|l9ncMr7aqt1x$0bJUIEO8NOfa=<~yXj66WPA5Oi;Fk| z%;eST@7KEqKSf`2Mw$U*$!J2002ovPDHLkV1mglQS$%* diff --git a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow1.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow1.png index b0289b7d65a15e6f4a8c5b4862772304fac0d388..d75684f5d060b5e3ccb613eb3af2ddd2aaffc192 100644 GIT binary patch delta 1079 zcmV-71jzf}1e_%7dXY=7YaDVgq?Ii%&tVtvSLB)L- zX!0xVhj!yTC!lvtBm9Q}y}qFo02qi-0F?hxwcU1n=LGD1H9B6tj8+_&2mn@pMPYy6 z^8sM_XM}6_hNCLGEu0f@ba1+VHsj^yhJsnmB0wMz=%a(vL6zNheCGu4T$CQEApi&< zX&V8=b3v8ec7J^51Q21h>0k701LIpek^ehdLIADezoPzS?C*~j5RhI(QU4;l9a=zu zTR3-u0A{KF6u<(&m315Bp1sKa&S--Irm1#@cyUR48M_tQK)}qhwL%*RaEh%bz&g1) z`1<)bHlM%u{TGjH=U{`aSHO+{*AsA!ItUo2`qP5z4YVpz|7Wd zkh_=koujTTkpGXCwfVkt)I@;vvu*x<($Cx7qlPa-`Nda}P;~7UTOS3i6<`Ft^mWmT z%H(Bc9WOEKhBW~km?dc_QbfEokO&YqLZk=^&{v2^la$%&ScDC%2_Q|s0e~1l^%VM_ zX+N(HrK)3l@op0Fn7&NC4np)w;~)8ukPL zXVDvGF|k9HP?CiaARtW~9-eH5kKG)n&=PHwxsX; zouu^y?%cfld+t^)(~IN22>LuX;pFb%k5@k~K7R+m&tL!IJSS)(4=8v_%E~*%lB$ z$OBe04q=E$tIiUzz-9|%3z&Kk59fWLH2|FO>rQTg00k-_fP{r6clyKdm>GbK^~AXf znt$2?YXxL|z_x_JloQO=@ONSGTo`nYCUWsHN=n!1Feuy(5j3HIq<)XI57?$KSn31v zVQ|iY^R3XZ56DIVF>jq8DVVXI7&t}~1fX910Jwciw@mzGVJ%3-&j=I45{Quw+4SK1_a2nJv&g1r#A$LObUK zJEwrnEc94iCN=M*0?7YZ)8M+-?@jd}YdTj>@0J1#jDRH!UqyU$Fh9-wJ_ta;u`u`! xDqxofV3!8~yF6f*2PD|#0oCZF0-WUm{{oTD)vp-+rab@v002ovPDHLkV1l+I0S*8F delta 712 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 diff --git a/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow3.png b/Resources/Textures/Structures/Windows/plasma_window.rsi/pwindow3.png index b0289b7d65a15e6f4a8c5b4862772304fac0d388..d75684f5d060b5e3ccb613eb3af2ddd2aaffc192 100644 GIT binary patch delta 1079 zcmV-71jzf}1e_%7dXY=7YaDVgq?Ii%&tVtvSLB)L- zX!0xVhj!yTC!lvtBm9Q}y}qFo02qi-0F?hxwcU1n=LGD1H9B6tj8+_&2mn@pMPYy6 z^8sM_XM}6_hNCLGEu0f@ba1+VHsj^yhJsnmB0wMz=%a(vL6zNheCGu4T$CQEApi&< zX&V8=b3v8ec7J^51Q21h>0k701LIpek^ehdLIADezoPzS?C*~j5RhI(QU4;l9a=zu zTR3-u0A{KF6u<(&m315Bp1sKa&S--Irm1#@cyUR48M_tQK)}qhwL%*RaEh%bz&g1) z`1<)bHlM%u{TGjH=U{`aSHO+{*AsA!ItUo2`qP5z4YVpz|7Wd zkh_=koujTTkpGXCwfVkt)I@;vvu*x<($Cx7qlPa-`Nda}P;~7UTOS3i6<`Ft^mWmT z%H(Bc9WOEKhBW~km?dc_QbfEokO&YqLZk=^&{v2^la$%&ScDC%2_Q|s0e~1l^%VM_ zX+N(HrK)3l@op0Fn7&NC4np)w;~)8ukPL zXVDvGF|k9HP?CiaARtW~9-eH5kKG)n&=PHwxsX; zouu^y?%cfld+t^)(~IN22>LuX;pFb%k5@k~K7R+m&tL!IJSS)(4=8v_%E~*%lB$ z$OBe04q=E$tIiUzz-9|%3z&Kk59fWLH2|FO>rQTg00k-_fP{r6clyKdm>GbK^~AXf znt$2?YXxL|z_x_JloQO=@ONSGTo`nYCUWsHN=n!1Feuy(5j3HIq<)XI57?$KSn31v zVQ|iY^R3XZ56DIVF>jq8DVVXI7&t}~1fX910Jwciw@mzGVJ%3-&j=I45{Quw+4SK1_a2nJv&g1r#A$LObUK zJEwrnEc94iCN=M*0?7YZ)8M+-?@jd}YdTj>@0J1#jDRH!UqyU$Fh9-wJ_ta;u`u`! xDqxofV3!8~yF6f*2PD|#0oCZF0-WUm{{oTD)vp-+rab@v002ovPDHLkV1l+I0S*8F delta 712 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 O0000Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi z!vFvd!vV){sAK>D0zFAYK~#8N?VB-9!$1&44FZWSLI$NuDh`m6gCKDQT1q$ol(bv{ ziGy$mDySl`P&y=#z~9Uy&a$Q;n)xg3K4~;-yPD_qTFz{?Dt|Jw+3c&X>#Av*>SpKe zR!(<}j}EH$myc?(SUfe)Z*q2>llk$r4FAQpWEv>G2MX;%j?JM9z@3-7e>rrQEujm* zv=57~C;L+wnnM==V#VY6_aF%YN?1G=Kx>i^fWn80#~Yv<7(o|+g8Ko&;w=|Px&Ra# z2Jk2z&;_8-SbyM}$7_);07VXk2T3e~Oo{->*-`{Z&X$dT54aycT*&ZWZ2CRFDdiE6 zoGnFwkkGSa{*f9Xf&F}qPs}MR6xIY)xUK=R4y@LKoE`zCmGH9{K=uW&aa{vsxRijs0dk6livVqU zh7wZ1T!1z^V-ixpRDd=)V-ivkVJ1MQcuYb+*qF|Mn1nFcn6CkS39;xd5-}G5AYmxj zxCls@B7Z<~wiE%9vxWYD0rvia@(4)ImLfoMwiE%9Y1EVWz5#>>bOE|gAPijdkU$rp z`vm#{yd=;C=sp1r;3*-AMX*^lO$H@ck%RzcNP;Cv26!xN<~_!~=u~VJS$!X05Q<$oOMEx;WUzGwZM2?V0r8_7P$7qp%aa7U99Hhks0S-3M2%fBa+b8yEe? z<>C^dn!@B|Iu#>Eq4%~F*Mk6yQMI$N2vJd}&0M8hw(5Ei0HLN5W<#5rP!N!%XvGCe zC7~_^G$hnudY&dWQB}~Ts9*uGW*=}tJqR!u5hKm}VT2MCg#`=fQnCevW!~(zFp*q$ zAxd3+sDTAoY=34Gy_AsA@uSAEs*VNv%N{E(uy=caur&;>xWEADl%?D|0V6vMw}-(3 z7ExeWmVWO9v`xpdH4GM9pu@gJfsq{=wuZri3$)n7Jzz%|T)}=>0PG5b1s5oF1B5yd zpa@_kRGFNmYdREM07~2dp$-H9sO~cR1xn8ZWp|hD_Q&AI%QMIb67zs5MF;+s*6thX@8_q*$+>2fU9DO*u)$}|~ zn)kyf=$H`T=p=0Z^ILqrNybyx5xBvbfOwFe&VOeOLY7=)Vp9brQL9!&PB+P1^}E8E z0Dp6AROd9Pc( z+U5@>T0nj>yUPA2zQ8;00%fHlx%?l1F|$L=?iJa(vR9O80r{^t@{_;%bXc3oLpcQG zC!Mb^&hiIq+G~TV_kdE*@~gl*zX^JOFMq$``+{p@U;Z!P4F>{z55PC-LO^%TZ}$fB zTca)nKrwL|vzkQhlHUq7cq_MdrCThI*LKOBPy-9dAD^u&?~=Qr4i!lvI6;>1s;*b3=DjSL74G) z{)!X^2Bu<97srr_xVN*n-OQUOXRFRjS{9=9(rMuWtGRu<=I-Bqq4NLN>t7EYyeoXvx%$fYvhbsYdkpvd zQ{Nn|o_`=}VzX5@3qz?GC&McpA%-iFDhw+&doTo~Ph?ndPKnWBZflL)hLD(s8zC)z$|_+V3~qQ@61^udsscLe|!Z^C~Hv4s%_Z8nByJXva{bAE!6n z{*ct<;GJd0S;&T#En~wqmbZT2>5!9kJIZ9)@O0(# z?hVIYg#4dTTl`DQ3#jCdeEi?nGwUDhU$FJvHT%%~g(;2uxGS=blvUKGw%ITrdi6^- zB6*YQ2HU?ypNv2n_N?9h9%!lB%WoUok9uoFD(E-n-SJ*?e0yBe?G29e82$U!$2OX( z`Idh7Dfy!2C6*%I5HhSf zm|fd&zG1^Izgdh2yOozn9*{fG%)GidGC1cipT+NoEH7mb>|@yy*13pB>CfH+S2kDr zSMCmw3a+osV!X!njUj95%&k7h9N4B>_J;Sby)R#TgPEgg!T-{mznC*6+Lojz@Gl5j n=@Ru?$t!u0hE)4jhn4e>om6P>`JQD8OqdLwu6{1-oD!M@Z;)KA6 z=1CK0C@U{b;Y~~A5chA|eJ_6bQ(> literal 270 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!Nr~~jv*CsZ)Y3wHaG|zkn>4kRh;3-m?qF9 z8nYpUk%uRD`n@|(+IK%${?Yh((c7N&H{N|ss5#oRRfHj1li^wr!=RAVU>JMXNU#^A%%^)jIp>Z z_^qi4qaij#t#%pnw1kFoPq86ij)(@U$%gZ!&2F$WCdz8JTkMk!G)Y+r(oC31oHnx- zlC{u=-plAt2fv&V!OxZyJky&FNG@ZQs)kvDsH>|p)tOClq>`W*h9O9rplKY8z?Fp| zm5bsbB{v?VFHV7|@DVAjN^;1c#pQf*jp{NQwM6|_@4ABF{zM_AmmQ!;M7c0QnMfj) zlfd`;gli&!*wh4`5CdXR45^yf}F-(WChYDJw^ z3lQ`oP3ft47luWmL{#LO2ro{n1xv|IwR%Fy^hKp8*z%hOY zW7BG(9bOP3F)uA{Ogk`R@^Vn~)wY4h!xn`Ul>^HuDsTgZNdhzDL?0;%JcIlElm+K3 z76;DQd_LUg^U)47=MZS#AKM!P-4iqG4c(U=gigJ18)K&^#=(Gvi^7l#kIyqH*q}r+ zBNAxmTp($TwiW@bg(9sMlJVJbJ0n;FU6akQ>m0OevKe+wcs?JJ zR5#t54N@n0X*UM(f2~q*4=cKDR;$_SBw#h{Q7lEpKzV@#{XZFl?7RGtSkZSG6^f-NfqbM{vXi>+7<^x%ETo4ensN+KOfvh?%2nbr#aiRG@Rvi}v1TE^g(0m}P zjtc^U7Ij=`K9E(%1pz^eIxaLH$g1OlfS^Sk7n%=b)p0>U(4vkD%?GmTxF8^CQOAYm z16g%k5D>Je<3jU+tU4|T2wK!}q4_{o9Tx-yE$XaHx?DW?RYOhL>MUcI^KjK`D?i+A%U<4b zrR>ed*2b$FR%Kx6^1R;zZS&Pdr}yoD`kZ_AmQ7tfzS9>+Pu(Bs%E|sA7~7ru-^m%Z z+YU8~ul)JW5&Mmdj;vQ^cf5HFFWYK8aJ_5uv=PC(b6?*1*=TG}L3Q5RtR3%{);0(y znp-#TZra`1m>G<=R5Hz_<3}yq)v>l>UCnz-Pkb`2Vo{FwK>O>P{Kf63*Vs?2tZlnJ zxnkqlrZnu+oqs)Y_2qlZZ|rS)_C_X__VF9e?;Wa|x%bc~)0s=*h_O6r11ILD4__U>=XTqHi$bIyy3vPD@F1Gu@Yd9CUOE2kk zHTHCFoV4Wa`P7Eyv6ze*(vME8XkF2|X2!&eE-?M&8CyF8otd!&M1nQ3!>e0FiCbLIlWnDto|t!Z^_ZM%xcXFqUx@#5gUZ0wFt;;I+! Sxvf3QT{LY*!MjuEzw|%x_1DV) delta 722 zcmV;@0xkWgeEbEFBYy#eX+uL$Nkc;*aB^>EX>4Tx04R}tkv&MmKpe$iQ$>+VQ9BfI z$WWauh>AE$6^me@v=v%)FuC*#nlvOSE{=k0!NHHks)LKOt`4q(Aou~|>f)s6A|?JW zDYS_3;J6>}?mh0_0Yam~RI_UWP&La)#baVNw<`9$B7iW07=OT^#7sSrUd+IAeBHyx z*Sjds@;>+H=vVS41AHR!9McVpc!PLm)6zNb6NgwyQi#uq#|^q5@gvt|m)|%S9Ts?I z$jGGTi9^ITl3X&m%3$PJKou$^#}EDozq>UHQ{5*!IUL z(6b9P>$d%UY}?Hf!2b+fX>EVC0nC1qUT4l)$$E+a0rYQDSO@H-6Or7z5RQp)!z?k5pttbR*U}t z000JJOGiWi8UPvq8b846fRP~=e*gz`Nliru=L{GV6*!h3P)Gm(0QpHoK~z}7#n&+k z!Y~+y;V%WDG?RpkdWKFtj;o8i(9xmj5nLQRPLJUlic`8c)IpSrEjCU5{22q`c?k(5 z0OQE>yc3+bQVN0-x7H%z!keanlrnBWA5YU10OAGo@$Is#-}4Cv-rW`ee-P&kjNt&F zwWhrVWB65{3avHTwxtW0f*+boDL8SG9dN+`gbi@Tg9gmOg9XgRg9P~C-T}V2S3n4S zc0ee6RzOJHIUqFd6hMJb4xqv(1yJID1E}%iYF7zPJj=4-9f*Y+V}1i-;v2KC1t

z2wCv;;}tOUW9dJgsqpi?Bq~JzqbQ~PEV9;;<4P$!0TpTkfuT94W&i*H07*qoM6N<$ Eg5tSH8UO$Q diff --git a/Resources/Textures/Structures/Windows/reinforced_plasma_diagonal.rsi/state1.png b/Resources/Textures/Structures/Windows/reinforced_plasma_diagonal.rsi/state1.png index 7bd92db59f70ce83df278ad44857a3797ff47877..e724d3b9f78d115d79ca3ded3230db216cfe4056 100644 GIT binary patch literal 15885 zcmeI3Yj6|S6@V8?c^Gi0)ABMTvJ#v$j8*CC8V>@7I3tsQ8?2RR@(5@}n zF2s;93~5s!#A!_3m}wJ+S4;<}sY3`!!(&K!wFxD`h6Fl=g6nu1V!+Tq?@G2LU(0ux zBs2Z9JEN7(J@=e*?|1Gw+CRItAb-yIgsBM_hK(BveXzAU~%$gTDBMYZ|GY;7fLc*!Zga?$FXW7U$i(hxf`7up{Hz`6@(Nlq$p_LPpd>1_n8CIwP^;uGiy<8(NZc zssVyNq;V~!;u;^17xI!=k!VYARt2xrI+ z_DW~@c}5of#iHnTgil#PKSE7bR_Ih|9$zSUIWZvp*p9;{(R@d}@!5>bJ1BxO=m@ip zG8U6&+GwRoV;Vuy1QFvTJQMQa6gk0F6ZJuY15GJDNRp<^u|8sE!ahL#aE#2{mzUVN zF@89fc8PuuBRd2SQ_kZ)Z@C?h4#v!koGLm?bc=qlEZ$+T$T4jrDm2#{zy(}+* zWJobd0;viW?kuK!;Ap?XEjYq$gA-YSqoYBsMwiuS<6Sxn!C7@A$@4lJYclJ2la*s^ zF00L~3Gs;(3M#kQb$<%GJ?0d7!&6TosEI!(UtYN?vD;!$KN<*;fyX9TLw1Hb3<-Cyv`VB zg96R-3!t4d?wC2sUO2E9lhtA%ZDvMCxR^4X(FXQn1$|v-;!I^^nTw)Wi>-ezaoh|F zl`ANDuYuB_cJYL5nIbG#^N-;(~ynMHLsC z52RIbK|s)=iVMvL(yF*1AZSs=h2{fkRa_7dw5Z}j^MSM~E(i!(RB@sCKw1?S1OzRr zxX^qct%?f*f)-U=Xg-iu#RUODiz+TOA4sd>f`Fh!6&IQhq*ZZ2K+vL!3(W`8s<$5<^yR}To4ensNzENfwU?v2nbqKaiRG@S``-r1TCt#(0m}RiVFgQ7Lm9TqHm`1 zUhq0<0K9jax?s#P@Xo4+%`J3dSnUi9tA8HDdhdbns~A>AVA!=%@Ve`37&b|KdFkQV z7&iP+UUp`2@Z6z>ne*B+CLejYxqiYM6O*Pc`}L7$x$?xM=>>1<8ww`PKB9NePrFf_ z)m2`4@%dNUl8e$dG)fh-xD zx;Dp@y*4|O`~@%+fjKc$9c|stOwi!7c%g3 zZAU#tO}39mVV4V*2C2Hr(c;|w!|{>pOTRo>bov)JMzmiCj`HqlZ)WaK$zQa=Tzsl~ z@34*4Kic(Tban+;k4d?%}bxQiA*PEEcuMY=m zPU_n3zGU9)-u2wXtN-j;eX>e=XwB2cE0;%N8EZe=`u*D*60nDxm#5S{)A&Vd%jKrJ zj{KxauODxlaTeTrnpUmYbAFoXK;euQzoz!&%b9%LG-~mg+BdfZe>mIePd<0TJ;~H) zd9G#ctv_%4)Z6*S!q&9UTaMk>VO#fv^IyH=q>7@Y-6Jl(@OIv+uBR?<+j8@r&ZapH zoAw&k%*DFej!JWYRsMwhpEfPIbm^<4rJWb#aSV4SseWGi?ytL>D(kP7l55N+tbP8O z2ZnuKdav}^>dSxauD#yA_qWUa+-l~NKx<%3W9x#pu2)<98DpAF_{ooN-@STsS~5Ou y7&iaCo(*01ny!pVJaj4V?5V%6E18Df9fxt$((UVe$6r!j*v`wz&u*Djy6S)8Ho|uR delta 695 zcmV;o0!aOheBlLEX>4Tx04R}tkv&MmKpe$iQ$>+VQ9BfI z$WWauh>AE$6^me@v=v%)FuC*#nlvOSE{=k0!NHHks)LKOt`4q(Aou~|>f)s6A|?JW zDYS_3;J6>}?mh0_0Yam~RI_UWP&La)#baVNw<`9$B7iW07=OT^#7sSrUd+IAeBHyx z*Sjds@;>+H=vVS41AHR!9McVpc!PLm)6zNb6NgwyQi#uq#|^q5@gvt|m)|%S9Ts?I z$jGGTi9^ITl3X&m%3$PJKou$^#}EDozq>UHQ{5*!IUL z(6b9P>$d%UY}?Hf!2b+fX>EVC0nC1qUT4l)$$E+a0rYQDSO@H-6Or7z5RQp)!z?k5pttbR*U}t z000JJOGiWi8UPvq8b846fRP~=e*gz`Nliru=L{GV6gZCrVF>^L0NzPNK~z}7#n&+o z!XOlY;h!cZO_)r>Jvwo7I(5CTmt+!Lagl%=JUbv4&kB&hcLzw}y8?k&PDHLkV1m#LJ~99R diff --git a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/full.png b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/full.png index a1c5c2115fc19c9b01bc5e8eb039ffff5e143553..4cfc4c45da5178cb9fb00132bd47b9570301ad6b 100644 GIT binary patch delta 2486 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 M07*qoM6N<$g2jQit^fc4 diff --git a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/meta.json b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/meta.json index e716cdf4ed6..f66453a57d8 100644 --- a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/meta.json +++ b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/ and modified by FoxxoTrystan", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/9c7d509354ee030300f63c701da63c17928c3b3b", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow0.png b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow0.png index 89446260094332a599021485bc68cfd23e52cf75..faeb000b4af4ee778ba66b9e19d9156b78305548 100644 GIT binary patch delta 2924 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 diff --git a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow1.png b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow1.png index b4ba2ac0075caab209b751b8869d58c40248069f..46547d6b996bc58da7c10e55cafb0fd78fcd9801 100644 GIT binary patch delta 1681 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 hc8I#i{`~MD^%I~G=8N?Y=_dS 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 diff --git a/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow3.png b/Resources/Textures/Structures/Windows/reinforced_plasma_window.rsi/rpwindow3.png index 7f987f7a8ef60a676a08ed91fc81eebb21aa23fd..46547d6b996bc58da7c10e55cafb0fd78fcd9801 100644 GIT binary patch delta 1681 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 Yzrx(A<|rn?4FCWD07*qoM6N<$g7_;%tN;K2 delta 852 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 Yzrx(A<|rn?4FCWD07*qoM6N<$g7_;%tN;K2 delta 852 zcmV-a1FQVe4eADvBYyw^b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi z!Tt1rb-1jTe^irN*shhDM-;l zg$@o5E>12k(hPzQ5kYWv5p+{Qmr^Lz5|;|K4c%(HmqODtX@63Z7hm(vcg;_*(xG=p z{iWW0!jJFo-f+qLzWej;j!=S3B9UORSd5fPB@zmS;A)$AJWlHMI(b@po#lEI-3^aUX^pBzxM!E zR#s5=Bup0o)fQs_sJ0jbK()mf0IDs<08ni)27qddF#z;L;Rl^>xKq`zytm0B(DFH9KJ<$DVC`7_JAZ+l${9Pj?FlZuPpt zQI5EFSCCj1{w%Eg3moRyqS5q&b;1tg>MU|d=QMb zY|-e7GJiXEwx9I%^+7FoD7S!{W0Sj(3PTy)`Z)jY5)@HTHefonoP$(`=Jn;&6Ub3e zHsJH{k0Vcpj)VU)JQRib z^yU2-NTonGU}9o|pDRf33eC*SDBT147*MHHNNIbA?3bzQl>@>7)kuTh0@CU9M#Srn zkJWCk1zTa^8+y2YCkd$(9Wf31<2eb^kQQh0000c)RZTeYZ)dZ(?Lz5ns{gQWkdhbxhwD2J_$Zi z($2FJaBeCy5`siYk)439sXV!X0rn)s@_8TG2>`+*XsZ@~f1||X$Vc&cAAKOe0Dud8 zw{(*-fJ=p2cYiNB3E2s7DGzRx8?WsU@aW=1X{#2}{<9N6qZ;z>Gdf`2*8V@pP5>Dn zn%ZY{00|}$vJ>F>_tBIdg%03wQ+okC`uE^4~&FvZ8D0{}OrnSUqK z0XNbwVDUk-$%z&=kpBga;IDd)Ao`I!z(X>92zPS*C0OQ~A z#EtRVPW(J4!~`($VgMK#U9ewvC~!GqvK!4ICcqajzJXOyH+}MXA5nrJ7cZf9$_5*= zik`=%h(Z7tFQIlC`H;5HjVLjI2Q{ArXRzV2mPm+E&r1;{27skGw_vdZP;Sg>c~{=A z0l>*x0Dr*q=?m-L-AVhG;z@M?8PDM_enjYBgjhPj&-J7OI&1ksxWFYk03C}T(*C7L zq67M>0f0n0;Hhf)7)YW6fcC|Y82w8SZ3e)lKsbMAe*yNJKK5~9?%o@A8f4}00YgoL zM`$aDuW9g_2K$F=8jSHJ=hC40^Xuhc)8HlLaDO>{_8s2RHuh1Bl*9aaz9&H1 zzZA*KVcy<{z?ifg4zy1-Pml{(*@Lmeo!`S|Wy!%1!_W zjd3inSBsjt=|41Z4p- zURyP1BR~8D6CD1c$r&9mi~|#d(4xsG4ou*BaPoR^@_KNxZP6r!4)_Po4zi-ku!6Aw O0000%&aN^ literal 270 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!Nr~~jv*CsZ)Y3wHaG|zkUKI#fhADGLBz=; z;BXMDfx(v8s^ZD=?3yf`I(?Z~Ux3bTcbc*hT zWQV$rDGf~^VUo1O5QjExr!aJgo5l@=I8KUj5~dv}g@#Gfw59DhCQcp7M-r1X-IHud zUdub4CNuqKZ$>)3ef!?q{k?rp_s@N=a`oMLIk)9d6qQ$A=Ba{ro%Z>{O!%#|wqAj^ z*`c!a3Pt7KtbMYmy-&@jDDJpaQ>WH>D>y+86!D^54~k-e5S&d>&gHQXFEj&HR}UJb zpi4h;tWU3#M3=tS;x&3hrJzwNYYl_y*3~saYqQ`G^~>Ek&KL(B1c1uxVgY|p;bJa* z+%E@zYs0i&7oVawyYwYmKwX`;QdcU6fzDE7H3&wlO=oiyF&3N6Y+I&djf{mhnrM^J zz?wL-ku$Tpu}kmHfxnz#(Z^MJ?ivdRC6~TYRYM$2N2AfAsHsQ}H_(j3;h>Ey&9VkK z!=SVTRX%12Dg_BA<9<9q5yDbPmE@pK^UK%E5!I#FYk`v2*uDaxWT2oj#tu@XV|<8a zii~t7BT-1&gd$;od}*RU13w6WpsGMSCZk=bQC4N8QJx}XQaxp0m=muz89U>81A&a8 z6?N4Xh+qt9MoXopB?RaypvaN109I{*TPeu2dsXtKk~6`RrkQf>ASO*=rfCvp@uQH) zkQ45eD-8o)mBTf%>~|+lS>-rFU1@3jROyz~NE=l4#8qI0E=DZ z9X`9ms^vl}Ug#pVF3oRzbYjHx?cmm{9RshID-S9v54Th9al?Tk39ig;wVUe&J1__g z58D?oTMfKPG#OaYWOdkhqmOq$Xp_uSD;sk?9v!;Qym7NwZ?*wmfE)LLDL0-7l;&(w zpfzC$wsYQ}Hb>iw2=`*H7X_05Sc9E0I}G)#*>2!%5HKT{M8@i1MOF~T_maWQq)=s& zmiHDU4O(uh!F>})Q+ba!-Vh&FfYw%A`tiP!?9^~-@^Z%86UPf$%XSM|)dSH$Gb0N8JAfL9_%H0t7D-TzEc+mf%8w;6;K9&j-;G zTnG@nNO0l#AX4T@FKy5=YwboE(8c(#Nx_Hy_pJv@O9KEeD8Fy z|Csjjt4=7Z@={dmS1GD}8%2HeDZCF+RK!S87dOM#U7w_=eEG3WC+?!C8HRFCNlom{ z{yl5HzOZEe!2XtBemMBV!09EUSvkdn*1Smml{3{N9q-n5@9B8(p4?l1G%I)AJB#1R zpSOMZk6+q;x})LJ+7NcTO5wy#|_Fn{=; zAGI5w0raU^Jw4p{?%A((z2V-FO*Jkm-n97TJAbqP6NfWoHw(t`{9$FwigTj`t;2eeVu=L{QT0zOIK`rwl{je?ex7GgN`Ki~6zWbKa(eUikBiSp0tgY?+f6EJ~4RtLu4CuYc(e6+0H%UUm)k6&4)o zh5jz~@4BsW?ZcMNSWk5H(F!g8r9$D`z3<)`Ty$g3G2OD;E1G}&gU$y$XWzQa-f;E# z%V+P_{i62Ie}DDB)g7*$tc`J}yS6UBkiFpa#)I7t9dRGs`o=-GI%Ywymr z**D$4MBmg`HS5+9$BjAH&)@RYCug1=@D>a&ZaO$;(KFXZ*DMgKyKVc*mj34-^U8+L zojCOB0oP{RSKdC?e)!GOdB3mj?cE=_e(6f?)z+Wx*y&D?qT!d$i7 z_QDHucONY;{C;fb;jfi!ZCBg+D%UQ2{&?j07fU{fM4p>b_~pE#S!dK&UcdK3{+5xU soEfjzHeIKr4I8S@Zv9#3r#9;1kq362+?{((do#Lx)oRb-m76>M3mj%}1^@s6 delta 723 zcmV;^0xbRZdi@2EBYy#fX+uL$Nkc;*aB^>EX>4Tx04R}tkv&MmKp2MKrbE=X9p)m7b)?( zq|hS9JC1vJ?|WbFz5|3tg{fxOB%o@Rk&4H}Y;IKyyh1=f&3|zS5;OHgdNBjf@pTU$ z-|r$k%e(H+(Wm512KYqcDANs#c!PL$)6zNb6NgwyQi#uqCk(nE@gvt|m)|%S9Ts?I z$jGGTi9^ITl3X&m%3$PJKou$^#}EDozk6#Irl;JbU<~MfvF(ph zAg~KG>$d%UY}?Hf!2b+fX>EVC0nB}pUT@*Z%x0}MUsk|8;gpO#Q4 z0Pkn?O*vrj7U*4b`_?+g=>w3VUM=4M2Zz8|k+Ro4-Xz`A*|&ddTK)S0Md5Ol8b}Lg z00006VoOIv0RI600RN!9r<0K(7k>Z;bV*G`2j~J04mlGnc=mDt008+(L_t(o!^PJz z3c@fH#_=zrP@73Yz{$x2bn1b;gwO*Nyo3kp8JwJiQk+r;1sz1GXr)cw%gY!Dzds>? z1P~lqmfe*kZj6DF#GP}PNa0P>Kx-X0po=F-0s!#>y7;LQ8R)|S zz*@_D3;OWe&gRxyv~9~5Fa)3Pn?gzAEITj;2S6Jz7AFnx!N~%Aagu-#JUAc}4+@~b zy#uIluK-GXbO1FzDu4qY9KeMS3gE=kH2ojIjbApVRFZh_4#dLiy8aG`iBGq6r6lo> zTOffiud8RkuOCbI>CA;6$|Q5Hx*tWY^?RXnjvY6~-~k(D`iq@-gqZ*U002ovPDHLk FV1h0lLiPXv diff --git a/Resources/Textures/Structures/Windows/reinforced_uranium_diagonal.rsi/state1.png b/Resources/Textures/Structures/Windows/reinforced_uranium_diagonal.rsi/state1.png index c40b161092bf1688a7c328fd6fab6c2df6b94fdf..3799df51bf9225b991de796f1ca3d2d663373420 100644 GIT binary patch literal 15695 zcmeI3eQ*=U6~NcVb*U+Cnx+$I1}fx+gtVtSeM=Wv*s(}#il{KAwn<4i-L2#UNhfq? zOLn1nNJ49zvefQB}Iz|f#1puui(Fe2x08k}yE+3s}OoZm56IJ2GQtgMw| zELPse@ivPgdl|h|=$9uUh4^OQ?b&chsx@|KTAXLuWHM<=T1`qK%$nV9H_KUAi-kcm z7_~d52`MI~)?}Pa`tdO-uMku^wOXT550tyI`-;YMfnsWw9iqslgg9$9 zacnUoNzB>AI}?%g(j<|E5g3IrO+|L*qIU5PMN`xcr9{Y_x@2IK6Td$fyXbnO(W0SM zZCMvWkVRV5Qf=vuL$(>JN@qfZ%ev53YKrY%lSBFBO!1^^O0FHIo#KYny`F!WSL7$*OuZ6Q%8P362 zY%OL7Z*%cx+qXG0&v6A#GBYtBenpZ)-FY8obf7IQX5_%mn_Y!I3TEOyQ2j`PCd|l7 z;oJg0lE{aYL{!kca#RRIHXaLm*!*C@%-pHs8Zvvc%_ux@;kr%?(40lapMG*$g4$7VQoO+Fg?1 z4!PV8Jr{cMA{Y5}>3-9rQzI5`hqPY(82J5sQ%uzaw4ElO7Y&$Xv@(}N3ZnP|Bbqro znw0KEztK8 zGHT~Sq+pJ|7YXgf4Mm&if)WEQPBRlU+Z>FGa|D@CP!Qa1Xbn0Y&h$A)dnw{(TBt@@ z&wDqP20b^c;ijph`MjqaZ(K;IP;V=>#>u{t>(pp!?((GD6EBE*%l3+T)kDd{P8rQF z3pbOer*mcqGX4w9OUFodz!<4(WL%|Zm3E>kAuTB+V0{?X(@Yv##_Low+TPY%p1bD4Zjt*psvonDC^ z{XbW)VsxT}boH1$?6k3bG@6zhc4Eve`ZY!)wpRp*|boNo8~Ro#AMBD z$wtG53#{}TgUr9yYIF|^y$-wGYWJ}CFm4f$Q!vuzlhMDHs`nEsij=m&6-5o(OBog@ zvWA&d72Iv6n_*@Y-OHleXf}5rJ*`jXy4dIWBfq21(<|nS2El-kMT(2e2h&nq7!a~Z zagq68T8aw;LKZ15G9OG!abZBnBE?1KgJ~%)3Vor!L$??281k9Tx33&mg2&IkVT4%%m>p_To@3tNO6(*U|Na`140%lE;1iXOL1X9 z$Rfo>=7VV|E({1+q`1g@FfGM}0U?VN7nu*HrMNI4WRc<`^TD(f7Y2kZQe0#{n3m$g zfRIIsi_8bpQd}4ivPf}}`CwX#3j;zHDK0V}OiOWLK*%ByS5^MWR2V~#qbAXFrw<)D zg`R5#2C=c(4?xe20QBAiz=v1S_uBw;asa%u9zE{*3jnTHcHaHx+W{!AZ1UB&q)tD- z=fv`(b=TeZ(u#(mp|$;ME|uLYJwEbkh4#j=BkMPR;mqvVmG<4+`m1jFZ^fT}a`W(0 zru+7tT^so7-_|s}a4@!a-q_n$zjfm9KR2uAYm?_63_abqY4g3;>>q3I53cyt;lYtx zzUXLtwfe%Y)`=k${^z^CxvH*dpKa@cg8ER^Isc#S3TmhDVOXyUH3OD?bvespx-^&`Sf zKX@HndD*bm0G)gPP;uqq(}(M}FRBJhXMwAOt4@6~zwdSZk>{pmD}7Jgwtn0H04k+k A9{>OV delta 697 zcmV;q0!IDMdgBFEX>4Tx04R}tkv&MmKp2MKrbE=X9p)m7b)?( zq|hS9JC1vJ?|WbFz5|3tg{fxOB%o@Rk&4H}Y;IKyyh1=f&3|zS5;OHgdNBjf@pTU$ z-|r$k%e(H+(Wm512KYqcDANs#c!PL$)6zNb6NgwyQi#uqCk(nE@gvt|m)|%S9Ts?I z$jGGTi9^ITl3X&m%3$PJKou$^#}EDozk6#Irl;JbU<~MfvF(ph zAg~KG>$d%UY}?Hf!2b+fX>EVC0nB}pUT@*Z%x0}MUsk|8;gpO#Q4 z0Pkn?O*vrj7U*4b`_?+g=>w3VUM=4M2Zz8|k+Ro4-Xz`A*|&ddTK)S0Md5Ol8b}Lg z00006VoOIv0RI600RN!9r<0K(7k>Z;bV*G`2j~J04mljW$Lr$&007@fL_t(o!^PJz z4#FT5fZ?AeCN)f^;RYU{lZWdKyo3kx7)~yXbTZM&24kx&ya$Xhe18Ze02N2y_fJz3 z@460C6AvNK)WW^@SZm7$#CY4b0ObN={5Tx0@A;+%e&5{y%AA2E9KboJdw&a-@W& z#y16M;Hv|)@Kpht_}>6+{AWN3d@-ODJ{wRH{|YFLe+1OPr+~R1OZ;@!!U0VDQMA@h f3n2t`9N-1PCdA8BN8=m-015yANkvXXu0mjfL83K% diff --git a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/full.png b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/full.png index a1c44f239f04f38430c1b7d52c090dca8a4f54e1..10342c5705897d15d15cec6e6e15d43900b21769 100644 GIT binary patch delta 2053 zcmV+g2>SQL1CtPtB!3BTNLh0L01FcU01FcV0GgZ_000NYNkl^G~7zLDP_ay*ecJtI=*Ya~` zz?BX`%tTL%A z3Z>(CwrV-PpE1>G_bUL1Y_Fi*|G5a38%IOm-;_1$lOpYMMSP^Xc~a>3;;a1-X$Qj3 zF`@@XtEDshSc!XZf*=sNTIAehePEG*N9x2Qbuw1&sDH}te9f3(I7CXg_b?v6pI9zI zWq~8?5|fGJGsZ~e?tt0rk*GRcs=Ag9)7>%IPaMA<}1%Qx1Y1yWc{iR|(t!KxZFR6n|FJDDW z`5+tvJcmM3hO|QDRLFCA_J{)j`Z1l2+$ZJjp2#`OwUTRsGzd{oJAF>k_J9k7O~PA~BvKYA>|t!ZC4#Tt!TevrxSz)m~_)xkXNMizuoH zauc-fP)K{K;R$Eb!63mkLIHpTRzx=W%Y5ovPgjwrgHPHu$Ja>g@?l-wTNEMZJ>3a( z#cthjCqo*a6;$P0bKC&1E4l{&Q2cg*JAdo^JAJMkM?*Am#RPz&ckED{!-UBimNeoe~~`$lZ42&0Ap#=x~D6^d*Y`_ZAXv~t%;fXkv^I!LD#}7*5hwH zOU^gOtZb9tL`UtQ*xb6s)loaBZnk9vP|Aqc?Z!QhpMVhOtGmb!9`;n-+#|*XP=88F zcKftfR{aWj-FaD=dS6DB9$-}m3;6matF4R2Ml*(_RwOL-k93X(DN6NX+&`~W7QgPx zx(U5II5!)W2>U0J(HcXPZ4J7uNLW&D_b@RYF>CtDxdQOD~0I9Wx z;q4wKnc-%HDgc=1F25@!V1y_DAb&Tm>bj;h0HCSr2}=J!*8m_PQUHMJU1dDm0?1Lu z0A$=hyS3OOYKu(jYL8Om5yN)cpq+`IQ|~wL&GX6916tNaL|Y85<}0UZ(sGSG$c1ko)y%oYDzgqmNm7Npg#dt? zX*QdPFEgx$K)IVU%0{{1$$v%C=AU0DUzqc0VZor*UGu?BTq9A=|A^c#x{hvpA0RA-c(f zscn9ooY;e@oq_cEMMC_xZ;QY`{SI&=JPfUgnE=a-*wmc``uV1~(0>3qV{fUaYsp2+ zBMUPNSm^pUPoprjOVFklRKz zyYWWsGGIx^Q7Wc{yMHWCCo>NecrVWwvrm?d@j(4qHm=xEy&fMHceKq(N_J=|qpD7d8FJJ9N-l+s_UTxYwXxuzFXx}F6f71W9F=l1WKU-l(zNnTp} zOxg{NRpwW^2qE?j#0bwAe;W6=%gQ2e^oEKdlW^{#eW$P65zTn{rJ95ZQta1 zPHkD1cL4~VWf=|hO%Mbm;wAtc2+jlZcF)^G}dKM4G0}E5KB6gFjB`Zx9^k3h<$b U03mOCK>z>%07*qoM6N<$f~`xgk^lez diff --git a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/meta.json b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/meta.json index 84639dad70e..739d63b2474 100644 --- a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/meta.json +++ b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/meta.json @@ -1,46 +1,46 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/ and modified by FoxxoTrystan", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "full" - }, - { - "name": "ruwindow0", - "directions": 4 - }, - { - "name": "ruwindow1", - "directions": 4 - }, - { - "name": "ruwindow2", - "directions": 4 - }, - { - "name": "ruwindow3", - "directions": 4 - }, - { - "name": "ruwindow4", - "directions": 4 - }, - { - "name": "ruwindow5", - "directions": 4 - }, - { - "name": "ruwindow6", - "directions": 4 - }, - { - "name": "ruwindow7", - "directions": 4 - } - ] -} + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "resprited by AsikKEsel | Original source: from vgstation at commit https://github.com/vgstation-coders/vgstation13/raw/99cc2ab62d65a3a7b554dc7b21ff5f57c835f973/icons/turf/walls.dmi and modified by Swept ", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "full" + }, + { + "name": "ruwindow0", + "directions": 4 + }, + { + "name": "ruwindow1", + "directions": 4 + }, + { + "name": "ruwindow2", + "directions": 4 + }, + { + "name": "ruwindow3", + "directions": 4 + }, + { + "name": "ruwindow4", + "directions": 4 + }, + { + "name": "ruwindow5", + "directions": 4 + }, + { + "name": "ruwindow6", + "directions": 4 + }, + { + "name": "ruwindow7", + "directions": 4 + } + ] + } diff --git a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow0.png b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow0.png index ee388930016be622eb0a63c291c95bc0fe0446a3..dfe885bf85353c9892107604d33eb36f0480e742 100644 GIT binary patch delta 2355 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 IM6N<$f>@(TkpKVy diff --git a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow1.png b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow1.png index cb46c4deda811693284d6b9b027bfb7742c2c4e9..e1ca7ea363976b27b350b4be8191b9df97a6c9b9 100644 GIT binary patch delta 1148 zcmV-?1cUqN29XJnB!3BTNLh0L01FcU01FcV0GgZ_000C-Nkl5TNpusmge|4ggN=!8IvaOeXXnqG=b=WE!>+=M^M4jHpX2`K@%znpe*4~+ z_a5P#LngaZd(WDW#(3h}-<6HOul4QpjfE-!fO_%U#T#ct@~a|)w*oVN$iWxCX_ete z9OkpXzedaFrnY*fxe5T7GWEJ~0hE7#~)d+(mUWi`)gkvTT#7d z+il=3z&OQYimi^VM7-n8cFw)T)bUcyxM+Uq9k4sK_kV4X@wbaNUKSZIy#xBsXTOn| zU-~K_n@|AR1;{28Kz0GL2?dZ{fNZwC0K!J-g`eIyCNln`hhMuWT7wANz5_x5WEUWt zPypEl$R-p(b^)^4_5uiRiOJs55=Gbvnjfd_e>OD%a83b09a~Y?H!aoil3p(^6JY^f z)Spmr5`X^m;+(!|+xnUNEC3{{_bSnov6^x5R}e$^FYrgz9w}8VELBVlP7LF&Z6SZ} z-~yWtHfqF^iG?s zdj&CsSAn8($1i^QGcEVT-CL~6na{A8W=`|uEq{%{^BFwUi*LnCh_Dr_fYjq{QG_SK z{`1*O0DxC&KQr-M?s4_0o3u54ggw&J;J(Y2mB&N&C z>QTe(C?L|+-i2g=$Gj75UQqd^3$V_WZa4$^)5OZe0`&+DBY;6PvO|wyA8R5Ygmnd# zw;=?e3MJmGsg3rJfL^l$tx387YlnCFZ0e@kc5siEj2r0d?D5qL%iCuXH0CXWBZhsI zR6NF*U*(n`32wxgW$ zfy4KAt}xF1c=dSBnSwYI4u^G&@dR{jqwD%BsARdobECGH+p&Lprmt(pI?gB!g zP{rsPe$UASU< z+TQ`mWU^v~zu&V@CX->h2kru9=M!aX5T~GPn^#X(jzdWWcL8&y=>?4NICO3EGF(bQ zNdv)F z#kJA?2+Yh*+x`wPO^lk`JDStstZwKVqb(pFk5kP8z3nUoRr9(0XbT{Rn^4+EMKyh0 z4?>R%%mV(mAK>wLQ0taAO|n+2!PP$Pb{l!UUVl_?)Y0bqP3AGMa43r*a>Kijy47m+ zYHLN%OP(Bx0GG>!oOfzP($1t#6y0t&yuu&39EKDYDF9MfqyR`^kpduvMGAlv7AXKy zScDhAeLWfs1~J(iXfzs#tQ5a$UwYR&_k9tc&xe}LCUQS$q)7gY?9|q1|CbnVqyR`^ zkxBv}g+&U06c#A}Qdpz_NMVrzAcbXU1ds#M&*>i#vI-<^?}6$;GBg6nfhjpe-DPim ba3J&-iPJcFc2Y^e00000NkvXXu0mjfk!^nm diff --git a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow2.png b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow2.png index ee388930016be622eb0a63c291c95bc0fe0446a3..773a2b3fff343d7aa621a31db801276464f4a3ef 100644 GIT binary patch delta 2331 zcmV+$3FP+f1*Q^^B!3BTNLh0L01FcU01FcV0GgZ_000QsNkl1YitzP75?VV z%+Ab?7q9UPdu^|fU9eIc7Gj$fm78Fr#1)SimxLBoph8lpqVS_q)c{gy)CQwgO)E!f zjffK&wKPy_r~nBNHX)YKf(e+|N`NjxYkU2`I9{{f*F5g@2Y;AAMIq|Y87q80ujbBo z=bLlSx%ZxP8N)DOCm4o-^itIhsVn?dJZb98R;`ZdeP7q}|3XG@+mhGD=k z3=G3Sho>{O^JELh5<=EK_o7yvyO^IXc}$Z}2LS*olYh<3Vzx&eFxDsDp%?;zrjCJ| zK|l$MqyhhxJTc_Er2xPm+7GhZ7am9gz_|aIDQerN001DWvY#FbW6!$Aq`#xsjr0@; z7eqKABaJ$}=bTcYV#FBYbTY*0Bv=(S($DB@go`m|sqMFb1^Fm^Pe$36Y(`O1e4zLW z#RoF8xqrehw{1N_03ZP%XU~J(?zIKY(c3NncV*1z|E(kWA$svE!7XemdS2VT`V+nF zhew1LkJp|4fAdd|DR2jbB`mW$et}v_Y9-mj5G~6xiVmg;0MOq52>@W$Uor%%_-z+J z>I##-hM4N>EO3NK*HfqFEDNw3Ui;o8^wt$k3Oh@a+ zw+&xsfx}APN5N7j7_1&j^bGZ)yLvz=YJZdYM5V{lo!`S?ofG`gcnSb&3%?5h=vzIR za`oOaeWGI)mQI09&I+R6ng6!``6-w_5js(Ke97aUX=q$Qn-2!~-Ag~lPu)M!e~dEe zRMY21tTfYh3otFf&5sHb-gc3MYLgHARd2gULd#+d0NQMvRxywA{?pGejtW8TJ%2gM z^}qflX4Z|Fr8f=JQ^2js#>8{1UUJ^W$rOnJ)3MTd>#%~&?1%D{K^l}maO0T6OP&%3blG-ni{h3|q`}J)AK)QY# zbRq?0Nb^tS%(}cPbiMj;aen8DFBAZ_uLn#|fe1fFWMG@sfs3)2>mvwnh)%mvMU`G0o${q185 z`B?7qL=gb!$rRH!zh9gAP9z-wCK18ikAKT7zggJ28%zB2yq)v_oKT|&W2I712$WM`7o$vlGrOE z{8!4;kj!;Jaq_+{uNYdZrhjnLosF0qNKn#UJ2E)GZB7OZA?7_Sv%y!x$^%s)HsOhe zLH5jXmrg0&wrrzTQ&63LHw`;ev?t6zA_KcJEo&nEdom7>M4f^|2e~!{874rAOxP0W>tOa5P^C zsDY(dpeQN6?1gM*xM|dgEwJqP|G&bt0ADAE-&S{I3H~-i-8AEQHbZdpAEGybEjn^m zj)`XZ&BD@k!0z}3%6}4;v6}Z$uclSmy*=WWn#xr}@$>=u0$>J1lZa)zg$0xSR8zs(%5{8j`BB$Ns#4>G}Y( z$So=U-OZx~iif6=t0f2dZK1bPP4Nzz^ZhaD>nyVNmb_=GSlIS36fe&*xHgdozN#IV zswJ=jwhQ1mA0}FTQe#hZ++boDfxsXc-WW?+#c#U+002sjf!e70#{ON1%!@o-rLt3? zR5#+O6t1yR1Am5L*;aYl2;l21aI|iG+bHSCwDgq7b^#KV9$M5U^WD`0O3zR)g4IKb zr^*SsdT%j(t0y0*9hj;mumZLVa382nbz_sW!qPF>eq%%{&14FjcyZ~LXPEI+MBUx@ zF~KQ`G&HWDZFNT;TYG>YOf7_L7XX(A(chSf-jkz-V}HG%`mdL=feoJ<&C2N*4(Ia# zi1(OmJhcAcKid8m*e?J8xOn~9RUY=Wy<5e=_il_LBFNCxBseIbgbgi9h<4PQ)JrJs=nIhAy_ptNUFK9EF&A2aO(Y~Kz$>lXolZP(}j4HP9zx)x2KNm~E_002ovPDHLkV1l!9 BU^f5& delta 726 zcmV;{0xA8b67B_%B!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000ic z000ic0Tn1pfB*mjgGod|RCr$Po3Tm*K@f&dQHV(;Az&d|D1u!oO<|*HZ3OWFd;}ZO z2Z-4C2tI%aHn!2mB3h*rL<_}22*D~bprHK6tgJ^ax!f3?yMNgahFMM|%)hg@yR)|= z-ak_;7C)&Oi+a7zia~?`nM}rS=W;pU4??wCO@{yozS(Tj)99ok1M>O2A3S`k)$*oy zCT{4@eL3B_T&89$L z<4=C@CKLKmtAEv4F^I|l1Jd7Q0<2Idgc=u-0@!4;S+Cu0hZ+}=LjYhHpobCU#Bp=q zf7pfd+4=!BV{0Uvn7`k)^A-3;qw&4A zpL(D1?klfLX6oba=D4^aKwd3Q0P<>a0+5dl-tyfnDSxo1pmMn!TGoaT*s$0ouGCF~ z!JfD6H+E~ohAjXVIbnvL|LYpxps>?#C|r*1nOJg>J6f!o2;zlee@fPGRM zG}Hv7!%n~T$70um5uoB=q+8F!l7jlBuoHm1TATpn)$*@X5QzGjT-eNVv3RHBGr3{m z1R$>#Cjfc1Bt`)H)Y&#JqNhRB5)fps%@z07m{0f&K=8p{w~dQP0qhzgEco4lZCu0+ z0aH4UT1HFNt+7Fa{|!WC06cPkWUIuvH7m2jOV07*qo IM6N<$f)tZUc>n+a diff --git a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow3.png b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow3.png index 7977b29f0cc6fdce99b0fa912ebe23b2a3fe692a..e10cff828eaca524427883090f88e0a16bbc1ae8 100644 GIT binary patch delta 1117 zcmV-j1fu)s2J#4yB!3BTNLh0L01FcU01FcV0GgZ_000CeNkleB9LK-& zW_D+1*_9}^(cP>Sy6hp5l!yv}qEt%~NG~F7P7#WQ(1PtrdnloW&<0{}ftEn_Vh*7d z@sgG#B%xVa0;v@&HV3tIb)QUezr$=P+Ych>r1S{8~rZH*w@?ZE( zaQ@HRXq^oCGUv5202osty;fWX_V2g+zeIV6HT0`a>z#TZ(|igTL;H`f_%m-8EkI>} zirR5G6zU=Hr+-=cGFRR}w)7ao-&{bkQo;DpIq~b`IrPPP;BZH%Ol8&L(Yhw7AwVv` zN56mkIRMererf^s$A9A&WZFMTr$=Slldl5DuOGWh znV)(hoVeK|^#^H?8X;)`Rwf%NG9NW%^UESFz=y#%7>2>`-&@w7 z`)vJgwtoZ!lrzB&rVj_I#$Uuk$RPbyn0jMF7HI(vJUDqC0DO0R+QOT8i*rY`r(*t@ z?nU$OTX+;9ty)|hy!(mVBgi4W3M{b#Uz>8&Oz*nIZA*Z2%)I`G**X#Q0S*To)Q;04 z-2qJ;D9%`iBn1qW0WQR8GL@Ht& zZf-++D(24&6fFPrBXTS5Y60_otL9+xtg>T?B*#4g6vat6VI`>RU`!=u3{?7|pPHE!&tfG`llKz7n`M37*bXD!j}c?(iiP z>{5TB5}12R-V0nE0+))@T-_S~>;8`2f!ccs^hk`heYVQgm$PTGVV2 zb;^TRzx98;oU}&P$L*H~*7W~!h*I`^0e|^PQ2+pU_yY1QSKbgK&#s!V9oOCp`7%^I z)F@gf!q0hxZO`Ba&%{D+&{kVr+0?9is|R(^5;wwdW(GzXJsmHEC^ zS3Sb65r8pO3F32wxgW$ zfy4KAt}xF1c=dSBnSwYI4u^G&@dR{jqwD%BsARdobECGH+p&Lprmt(pI?gB!g zP{rsPe$UASU< z+TQ`mWU^v~zu&V@CX->h2kru9=M!aX5T~GPn^#X(jzdWWcL8&y=>?4NICO3EGF(bQ zNdv)F z#kJA?2+Yh*+x`wPO^lk`JDStstZwKVqb(pFk5kP8z3nUoRr9(0XbT{Rn^4+EMKyh0 z4?>R%%mV(mAK>wLQ0taAO|n+2!PP$Pb{l!UUVl_?)Y0bqP3AGMa43r*a>Kijy47m+ zYHLN%OP(Bx0GG>!oOfzP($1t#6y0t&yuu&39EKDYDF9MfqyR`^kpduvMGAlv7AXKy zScDhAeLWfs1~J(iXfzs#tQ5a$UwYR&_k9tc&xe}LCUQS$q)7gY?9|q1|CbnVqyR`^ zkxBv}g+&U06c#A}Qdpz_NMVrzAcbXU1ds#M&*>i#vI-<^?}6$;GBg6nfhjpe-DPim ba3J&-iPJcFc2Y^e00000NkvXXu0mjf$CiNq diff --git a/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow4.png b/Resources/Textures/Structures/Windows/reinforced_uranium_window.rsi/ruwindow4.png index a50fafe0ed2f6c7e70c0d0444aa84f70270f1ef0..2dff7e5127da870b33ddd1f786a203e300ab2265 100644 GIT binary patch delta 1112 zcmV-e1gHDz2JHxtB!3BTNLh0L01FcU01FcV0GgZ_000CZNkl7{~uJ z@9n<6&2HHw(!O+;y}0yHnh>E40SPr#v`{apVlTx=dMHZOQ?y_~L91fC6_g$lsFZ?| zm`ep)thFqKU<<~i^q}iy*)`kHB%5TD-S_s*jEAt&g1ae9nSY7o{jT4>{eSsqX1;G{ z<`E$Tbh1009+|(A@KRzYx%c#U;jfEhwc(|U{;pRRt(Sg$@#bdFf0O>|2N``+=HVv> zXFP`$TBOP{8&GGuFYgVGo+a7C3!X~dEn@(s28mb}_OciOAxxRBDxs!O zN|M)Oq4USjAU+dUnv-?|yq+YtCvB7U`~Du=L2qvdcSc*b&mtI^eLyM$Ww(H`&p6{Q zukzxFC0CWcb^{)Q8q^>c*6(noqAJDyi=Yn(`hX3BK7SzS1A;z4OCLaF_XA$fzIAl7 z&s;rn?a=&0n>*4vXujzTh4%gRnwKLhV%N)s@cnFdSSkTY)QteI#)cOzd!_2K$cYsJ z&Xm^sMkq6&Ufb)nJ~bY-R`<8--Hw7n1BydsKb`5YyPQsRXOiLEv9+3gyP$myQkp>a z@PaoudViKo_vMw=`evvzfDpEq#Yn`mK&e5L>28A35fGn=)APsAAbC9&0;OBR1a*tx zXp7a`+rjtP4p_hM+mp8G^(3`d0(Fbvi6z(NRn9o$1(f~DK-rDVKF~f2lum&Q>vy=Z zG5@u%{&j*rK$TF?2O#JJf<7SV1GZovAiW>3JAa)XS?_#Ggn!LHVrJ!Fg2(PI5CCWv z*S#MgeLrCSO2V@z?9k#l%LC{Cx|#aEC6xO#R0RNgGHNx8>qL4ABzTmz4HztSBOan= zh=5Xb-%5pZuU2Y+K>-8J<9d;v0&8C7%Tje2e^-il``gd4?z*^m@)I#roW%>t=fF4< z27fhZqj+Mcqjd^M8}RO*@1FyJsi`?y>MHR+j8&2Txjmfio2vl8smK9p(H*o=Ts(8@ zL+QUl0%-%t?>!$oV^Onsa&6;4QwRe9oUy1`Kjd^SwOWnh;^1!|NhKi3lc)k;$UJ{P zn|)6z0ZF8*z~fwH+sbHPg>@4cpgRHG1b+tTPCz$-0lE{=&9*l{x)YS;aqbs1L-u`v zZ9f7619T^#o4^3w3Fsy;Kz9PV+4cr#e{b;Wk!y#fz95VL_luMB6K$@{rmC#Ib_3pt z^i!M$pPHJp9@#d3W3B>3$f?KyYMtKEFfOaF{kMSbgB9%tB<~&l3;>K9rkQ_!wNb`7 z6Wy6)_@PS_Jb|d$C@%Kh{6I!udle|qGGClzMy|h9<92w)swXdahC e`v}l|y#5b0A$=t}Z2Hsy0000qyaTFhst8{ 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 a*Z&1WAAozTGqyaTFhst8{ zAok!z@a|cfo0k^B-ynDqR1ic-?ZJ>%Fs5y`xzz-(A=osC3V+$Oo9wvLeu9-AvNOa< zoO#OdezVY$eRi`mvqKfcnMfpp1Azc)Hk-)n^}^9Zg25nawOYvcq?sXk9J$Hr5|mV^ zklZm01GU?2=%FKZKN%PSKA#U=%$!+wKWH4Zzwd^AF)#vnAq7ARixdDUEK&fZut))r z!XgDg3X2o~DSs@??*nGGCl;VQg5U2)#=XEI$ws4r$O?}fA2%1x(LQ z?L*l!mW5GkXW!#?x$9f{)^H2B`SgkoWzSe`%k%Z65yn4UyBq5p!!6+2t8fv@o>2{# z$9y(=*=#Di#ZN`90+>eu+{PZK&9d773;+i(-vL+WrX4>6kcH4*v+Ge+SH1ADFx+1O zP1C5arGGsSs4r)ihg-n)`Sf=v9fK9Tv+_K53A$Wh7I32!TZEE^y|=N_L#VmHEFk?k zeC*CpFW8eIGdEd%3|%g;j{^3LjboAo6Rzv19t(*WU|(^I-wH*mr3(PT6TT?wr_|5y`QONt!RX7lrC}LEltVCs?gGsQu?r#&+!gTe~DWM4fngUnA literal 270 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBufiR<}hF1enaIvS0V@O5Z+u4S^4Gsba^8U=G(fAZq3j za5#w7z+g*kRqAzPCHhZ-yrUl@PsgY{#|1s$tkh+4{1mvGRt5$Ie7Pgg&ebxsLQ E06wu-kpKVy diff --git a/Resources/Textures/Structures/Windows/reinforced_window.rsi/full.png b/Resources/Textures/Structures/Windows/reinforced_window.rsi/full.png index 73b05e9b2a0e57f6bbbf74c2203f6a234ab05f53..34c51d7c3d6a3b995f8df92ed1176e988a2ad8cb 100644 GIT binary patch delta 2050 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 delta 735 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 delta 735 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 E0C52bHvj+t diff --git a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow5.png b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow5.png index 6770b1a2357e8a4a28f4bb16a59fdcda5cff46a0..6f16899eded8c32a19b7a837eaf03ccfda43eec9 100644 GIT binary patch delta 1004 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 E0C52bHvj+t diff --git a/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow7.png b/Resources/Textures/Structures/Windows/reinforced_window.rsi/rwindow7.png index 0e02c2e8de00c8cbba348e75dd3a5b8dbce1d31b..f7fe3b636510031699b058d6ca713ee68030872c 100644 GIT binary patch literal 272 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=*F9YvLn`LHoxPEl$xz_HznPrN z7BqHNs5P}|CM-|y(9UVR8~-FCQ%Li*QOf=A7nyEt{{3SSad^-W#L&p>#mK^^!75;} ofJA}6;xl;uGvU>Ee3MSRaj8(Qx{jql1nxza8-i#ZjF(v4-9*E*<*eb%1t;ulh z(@(h%-|hZSoyTx3hyjNhED|r6zr=&}W6CY<`N)v;l&3B*C{zLHSO!m5KbLh*2~7YR Cu2;wa diff --git a/Resources/Textures/Structures/Windows/reinforced_window_diagonal.rsi/state0.png b/Resources/Textures/Structures/Windows/reinforced_window_diagonal.rsi/state0.png index cd8aca5579705880e93303708f4e5c727687e3c4..eb9489ddb47bb11907f90822a5ba80accfef0552 100644 GIT binary patch literal 16179 zcmeI3e{37o9l$TG=pa?9($F^Q2C-a~Qql9B&pz9Cb=;+Kx@6!Gl5}wjqnz)a?MrN* z>pM4g*0HKlSK0vsRsjh`8e4||X<6HK6x6b@t=-lFRXPfzzlkC}#@_k2 zU+lMR@W(VgONsq`-}n7~-}`*O_kDMN+@9W^&onizXrw5rsk_VH2fr=m-{lM7e|>E1 z&+zMtWY>^RQ45>RzXob@e+xxq-Y^v%fyp#Hq@=pBqezS7?u!- zsEIb~JI8)twWvy)b&wCRfn*1Ws$F9#&_C8QAdij6f?{3oYxHJB=pYUZ$&!i361tda zv*!GY@V7b4SS`6J#z>pB-3(|626`67eZ`ZdKncCT4pL+?Qj)RT zSf-YdBA0BE=~OJYG(~1W48%dg(4n2Zrd=|s8JZr|>Vzz*>js872?R>9YpypQuNhi5 zI=4Xt1*A1C^?_^>FnvJR(kU5qZi8D{S!?%(8ZIZN%9E+7yLOOK>zJ9EyjiXk@)`2N zy^0+vAQ@U}K+|Hre3kVU5n4Jra#dxyZct4q+Ni$9%b+IZe3!iezhnR($8rvub6Y&wy6g8YJ`>?};whwTe$nv6tuk=wd6ZHYFA4M{xIeDp^ zTj58M#juu&ONLL4OA){%6A>>{9;}#Isw%NVi)ksiEZ}o^nOeg&t^AstHp{v_Ap;#I zL$62@OjYi}-5^D(M~jM>>dUtcMUz!UEC+S7f=h9+EbV5UPTFn1iKW91w@31XSVi&hxw5M^FK@cwx)>e0uDx-=p@hP6 z*bO(%^L00#UuT80S%Gd!sqmzbVij}Dy(n-m0Pw&Wb^uxe9vC77b0^t3xEG%11ljHa zA-Aizml|$nh3ZnxlFC+RI9F2rU~BbgxukMEJt?JhV0NrFYq4dO4uO1?6lx{c`9w)J zPXnK9HWZ+EnX1w9vPzcT`~-D&I_HL9mU;acqfwB+HKe?&+^qUebS-R*N-5ADftTuB zdS%{gwHfOE-(7$oArZQ??W3h3q_7^AlX#kycn{4hPB$$miVQ1Jv4`CbmqYMK#WYuB z5#6F$RTY49=R%>Uvm)<=w<^V+UNNh_lWLxGII`xFhVmNasFa8R#m5wPRvbWA^uL_B zx%I<5nEx(w$Z7n4khy$5t9xRx&(7|lUh_swg#8!x0x8$`>|SQpSh;5M^Mhs|jiqz* z-5d))jNSZSFs)RhrbBqsN;PU)w%n9Z4IfvCh74C&nRko%TbX|NU;}(Eo_E0W6CFk^ zdesbw1^p_#mC?y;nW^#d9aS4}N|6-7oL$SaZR$ z)Ohm9qfZ~%x9q)z2i8xYI<#-m8Ee;9j2o_YTv)QZ&+&?-Cw+MQ-e-F6U$T759{YC! zUweOY-L;JH{{Am4a_HXR^r_>oy#3Wd*UnqN_1e50k=0K>@kGn6liR1K*4 z+;UsnJSsWzoNXQT>9ze`OU@q(?)zE##KP_CZt0UJHvH+$schF&^ZBuI2ezxk%+9hd%C)ATnUyZ-ROJF~yJa`ErZJf6L;Ejd4N%iRxL>|FZZ^V>r$UwUr$ zX6Ez5#sTo_-9i70=LWpY@Qo{iM_#@(cB;Sec#KapWqvt)$HMH^V-J4&C$}~no%rx{ zYj9hi_Va%To3EX@_|#-;@)xbm+{Haou;=LC@1FeRUl;u9gMZF6Y(5ulZEk<4`L2mi zL~nlm)i+Lmm)n2!8<)0kd3fU9W#4N*cFz#E`tW?p-@Il%MV)JhO$=$4&3$9 l_=#(Lr@p^<=lc27*_POjMO!!SGGA-&?(FeTZMc2szW}LG%sl`A delta 726 zcmV;{0xA8oet-s$BYy#fX+uL$Nkc;*aB^>EX>4Tx04R}tkv&MmKp2MKrb<;R4t5Z6 z$WWbH5EbbtRV;#q(pG5I!Q|3EXws0RxHt-~1qXi?s}3&Cx;nTDg5VE`tBaGOiPeENGIZAF25=UUJ*n;&3_1D5;OH=W-$xT@pTU$ z-|wP4%e(H+F{l(w2KYqcIi?#H@dokirloV> zj5;c)!a|gGjeisqX*!R4_(vUoid-_eDq!STKn*G+#}EDozk6#Ir>EScU>xXuvF(p> zAg~Lx8n*p?Y}>69!2b+fX&ry93B*20Z*;Wq5iqn3TwHfFc@MbU0Y;v5$&eh$PfI8k zf%h}|raUlw3ke?Z;bV*G`2j>h42`(Cj+33gs008_+L_t(o!^PJz z4uUWg#__LAgg4gN!P$Yqa0o|F;pprEoV|m)qq{5d44SY4V_9{AU<5l#E9HlUBkaSQN2aN|}1KJdu_zVJx_KJjF+{2$;Of88%9C5b0VGQ0z!@Ukp_1481f zY?~`d{A&s%@NNo*ZY=$yvnMb7aXn|Me^Df&?!$KN6W3bf1FKOJy7*C8<^TWy07*qo IM6N<$f+QD8Hvj+t diff --git a/Resources/Textures/Structures/Windows/reinforced_window_diagonal.rsi/state1.png b/Resources/Textures/Structures/Windows/reinforced_window_diagonal.rsi/state1.png index 4130608cea1b0074f870bd6a0abf28dfa6bec2fb..65254207165b957f648e77219eb234caf994a8b2 100644 GIT binary patch literal 16152 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 diff --git a/Resources/Textures/Structures/Windows/tinted_window.rsi/full.png b/Resources/Textures/Structures/Windows/tinted_window.rsi/full.png index 371b38edb204fd13fe1521208356135a1f129acf..6baa538dad92fff2a6c364b70fd4a5d045c04afc 100644 GIT binary patch literal 9436 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 nXYAxZ&0s4b(PK|I`T=@cMw+$i_EG->@F4?q delta 361 zcmV-v0ha#UNrMBBBYy!(NklzlCjnr09MUc0end*r-fcs%-p8{Zh>#{`ISVVuV*Rc z;=_vu2-bSB3bC)P_}AZG2t#S`7r5M>)f_fsy0m?|4?)lkDzFxvbLb}O4s17Q zj0pjl8A_??X!Ze8K{5BVQ;iC-%Jx~F~s2(i5p#iblP00000NkvXX Hu0mjfh8dyu diff --git a/Resources/Textures/Structures/Windows/tinted_window.rsi/meta.json b/Resources/Textures/Structures/Windows/tinted_window.rsi/meta.json index cdbfb466b44..30517fd0ac6 100644 --- a/Resources/Textures/Structures/Windows/tinted_window.rsi/meta.json +++ b/Resources/Textures/Structures/Windows/tinted_window.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/ and modified by FoxxoTrystan", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/ f141c349e063f7318d8c8a2417d840f0b2d06600, modified", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow0.png b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow0.png index 5539fa6154e17c821e8867ca5f77bccaacec935b..414ffd9f3ee92a394adcaab92ef34f74bbb1afd5 100644 GIT binary patch literal 10814 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 ZYxlTu#$ZI33;lct)RncBDiy54{s+=SrBna_ delta 1468 zcmdlNa#v`AvN2;@rn7T^r?ay{Kv8~LW=<*tgU0!(6Ky>X2Z*%#2QLlMY7!GEJP|Ng zr=zQ5vfDxqQLo9F@>=yP9<(0+ZSj8Y;o9$vPHT^ttWM^+P;%Snn2O=tNKxkX9~R0x zo>>r{HqCIl$B~QM_Pu*)b~ScN`osFGYtwYuez-h}Oq*f$k?rG^Ww{0S)cH0ytr40p z+&}Az!bj!nqW$+Rp2vz+q}}jQecpNaNYcL6sbXoY!OHVg`c};H`{{Hmd20P&7_qq0s#aH12|9N6w`quAc^QoT{mzy4y?>WA_xAkqJ3k$NF*XSnt<^s=p_ze!fwRCPvY3H^TNs2H8D`CqU|?W* zGg(N;pOJTRqL2$SFPFmPWkOCYKw4q)OCkBmJi>aD?S$wV{EYk%f{%NoHD_m48uYYF0REKV#-O;LghCTAq(rKhIY zD(Ndt))RA>Tq341d6AfUy@EcHNjCcErrYRaa|lG8OKNd)QDyE=aCEi0!a<8;s>x;OD-ZN2N+5Ee&;F2`1er$v@I;j6D+c<;3S`ssECjyj{60r^Em6B)Ng z>GH_cSfK%4D>_(8!?8hzn<*d<;7?*)$8c&vuPXET%U?C z%wUs9Wce9sQO#j}{lmv!e_YOntT@l$T=JyX(^8Ug(;-fWdr@;3>YuE2-NR#c>uz<{ zKjzoppT2r7SZ5>GK3n>WK9}oy6KV6am(*>~dKLyZ?AdC;cp|!6xS=NN!<6{+orsi@qGIO8%wlkJ(vGVy``Q=;J2y!?0`prpv!XNwiwrJt6pXPJRvyL6guFw8j2{BLllB1Z=lm)1p?v=xmtW33KWpl~Xe#{s=zBUrhC}X&Q-g`* zfx_btl^-u-_<1Gbzd+8G-O=VwY;PDh@FX!$ncXX}fA#$owTj9AqAX508|)HYmM7YA zdHvO_+*-C74>qbETW1iS-uR-{)|};B^YZ$@)(D2WU}@7UEL)WQ_OHIZd#ku|{eiCT ziKWW?)}nlyxH67G0_Dltrz^Y#JbulJxpT_s)&3hFXT^j;J-=t`oF0Zh*JjQZxq4b5 zi<6`1@vfkeUEISxHUHx3vIVCg! E0BoaL-~a#s diff --git a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow1.png b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow1.png index a7a0cad53aff9f936f9dc456b55d44b57fc39e4f..90131a48bf96cc8117ce389ac97229626c1ca243 100644 GIT binary patch literal 8214 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 delta 1282 zcmbQ{uuX7+vN2;@rn7T^r?ay{Kv8~LW=<*tgU0!(6Ky>X2Z*%#2QLlMY7!GEJP|Ng zr=zQ5vfDxqQLo7wQd;#Z9<(0+ZSj8Y;o9$vPHT^ttWM^+P;%Snn2O=tNKxkX9~R0x zo>>r{HqCIl$B~QM_Pu*)b~ScN`osFGYtwYuez-h}Oq*f$k?rG^Ww{0S)cH0ytr40p z+&}Az!bj!nqW$+Rp2vz+q}}jQecpNaNYcL6sbXoY!OHVg`c};H`{{Hmd20P&7_qq0s#aH12|9N6w`quAc^QoT{mzy4y?>WA_xAkqJ3k$NF*XSnt<^s=p_ze!fwRCPvY3H^TNs2H8D`CqU|?W* zGx;KqKO^sC1zs0sUM_{nsk}}sKw4q)3SRlir+M`z|K+ux?7*ipxqwe?@+>~>$tU?V zCx7MhnC!ssFu9rEWAZtEF;xY3Pu~D5#{f@TB_llpB?vblC$S_gzbMyM$tN?fv_fgJ zkbsgnL@F$`s5mn}52V`AK+niRX>y=|=;TZR*%Xk~AYfCGTj1+!<&jxjl3!G52NMQL z6s4qDIVGke2|)#OG8KwTT+2$V5|c~7h8HK6rKTuB1(P!p^U_mOY?bttCchPMm~1Sl zF*#9Cy1+|e?Xi8Du=wXHE<)0gXgN6*@s>TCa#F}OOEROvL!WL7+;eDY*dE*Z z^XGv&7(`WhoXywl-@`WDPeQ>n-Kk+7ll-*Psr&CUUVb@cDr?&2$o;$l^V!a?%gZzT z`snM+kBq_kN8+1Y12?dVe~moA)3E9&5Vy`{^VeS=nfWH&_^?-Uj1J3!EJJ26zULBn zMC#Ip%L~4gP2;XEeA&b%{_Ro7r9)flMSUfEqAxu<6lb&ZM4UmcYec=D$5P%6It*Xa zqzw z@x0A9JERLH=xq3XXtCwd`f!U5#xDnhS>3gzuCRT#<^CXlqnsf`Hw_7w!8osY1@3kW zhXiD1F>eXZIrl&4szu-9`;!yiAN+WCpK#)x&#Yoh0b6G4w}Cm3!PC{xWt~$(69BuH0%QOH diff --git a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow2.png b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow2.png index 5539fa6154e17c821e8867ca5f77bccaacec935b..ae12f39860f52ffc274a700f9d45e285625ff1f8 100644 GIT binary patch literal 10815 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 delta 1523 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 Dt^%_Y delta 1570 zcmZuxYfuwc7~PbIA_tN#C!$W4cm9K#tEP!>Pn~$b{p>z~LP2pP#s#G9UY}a(+?y0DHpcnn%%X z;e&LRk+>f3_h46hhrHEN$|4++eJXtSR+lGCNBx17nx3$fH7V$xuxaP$)B^m#-}O7( z+QG8o!nqC}%vI(+OCO1su}Tbq4HK@-ukD+dI*+!l6NNl}SM8#guG@OAc1yq68n@VK zBtQ3H5z4M}9yq%9Nx_)#>HKqV=<7zMrY6UDQ_1?A%zZvpO0UL7b!NA>w#kkj;(2me zOG#x}al%E~xN=JBSvAg@Tf14Gb@1*KEw=C2u;5(VVz}hU*i&Tuai;ZV<)&NHk^j=n z?z$RINAXtx061x5Q}qDgJl_TyP=0U$0N9U_gY-ligA8Cu>=^UdWG*Ahhgzu-qEirJ z39iR1KQL}9^D%Wf@gn}S>jS)yXxrCGPE&*h|%M$Xii~l^fF(+HC7aMc5STh%XEhKq!pLAq0_&FfNSA6+wKEjCb|&gN1Ur zkcYq!EW+dvpFm*8&O;Qz1k6K(3W{0e>XU(RgZLOO42FbU6o>dCISL7Jo(NKi z%{cOK2#J7%&;k`+`G z!ZF$&NDgj5ZBe*Ui(*;0fsLybp(aoVhKKdfQ?~*D?OvQDGR3(5(f5}U&db~^n$+SX z>AK=pdw-Ur(^^GbzIOpo;N70ovYH>*Jn6TPwIppJ>ngosi5xy}9bzh5@7<>l@{acL!CPdec`ipZ~RH zI6cYBF0H0)tz-go|2UxY*^N5?OstSe04dP>FqR*ogvBcxqnI&|tMkwJUOL&+$0(}c zn0I8|Pd(mE`$4t5oUHQ$R)6jJUJNcv8KGZ1?QLQ-J0&fy4}7_c_NB9xnM`f##)ngG zuN<)$!U|ta-qCjP*l{JVkaL?HFNZ~Zj*cs-!doI5J?cICx53tg7)FN1d}(qp>*eY> zU7G4QE*Xhux1Aktm=kc8ky&SdowKN@^H_2Q@4(n;+QXu@yT6}mu{Q>4C$YRZ|<&ZULj) zcQ?}ZCmrp_!nDbm4RB%oL*K!&sW4IGh{gJWY}E!Qnd^z(A+XiHx_(XRh5Vtis~rrP giQZjy&H4gxSv#WnG=1xS+Xn^2#Uw~-qcY6@0o+YhW&i*H diff --git a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow5.png b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow5.png index b26c7be0b2da6c07fc5f962d1858683c3a6cd74f..83797163f225f940ae731ded308e1418c5611567 100644 GIT binary patch literal 6896 zcmeHLc{r5o`+rBuzDz0-8B-LR#TbmqZe+`v&~jupV`R*j8GDwHoh+dgkxo(4DHM`5 zM2nIoOV$=^gs4;M`;I#2)b;!RbFS<6{jYbfdFOfW<#XTn=eeKfdfth%voRABmK6p7 zK+M9N-~j#_^1g!W!21=t&maH@-VJhe;W`lgVJtS&o$f`2aRXUY7&Ut>$}t5i^sI(Mm{rFO4l z%ZlNUzQ?j~QO((%Ine{~+4kTIezt@O-PmRR6|X7PYi-vLJ@M`Pcr!gHv>sJiqxorq zd3;%!EN@A-zbMi}crRo4#p*a75A7kGT0$(2)wrhxV{k9G8R+SYZR)Mc57@f6F2f8J zdd#5OOzm>8;9U+ouuNf4B6UbFuLVD0{kii_*5Ketzlj^;Im;_Ft*bM7WNAI=imHLL zLA`BniE_%VHC!?DwZjn#WZ~YSXr`&7L{vldIw!})Lwmy?kdif)JbY&S?m?tD2Ni|z zDoKP-?n)Mjq$J7`vut~(hr`;mHGfFGy%dA+LG_nFmpnJBwa4bGkZx8)4krxFbxA+e z-AJmQY;^uZP03&DA?xMmcw*o-pL1>f^{Am`g_ewP*qtmrQ(3vIG~rht+W5u_bJYI(O)uvL;__JC!&)1jkx$&ZrH>>hk8^W=`Q(xWz`gm@=LpFjicWqpC@X5X@> zv}|m>Lh0T!zPEav4-5XDA$|QOrK`(HJ1X1$4==B#dsj54Bs#ra&et3z%vq` zH%9qkC!TP*umrhQnPTPHft8V?Y%EbwQnBh*E!fhkO13yxbtuKF3Q%2(6vd zQ>N#ebhk265fl2?UlZ+VrM(_v82M+8EiO`L^DrVLtAipBuuI41+JN@D*Gc5p_cb5C z%n>Dy^v>KB9js*Pm5=yK==Z|CiW?k-ciP0p^maP6Ro}!q3~e2~=L6e-yGSu}wDrR7 z54&{)9ajHXBtU1bBe>f6NVPpi8yItSR(QBBK;&?9e~!MmslfeR>z_G#4bhD=eXMGmK1WsvhqdJP#MRJS zj&9MHt_^clKBjz9|5^0;-gjY6&x<4UfoVs^9=WD`DI zZ^hDvPNd{Yiy1e2ltwsX;-iP(zK+FenPSr=v-UA8GBR|VggWD~#h zi~CNo?KL4;{A*J$gg)#Yh?8w@DiiY%@#I*a*xCB5q3<0~8)+Em`nz_+lcvJ?I=<$| z{9S1=HbZ=q$Acsi#QmIPJ-Tn|ZX9fnePmYmIamE`Qp|%f>!^f2^FsLUWSL;fY+y|#D&lI) z&0`nu$UvRG`f3?hYoKK`&tK@v1ms4C4JF;r2?)}|_vFKN^Ho-+IRN99@!?yeHW&vh zLVTQ}<|iBFq$1}dilI}N-L|!>UUZt4EH6oX4&#tbZ1O#oE1gtad^XesZRvWilomI( zlo*|zni-ZBdfvmJJLPIl?&$MRY?0jfry1FoHQTTmqe540%sA|Dd@ZbqF@-a{d8MIf z7!gyDHDPqSx%-&;Y!PxuF3#H4^R$={wv6BH#=>O$eZW$3IpmgjkD*Rx`JWLNqdqw` z3CXWtaD5C42Vq-(3sRgpY*@9pe%$^IT@ck?^}6A~Kzlg* z!Fs>8Vu&gk_i6L?xR`jW^yq_i(f^`!?x+#rrwZ*?yy#b*D((f#xvI(+7s?PmI=Lc|4!m~7HvHC!IDn6 z?v(xd6)`?jx8_GsNE`n#uYpekF^^JR2XUKrT`vu2WYon`tj;Vn^a=2@w!6Cydu@Ph zz-WFo*tPd_!3l)od!LtmqgUgl(i5&5;;RqJz2AQ;d5x5si;&!i@bP7qAU|KySk%Vjr$Ts$f1t`(Rm&jKNNnCuOJ>^V)^g;VBFmlH zvi8PmHZya3AYU*V$(QqXS8Oy}H0c@kpxuE!|GF8rW>--_T&C1-dwoY!hAtU)4p_FT z^o^Sv&*4w4?}TD6c)8}Pxkc|M=vI_fI9QS^9U>%8BZ4;DPJYd{+o|N-FvohaW5{3Q z#Ct#Gh8x_xs)u;1s0-0@@8$2pj-LzmNWNqib9kli-cqX5@y@efW|zN08aFz1#Xj0( z1Rii?>EJ=e#deu=;lFe>b@WwM{>|nvJM4qpf9W&fCm8>R4x$~!0__s-~;sFtGIY@%oC&F zuvHW8Q9ZbewH?fa$)>`vNGuYKFb$ylVc`10FkLpq9q&Nc^Bn?w(t~?&xhy;icMdY&x0rjDu?OI zCR0uQsNURdKSEH*fBUn1*K$Y7AOgTjL2#vM(<^3xXb;7avbylIaxu>QIY{ zrIN{L41!A0#v!oo8bkyUhe0EB)O9r7acD9Xjn@7F%EFt&C3=&oJSY$xNe6LAXbl~T z4h4V<`jE)XPQ99-Cc7PibBTkVX_%Sa60J>B8`e-dDB)EJi_rtb{2YY z3=;j1#LkPzbq5{v;Ct!bz5)Lz9O(?|J}!~Rrn(juqobjvp{1>k#cH9y1zN>(qOv() zC-N}W(MSw#)txsjc(53dSR$`aL4Z{`SPR~SO(k-fY)2;3OApS2fbl$6+Z(3)ZBoqX z9MB?=*YV$b-k3=H_VjHDc+po?FxYC_;)&#MK{!M|DrGeg==V)U_8@xGsNnkk-cWzZ z>HlT2s8lT~TAS*Q(ALxe8765_5kx8#gCMDEQ%GctJ61~z`!hO+>CW{hvZ+Qiuu`xZ zuz^;qf$dzSQsrlBe-A2;Cp5UW(dr0{h9d@pSI6M7+G^_Rcr+T0`d%=Kx2pfDSQqtw zIMH1-_+c9W{l3Y-?FHPeP=9Y%-#O#a_&>b9&&B^R0to#p$iL$E7hS*T`d1A6E8}0? z^^2~5#lXKZ{?%RoZ*&R&^TI>*22Vl$;OmT(=6JqY9PA^zK*uAgu5w zv_UjT$$gS@;dB%&W?{_$&4`24goH0uxFPmfU=; z_fe!#he16vRTiC62hW5VhbO99?rbzp^h??xrGh^h{6Rpz)*N}}uo9ZRE01qu+L*xC z$e~ir1*tJ_2b?&!=J`?!T5@2mtY-fg{aZ85LXrXNO3E^89Rw~JSX?hJ8;3qA6+3+R zHa1YAVgRx(m)n{mr(*cveEXVN+M@M=yxC2H*D5(jbH^4T=Ff`LwCm~>(GGdjz9;?t z%iCv$a$kQA1tOsAYjY+m$H14Y(JK=wHqP$am1YbCqGh0sg)?Vj4>TT{&ee2won*d#aWYo{ z(QccKJg6WXIk)dMk@V?x*)BPE=1%YLf z_<=HsPu-O0R}~(0%%=^tZ-wvsy3&9;*+J6SV?HIbz8hEKi_h?J1)jWCA#QRqaR|wA zv+*jS%q)ELiGG!r!N-+2KH70-^A-5Q`Dh$~E{cEn^)X~2eL6#cb;JXA)4Aeg0i^cT zwEvCkaa|3y7EItoN&nr6;@ZXjyum$yAOL{@{NaGi^A2RxB9dYb0Usm*K0}`7!;xpx zmc>a>!fzP4} zh0zX%36~S0I%b_SZKdT}f~TiE%Qo+U0O;vM`{ZwWEQ5RjDKjhwdAHM&01L?<{%jCv z++JU*ILB^F;E_6VtG=St@J94)m*Fz)I=g;15=ZH3jSU)A9DPyCHtsF(Fk8jVZx^Si z_6*HMyyiADPZe`S_hOhzu~2wZjk44D)~qjnGJk%t9%_{QEn%PhDh=NV>MpcTGyaDg zbn%2fhBG^oelg$7-Fr|~-f`pRB3H=%R0v?aT(O9f?6}5%eL~D_xyA2&boqzj{mjcs zY>LI8WbRfkRG3@NF+a9;MbL;ueC)__7G6N~Lw8s9ym4qy^I5d?{;jg!EKJw7lpytv zAeMta!1*odR`Bg*&dz)hKw;4m06-bw35ytnCCtEtBQ3EYti^<)OfLwxV;td83<-9?2EmEg)o>2h z4Zeb11wX-h!nQaToQMmC^*B}ln9QRwQ{@t_k^zY%Tp^z(EL0Y! z5vWi`q$z1!-h3|wH;tbRy$5+IT&a+s%z(%cjI|7gIhG!9x~01sB!3V^C;vB|PX511 z=5^tG1y3%LnVZdJ%%hvanWoC*qnVr%zLIOMf>bgtZx>$)@};H`*$tbT5A4Qj|Vj7%H< zCLX!D!>Zl^EKv;w6!}f3FQ&HVHX&-&FRfqI6;9n-_)}+@6cF#^@UL^|mie zP0oJgq|icI3}vO4p0rAq2^&Q5t#64X5=R4y?66 z<;6F9dopqA&ZUIKc|Tc(ZVU~?Py!8h>i7>^BHFlakJFVu6aFA=hzRp9Y0i& zHM$%?FaRpyuG$9F+u|R~p5c0#Q;V91@1U-_GLbgOic!&*)(Z@1PIebR)S}iQDPG04 z3-#9C25iTDTJVxj_iDOO0T*pNk5|qNKN=gJc(<6jbyZARP8Pxm#y5ZLbqnb3E5Gk{ zZfLvi{i<`Du6cMYpX|a>qt|`4@mMRtpDQ{2U|QIFV`w#QDM|l7M diff --git a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow6.png b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow6.png index ea4706b1911f1825e785f39c9bfe83f1f3defead..2cae7c43a4c77e1c531fe25b58c365624492faf0 100644 GIT binary patch literal 8464 zcmeHMc|4Te+aF6rAzKt>8e5hzyD?*5vu4SjFe_sj%Zxojk%*!NWvfux%AQ>zBwMyh zmLgBGmMtOg(6jZv??2DyeSiNw_k8ZT&wb8yeXnzUukSgZIiI;?cJc%l=V49&0KjFS zuVcY@YV6#5*%;q>6rWK5VE@ZtOIx}HE&%B5>qVw`kbv|cZxWCcNFf6Nfp6?Jb*;bKeX`ZIVm+ zUl~??GXR(Oym>gZ)z@9w@M>L6eHzm;Hg+W7ku>u~&~V_kT?cKe!)F`YST{ZU5zR8N zo+dn&>DtY&6^iaz%5p_;&K9_2t?n0S3Vo)|vK(S(L$MlFz|Dr#I9gjQIJr2PcfEde zzII!gqxW>`dDw*`p|#(*i%0omRz)0UX9MfCFTWSXtG6~+UV#`%0yA5tSMI~aM|cFp zAm6!f45@Cf`>Y);6v#08PyzwV=iM3Y#_(XtSSESS z$MjamQh-OZ#D&Ne0abx^-GB=*CtRc^#P^0DzA+xxAi?@2L&F;I*;ut%fNk%$v?hGg zu@>9LT(%HoWsG`qw5Zao5_f8ZPJ$%o>$2BOayiC7^z$aox?%UzXzfYv)T(4#i}oA= z8NJvucO|6lVq+{RuiOhBPTA-6+n=5Tm+hrYS>GyqYd@3j;;%RVZlo$}jaN^ULPWo~ zYJNf_G)WE7snT)X&gFJ!l%UXN@rxuYo715iCbDy7OA4p`M?3>02as5kTjdX22XeOr z%h?BcG9g)0V*SrFUnpF+=~t5d3crBHwnrZd-;=Bo6Q`-6#ojcVrR(;A?k+4%FoLL9&x3DJjKfIU>69!Gi3W_xB232F*%hpTD{jMU(tq zeRDnqH6?k^3sieOsPh0_Xm}=Zx+A*v2^I64T$o?tD5!9P-R9CUlnk%ZGyRw3S#a2~ zSh>&ST0Z)ms?D&<%3HHfz66>q2XDpwvRm=GrE`xC>h;J}A;EU7lGiYCWfjpw<=hrnc?2{BUN5MYH^d!?_g@&4V}3N}C;I_IPj}8tZx~Ty(VZp~ z?mc=HUIjVKF6=6U1(|Dxc-ZL<%JWVte#b7|azI)D9$aS1%mDWSsH2a_)iQv1#-`5iObtM4ZV0$ITw# zM`-YgD1M4i#dw{6&~e04Xf_iQaaGq2XICqL$ z7@gA7L^yKGoHGZ_y@ z(-zww8{az`^W=sh(|L0Pg=gl^JxDT7#Ul3PS9!~cb$C1+&$b!jc6Xldn%1oHfv{?p zA3N$$f8aW`-|Fqr;#Iibu-+*hpK4`GqC)qcIOQmzBv@aVu;D1wa%?Zfo&$LKVu}sg zI=!QA(!_z_>6|8@D{0!?=5hF(+xdt)0~{>HZE0oRZ{G3T>vk8RREeD$7^>(ho4*We zfQ`rcgq(Zk)jK>@&CzIhq-0G3`><0|N@xh$_iqlY;`13{IrCePb%2Q4r5J^82sYs?MTv6zlkN_sD-!X94rsA^ zAld2Fh(xh6@SZ_@!HF<&L(lH7ItK;cA}lWPpG&%I6k@L?=Bx4$x+Tt?z_}hW)gZai zbjfr=Z1my+cSgUnBmP!V;`!be%4Ub;xhHt{;7)dA^W^~_6K~+GF$(E^6OMy1FRDw+ zULHk8HtQf847+vvuD%;~I4%hv#^vsx5j2`{ix`3#bUu`ho;=T6-P%b+@TMQuR$M$| zruzQ;;GH6`<$IGH&keZ66WrF|eFyJ!(oV5oIr6=IJ)Ps#qsv{4W#75a z?(-Xw_bZ2D7ar)C@*+r-WH8e{!C=H46HE0AFO!ak`F~RPR%pq7JIN%Et$g&`YI04x zhn6Sj5gC?)>O=2=!d$YApAv)oY?^`E1~`pCcx-?CK&-WQb?GH6TDgNRV9%^l#oyEc z(-bgLwZ=7%qFJkfuy3?0c7+%#338SP+!l1E`QzgrZyD0XD+&3p!|e}T8hSD`7FW5! z3{{T{2?&^+MR6A^CyIyr9MjowyJsh=f8-_W7=Na1JoQ3Ik)fuj(D{~!eNQ>i6J!-%8!#ivcn&=BxEreO%lr`Z`(<=DCv{ECp+BA6khe^l6b#5 zN1NB01M+mv^xKXz>2R~kaLq|nUbtj;r&Wtfs$wsfT2a2|Z;}(1HwE{UxPX&{^R+2^ zgBtJmyp%`WQ_EsLfmZYDoNrN_xNrcWpkeoLI677Kc^>^NUg}D4XPBZX_ng39wO1N5 z5mvVxEe@Y7=ov1w?z44I6S3g{X6jw#%vHo6|6-ji2qDa>eRe!_<=lsxDZR778Vw;* zWLjY#{21P};84IxR=4#SX4mYW)!@15VM$U@~H}J6ZQWp6A z7kDZrUtK73%*A+p<5oT}^|^2b)`~aD_o?9Ndof%jSpTKDs&xW+)jDpEfzAVYC;20f zSzI1pZJJa5&Bwp!_JP?N-kgGIN<>#uYV0RHPUOS*VwE>Nt*H_zDR0zy1~;A-*2D_# z;agH3#5fHiiq+EGRga{ZQ1-CqmivdiSU8$C3oJ4knXg2}42m zvEh;wSDq>pb(${zGN~uSAVVf;;YJpofQ!gv>ntpNt4y5|Hk}-0n@4%bZ!a~bKd$0O z6YeNehc3O_z>GwMh$%{~EY6o-+>lmrSKC0J9lL1s!)a7!^Sw&F=b7yj!OMLS^>EXG zEs=(Vi?u(vsM~5+dMDHZcl7rIi;rKAFQv9RQf|Ta8rQf<0N4olf z%tpM?n@?(}kM!Sr+?sP;`t~4O@>Pbz7VIFMrszquyWEnxI?`oVQ|jyeYI?QD*MUy- zSvu_Ra-`DODCAJBx>p@Fsc_vt!J?u)Q<@-#ir~(3>cYJ-F2~A$}rv zuAS^CaXSb!9=L&Dn7^MUar{RZPed#DHM40(K^w{q{2_}#)VSCqwk9$cYB4hydOXY} z;IO7OIrRHd^@&KQm5U{FKP=Y1bTiXonAvxBRWd?fs$1F)5AuJLd^tQCHoe|p8WN-( zIQ?m+Y$)OWp_N-F_dUH}0)A4S*zIrVnq)AoVPj-;;c2eVt$p5o6!Gi6hr_F5Fm;J_ zeQBR=QJ2_OG%JOx<+@`gTBb&2gFq+!MpFu7d(i`01L49W@%(Eu(RJ3XQ+-cOMbE5h zi40yDN=f!_m;);ejj3vS&W?Mv3HRw4F)F2(`C(bfDXD2xhZ?dF5x4(7uS>9m)#z$N z+fwZ_w0n2z-EW!ooJ^UqM?dJdY~iOHYQ9n-p;vB&RWD{1g>zq1su@}Pf`f<^k$rU000&BKyMtuokR!XNiGzsDrljm z0R*HFRY5i=6R3%|Hp!KuAM8sy6@1c?5bRFC5JBo{oGO7>27o7tjspgIdQfTDKvmE# zE|$^W>4t!SyC!sZRgkTT8Bp8HmjpyAAQhls-9U;z9HhnxRPiN}u@*Xdze6zIR6(wE zx;GXA2?z*K2tX)!`MN-07z_pig+t(QFv9{&3!>6-fnX|4dcZl0YdU1c`{6CjHs|*LY^=%G5gbF zhXNOhr}wTGgX~`{=@jx`Wc@O?osr#i{yq_g`=7YKSpSjxt}(;P#00D3Mey61o`H@k zXeU0F=tZCqvAaz?1_4EoU`Q|;4pRan5ePCEgT$f12!tXTO;AFk6^Zb_K^ahKbR3mH z+JRz#D^M6XP=XQ$haoG1m7qiz7)c}(z!*FM4JM+AC>#NW$DvTjzd@M#QW&bldHj7= zJ5WRh6d40oL?ILjU<90m0wa+KMKB%-!+_C93<8J4DB@t~pHM^sR?o}V6UQhg#S`a3 zf_PJ1c4O=ij@2|XPzAvipnvt4dEn?|hJz}|m_qdn{A<9H;z>G1$L+8QQ$)fs2qh&H z3W`K2VSc8)i)T&pr7@Jag9(Ewz?F90cgligB*P#Ux1&=Az-~Vy7p%4~2}k$xwe<4x zPzCKk0Czlhyq6%bZ z5HJ7+se`43*d%k4iHfdTz*kblJQzjXae z*FR$59~u9vu7BzJM-2QU{*bk9)a zdG$Ceb|IHDM;!KOF0wcGwj1>78rDK&%3{7en+Qz{=zd?f0k~sMzBPbiat$6Zmi&O1 zs*z=Le6KAW8gon@(UEd3TS8@KCZqb{{9TofnuYGqHnf8*XF*@&5ie!Guzgu34~*BE zisE(cB-NykqNgL9uQ=E^giSbj+m5FmL!{r5=H`uy;s7Tg>#jG44fqpZsLsmMJA%o(pcbA@AJooyG(WFJ26|;CN zvuqDgIc!n=o9byfvD@@(kv>@)Efwl|5seBx1;eXr#hz$Wz&64=r*i8C8+6GaxUNt) zAw0r!{6lr2Oi1HLZs;sWp~!vAzY8*XU`C<2M`L=!6cyW#?lohB?dV;qcbCqX7W>_;+q5 zz^yc4MkhPnz(kjQib-gnBF}VUKmh>2DrcahX&Lx-?zX4vDI3w}nKa*Px6wmoBr86o zXTMZx%b?b2(T&F?#R~pVPX5+a68*7VDpol5G??VkWw%wrAu^vM(li~d@2q>i2QCb! z%#;b%WXr}M$$snad2ecN>SIRe@f#+vL#)Ad@0QN0ba$#IJI${zy<2KX*1%a=4~cf^ z8@zh8Rk+;SaeMzl=3(RgqO*@@Rp|151@6)^%NvU;&MvT}eTFQL->AN<8tep&ujMmx z^122obyzx;!}Ky5(igX-Zhr7E>Pfz68`}xvr%%Hj5rCUID&^Cr!S$frcrFS6hy}TG z0&=d$+}+E284#ZEsca8W5uQC(K7k@id&$qBWE@%L99F)%B@2=K;;XC_^G65FAR*fI z##MIxdR(?KtnFf3>K1^&(P;d4O$!e^&1}g{xT0iW9Ije{aQCl=}P`xHwPCzp*NIu#x!s>N~ z50K$|onw7dtfHZ(P$K+pWy_WNQj=xHbvRE&X>H}%=$+Dqw>Xa7J3BBGUgUK$pla5C z#6gQ0Fln1mB3k3*Fj1^*p>}R8zk9)E<%suYPZ%LW`*PrA-8()$08s#YBa=5kG(0-z z+r+2spax)O?3QCVgo!(xWgMUcU_5$?1kPDi{MHPabW~Y4i@VIp#tArRe(~%Nk?z2L zuJI8YMv#D+nlIz{BAY?xLa)59iQq-4xZ;;+F)S=xVkUp$l1I}shj0UghrkXd)QKD zGhpOA*1qHe(2vr7X6WS!DmmaHeQsX7f4ZId>Px+Q3Ym|-gI=$F8J1IIs387~65;#W zlbSn{ifU)OH~~>-typ^Eq!g7yJ2uC^ZH^(xb*^}TSsO%e8{iwP7nkHOx}UL=01R|b K>J(`?NB$R18wZsD delta 1608 zcmZuxYfuws6y21EB1r%Zv8bbQ0gJ*Wn-DgSLJ$Z_DuEc#4k*fIvm1ku#3U*z7$%CN zw#p+yDLQ+!>H{e5tbC91pfYoe6cmDG_!e2XA48gv<5vki?d)NsEO^P7t+N((PiMl@q`zseEj z_<9fGs1bK&Ac!!MALkf#~;TNN8`zmEEcV)ZdrbJ`2H0RZ4(h)Xd6 zfaf$PC_q{H=K$b3YeRi}oi^@(DMp39%G6VMeXNtkvsS&KOnc z*PA0i(DstXw#}zU+A`@OwsQJB+j)BM6jpXtrp_eJ&NA3~=}eDo)WG4gVGd}U>*XKF zRfnqid{h7-JRF1g!cYN(!l(*D5S0ky!k9`O$_H(kUb6y(DwU9jzz{6LR1lv)VF*Qd z0!YO})L{h7LxgIQc+AT`9pQ%ZF1&q!y`o0zw4yg%}31)R=gY z-k61wvb9;L2Im-b8j!VECRd1~6tW1A$A%|DMJ8${NNNNauhp&325l1W=@ta$!EhKN z2t_7X%W`29L(jCZ;-|LzaEZr_#XsK=n3b1N_+SR-v5^7!#_S|mC{9IMAkVMBnvmA&L}e5 zfMRQLGYi+LBP^g1jFeoNqH6&F%6*wMDmi=AlOHZ6oKtw`>r)Dq@|A@xuE9)qj}>ZJ z&g@(ucXpeyc^RMG^ek`&b6)BU<~8bpc`EpveSo29x&MIL&lfdDo(_!}*gmwO8E@|2 zaPnq%KDzTzMfxf7>5^JqxsIsx5(Lz?w2JCm!KmWvhn7H4Zd}LSGL0Tgjia--g@a-|Jw0olREWP@9F7@XSSXh zsh<>bhL%z5dV@2kpyOy#I&c5*DaxaQ)_cF7tj{l!Z)!SCgo%x)-eT=*z2JAHD$=bR zs7iH0+LP`$^v)`OEqFh@@EkSo@NXnyZv&6OdsMcgqjGG0>TO_X`|bwHKIM@sn8c8j zQ4ictLm1QT*w(Hz1B`sSg2j4*X?fr`iepQ UmuXw}IWH(c7MmcgiB7lv3lLLlQUCw| diff --git a/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow7.png b/Resources/Textures/Structures/Windows/tinted_window.rsi/twindow7.png index a422e8c1526371137e017ed0c42b0ec483f2f93f..17304ce1044032ee392be2dcc63be90d6580eef0 100644 GIT binary patch literal 4882 zcmeHLX;c$g77i)|*%W0}gfh5-*%PufkzENIhyfK`W~fvup_D9UAwfV91x0Z~2Nh{V zdk|$56|iM#+-Mg@)OKra8(hFfToKz5RKR`-h-tv*m{di@>kH@oQ-T&c)cWdpO+Cxyz%XwIWy#snkj-7LP*OL=_65226^> z8ScK=u~_}c%O?GP%(-c2vPX`(bSAd=rQOTdk5d~PpX}jZZ}+v^ZZ^~jpOO}S_U*@& zysp5e5b?St`RXuhQ9V@?P`iWokC^MDWSmIfj8`jedz1{#A_WjX{HqA*DcniQZ&h;Bz)@_$EW3&t3>HPUR)R( zw7RmiKHRyvUYDKa87bQ~P2lG1ebjpSyW;eg(!_&sNlSF4{eIdRm&=fWzEIR5Xikui(Rhv^K7Zd+|GlvHQVeUdQx;xOXQ0|z?j zp+DOVRoUmvTQ}a!Oz1f$tlXu{{>)Z8fAi}xgd>oDaRZe7UFeXpkB>2?Q*$F@TpP{0 zE9(6NCuXh^4SXE&=%refs-l@nXam(2HoUE}C+sBLWWiwX0Sf1Y){mtS# z=Jzt~)I}BM8}tpGMUT$m*mdga}>djnj*3 zeycg&Wc8tTJ8o6k@U~?1HuRN)^^)PSK?yOh(Hw`x3!V7*~A77nX^>OS& zpz3t*IdPVeccb04$HRSxD*VFh1h*7dcVK_Yai)hhqpV#sY17}{d*^N3)6v{&t#}yU zmCV|7GNoosgihO~qxD?wvORaS&b3r9PYnid3c7DCHzrq7i zGpJx>DXN9Us0>r^2yNA;2oNUW5#}=m6oD!Tjl)8htI^2i;Zex)r3gnt@SASsYv2L^ zIjV&rgFIfL;Tm`Z6D}8A8^vS-WHQk%q&Y#NvW2RsT>Z6Oreo!G$ODdY7!M%*g#ZhJdF^&7{RCp zQDZ7Crc^*iOjxYcX?X+!&_kc%ldA-Ret3nZj|IR7*#N7^R1$?Omy-v2XtW^-0HiOV zKlRW=fqjZBLN!XA8bL!6P=(fWAcO?z_gCrE@uqYn2pNq><-k+}R;7NiZDjgklO)*h9^-F7g z9BSl=0%n^+CDQ0oG#Z!6;LvQ^vmJ|Kh~gWH4YG0DiqPu)ToY zirl|l^>JpT@h?33YVjAY0H6mK`6_+~=^CW#s~Gqy}O9Ocv+_TL7T$E*ONp|Dg3=5 zSu{u1HcNpnS9nwpWgfkT2jqPHD3A4zp_Kv>ym?p0MIk)$`Y5AE(u>$ake) zKbY8Lc}y6GRBnv9Cd{0i`Q7^BIVb&^OV1{5C|gic+QNHhUCWW9yPlP2Y&lKHfdW&r zyuzl`24*E}bQnFAyE&;7Kkig0Y1g8O6!o-%A&%M2_>Zgamoa}I-K-F??X)NFyuCmf z*pG?-cBYwNbSP4&OD z=jzZl*&9JjL7S81;Y!WY{N^`ip*Id?vreBGPZ1S7*KOA8k6(RpKfk4G1uo5AefU*S zcQSZ5wGhvm8H|$|KeIhJM#*qhXp9DjvmR~yn&EQuT!0X-PO~y4UtJG}3=g$!^GN=doN@d&_xGEFC9o$>`{w_{e-%6G2Y8UwEZ{^S%6C z@4Uyk1J3~m`&j3PmG^81NdCv=^bL*pqvQv}zf`CGR&yc8W(9WV1?Vmujvo>pToM?Y F_6HOSG7bO$ delta 966 zcmbQF_M2~lvN2;@rn7T^r?ay{Kv8~LW=<*tgU0!(6Ky>X2Z*%#2QLlMY7!GEJP|Ng zr=zQ5vfDxqQLo8&1+?l{JZL@s+v5G)!?oWToz@;PS)I&tq2#vDF%`qPk)q7&KP;4Y zJhLD?ZJOb9k0Tei?R)pq>}u?k^oR9V*QV*R{cw2{nKr}hBiqL-%W@0usq<}aS|c=H zxPR6ag^$YDMf>ktJdYKtNW0;q`n>b-k)(aCQ^nF)gO%s0^sSiX_tWWC^3?jzV(Du` z5_|1_ayv)Xrp|o5rA^?l(zFQ;9IT=ufla*{Z>==NCY9)I{m8%TAInaWBGH2^YCWFnU~E^T_+-H?i1H{>q{=S(R07vOlZ#ucqaSzMA|RA~nj21*pAq**y7rXvYK1#>bd=d+6nDHNBumX%l~XC&sOr>58{ z=_^fM#O^Tp1-r&%F%I>51$`u)Hu~tM+2~`l7^2Q4wK%ybvjF5?uo)21AQv|v52()y zs53XUBoV~3uP8`N&Q2{+NX-K}p-9Qz?%iYEaA2g=FZOhC45^5FJKK=A!9n1F+!KXH z*+2~k5o@6fhl5xR47S8p6;GCbH);N{^E$7$8Si_v?_BdoQR8bt3~QD$M0hi9n8uW# z%X%P+t6{4ML-x-a{vXxz|9kl}WNR|uP=g|23DNz9@s~c>02E2ET+p!!hF4-dbuSO~ R*8v^O;OXk;vd$@?2>>aBXYBw0 diff --git a/Resources/Textures/Structures/Windows/uranium_window.rsi/full.png b/Resources/Textures/Structures/Windows/uranium_window.rsi/full.png index 5695bc0c26c731ad7753c4817a372db5d7479cbb..f7b6e10f869a9ba3ee1d2f09f066f153b5e21e5e 100644 GIT binary patch delta 1302 zcmV+x1?l>*1E~s-B!3BTNLh0L01FcU01FcV0GgZ_000ErNklm1cWW=*sk>-1S_6Ke zxx6sKg~{ImcyRMxB1E|()eV579Io5fm?)0(TKYI?-(rChkO~2?c*g1Cp6M;TnEL=6 z1-?KE3tt0DkTro!@bs5+7h!H~2wd8&B(vJ%ld1DSgn#&yzZ?t-+5=1Qp8EoC@f8?B zUjX14V8Y|~KEb;)XCdW-4;!P2;188(5O2Na-lBwyB{g@efOJ%p0Vq@yL|n3qQFd?H z$!y^Zm=~)6A~EnmDFsCjauHs>d>>~9h8sBkZxvVqAQ#?0cj$gT?7c$4bMRCZW_@T+ z13Cn7ZGXPDCV0h6av*yrC%MjT0NbIH7@Jyd0|PotqbUF> zDad^nBsSk(`mQOCmsQX{zy9?bRDWtIyaEsrL0mTaQC!g|?bcCocMX6L zwCN~MZr?{$ug&lE(JmuFR!H`A@2ay005Wizwz52GbyD=I>kc4=z%VS*kqq5#%Nl@C z2_snfnl%XlI-{F{hH2FUgc~PqR$EgXOCjqG;Xl?{ZS4S%ud1d%G*TVFtUb+Db)#t^ zP=Cr}#-3^nkdbk|`QsD-DG{d`>NZ;V{>l$53dM5uWG;6W{R*Oq`JZs(!L?eX<|7zyLw}$h@bOnVp6=hziKC~Ft%t*BUwVp<=7!jo z?4sb6u$QV3Sq~=|)D9-N{B0@T-*AG%GY9G0 z{s=iMsA&~2UcSbHTj1h9mjQTe+rt?E93k)daka&Bi@NXlD8)@O_N{7 ze&OSeK`PP%e-X$cdiwi@MqXb6t$#U`cz}WV3t+~{xltUWRvVObk=v$pG7 z4r4P5+FP-ix=PuEj4v6*f#@_{bTP&l06lMK!x0FJkb&~g!5PsmGh^7S96rL!b>?aw zYtdQJB{dF0fK0MkCm3TMv?i}5#Fjvrj2UB~b0B5_g8KMY9?$;;gjcr_8V_4L!T@CSsfP57~!&FvPZ#nO`PCCZi-t&VQao5rFUe^biCAjYF#_ z3L49@yaOP4mSyx|Xhl&(5ETGkAo=1m+U0o;pOifNR~&|+cUWd?&M5)J`|%DAfcXCV z>J?%>{h;KCovuz5z}xLRD}@6bG2!;EvmTQRNefdeun{X)Cv?_hRYh!6VEbwd2moRT zXf}DL(Nw?3AAcG-Iex1E>J~f+$q}fH>44V)aB{H%{5OnE2coe8ENqR5=}H@5C^-NJ z-~b$e1JDM*F=}GEss-TFO!Nil4UCOX(>gU)fFasgQ*!A4wPeD-N{$KF5Z$CKD6MPB zdQT1^7Gff{kkoBU6|in+a diff --git a/Resources/Textures/Structures/Windows/uranium_window.rsi/meta.json b/Resources/Textures/Structures/Windows/uranium_window.rsi/meta.json index e4e4f5004e3..099201b4184 100644 --- a/Resources/Textures/Structures/Windows/uranium_window.rsi/meta.json +++ b/Resources/Textures/Structures/Windows/uranium_window.rsi/meta.json @@ -1,46 +1,46 @@ { - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/ and modified by FoxxoTrystan", - "size": { - "x": 32, - "y": 32 - }, - "states": [ - { - "name": "full" - }, - { - "name": "uwindow0", - "directions": 4 - }, - { - "name": "uwindow1", - "directions": 4 - }, - { - "name": "uwindow2", - "directions": 4 - }, - { - "name": "uwindow3", - "directions": 4 - }, - { - "name": "uwindow4", - "directions": 4 - }, - { - "name": "uwindow5", - "directions": 4 - }, - { - "name": "uwindow6", - "directions": 4 - }, - { - "name": "uwindow7", - "directions": 4 - } - ] -} + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "resprited by AsikKEsel | Original source: from vgstation at commit https://github.com/vgstation-coders/vgstation13/raw/99cc2ab62d65a3a7b554dc7b21ff5f57c835f973/icons/turf/walls.dmi and modified by Swept", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "full" + }, + { + "name": "uwindow0", + "directions": 4 + }, + { + "name": "uwindow1", + "directions": 4 + }, + { + "name": "uwindow2", + "directions": 4 + }, + { + "name": "uwindow3", + "directions": 4 + }, + { + "name": "uwindow4", + "directions": 4 + }, + { + "name": "uwindow5", + "directions": 4 + }, + { + "name": "uwindow6", + "directions": 4 + }, + { + "name": "uwindow7", + "directions": 4 + } + ] + } diff --git a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow0.png b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow0.png index 31bfc29cf0acfbe6522db842e91025891a0ce052..7be507678d49517ac92392e78b96843349952311 100644 GIT binary patch delta 1672 zcmV;326y>|2AB%TZkN08pnU9 zE`9ImPG+VvSuc}TNYsuuWK~#W6c;g|E&&ly9~bsb6hs(sciAWkqO!10`XC5KU0e-b zgUhmB5@862WMd{VF49O9c0^Ri1XoI;F8i!9QeB~rhX7{V0&JgG3lEaZ zXBn_cghF5f0e^6;@i`wK{S+w#S6#H8i}Phx8~w`E@eqInw|m2Em@0G6;6K0(AQTwF zCX_&6P_!fzquQ@m_hZjR7BEwKM~OKe0(chKaLZ+zcxHANkPrj`)O{F8@TVh}vwO#Z&TY4=QO837&*2?=ihqZ!99xQIb~4WH9S5+V?ElOE zn|e9h>KP1Su+y8=%c+&^r;vyyv@hn5X{U~d0FKKLDSne50uu%;ecg(O0KgOu?~i?` zoi{cDBt+!#tqIe3?cX{O4*`T=wM_E+OK!l|9Gt~N03*8TKD)>!yF|U!9Vcf+)Y_O< zfQ*>|^nXr*LUldhnv-|k8g{rwYoxl(ezKpF(++Q~`y2O<|CO)9X)4d=l;e3-C`;Yx z=Hm{nLm&uT=A3DrlpUc}fU?=ge?H$0_&{1G^-n@uFjRHVvWSTx1PdD9^PQm00{YD8 ziC2a<=%QQ^vs05?Ki;GFd#p~~DHC=1Yd)aHa4J<&4RW$V1s{Df-K=e5QGZd-K& z!)Au#K}fXg(OalnKt0V`pe8(~&N1zxj2>}KcqF9-i;zu9Mvv@;43Kt!q$<5Klm+A1@56M`@z}+XK zDPSU;=Fueax8wII?9C=Y?L z2O8&;&W-SzV79lgrG!kIDy&CGqdSH-@4M34twJ0JMb7cU!qBe6kV_ zHC;#tu&@UD90*$cB3^^<4nIa9B!}k@@!8~I0DgPHl_W_roGSz11}@{y2_|Z%cz?L> zHTpuEc~R#VA;2A9M*Ej7;ZU-3oRK~+PVK>#DJ&7CvowL4bio!pg(O#8cp23*ufpkg%)iP43_jlc(SHrx=v=$J zb?X&8S2;qhn!tm@Eg;t5_iI z^@MggXcM4fr6~%7t1hnSqFfQQ31A3;X(lNq3Y5KgOn}gXAuyC&8~w22;eQJ&FNmmO z<9#=cjy=4{I;+G#haTg(nU{Fm+D~a)up%dG--WOLTZKO!4tX1nj9lnhKh(wv` z3||DNew}%O1tZD3pM3;CPUy=Wh>ZaC&_(nhZy*)|2qOo;T~}|>&K(N@q&N$JiA7H8 z&ESuP00fdr;gUD?J4o>mpnnaYfCZs9cOV{LjFWY^JsREr)sAtfu# zOk>F+)`~2r%aIZg~{}xv!5na%s SNQM9a002ovPDHLkU;%<4c>$>a delta 749 zcmVy+<)xbo%zAz4P%15|Gt@d zGqYJqN~YWGK5)~E!C)YYL4^Q~M#Hq5&8G2-(C_!_Apn9O4u{-3Kefn!cDrqY-@Ry` zjz%MNr{<4yaK3YO%uO%euvY)m#)Nl__)%lg~*$>0CKb4`kB0c`M;4akU0 zqc(tkW2 zCzHvf^dTVr=e=HUVF3_4sD%JN8Q>DP!zB}k0DEtOp9H_&etNMGaxewa&6nY~+7v?W zEzNUAxPR548kRB%QXw=`3Y$(Pyv7hX;bty2c*=wnRbj360$F$V))2TGJby(MVgc+u zeU{-&Ks#aq=;_Yf*Sl5)5ei!cs=`uM0nJ1K*au4#fPJu(T7`kEH$?%;XB1OdO0lHo ztt{7{f7Rz@=`x4{un(3f0Q+F6i~#nA>8VLkEoOk-O|~-LJ+Q_f^+tULSP}9}ib??} zwefV#NfIpU-2-b<)K!AiH4UDszZZ|u>Q)IZ6#Q$TN&p)?VNQ?dF)1pBK=41E4gSZ| f-1I`00ZH-*6;1wq5j@1C00000NkvXXu0mjfL?cvp diff --git a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow1.png b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow1.png index e395832e8e39f6a7f69e6c36c189a1f45bfbbdef..9979f28e945787ba4ffab8d70010c70209c7f274 100644 GIT binary patch delta 1205 zcmV;m1WNnk1<47JB!3BTNLh0L01FcU01FcV0GgZ_000DgNkl&HWrgUS7B7#0x#fMTMv@iNrAN&)<7a>@oC4wOMN0_(xpirp@Emn{O zf?%jkXdW6i*f#g1+1q4xX2*xwT)b_hXE|pi`+1o&yXWlpw}0Q6Gkf^`&Wa!i(8=)C z3o|m~?@#{pn#}l^%-~iq|B(|m>H>~l47(HD#(S0>wk;2E!8gIofd5olU%LVQvEGCB zme|7$0{XF82^{F?1Yj%}fDRylo7Pg;t^syNT3@>X-}FsT@hj}scDViEE&vzvZ}X(| zgtO@vs0VebUVjC{G`X|zBj?ESR{jl=BGnRoq5BzdW$uF+fS=tJVnVQL?1gXm;o%)? zfLl8cA=7aqL?H}Qa;#`ReD>Hys0cQ|7KE|d&N)uECA z0R;Wh`q~ZXxlyABIJo5dum7#5dE~eUbce@DIeqO0*nbnf*L3O|I>n{yJ~hh8NfqLt#G1JHyU%PHk^io(W z^KEv5_aA-2Qhk;Dmx-q1R3N<&I_}Fy9i=Nl->&XX{@N~%jBgzcu+JYf5$WCn+r+fkp*i7#+Ri2|NN@UGA_}X{p04k@zwn@?y zOfSxc=W$1wbTiZ$kbcZ^vWVk(6s!^$(SJxsDvZKn%*}B*e`Y?BJAC zT0I&Q@fm4FE+SF}Y&fgDI0}O+LRl@N+mXk$D zKUOELOsN@-+`#4hCC1zwU@4Q1hAsh?4Qv99{|5Vh^ZqR)8U`HA4b%v82a5Ou_vlqc T5^UWA00000NkvXXu0mjf8ooA= delta 715 zcmX@f`IvQrNGZx^prw85kH?(j9#r85lP9bN@+X1@buyJR*x382Ao>Fr%o3 zR|5kBQ-!CCV@O5Z+gS&*g&jqXsh_Oc9Gj&hdYz4BtK8)^GaBT+Jx~>2Sn=VByn

8g6oNhQZu{wxx-Ib-us)7V~O z-+SGZn>A-{CzhEj&)__4FfGV$;T5&M#|+mvzA-G)c%@-!v*ydnt659_ACPlcDz#42 z(geuYH?56OzQMd=-`u(3;f8HNvzHpnizW0X@GrQ-u}<@*{hBY4mUnk@XS;}<@=%+u z$TR1N#5YNU?Q#3+7a!TtKYwn-POfa0YKHJ#;_oyK`5s(+a{2TIw+-75e0SXBEosqf z_{R9bpIa+md-dcu>8FL|AC`I;#;76PT;d=V@~<&JVD`+}8*X{b{1!j2=Y9R+lt!5YOV1Yb zCvNq;T=Kl|!!tH7u@kxm?|xcdHhk8*`8z`;+nKe~&!#u{l+QcACw(sC69%nbFRtu&H)7W5)=Te~_$xhuS!1eKb$JU{+?t$y+5y^Q|8?fQITpMUOo@wIBv)vSr@8=G$PI6^!L3WFGifb2p> zsIQ@cQmVhtePhIw#p%qg>i3+|s~=zgn2@xq;L8KUk8AI{h%6PtjZlOq~p#u6{1-oD!M|2AB%TZkN08pnU9 zE`9ImPG+VvSuc}TNYsuuWK~#W6c;g|E&&ly9~bsb6hs(sciAWkqO!10`XC5KU0e-b zgUhmB5@862WMd{VF49O9c0^Ri1XoI;F8i!9QeB~rhX7{V0&JgG3lEaZ zXBn_cghF5f0e^6;@i`wK{S+w#S6#H8i}Phx8~w`E@eqInw|m2Em@0G6;6K0(AQTwF zCX_&6P_!fzquQ@m_hZjR7BEwKM~OKe0(chKaLZ+zcxHANkPrj`)O{F8@TVh}vwO#Z&TY4=QO837&*2?=ihqZ!99xQIb~4WH9S5+V?ElOE zn|e9h>KP1Su+y8=%c+&^r;vyyv@hn5X{U~d0FKKLDSne50uu%;ecg(O0KgOu?~i?` zoi{cDBt+!#tqIe3?cX{O4*`T=wM_E+OK!l|9Gt~N03*8TKD)>!yF|U!9Vcf+)Y_O< zfQ*>|^nXr*LUldhnv-|k8g{rwYoxl(ezKpF(++Q~`y2O<|CO)9X)4d=l;e3-C`;Yx z=Hm{nLm&uT=A3DrlpUc}fU?=ge?H$0_&{1G^-n@uFjRHVvWSTx1PdD9^PQm00{YD8 ziC2a<=%QQ^vs05?Ki;GFd#p~~DHC=1Yd)aHa4J<&4RW$V1s{Df-K=e5QGZd-K& z!)Au#K}fXg(OalnKt0V`pe8(~&N1zxj2>}KcqF9-i;zu9Mvv@;43Kt!q$<5Klm+A1@56M`@z}+XK zDPSU;=Fueax8wII?9C=Y?L z2O8&;&W-SzV79lgrG!kIDy&CGqdSH-@4M34twJ0JMb7cU!qBe6kV_ zHC;#tu&@UD90*$cB3^^<4nIa9B!}k@@!8~I0DgPHl_W_roGSz11}@{y2_|Z%cz?L> zHTpuEc~R#VA;2A9M*Ej7;ZU-3oRK~+PVK>#DJ&7CvowL4bio!pg(O#8cp23*ufpkg%)iP43_jlc(SHrx=v=$J zb?X&8S2;qhn!tm@Eg;t5_iI z^@MggXcM4fr6~%7t1hnSqFfQQ31A3;X(lNq3Y5KgOn}gXAuyC&8~w22;eQJ&FNmmO z<9#=cjy=4{I;+G#haTg(nU{Fm+D~a)up%dG--WOLTZKO!4tX1nj9lnhKh(wv` z3||DNew}%O1tZD3pM3;CPUy=Wh>ZaC&_(nhZy*)|2qOo;T~}|>&K(N@q&N$JiA7H8 z&ESuP00fdr;gUD?J4o>mpnnaYfCZs9cOV{LjFWY^JsREr)sAtfu# zOk>F+)`~2r%aIZg~{}xv!5na%s SNQM9a002ovPDHLkU;%<4c>$>a delta 749 zcmVy+<)xbo%zAz4P%15|Gt@d zGqYJqN~YWGK5)~E!C)YYL4^Q~M#Hq5&8G2-(C_!_Apn9O4u{-3Kefn!cDrqY-@Ry` zjz%MNr{<4yaK3YO%uO%euvY)m#)Nl__)%lg~*$>0CKb4`kB0c`M;4akU0 zqc(tkW2 zCzHvf^dTVr=e=HUVF3_4sD%JN8Q>DP!zB}k0DEtOp9H_&etNMGaxewa&6nY~+7v?W zEzNUAxPR548kRB%QXw=`3Y$(Pyv7hX;bty2c*=wnRbj360$F$V))2TGJby(MVgc+u zeU{-&Ks#aq=;_Yf*Sl5)5ei!cs=`uM0nJ1K*au4#fPJu(T7`kEH$?%;XB1OdO0lHo ztt{7{f7Rz@=`x4{un(3f0Q+F6i~#nA>8VLkEoOk-O|~-LJ+Q_f^+tULSP}9}ib??} zwefV#NfIpU-2-b<)K!AiH4UDszZZ|u>Q)IZ6#Q$TN&p)?VNQ?dF)1pBK=41E4gSZ| f-1I`00ZH-*6;1wq5j@1C00000NkvXXu0mjfL?cvp diff --git a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow3.png b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow3.png index e395832e8e39f6a7f69e6c36c189a1f45bfbbdef..9979f28e945787ba4ffab8d70010c70209c7f274 100644 GIT binary patch delta 1205 zcmV;m1WNnk1<47JB!3BTNLh0L01FcU01FcV0GgZ_000DgNkl&HWrgUS7B7#0x#fMTMv@iNrAN&)<7a>@oC4wOMN0_(xpirp@Emn{O zf?%jkXdW6i*f#g1+1q4xX2*xwT)b_hXE|pi`+1o&yXWlpw}0Q6Gkf^`&Wa!i(8=)C z3o|m~?@#{pn#}l^%-~iq|B(|m>H>~l47(HD#(S0>wk;2E!8gIofd5olU%LVQvEGCB zme|7$0{XF82^{F?1Yj%}fDRylo7Pg;t^syNT3@>X-}FsT@hj}scDViEE&vzvZ}X(| zgtO@vs0VebUVjC{G`X|zBj?ESR{jl=BGnRoq5BzdW$uF+fS=tJVnVQL?1gXm;o%)? zfLl8cA=7aqL?H}Qa;#`ReD>Hys0cQ|7KE|d&N)uECA z0R;Wh`q~ZXxlyABIJo5dum7#5dE~eUbce@DIeqO0*nbnf*L3O|I>n{yJ~hh8NfqLt#G1JHyU%PHk^io(W z^KEv5_aA-2Qhk;Dmx-q1R3N<&I_}Fy9i=Nl->&XX{@N~%jBgzcu+JYf5$WCn+r+fkp*i7#+Ri2|NN@UGA_}X{p04k@zwn@?y zOfSxc=W$1wbTiZ$kbcZ^vWVk(6s!^$(SJxsDvZKn%*}B*e`Y?BJAC zT0I&Q@fm4FE+SF}Y&fgDI0}O+LRl@N+mXk$D zKUOELOsN@-+`#4hCC1zwU@4Q1hAsh?4Qv99{|5Vh^ZqR)8U`HA4b%v82a5Ou_vlqc T5^UWA00000NkvXXu0mjf8ooA= delta 715 zcmX@f`IvQrNGZx^prw85kH?(j9#r85lP9bN@+X1@buyJR*x382Ao>Fr%o3 zR|5kBQ-!CCV@O5Z+gS&*g&jqXsh_Oc9Gj&hdYz4BtK8)^GaBT+Jx~>2Sn=VByn
8g6oNhQZu{wxx-Ib-us)7V~O z-+SGZn>A-{CzhEj&)__4FfGV$;T5&M#|+mvzA-G)c%@-!v*ydnt659_ACPlcDz#42 z(geuYH?56OzQMd=-`u(3;f8HNvzHpnizW0X@GrQ-u}<@*{hBY4mUnk@XS;}<@=%+u z$TR1N#5YNU?Q#3+7a!TtKYwn-POfa0YKHJ#;_oyK`5s(+a{2TIw+-75e0SXBEosqf z_{R9bpIa+md-dcu>8FL|AC`I;#;76PT;d=V@~<&JVD`+}8*X{b{1!j2=Y9R+lt!5YOV1Yb zCvNq;T=Kl|!!tH7u@kxm?|xcdHhk8*`8z`;+nKe~&!#u{l+QcACw(sC69%nbFRtu&H)7W5)=Te~_$xhuS!1eKb$JU{+?t$y+5y^Q|8?fQITpMUOo@wIBv)vSr@8=G$PI6^!L3WFGifb2p> zsIQ@cQmVhtePhIw#p%qg>i3+|s~=zgn2@xq;L8KUk8AI{h%6PtjZlOq~p#u6{1-oD!M1vt zk;bE2R44HT7c2y+L*yE_lt8;^TDmYPm}JxJ(nWtl>84=XLV_2CLVrZPa~Cb7q!bdG zLb1UVYSP%mix`O}@!gJf8;@o*UCj7GFZSYybEa7DMn}>dy?>t`owqdce9oXJI!6}+9?FEncZW$HcvxT$s0-VqEV1mw+n0=qz%E$ z(p>O7tO4kjIsn;cl+zV#*QI1uAr_51Okorz<4%EV#jC;7>S+Vuc|ooZz-Cwj&@XiW zj9ifG@9Ss{K%=DV0mC=1%*xEyT@R2x7cG1e9)HbS0*=D8y1)tFGp%53x_|?o5v&OB zg{-}_qyhBDdk@B2Vh_jn>BnNlw;|C5z_>pE3BV6)ehGrz!BSWH`Y%ZX_^xk~x>skn zxfAC4Fjjnz=hf$2$i70$Z_#k;#0-P`i$8ObJnt6YCM`13!M8)w$AIheAI$>%>Z}kK zf`8Rm*wqOOyYHI=+}(Ksxy0e5qz8>10Q}b;{=bg_Ggg^(w?!^#-~v4%&vmy2z+L`? z^CsW~=l)C!>M0O_-!E$~EolHfx100;2S54#>;Kr&IP$m$bO(=9vJuEh8o)`nvPE6d zxE|H04glQ&=vD`S?f`VF13-5Gx^?OSNPp)7vU;QR!I;ea-}2v{-v0}Q59y8rmf9(JOuyTw$1@4&340a``RpQ)8kFsQ!0hq6E^EAB4%Ex2bt6&&mnSVVm zXRRH;{j*;lj4v$wh!v0X*3e~=eukG4X8>^h7LQ&$T8R?_GC!> zJ`y%p&jFBkf{sziYhb10WQddXpehc_?niI4d-D1ZQjHbuD*y-@B#sT47A0d78Wxx? zcGJNIHvYExdK>>&s2xD@tFS?WASGy;7z9n0<8G%-9S$WMD}Mn_dR{s7?CW~~0000< KMNUMnLSTZLmN?S@ delta 715 zcmX@W`IvQrNGZx^prw85kH?(j9#r85lP9bN@+X1@buyJR*x382Ao>Fr%o3 zR|5kBQ-!CCV@O5Z+u8fOg&jqXtM9zAvfHgwikIV6eiW8^WWFU>c6)Lu-x%_!Vjw#ofdt&7r(CG zbmd10^R*6}D^W2F0ojF&4r`CHGHewSXFwD9RM{XuZCPTy^V{dG&nu_SjV|jhkFUSS zwRQgczIEm2)iy6SZtz=vxJvEeGIXsdX8mF~QT;J$?KZB}{&8Ox9bM7Y$6CbTDBuy1 zyJSK(_uAIlj7SCc3mLx**VtM9w5$=5bvw>v+3>8pGcqFAXy)IFs!wM_x9Ch@Ua|dj zy=}elAMqtqn#=w^)&+`%H_kcHJ9FBvEn0CWloN`U+Oe0e>^_c?KIGk&wGux zCvNrJT=LlO{)Hl1hKE?EQ$8=&)7Gl<&j#D;7tz45aC@jrcsBarZ#((AO(K}+k+>V{iBzM6({ zta82jam}VpwhhJE%hzdtY@2IW{@rdjLpIBAksEOzj%l>smN;z3q!#{aiD1G16W*6N z68IO~yJx?2U&}{h1)G13UwD4-Pjj5<<@8YP*oOXwXP-MWzv^yVcs1?ck=K$D$~TxZ zOkDn^s#XIHe)wn7$Ir>a-x!({Zq)3~`O~!JYSzR$=4yt0@7;q=2}R{D($G3ArEtW* YeX?HTk(G*Wz|_g$>FVdQ&MBb@0K&LFeE1vl z`_r@qQ%WM8EOjXcIypJ1i!OC?=_0tblPE5QK!-rVMXGL{?ciW1Gr5R3=+a4O=~TK% zF-4lvmh}EQoJd7;tB~@2ft+W$+;Dlny!kliz)QvS3t~!n?1vEfFywMv zIEIn7sJwayyqj9Waa}%aeq?TV1tQs!)D2i|y*3vUog01(jEU*18_;leA#6hsLli>d zf?E>PS2v*g%zpuf|GNJ_Gr&clZh+Jm%|m|{P{tadU4S;$0PO;_=_>;~g>w4JfEc+y zLBHrL12pJ)A#{EB{+(W)@AdzDuMB(#h#R0W(4B{PH5vomdGy!Mp@20&y8vyh0ony< zBlbq9U2E36ez1n>LP*4bcCA_8T+AS8ftvsUgdPM%34i%>k$opvG;e!n!%6S~-Ca3A z(t!8?D1#p}y*I_}>P@mF5tGkDwgdc_HIQlk7n~T}mp()M|O;u~nx`YYp z2Fzw>S%F5dYpx?Xef2S5zVv{F@rO+BO_>{!*U1vdpxy!ZcIr^_p@PW{9Iiktr?1`t zlmn9$I897;;6!$_MBRY-tr!n002ovPDHLkV1iYX BW&i*H delta 639 zcmV-_0)YLS2ABnqB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000ic z000ic0Tn1pfB*mjElET{RCr$Pnn6kfK@dep(RGMXTm%Dx2MD6RK-c#<04Y^Te=?<)iblIH$B}6)f)|&@qc*yIT#F@*=*K~Znm!F zcHnULsCj*VZszm(Wcv0fcUQSPdAgF}T5L+Df#O@B&=7KM4qX7=yuAI3uD5InT>z$i zT>P+qFp{A;bO9h$JidPqvJjxe#bW`qCJO;5ysLQZ0AXMRT>uJh2Z)QeTpZ~FP;4B) zqj*3UfI?G&XMY~sBK?=(@$LS(4Ay1(o9uhGX&@LW%XM68QurU*mDjqz%+^+;1(;1K|9!#B^ zAHQL~2BeA)gG?|N08+*0umb=W0U$1Za{6((h%>oG!+%YHqQ#>r8Z|~KxCvMkuFa3- z-jAjz8}}KI8?I}BtOLunpr}tkSx5+H0rXq|8`m{JhD!-J8z8r6xCqduXDlHH%mrw( zGbJGhOa*9@GbJGx5oQ8(il-#BgN^A7NJ)r;jrkhTmXM0@kVx$eNiLQuKytBE0g{WQ zo)VK>EO=Fb1Jtv?6JSAkY z2u{D7CY=(j$U=b9CBc#`1hl7kEWsMO0Gts(yF4Yq1G)e`ClE{Uf-WFxkcNf{LavQz ZnlFM&P>D2+`?3H4002ovPDHLkV1ld#2S)$^ diff --git a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow6.png b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow6.png index 4097d024fc29b07a3490bafc6219ed5d0ca86404..eabc47c84b865b76a0c4cadd8a6c043917b318bf 100644 GIT binary patch delta 1209 zcmV;q1V;Pg1A#8 zKZf~YhDbj~QfUZQ8ipFHnk)*VYr_z?m(w%hnPdoxdwilIWxKU{@!`!%zwS_`<{D67>4N7$o0|L z`HyxOFka@1b2quRa*IO2#+|HS-|o55XHo<~lRZ%k%Dq}Tf|0+2IP$~Cm1x+ zG(?S=`W&TPLz#6v0HmTXJiGLmgcV|K*~+Zr0l+X=?%HP0^;peR@p5bGtd%)+QY{MO z>c|-5&H#{5W*rXzi6l@4;BI0Cd|#P$JOGH&v#|@9d4F}*vi*R!e!Vt!SXt^$R;KLR zJ(Nl=cLr|p!P+OR1bKz>H+ANvYfNLw~LE~5Q3Tzs%#IHvKg>nPmye>F4a9uO3wkq znH-id*nctgw&L5RB@xn9`~RDi0q8AT3~`=qw@R}fpWHzifKsl(Onr`qs4-}y!BjO}3^#Jrs9RM@Wb63Ci9)Lzk_X9?*kAKd}?612YAYBa2e_W3Sfq-_H$u4l3 z(KwNe#t9E_z&E2A;cv^@OG_F+!8&^|-V#lmFr+|=Qn(9t7Xag7AJ{iOA3e}|;H z*4K+94dBbd6b-*Y)vdH@eR!|xFL^;yk0px5EMq- z(tqcGi6ynuY# z1mJXw=Y|*M`}bIb(>CBl*Zyn(jWh@#EXdkROB%qLsem)U!B4*b`9HR7&;32%RP;J6 z8-bjp0UUNKTig|od{m=O0O$@tw@v`)4u3$mP5|f*K(~%P0O?vlR+m>N#$@*YzJKQU zJ}+<-Isu?N0NpwPpgREFIsu?N0NpzF0JJ|eVQY2j3DCNh^;YW@PiLVvwV z85giH5iAEal18h^+An9V9l*ohPY=cyp5CX+wzx9%Ch0Is-i{ui^1^_H$~-@;E)s?z zH!i-zspQ!g9r8a(dod)QTxu<@_5v`t7cG}92Mv-LgDf`PzMv+aEiJd-X7|(OucQ`M zw9fz_S|D+nkPTQi|AgH%BpjM9G%|tBziqz3(LGnF9YFE3)&j|Mp#*det!-UVa$)5! Xp#Wu4&1DdR00000NkvXXu0mjfVJ$+& delta 715 zcmX@h`IvQrNGZx^prw85kH?(j9#r85lP9bN@+X1@buyJR*x382Ao>Fr%o3 zR|5kBQ-!CCV@O5Z+u8fOg&jqXtM9zAvfHgwikIV6eiW8^WWFU>c6)Lu-x%_!Vjw#ofdt&7r(CG zbmd10^R*6}D^W2F0ojF&4r`CHGHewSXFwD9RM{XuZCPTy^V{dG&nu_SjV|jhkFUSS zwRQgczIEm2)iy6SZtz=vxJvEeGIXsdX8mF~QT;J$?KZB}{&8Ox9bM7Y$6CbTDBuy1 zyJSK(_uAIlj7SCc3mLx**VtM9w5$=5bvw>v+3>8pGcqFAXy)IFs!wM_x9Ch@Ua|dj zy=}elAMqtqn#=w^)&+`%H_kcHJ9FBvEn0CWloN`U+Oe0e>^_c?KIGk&wGux zCvNrJT=LlO{)Hl1hKE?EQ$8=&)7Gl<&j#D;7tz45aC@jrcsBarZ#((AO(K}+k+>V{iBzM6({ zta82jam}VpwhhJE%hzdtY@2IW{@rdjLpIBAksEOzj%l>smN;z3q!#{aiD1G16W*6N z68IO~yJx?2U&}{h1)G13UwD4-Pjj5<<@8YP*oOXwXP-MWzv^yVcs1?ck=K$D$~TxZ zOkDn^s#XIHe)wn7$Ir>a-x!({Zq)3~`O~!JYSzR$=4yt0@7;q=2}R{D($G3ArEtW* YeX?HTk(G*Wz|_g$>FVdQ&MBb@0OtojiU0rr diff --git a/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow7.png b/Resources/Textures/Structures/Windows/uranium_window.rsi/uwindow7.png index f2aec98846cb982515e94d2f3e994d085109e69b..f75790a41878a5b5e9df599eb3004fc19dc29d2f 100644 GIT binary patch literal 297 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=oCO|{#S9GG!XV7ZFl&wkQ1G^= zi(^Q|oVT+#@-`cYuo@=um7Ng!;xlWW>L%vq2R#lSzZQkYDkJCQ+V6G~_nfO; zeWw1}_rRI+wGaPqV9a2YV!ps+!nT0*-Hhn4!XFIb`xm|DmsjXTlF69%is?(`zEh9? zGeFg5@Ce*jsF}B3XuJ3P=c{}ER@Nb#l)>Y`eLz y`@}0OkOX!d{?4>d{6rE%RKqcbEes&rXX%$%%2g+2GNk~$$>8bg=d#Wzp$PyK^Ji!P literal 270 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 UzWfgt^#A|>07*qoM6N<$f<`MZ(f|Me diff --git a/Resources/Textures/Structures/Windows/uranium_window_diagonal.rsi/state1.png b/Resources/Textures/Structures/Windows/uranium_window_diagonal.rsi/state1.png index 772c39f64193e84526e379b91b594ec019c24264..5286b1e17e622aec224cf58ea6b78db7afea79bd 100644 GIT binary patch literal 15604 zcmeI3Yiu0V6@bTiL5v&_QL$AL7&Z;0rL*(c*~g4_H+H-ZcF2a*b`uAZlG&NN-cfdU zhMlp!c3jCZF%cq4r1A)_@Muw*5Q0=IbrF%$3J6V=N}z;BZ7lQpQ&AM9Dqu)baPREf z*Xt{*Ao1spv^#t5x#ygFzjM#o`7;l1+;CT2?GI}yimGdCjkLo%?R>6X1i!6;fzRP> zvDv!CqNwYZI-eTq>1P`#N`6!C?6SL}>t)qQxfRWb0e3cK!r2rRT%9!)bqBEN80gm1 zA=jl7e{|8h7IJO&M!Bfj3=(?lKn8RSZ0J-6cBqo(S{<$pW@YFg1#E@Rrjlt(&W2n$ zzcT#o46`meH^tr&ay2;t>8|KTy4lD8+Uxc)D(Cale#y;y{eIE^Q(EA7FUxsY561`| zS>$9qeS({34jTaQEm6O9xo?nnkPpy>)Jt9pT*445ilnWzs~Kbm4IbMjI-x5AI6 z%5fu;QtYsvQn~?arn`e|d9Y$;=~T(hM$*W@Wr46K$W|M!Y85fm9_Ls$rBz_TWLOnR zf~m?C?i!_g`e;#+)Wi9K$>pE{F&+>l5NG_H7GQWD07g>1J_dLLnj*ymlF!M7 zQ@qecd0md*-01X(mD|Cs*Et5!sN9yeYz1zoEfR(UZXK>n;T1ms0teUQ_(##JRC24J9gY}SqE*ID6gMxc8#I&9}k zvSN<27Y**k&x@j@`eTfsae(nFVw{mgPmBTnSOAEUPt-h8aW7Te%m~%0J9+O%(%|H# z13WN&w4C=`<299x1)R1LauxeZsZ+zLr7M_gPqLyqEjz3_RSzKUX`|(3p=SEbbj}Sy z-hYMp>@oThAdTx9c~`kvvpcbjxZS5@KvOrYr@1t=yw~YwsQc2eB)u`zfylJHxH7#5IJgwVdp%4ujuCQ_* z4D$b49q<_zgneGG#~WnPVbo%yo(0LShz|d?ET^A%V5FQ4s;FwXWj4bKMZqwis*0!0 zTr1wZ z^1=Gn`!+?Qdp}ux+MIV|=$h-ksO>%XR`kZ zg^w+HcKn?yi|E~dYN*=^)l^_Y`s)`jovaB=GP}+V?78fD*;x2?!W^3T?=AE1n>Ts< z=r7jn`}*bO2M0qn^J*vmv*($AzQ1?V$fmqwy>8Lz(TVK%@{zlj4?Q1zbF$;3_T{f>JI_xYPL4nN zcXnj{kn7m^gG*j{{MDx$t~T!ey8X2qb{)TXe%)qu{2xc3xN~b_==jCnt7qPMWLxW+ zZ$cj&*n95aU1QI$ddl$|`ZRQ4Y}gt*P{)dmS8jjwx7tgu3|$)BKXLEq>B(g)SBx~C zbrw20R)5Qfoqrg=@W%e%ow;`PiQ&-+_xi@;<0FfIWC*`r+2Mo`)*X7c_Uzc1RZneQ xuw?a-J@uzu_y7Lvg23c^3rF{v)K|AsQ@>n$^3rn&uk&7VTg!&Xt82Co{}0}mEfxR( delta 660 zcmV;F0&D&BdA|jaBYy#fX+uL$Nkc;*aB^>EX>4Tx04R}tkv&MmKp2MKrbE=X9p)m7b)?( zq|hS9JC1vJ?|WbFz5|3tg{fxOB%o@Rk&4H}Y;IKyyh1=f&3|zS5;OHgdNBjf@pTU$ z-|r$k%e(H+(Wm512KYqcDANs#c!PL$)6zNb6NgwyQi#uqCk(nE@gvt|m)|%S9Ts?I z$jGGTi9^ITl3X&m%3$PJKou$^#}EDozk6#Irl;JbU<~MfvF(ph zAg~KG>$d%UY}?Hf!2b+fX>EVC0nB}pUT@*Z%x0}MUsk|8;gpO#Q4 z0Pkn?O*vrj7U*4b`_?+g=>w3VUM=4M2Zz8|k+Ro4-Xz`A*|&ddTK)S0Md5Ol8b}Lg z00006VoOIv0RI600RN!9r<0K(7k>Z;bV*G`2j~J04-N;XXXp$7006s5L_t(o!^P9f z2|_^(h2ayh0U3AV1;GNQK0C54#g&XQYZtl`#rv2?l9L9$p92Ai7h`-06AvLkn0QLb zKj0f5POGCZ@$2K_x4;+!FqF!BB7V7tH)et+KV0!r|l^I4d<$z>PR;Obvc zi>n5-;A#P_xJp0|-W|}3cLiwR%>i0?Q-CI39iWX@1z6z40akcXfF-^dV2#fPc;J%( uUifH$C;k`UjsFBN@J|2>2LNH>0PqH@&E+BUD&+_O00001IP)GBYy;sNkla8U9U|P zB)rPk%+*}Y`Mx=?d#(VSICZAMQ@{`3e{ejaeISsaxYWuJ2bw%@I>POg5xLOW37IWZaXE< za+0+c^~nkD_XH$KLQ8x?-{bk|Nm>~+E?(f+XJ3828v+{V&z(K;(U&M=s8>URAY@~0 z9e|-)Qh!Q#)Q)z8a|gtj!Fo_6g@9fN{=WNYB;hM-f@)D zD5D>5<^Kp!iq&?64FcNRLy$Vh{4ZBVLfnJ3j_cPKktpuJ>kAO+)uk&M&1f!!twg3lEfkUk?K&>wgvUEZcPfB7#wxv1)~2OJf@J}wqjNJTf$8xYrG4(NZGZCn zu6(`3ZNAaj(b!5K~ek7m369Ng{T`L zN(RG;EuNd{)->I^F0dMPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi z!vFvd!vV){sAK>D0YFJaK~z{r?Uy|gf-n$9qZK2KiZutYqOkT5oWj!D16W&f3Jzgy z?E$DoZE)x`-%f%76~fsDESIHnn||Bnh=?n!W{4 zJdR_!(Kn9ckVGbc0Tf^P+u(7D*ks{GVs5AK+%C_}PT^rAYvu%&Yd^pQNN~EApyJ4V zK8BgVSllG=%f$+yOP7wwilc@YBXRgf7|wePINQfDtePMnGEtkI_1z zOR0eJG|L?@bVGTX{-kmRq(qabDh_^~h}2_LYm{6OK3AQHif6difm~u=&_yLDz$ca- wAX|`0poSPD{^P}D@K>|JUrwnv2#mb|4AL%YCpANW01E&B07*qoM6N<$f?46LSpWb4 diff --git a/Resources/Textures/Structures/Windows/window.rsi/meta.json b/Resources/Textures/Structures/Windows/window.rsi/meta.json index 9f6536937a3..41b8be18b43 100644 --- a/Resources/Textures/Structures/Windows/window.rsi/meta.json +++ b/Resources/Textures/Structures/Windows/window.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/ and modified by FoxxoTrystan", + "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/raw/99cc2ab62d65a3a7b554dc7b21ff5f57c835f973/icons/turf/walls.dmi and modified by Swept", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Structures/Windows/window.rsi/window0.png b/Resources/Textures/Structures/Windows/window.rsi/window0.png index 95094714d3b20738d39d4ac64f7507ff94577854..37bade4a4a71e531e2b23af81c6e620a18dc4185 100644 GIT binary patch delta 1616 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 i(kJs}fy4#?{0&-Fd}{Oz delta 498 zcmZ3?+08ORxt@WsILO_JVcj{ImkbOHEa{HEjtmSN`?>!lvI6;>1s;*b3=DjSK$uZf z!>fUTfpLMSi(^Pd+}qi@9xQ<(t@CgByqdvtnWfvH8153}2Cw#kqEZzcuImpRxfTK1f){K*`Cx%&I5Vr36Lq}@MLyIJ|*Or6vB zCaZ9!Mz$TD`Zn$R#%6yfE92R%)1NPoD6f-w|M1U>t^J#X78~etF)VXsJg`NBVTKqh z!{tQ`2~i>pKHW?WnTFq)!?xertx+v8-*54y&XX%Y6vQ9-^}5kcZvS43JHOvCinu=T=p z_!(n`eaF)!@BKNdDqwD-b69jO6WGdZkT-VNb-LD7?@tK$QqQOi_1cd0O!suRTAgXA z^PQB~#`#_H!QFtBhkGYzHk_AM3}z_Z!Sc)0vrSTM3)g|XiuFwI7%TGE?qq+kcc+&f cv(pcTpp*;28=@nPgg&ebxsLQ08%5>{r~^~ diff --git a/Resources/Textures/Structures/Windows/window.rsi/window5.png b/Resources/Textures/Structures/Windows/window.rsi/window5.png index df4ef650886770bca3ae09bcd7cc067227552802..df8dd36cf54e1eeb9e03f2c59d16196a74347996 100644 GIT binary patch delta 778 zcmV+l1NHox1)v6yBYy(tNkl?6Jd8u8Y^* zcX+h;2~Lu*#updh+0y5&Oh$kd$UF~iZ8xv{4dMcP3sXct1(Z zp?kvS`Rg-BtlsAx$F2#L?*Z%rNKAD7U>87QqU%RJ1WJ&DD7643$U&6K3&3_F)SbU} zHTQ>^dsZ7ETUZ33#_vBnhmelEl?&wnP8_4zY;uI}3xDgG;9%P~pQElW!*Qg6EsG$I zF{~VO?!PBl!*u5mbeeL7FNAdxq{g3~n!tyikNYp*WB$ck&hWXg3ZOPN&{jYiMbNGX zfA1(~`23vMBIy(fGK>wjkZBEM8e_kf*}@l5`F#MN0LnGBfARp37l1qg#v33E>smy$ zfARp37k>b0f^h9;wFIErKY0KSw8H8wgY8DcEQ7=kZv;;km$$tEg0S|0^&m8JL0Gk| zFqOayUxwz6a->iQTMv--0Tfa114@vCD7643$U&4^0PcWwX^cDI4pe>!h~F2u_~4C| zzu>>WFCa~Ak`jnnNNti5pcbG6IfzmVP=Xvp5q~ey79EvU=E@BD2J$XVkuV%0hzqdK zcL9IXH?W#+jz}HFZ1KhCfa3?padK+Xcm}XlJRvUu7vepDJOZtuVE{hPOi!4~5qc3@ zeDNMY9s%+SkY|9r1LPs#L|g#l5y-Uh43Kw#JOnfmvH;*Wtb^T!`Dp6<00000NkvXX It^-0~g57m!n*aa+ delta 642 zcmV-|0)73U2ATzsBYyw^b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi z!vFvd!vV){sAK>D0xwBKK~#8N?VF)e12GVW4`db4D#SSq>I9mHsN@My3>E|e0hU4W z1js%F8iB&#PM}&q)k62!y~(ACX=nG(O!Cd_?9I9VyCe)rx_?uFX`1GDJRVnz#iBYs zoj&pFj>Ds-`uYB%$96eyyLUd%k2m-HxDmVDVNiHsG^r`2lnHPF^yR5erkB^TudE4N z01f*<_?o*qZ~;UpJk5U#k`Ul92+s?kDyayd;IZ(k3j%Z~+w7FGf8) zk-`+9grQOoPk+D#P{>$Wkjf$mqX^)hEkywLY}tB0;Oye|iXS&(+yCdcrAz_t*-`{> z&z2&9yDFne9W6BK0-TVt>ERa?RRLc3YH$Bwtam) zKqP!Js0$!M;ZyhvK$r+%2H{_44|ne`vvYn0!%{$pgny?)QTJdJg{1%*^YwDx_G6z8 zMbVg#fYh*F1KQOT=+}bWra%Yn_tSB>+zUWsy#{oM1pi750uupp=(%DbAqCV0$YEzl zLJDXL=st5qLJ}g>1UN%{O@do!R7XHaf?sIV*8opKsGz6|AV@;2(3l8FnIeFDwiE%} zvjzTp0ekfQf-(iTXG;;lJzI(Z?l9<_AXXNnFal(A#4i&GZ~<~pz%9l^0$hOH6ObY- zC8V+l_M0Oy30kBgK!{0DBMAZC5Fbd;1}=c^2+(nPNP-1$0dh|uAi)H<0QZ1&`G0pn c%7Ci+18Fi5jjyEM0ssI207*qoM6N<$f@qr%%K!iX diff --git a/Resources/Textures/Structures/Windows/window.rsi/window6.png b/Resources/Textures/Structures/Windows/window.rsi/window6.png index 30629fcac2aec115a9940cbd378b6039b439491d..13aaa2107eb3d7196a96e5530e1996c6cbe0b650 100644 GIT binary patch delta 1168 zcmV;B1aJF`1fvO%BYy;HNkl!EKN>NIr{=f(gEf&#I zP(f6D(HDyZB=irk?>_im3%(RYgdqA*d=W)KL8(ZsVk$;#DJ`Lh+G=XrWV83~&b@a= z&fMLyDUudvof+Bv0=WZwXV1Cc&Y79-oVg5|kWy-W!M^7XoPWIQ>6fu33h~PR2k`di zi>PnA6$|r+F*AGUwaxl6#_+}qyFSyg@9A{54PEk`BjB%Qf?O0vZ8||f$QTMpe0S<+ z#9?66wpnYNfYBdg$O;M3=@_%?R0vE>-J`CN?;Eq}3<2cGy?1U?ZC(hYcHIE;;Q0)V zv6@kLoFTy6Z-2fK&Jd8L3Dy&i+iDSt=BhEfP7vS;fhh2i2#KXXu0mAIg@F?U6j4Q8 z7Z=Zf`94Hz&6sT`_5q&ffy)3nZzHQT(30kU7bix5OcQn8xA$R8`U0M|M7w!7K|mBm zXm!{AmBNE4%;^Cq2w3ae_z0dM4$MWS_F#MUgHuo4NPm_t%pZPzX7&(TmzOd3L85oQa(9`%m&F>0~5zy24r1@RS!Wi|1v_5Hm(*CZ%iYKyzfsQh#@rLSqDw#wV>$nxC{k5*S@k#5G=0{%+z&6Z#cGbe01mb|LDVO~8$gvbm1`^)b0YU_^ieK3K(w00(@q ziV*=0_+S-7Pk{CJ1?YT%PX8k>&J6GS0)Kd7tP`-~`8ib}p|m*_P3k;_S09JhN#KudxprUVd*DTZYGq?t{i~1P*Rt=# zad|3`Q0174CLt4$odi2>pTM6I&8gn0svMTKo7nKYt>q z2bi9|A2pAmQ7bD;qL4WE`(>Oze?e)FJ-Z*oE!~%^-qN&hoq#vLC{K*kRgIvEsGVc! z>oeeafiSL>v$Pc5gH`22fB5}{f!TK=1gJnl#ZxMpB+P@)I}m<=qFY?O9@zj7Xj>=X i(kJs}fy4#?{0&-Fd}{Oz delta 498 zcmZ3?+08ORxt@WsILO_JVcj{ImkbOHEa{HEjtmSN`?>!lvI6;>1s;*b3=DjSK$uZf z!>fUTfpLMSi(^Pd+}qi@9xQ<(t@CgByqdvtnWfvH8153}2Cw#kqEZzcuImpRxfTK1f){K*`Cx%&I5Vr36Lq}@MLyIJ|*Or6vB zCaZ9!Mz$TD`Zn$R#%6yfE92R%)1NPoD6f-w|M1U>t^J#X78~etF)VXsJg`NBVTKqh z!{tQ`2~i>pKHW?WnTFq)!?xertx+v8-*54y&XX%Y6vQ9-^}5kcZvS43JHOvCinu=T=p z_!(n`eaF)!@BKNdDqwD-b69jO6WGdZkT-VNb-LD7?@tK$QqQOi_1cd0O!suRTAgXA z^PQB~#`#_H!QFtBhkGYzHk_AM3}z_Z!Sc)0vrSTM3)g|XiuFwI7%TGE?qq+kcc+&f cv(pcTpp*;28=@nPgg&ebxsLQ08%5>{r~^~ diff --git a/Resources/Textures/Structures/Windows/window.rsi/window7.png b/Resources/Textures/Structures/Windows/window.rsi/window7.png index 0e02c2e8de00c8cbba348e75dd3a5b8dbce1d31b..1a2e65fad78efe662cf60742e0d6afd2088f1e6b 100644 GIT binary patch literal 301 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=Up!qLLn`LHogK(~$bf;>T&0m+ zq(MM{$;p9H?!cu21G~6c<%#A0WA&$-W=}7f=QJ&~Q?8)4uJ7cJ-#n|^vw}0-p ziOeY`I9{^be)tM;zp1UGGK?m6&+hv)*nAU!itCLw)Z4C53gQu&X J%Q~loCIB+RX~6&h literal 268 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!G)eKjv*CsZ)Y#$ZEz4cAa^WQx{jql1nxza8-i#ZjF(v4-9*E*<*eb%1t;ulh z(@(h%-|hZSoyTx3hyjNhED|r6zr=&}W6CY<`N)v;l&3B*C{zLHSO!m5KbLh*2~7YR Cu2;wa diff --git a/Resources/Textures/Structures/Windows/window_diagonal.rsi/state0.png b/Resources/Textures/Structures/Windows/window_diagonal.rsi/state0.png index 39ffd5be1fd6a117d57e55f02f9ac0cc33eb5ef5..df5805957d6b0d0b891e10d01cb5a46e4c36e95a 100644 GIT binary patch literal 15988 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 T+&>K!JMPxP$~!+ZV$;QnZ1 delta 659 zcmV;E0&M->e7*&cBYy#eX+uL$Nkc;*aB^>EX>4Tx04R}tkv&MmKpe$iQ$>+VQ9BfI z$WWauh>AE$6^me@v=v%)FuC*#nlvOSE{=k0!NHHks)LKOt`4q(Aou~|>f)s6A|?JW zDYS_3;J6>}?mh0_0Yam~RI_UWP&La)#baVNw<`9$B7iW07=OT^#7sSrUd+IAeBHyx z*Sjds@;>+H=vVS41AHR!9McVpc!PLm)6zNb6NgwyQi#uq#|^q5@gvt|m)|%S9Ts?I z$jGGTi9^ITl3X&m%3$PJKou$^#}EDozq>UHQ{5*!IUL z(6b9P>$d%UY}?Hf!2b+fX>EVC0nC1qUT4l)$$E+a0rYQDSO@H-6Or7z5RQp)!z?k5pttbR*U}t z000JJOGiWi8UPvq8b846fRP~=e*gz`Nliru=L{GUB{Sbi)dTf+E8t>CcOeIJdj10piO!KZJ>=lpsvJloB8C zi64%qvoP`dWsciG4F?btu!aMego*F=*>?k5_-(oR1+?G*W?|wkSI~o-WnV!rZW=Ix zn+1&GCIK2;9Z Date: Fri, 31 May 2024 02:13:45 +0200 Subject: [PATCH 31/44] Glorious Canisters (#406) # Description Changed the Canisters Sprites to a better updated one, no more ugly 2D Flat Canisters! Also update the TG Sprite from Tank Canisters now shiny! ---

Media

![image](https://github.com/Simple-Station/Einstein-Engines/assets/45297731/559aaa68-d430-412b-a44d-7236f4874832) ![image](https://github.com/Simple-Station/Einstein-Engines/assets/45297731/2e7732ce-d8d5-48c8-988e-ada0d9bb7048)

--- # Changelog :cl: - tweak: Resprited gas canisters - tweak: Resprited gas tanks --------- Co-authored-by: VMSolidus --- .../Objects/Tanks/anesthetic.rsi/icon.png | Bin 632 -> 942 bytes .../Objects/Tanks/emergency.rsi/icon.png | Bin 459 -> 678 bytes .../Objects/Tanks/emergency_double.rsi/icon.png | Bin 664 -> 887 bytes .../Tanks/emergency_double_red.rsi/icon.png | Bin 648 -> 930 bytes .../Tanks/emergency_extended.rsi/icon.png | Bin 463 -> 693 bytes .../Tanks/emergency_extended_red.rsi/icon.png | Bin 482 -> 852 bytes .../Objects/Tanks/emergency_red.rsi/icon.png | Bin 473 -> 609 bytes .../Objects/Tanks/emergency_yellow.rsi/icon.png | Bin 463 -> 722 bytes .../Textures/Objects/Tanks/generic.rsi/icon.png | Bin 623 -> 844 bytes .../Textures/Objects/Tanks/oxygen.rsi/icon.png | Bin 651 -> 851 bytes .../Textures/Objects/Tanks/plasma.rsi/icon.png | Bin 482 -> 513 bytes .../Textures/Objects/Tanks/red.rsi/icon.png | Bin 619 -> 853 bytes .../Structures/Storage/canister.rsi/black-1.png | Bin 705 -> 329 bytes .../Structures/Storage/canister.rsi/black.png | Bin 497 -> 340 bytes .../Structures/Storage/canister.rsi/blue-1.png | Bin 819 -> 377 bytes .../Structures/Storage/canister.rsi/blue.png | Bin 541 -> 394 bytes .../Storage/canister.rsi/can-connector.png | Bin 306 -> 269 bytes .../Structures/Storage/canister.rsi/can-o0.png | Bin 103 -> 206 bytes .../Structures/Storage/canister.rsi/can-o1.png | Bin 96 -> 114 bytes .../Structures/Storage/canister.rsi/can-o2.png | Bin 99 -> 112 bytes .../Structures/Storage/canister.rsi/can-o3.png | Bin 99 -> 114 bytes .../Structures/Storage/canister.rsi/can-oa1.png | Bin 186 -> 144 bytes .../Storage/canister.rsi/can-open.png | Bin 127 -> 143 bytes .../Storage/canister.rsi/darkblue-1.png | Bin 753 -> 377 bytes .../Storage/canister.rsi/darkblue.png | Bin 478 -> 491 bytes .../Storage/canister.rsi/frezon-1.png | Bin 481 -> 377 bytes .../Structures/Storage/canister.rsi/frezon.png | Bin 453 -> 394 bytes .../Structures/Storage/canister.rsi/grey-1.png | Bin 890 -> 324 bytes .../Structures/Storage/canister.rsi/grey.png | Bin 615 -> 341 bytes .../Structures/Storage/canister.rsi/meta.json | 2 +- .../Storage/canister.rsi/orange-1.png | Bin 781 -> 351 bytes .../Structures/Storage/canister.rsi/orange.png | Bin 478 -> 359 bytes .../Structures/Storage/canister.rsi/red-1.png | Bin 729 -> 352 bytes .../Structures/Storage/canister.rsi/red.png | Bin 515 -> 358 bytes .../Structures/Storage/canister.rsi/redws-1.png | Bin 834 -> 378 bytes .../Structures/Storage/canister.rsi/redws.png | Bin 607 -> 403 bytes .../Storage/canister.rsi/water_vapor-1.png | Bin 705 -> 329 bytes .../Storage/canister.rsi/water_vapor.png | Bin 612 -> 483 bytes .../Storage/canister.rsi/yellow-1.png | Bin 707 -> 367 bytes .../Structures/Storage/canister.rsi/yellow.png | Bin 606 -> 386 bytes 40 files changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Textures/Objects/Tanks/anesthetic.rsi/icon.png b/Resources/Textures/Objects/Tanks/anesthetic.rsi/icon.png index 027abc289fe525f233da102411a255b12d97e14e..3ef540f37f7d4def3bd557b9bea0eec9d9b863b8 100644 GIT binary patch delta 921 zcmV;K17`gA1g-~=BYyw^b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi z!~g&e!~vBn4jTXf14BtfK~z{r?Uh?dlVKRg|I^jhELYPGD_7ID>EKD{|cFGI#0jgWmuAeX?|M63Ij~HP%BSnG`X^s00|6S6?}c^mI9U^3|mq*_zdAi5emy3eBgbX|reZ zVsQ$ek)h%#On=3${p@xs7lsiEW!yZsM& zZb1&4M5)8#=dIZT69&`;>fYXNcImg`TKXD*}B*5hDN8t`7;+IK0Oh03k=Fq zzH3i07B5@?!9)>S8ceYE_QL$-8+&T6Cm`3VV7OczRZhfIfhT1}yj%p0Z8s1970ybZlu}j@!^yS-Re|Wzd2aRIfosY za}_Yw+!?W)7||vq`82T*c{}&Q>G8r9=(&E09ZAQ{Ozv`WP|T5|)_6B2IT5u2)N?Ak zZ0k;Z{oap(8<&wHOhVf;8DtZj@V$~iSR}>$dw-8(mJ<;J(2>fQwu z-+v)xrV@Qt8zxUlh0o_>hfKeUhodPO>Dmu4z0}}@<5EI$BJ5j09~Ii+t*_hB+0o7B ze*XZZ2Xts{RNn00000NkvXXu0mjfEB&&q delta 608 zcmV-m0-yb^2lxb#BYy%vNkl3^j$3VfRFn0AKR0>MQLO@GUtT4zZ zUQ9#l5DQ~B$J{{}3<^DY9V2Xq4R;cUksf63B&@Vh7!$e*g|+h_$XJ}L$#zus@6?dm zHfhr6sqZoQljr%~{2>AQ>F0_f@Ej3%jySEOuL^4Db%e(!;D03Hn}EP`B(a!;q1Pes z90@Q%6!SSSw{F`?_#z2S7mg@(4g(nu1*pgMmE$~vQWUdJ?LF7Mw zp#Y#~e!!Oc(X9P4+}cK`v>0^@e{m;-S6@#M$)wHWR=6ZdScu&> zr}s@DH8VvNW)Kzn1^{4Rzd$6D_5^n=(3re>{Ilt}@_*aF-G!uUIN)Lrbb{~e7Z{_5 zaG-92Wm#8npvwkgqDbCsY~Wqu0ak`dQ~iys3=`b@p}T?uT{O^u*J?FHGHJa0Lm~X{ zya^s<20Xz5hX$;0Yu-Lz!x%ke!dFjzd4k&tbb>c_`+>R%g&Fibc_VEfffF16*57A) zhIbTb2U+y`o;$_yTVMqP@bs$LrELSddwbNwR0@(LwZNY}ec~J3F)>jjnx+v=(@3FE u=;|laZ5$_wi6YU@P66QhChw=8>&$=79vnEQBv~N<0000Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi z!~g&e!~vBn4jTXf0y{}WK~z{r?UYYQ6j2< zAUXtIq=To5q9E{Q2kTID5TT$z`sW5gU80C0Fd?Y*&qlWGnt!-i+BTLpv%Bu@O!Ir} zNI@}gcRkJr9`6nF=6$~J_htq*Ha0dZNmW&iPAzxIMM!d8Epy5co>n;9k#a9 zS;pQCS)To;E8ioiFy*VyK4o&}%K+wHzk{Q6Eo$3#Lw^ZPF3Sn3#Q)?(UI84v2sK{} zV9oJIICADBHuxl@rDK@7+YQg2R)jC#L}Yw`yQ&2D_bc=o;&--1zS z>JQZH^y7KgUbfrZbZ)pRV9NK48d7sIo&?jZ>?C*j8xX!aSdg5se8|_)tCt9sa7!Yx zNflZu0e?9(1ud}v_pW9{`yU`O(pQk2u&lu1XpHr8^7Hbnbw7bPdG zk07g}wpC(7dF&%H^E0S!67lJJ0Fkj9Mac=S1vWQ!>UAeNkpB7IsKPvA_a6WCsTBkF pA{4^-%K%z(#pE_NHZ}n88#Ao*mK2#0NdN!<00>D%PDHLkV1m+6 delta 434 zcmV;j0Zsm<1ZYxTxTsW$#plu(=nx7uTNcrw zsNhsb>EfSok`6^dCntptE~0}V(m_xQ(ibQ?h>NH+35tUqKBpEGTap^LoGIjWPPmtV zi;IhkgDA2j6j>5>o@sMZY8pCYlT+A<_)~x)OJZSZ5!297WPeF?`}~||&+zs3S&nEq zK#?U8n^DEnZhVLp7YFqqqw|Pbv3PTt99$0$Ty9mJoC6r|e~p_?%d# zG9KnBo}zz034k}3YC7-Vuza(sC4{!N!Di|4+xgm;w<5P3plS&*Howa8hu2X#SQvq- zCB*w+^k3wb0s!Rcsc%c>l-zPaATV4PJ1Ga7J8*HCcPms57Jo!1hdUlXcwepo9Fx1a cxVQj(0g%16%!>5-C;$Ke07*qoM6N<$f-q3U@&Et; diff --git a/Resources/Textures/Objects/Tanks/emergency_double.rsi/icon.png b/Resources/Textures/Objects/Tanks/emergency_double.rsi/icon.png index 78f1677a2b43a3dd8afcca502b08ca196f3906d7..7a604ad671d17361796f8c44cd457dc55bbccb96 100644 GIT binary patch delta 865 zcmV-n1D^bt1@{J!BYyw^b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi z!~g&e!~vBn4jTXf0}M$-K~z{r?Ur3glTjGQ|GLd=lMJU$r)jCHX%<_}zD%T~Ez1N+ zi3AfX=pv}Bh#-QDE@}`&f-ow&3Cu9Es2N&jla^nliHWvy=6}W1MZ?cEoqF=TZX)D# z>UP!s@ba8@d(Zj(pXWU9+2D~!|Gm6yaaocWRQ|RhnuVtZ0s;htj!mXMm#japrr>M% z5fOwN#3wXTGrqn&vSa5yVmIP8+2PyL4w1lE5lP6(U`*s3KTD{I@bDP-nXto;oV!4R zWE*MbjEU_jsecTVR={m0XqoMq+u=0Qd%6{~%kLHwRhPx2T6>tu*bb+apzxQcMGTB? z!)z0ddScOCO5wo=qTwgW#gAb#GUNpiuZ>4*ofaP+CBSN#fU%+rnGX!i^A^hp!=NU( zT)%(b3~yU>N_KdNG!HNi!cd?@iE(cuaPo+ekpRM`nO#|!+uk!X8o#HF?Y*PH_sK4|_!Xa%$- zDWo_%hE&~4CSPlBldkXgNk>CE(OivX_PAAZkSOC;JKb;#R)E44=}F9(t0;o5MmH!lUTJo0+sn6QQkAOsIogWK;eRP5%}U`7#h`KSp5{{&_u+` zwm|PKLDQ8&@FuOWjuQC9g+hDd(~|bwp@F>Qpnq#49VQ0eqt+ut9tl#bhJJkA)VE$} z=Wc?zq8!5g(fC~WWyuXU=Op`q@wQlsUUesUTf-pDxd=m}3eR)jqciCYI2@m;YXw>w z>+z|P8UcR+zL|B*&9o1t00000NkvXXu0mjfWD1$K delta 640 zcmV-`0)PGY2ABnqBYy&4NklGnDA=3d9_m~a z^m?6lZ}$iH;c)Kx{{QoR-#G^`F)=v@LIFR80)Eo-?*$_SIe(9fE?aE?fc(y`oH+w*=SsbXKO1w9a%*5?CSI;oEr$pDnwdD00a4&-JLf|-ox#Lp z7|rW1;BMzyAvC;qllq*$BA-~x%USFp`6nJ|1;WBiGF`|w|#70?L4#Lej06>txq^3HtSVbbXiYY#fY&tV=+Pg01 zJT4jwjpOHD85>{T;rsh1ZSzLeTr)tciS?LrE)CZ+Nb8f!FtXcq1>!s|wb2Z_UQJ9) a{&NcY##;FL(&wW90000L#Nq@uu01m_fl`9S#0009wNklAXyxRKss>~(JvAIhC!=-h!KS%N<~3}qG6JV=B-w0IlOFc zDyB^r+NtyTDOQ_vPUz1b_&D$3JLf#ld->k;!3{V5H$2$UC4VRa96%(0vAoY(xe_tmO_9o$zu9v9+nhuF17#7R?&ecSN z^bG0D*APjxjOLsK9#oL*D;yyU0%V^M?MPmUCjEWrSA*}6(JD#{u2eKYJXsj+%GE^rtt~%6hB3aCW#?8 z)KtNX%Ym^!5d5EB(1xi{!aL9IToqy~1zV0lNpU49Funv&a|*L26MD6+h*zv2JU0(Q zu^4GLwYY8&Gi#~H>Ss|XpVvAaVVj`j-zT7lLD{2#u6tuI>>&yj^XC)bphJ zck6lI3OMX&6V$78|2|Asb>nN02l&Hm+;Uz>x<<~F}g-3(bQJAZE^~` zn_p??qPH5oSZdV~FzEciAzVg4xN;h0reK%JDK4LkX#v!#Qm2-b9}$++Q$8;$||0+t|c_ZjN)>;M1&07*qoM6N<$f>}L_)c^nh delta 586 zcmV-Q0=5032Z#lbNq@rt01m?e$8V@)0006VNklJka zg3=TLJvC*pg)mD$et6HIrK<;a2v`9gK(PZrmS<#VgV_QiVqm_!iaNvb!w129LXKdB z(qsXcWgp(WVsLVHVOYO*H3N(fvi#wln{fW&Q)jT+MRo|le18ry{PTuXu;nm5%<@aO z?lOXCd?7(r2*d`s|DUQT#o&GPGKSB6cmx@?e0dMH6y|e~V=Zm%8LnNvgb@-XhXBm- zTMu7=EkpJ>i0>@G0;WNHP+|lDP)LB%1U5jD13;Gd%v=PveD8-p3|IJ=7>;<`F)UxY z3~o6t0CEJjbbmm!17Mav&P;$?4hxBX8Bs7F1VC~y0J0Ry#0iLU0L=1|^f$K>%kIfGpSf1b+!q5Dl{&6cQjB7TlCr4gz@7 zK&HM7JkCKr2Kl_HtsU%$p!f`i!Y8l6>d3Vm1h6^)RBAnV_Lkv$MF-e&SV+Je;o;-U zFmLv3hREnBiYx~KoFM?J%|d*=!E9JafB?u5eeJCbp6)K-{7;GHAb?Xda`Cxl^Hzoh zkugvi2t%OM=P-cR0Axpi3L8oj95z7E5acQs2B>8@2oPlu$PrK`QN`;h7zLw%c)-8_ Y072YB(?5M#LI3~&07*qoM6N<$f*X7LNdN!< diff --git a/Resources/Textures/Objects/Tanks/emergency_extended.rsi/icon.png b/Resources/Textures/Objects/Tanks/emergency_extended.rsi/icon.png index ab8bebedb66473deecf4ae8c20de54aeb8e32b0b..2b73dad0b5be0cae15e34c9ab79116922f58a845 100644 GIT binary patch delta 670 zcmV;P0%85n1GNQ^BYyw^b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi z!~g&e!~vBn4jTXf0!m3lK~z{r?Uc)F6Hye0f3YAggy0BHOF)Csaw12cAH8!nGo5$E{u5&KQ zP*5_HNfsjW!Ei`s?)}a^=gh#u!s5T9p+RJH6@Kcnt`I9?Z`UDBn$4!sw!MQV!f)zO zaRMZ74YqSJNd>`$H__)1gnC0sRFnY8{kuDG@6L62JYJqeU;hbJ?m{XxXE+H{>`aV! zJ#Ed*>D$75p??r>LHKNd$6`wy4kweOmXb4JssbcegSaBt(E8#ca=A2apW28GT|V4A z?&d9^YA8y^MwKWv6ShJ$Oi`XVb~W1c;55{T%Li)_=n)~0O=Cr2SpC89F8mGWK78l< zQzfV^i;KxWd}URjD32c);&S`o6AbUG!EmHelh^I=s(R z^d4carbbvS+{@@cD)G~6``J*tyR4xrD=QMYyZzYKGk{D=hCF>2$p)7lP6=hH2F`l5tCP9Wy=Xe3ySjK(KDEzieowcQ0qC#-`;qy_FOjA zW8Fn-<$p61ACZ}R1SJ|rM$W??5c$c?%88N-Nluaa?r^V%Je$MP_$-zdeqmF$gz-zS zE0Pl>XJF!ff}eE$@fRraDi$I$TrM5PdcLRIu?QV_{+x{q-0 z-Q7P2L4pMNZ_zbX=$a~Izi;*%>N++(y?w|^coxt#Rg7dtaeo~fT~kFUtZ;I4NVvU2 zO2U(XuBl>RFvZH!5?zrf00V<50E)MHDGARfu(P#ES0sw_RAMTvaFE?6t|tkF6)6c% z0$84n9ujdT_ zsLRYU4Y9a3$J_aE&3I+!vl})?r)PDoDP4q(fP>@-Sf(MCXIgnFUHJ-^60l4|EKC$W zjr#$IAFjYM4UtK_H4Ofv06@ZMtNFeBgoDI8@Y*>IOfS|*_yvbLYQXQEOAAya?jOnk gzQTh93GyfM4%4>HHU-pp-2eap07*qoM6N<$g0{TSWdHyG diff --git a/Resources/Textures/Objects/Tanks/emergency_extended_red.rsi/icon.png b/Resources/Textures/Objects/Tanks/emergency_extended_red.rsi/icon.png index 8ea77e5c6c0726859e53976593c36d3f5aef2054..67d4bb4eb67c07c0fd2dccb25f8f7b27668f3590 100644 GIT binary patch delta 792 zcmV+z1LyqW1JnkPNq@uu01m_fl`9S#0008%Nkl7 zEf|nZ08JM6PmxW2o7&uNH(L_QFgy66Gdy$)4z)pU)FJq5QITFCGcWYb?ET8sHdd0*TsRYPWq{y;p!H-baQOI%K>B&y zva4{YoJWtY0e^!7FIhII9F&Q0J)sCj*$Tm}7rHEkuWw@cSSNaYCY03wg2%s$`6-UA zyS6;WqT9W#piGdNjg3{28!lp_egSNmmmZW zoH#6e)~ta_NM*xVyUo5uQcM{bD7h%)pK_sXNrkufZhv6&(L=ZcXS^I4`9S;2LdCF>Twd4m^L=Pv)G7t$)^(JX6?RfvGDk?ZB>K^E5 z@B9ls+x-MvZm$UUr0gKuXp;peMYWLNckj32W5s3hn(-bV_!*rD&o?;mVb~-KPErP= zqzHcc+xwbby#sCL7K3LOJ1}aljR{VYG!SYyx?Y@?hqZ44e2oEqCy%8-!`saQN-Gy(9!AX+WkbX?4yBB9O#D?2eZlR_5d&1x($xZI4uL~!SPQo^K z0J{o5l!6L5`b`Xv*2Gowy^6RInP_U90GFnM%j=K3;lgR(&B#RXG2!r}lKKw>`~fOv WauEzvIQ(}20000Y5QgX0*r=F`h?QU? zM8ppS5fp-AEd2v&WhIir&i|3(z|KEmVK?%h7KvqJ`h;op&2m~Y^bp)W#?vG^{1bzf+5dWPqC(SL{72|%>5waH?DpzH$ zidrjPTy}KDssIFwndO!|YbSVA^78GSg-Uq!MC1gpp(yOLOvyWeB+wJxh;#*zqwz|o z$29d;r|UsMdw)XEiTlaxxQ1>e|4HZswpW%Kj@?H))WdRh@_fC{aTqxWm4K30M6aA_ z66NHIz#spH90Y1Y$n$e)?Q-Dz6Xdy}q>S3=kOR*OKt3V*Wzl~CD42C}d(HGBX(gl5uOg;br N002ovPDHLkV1nVv$9n(( diff --git a/Resources/Textures/Objects/Tanks/emergency_red.rsi/icon.png b/Resources/Textures/Objects/Tanks/emergency_red.rsi/icon.png index 4fd5f559aca45824e7394d1f5e2c2792d65df4ad..cf68a7c1c7f9e4807f531c343bd8a79e352f12fc 100644 GIT binary patch delta 547 zcmV+;0^I%C1K|XaNq@uu01m_fl`9S#0005@NkljObZ(kVH)b+p)0ZS4AC~^SEa#c+&u*D!txwv>3E}TEcz{SN&v?IuN z0LXF$Q$2>&%jN(ryZ_z)|w!$5%#B zbP!4tj8K{=0JHpA(A4u%>#`YuG(+znZ3Z*77YvtA@G|^i{LS!}@ejk*mx>H+pJ##1 z289GDTHd{TiGS5DqC)^?`4fjOu;pw;yTO)EWqreN{kRYV%YRk|CH+q*mV*E&Byd?y zGT5LP{C{V0z<+a3-~X@9Zu@^T%JDx)3>3ttf~@~n@urcS=!kY1$RbV4cMNKUl?-1# zeq^{eYcj+A)1qKGDZ>{GcH1t1eG3*K0T2}h_$(LJeSgZZVYfC}mV*F6O(4rbiA&Dl zEdx6XGsCAJzZhO#5d+6L$nx#`^-$uRR6sBUPQ4KZr|w4=gyEKh_`F(=DYhI0h>8MH zjkgTnm_IW-y2cBpxs_fr>^)>avE?8@lmVdBZDMu`%>MK5AH#(+7F4ku1c){SIg3%t l@=-7fMjXK?U|?Wi000kI<=cB-sSyAG002ovPDHLkV1gAI^!)$; delta 410 zcmV;L0cHN-1la?SNq@rt01m?e$8V@)0004QNkl#I1-R zRs{t?1chR0-Rv&vQU$n^ zDUJ}Ul!Hh!aCFn;wJJG~J_JS7JMWyUl4~>?4H3}?ffJ~|!AAhpumAu607*qoM6N<$ Ef+*~_!TPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi z!~g&e!~vBn4jTXf0%u7?K~z{r?UYMs6Hyd~|D>_hBvxsId9;P7O>2TQB8m?vidBNB zrHF#~prS|@bz>LRjbJw}BJRvW5Z#CiZC!|n&nQ}~QQHV=7Jq`4+7OL~SaI@bGVz*o zO^UISOdbo7`CvH7T;_f!=f4@q$jJP6)Ya)3U74>1QD$mctXaExMjDL@XlZTZjqt?+ zl-&TyEmj*BlT@wN;-&Wq)arSXnkcIQlABkx;p*k{(CLi4iLG6`({e3Bp^uWAD2e5P zb4Fdu5~gV~uzx1IokuWqu$k9vBsDb}*4X&#Ugoh`lr#a7r;9$JR>0yJKrAM}b=U-> z!;Fi&YIy`Sjd(nwph@IA6N*fgOjaJ);qscU^&(y2+N45jhXG%1y@!}!5R(jV+(GpF zzVZEO5)?}~9GvAVY64lge}j|DtNZS9`I-Cmm~xL}PJgum^&RFMIYE>7o4h3UcRAQ? z?_Rcg%Xaqc)mir9hJ!siVdXi~XQyp`QHQRmuKJETS2+0AE!zrf%Lr!!`>%r^iZ`6L}vb zxxUkaX+cCHl7hScDL%LNLXn(?GX5Q-lVRL@JXo@v$U6aRD0xzwN`TdBAb2LRaFG^* z`yt{wOGV^F!9%E8YD8?zKl6gI?Xy-)P88gP{xsJsj@Ti_Q|apme3yJ>W&S6UHv0YL hQc1atjLbg(@Dmzw6;CRKpVj~X002ovPDHLkV1fizPh|iA delta 438 zcmV;n0ZIPS1PdcLRIu?QV_{+x{q-0 z-Q7P2L4pMNZ_zbX=$a~Izi;*%>N++(y?w|^coxt#Rg7dtaeo~fT~kFUtZ;I4NVvU2 zO2U(XuBl>RFvZH!5?zrf00V<50E)MHDGARfu(P#ES0sw_RAMTvaFE?6t|tkF6)6c% z0$84n9ujdT_ zsLRYU4Y9a3$J_aE&3I+!vl})?r)PDoDP4q(fP>@-Sf(MCXIgnFUHJ-^60l4|EKC$W zjr#$IAFjYM4UtK_H4Ofv06@ZMtNFeBgoDI8@Y*>IOfS|*_yvbLYQXQEOAAya?jOnk gzQTh93GyfM4%4>HHU-pp-2eap07*qoM6N<$g6LY%f&c&j diff --git a/Resources/Textures/Objects/Tanks/generic.rsi/icon.png b/Resources/Textures/Objects/Tanks/generic.rsi/icon.png index 0202db50aad41fa2ef23b84e3f35f753014a65b4..1074a9dffa8ec992d0cd00c572640d02c852a57d 100644 GIT binary patch delta 822 zcmV-61IhgF1k47IBYyw^b5ch_0Itp)=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi z!~g&e!~vBn4jTXf0^vzSK~z{r?Uh|fQ(+j#|FhJ&X@nn)`H@QQ!5@xJRQNyh$IC^NjPxu_^Q>#3WTH(qT4zfI^WW8bXo)A^GF`caWW}W|cQIwXivd!yYxnmZ+G&rOwvw=H+rF zpPygCQ<$dHXMfps>-j5eNkVhsLTsr6Bo_u1$9Z6EIw7=w5n6*5mDPJu-*6JIp7*nE z&~i{G!tIH;0|ez|^QUf@G#{_w>zE03tt}`k*R%QU$;miedz9@1+7~{bM@Hv=BMXi( zu|__U`}7i0I!2%`C`PqL563`{5IUhb)c=YlQ-ujS%8QEgHZ3PM z-GPqwE`PqLG>ggYb91mQeBU6~8%ogE`*728Vq0(&h2&SSU&h_uez=8qofBkI$cd-{ zNM6@?2G3>{zz?&Q0*dntwM78z&K}ISXo(? zL{3Cp0&068;KzjJGwgQf>bJeV`IuyKBH}}+3ul@eF>ba%u23*J{mtI%c_5jb5PeW6 zgfBcTjqQUcj|Sp;)x?PUFbWYom0X@6!G8eo8*bp9jDR^2D*ylh07*qoM6N<$g8ik6 A?f?J) delta 599 zcmV-d0;v7W2JZxrBYy%mNkl1t|gX1MZTyE%6C>*4>gg}R*;o9Bh zkD(2SlS2k$A{48GlRBw%2snyUB`F!*4nqO~aY+gX77Hq5P(qT!(cyP72T9E3l3Y9G zo$fyF?s>lNKmI#dWtB^ckxWP z5~W$M5xH^GQz8%nBbkuq?jCPSCDu1K30;q3?(PBb{p%M`iNGdMJuS1ov5E8h54SV7 zsGgSDHg-@VQBR3L1e`&iZDWT)_ZNj?4uE_23)p9EwD^`Q@xOOsX#pddkZT_gvCrBR zkDdUaswx1PJAZd+)@wL}KJD|1P_tf}xc}O+@crxoCz%R`e{g_Kr{f+gktp>~pF;rc z^NY~1cVSWm&h#;)r+j~^C%!+(7X2q9#tRHD^tp(sjVa9;vL zI6yj`#G#c)?s;UdaJq3giGMmlfI1ZYojYycLNw3#K zRaIWSc(yPcrtAYk2$@Qy+$|MAQ4|`D2BvAcwWH#LrQqN(0Zr3J*4eggVzC&OWd#NY zk8eRZ98d-(cei*v9vB>^OrTP!gpQAo(RF>K9>ki@6(NMQEK6FJC9Bn{ub<3$GqV#R lg#7vA8^G0dzRD_BnZH8}4{Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi z!~g&e!~vBn4jTXf0_aIZK~z{r?Uh|fQ(+j#|5M!7+0t|yb8e|IwfxA8(DWkGDEhF% zqKmrdrmG+_(wpeYF1qo~AW#TGqL30Xk-VrVkODK&QCOmaXn(G3n{&D^H|J^3+vbJt z!)+(%Vm}z~&d%BU`@hd~-gA&7$-g2iOU=_Ka2S@9z$ggSH77QtPNyA3d&^l6b}|ft z1t580aS0QXl;h+W8~q55+Zi#0AOV8%7tbC+snoEQ*Ed{d=gj7xQ9~p|g|S1UEYkB* zsf^d@3izt3V}E?vg=Thq_1Z1glHj>eArh(p$^C=c<#M3B;k3W}D{$r4AhWCx1*fm$ z)ypnc4QdBfBGf%03XCxmlp8NT9L?#ufgiQ4(4A|BLaTw#WrxM^9lY0#seyKOz1!^& zQ6(tM;^M-FH?9Di<>IE-@Rrs?lV6He(>%;yronq$EPsG=as|_)55jt4Zb4A)U-1_C znqwJDGs{R3a}bGlKyhH--#j=^_c)>rO?PJ|3Va(^1r_vqlUn&7pWktXqCpz|}6d%der z$ei$fo50A>AWg+#YU~#>BsTv}aO2HjcS3R^ z?4wvwqGdfcjeLc5Y5_jG1?vtgR7Z2+TJ{JcC&EsmKiJ6czEsKHYN9kLd$Gu}IhY0) z5;p4jW+F~RA#%=^z~^@Qx139GIT3X-3K94!xI9Uc{{Y|*`h}J&tuOcr00000NkvXX Hu0mjf`LT;r delta 627 zcmV-(0*w9B28#udBYy%?Nkl{%zzZ2&FwLjutgxB%Q7GZ$o=@nm+%|_uAv#yyD576y@tebGtsbs zBnn!~>szFEQ-6GoECF!P=L4YNyUu1}gM2Pa>itK@W@6)?_Z^MG$0sLv@_g0UIl$?? zZR6UxJx3z>rXr{A24qFmF5P)$3b&HF8juxLQ*Pep;oj%6^}pfOc3+o(tf*S=3@rs;g$ttMb#cZn&s)U7$dI2 zv2fAvtr-p$W+gHxPaiqs8<3Ju7LsvUL&jQh1CC!*iW{9@c# zyQ(S;!)z-GK=E8lhb+03;;wo^2RzD$vz+9w<(FsmOkC$~JgKftT?` zNBr&$!egPb^@Bd2Ewz`%^h5ez0L3}58(vjFm-zL42f%iCGtK-L`2*RN3UI@X4}Aat N002ovPDHLkV1m~)IY0ma diff --git a/Resources/Textures/Objects/Tanks/plasma.rsi/icon.png b/Resources/Textures/Objects/Tanks/plasma.rsi/icon.png index a7fdcf8f676acd409535449890051e28d97434da..2eb105e1cc10d9e0135aceee7774669e1e1f8ad1 100644 GIT binary patch delta 488 zcmV-t?hrN;MLDU5~v* zI6<*uUiFKYmxYH4;6m&IN#r*dSl;q=M3kV)aV`rF6=4XHfYC1{N?_aZ%uzrU9w`te zfpGDbV~hij6$q4Y?}R9!a^}hcaS}=3(gINuN#IHXK@xT=8C+RFlt>C6OJGvqL;{nH eR3H_Yy1);^k4H_V^-Yfe00001wvv+)FN5J4z*VNmN4RQwr8DMByM zF6u%&fCumZrHi`IBa~91h+vOUwM4`s3PsZB0o)WF7bQhwn@rM;i@d84X7W7qecuG4 zM2RwC3?ZZ;gbcfXW>Wax&K7U>JAk}sG-5%&5qQH-`1|}ESj~BvV?N4hH&$7@Ip_KDb3-AJ29VP=t;@J!=C3%C<%;$UsYe& z-d`LGccLdHnSW-QaW}-b1%B}3?iyNua0BWaH^1O2@f0wG@IAQ~-0$=NQ(kZ_5g$yp zo*G+r2cBuB1H-{%1`HwO;ru<-&rJ?zFR{L6eS3b~UE^foRvGSDfr~~XR(@S(fBKqo ze-~}4KXTpAvIm8G3XGC4YaR6L(hwS^=k6#ibhks#EPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi z!~g&e!~vBn4jTXf0_sUbK~z{r?UY?eQ(+j#|J!7&O{LA%oQxuKhKgn?nn}?`Q4xe# z7hTjvL3I%l+Erad(8q;05#)tt7nMm+h!=fO*#}mVvs$1@pns8uY16Yab56Ipv(uiJ zZIJE5eFRYB|tohLEAy$NlLr7)EJgj?`pY%mjUsT(K0o7j4%(;=Zs zP#B)K1if(uSSpt{KEn~K3N`9)KDmG~vla_72V47v(|_Tj?M_%v%q=zu^q577HeBUH?mNDCY6td2v)Z5mSI<%L$o(j!I)glek+w0K>6*%-U=r<+?%+ zk6)H7TYpY0Yaz+cU#iE8qC=nxxIDria<|lpoPrrVd9^VnIT7_MAo;F+Td^=>!=^_U zF!;{*ef#AkrlHQ`;*t{)TR=UhvQIXf@grXYwNehgd_B6a%wko#%_nyuE00Id+w!>N zMA!g<14rdnW!qtEA7*mTyaS`Fz2JHQWAO;y^nX^wEhj<-AUVyM`Z-o^`n4*wcJy51 zF}l(PiPrGI4YGcHD9z--+%kgxDHpn5 z-%m(Rggu1D3hJ>F;{zI4hP1&?ZA*1OOjd7Fw-i;`r2uj z`Z%f*>iJS4ZbTs}tNNfwOM}znNxGbfx*3J=UnX6iBE^3I@EZ*%intP!sz(3-002ov JPDHLkV1gMgdgA~9 delta 595 zcmV-Z0<8Vj2I~ZnBYy%iNkl9l{rSK!!<b3D!E7#k1bIOAnDJ_o@5-j1n+Z4Ioxddb*$klN2C zH(jmI)9MT!*=s6ci$G1UGOf;_|MkJ5IL zM}biQ;&Myk)_=Ly9MtqG#of=2jl%k|=N*H>6R9N6^KaWb2Y9C+w69UR72Dtd&Q4z( zT)GHbFvI*8`2$Ki4>0FXWB&jE002ovPDHLkV1iBEDiZ(z diff --git a/Resources/Textures/Structures/Storage/canister.rsi/black-1.png b/Resources/Textures/Structures/Storage/canister.rsi/black-1.png index 791f22c9585e4edbb8f317ed5056af0c0401aa54..2f7fc54a31d9ae8803959f49eb998bd39f8d1e00 100644 GIT binary patch delta 314 zcmV-A0mc5o1<3-C7=Hu<0001iRAQZFw! zV_;zO^Yh5a&w6xpfRp$l00001bW%=J06^y0W&i*H)=5M`R49?%(7|rPFboFZgg0=5 zIKyBm$2M+LwCf}upjFtq(;BPUc3daK8}I^1+;`wTNehVV6@TWNzk~hTjQ#V1DVqVn zz0V#-QC`wbIIi8I>KXu%g76^l(>;GkL9_$cBp#X-?u)rKg>gSTVO)fEpw&+ozqA)r~1rQ#`0OuHK547=H)`0001UdV2H#00M|fL_t(|ob8r9OY2Y=$A7U&O#;neYbj1j zpYP*Xu-4l#02$yyW=!7?_S--@K+Q zz6uWy4@$&r{LRhHG_h%NdV0DrS7Hw|8V!UH35So54-CV=bzJ~l*JUsmP$(3r*Xx-{ zd%Yf&N@b~LQk$^RXsF*p2wd02Fs4t{!NCExZ7)pv`+rvvu$B_AG0$*+f6s6@RAW3m zJjAwbgb?bO$DhCbxwan#=*b<&!M1I#uC6GRN?4YK5JF8T>vl;>r4sM&@2d-t$RZ~v zCje}1Z6!qN=UJM~Ce3D(ZnwLrp$Y9k! bBy0Wwoo@~i%npX!00000NkvXXu0mjfczRWM diff --git a/Resources/Textures/Structures/Storage/canister.rsi/black.png b/Resources/Textures/Structures/Storage/canister.rsi/black.png index c7c4d4732e82d702e4862bd8a5add4555682ab4e..2b07b2b087de424e2cdea45a4f36f45737149617 100644 GIT binary patch delta 325 zcmV-L0lNP21JnYL7=Hu<0001iRARwHz?PJU?_ z?)BB$&-t6-(yl#p!w?8#BwQG(NB|f+hPhw74}Hz>MZI%9UNH)DOtS z>MvlbmrQ&b>gp|G%i{m2yt1%VSt5`kI#5&7f_*QI)S+jA;A{Kj+;jZ^{umF`Kq17y z8TfL!kj5qj2_Xih6lZ>Dtw|)v1X#0wf~o?Ez~OKhC`3510DrLCLWbKX1Xc>NEW>`k z55}fx3avE&S_;?-oX_WA`|)^WjYn1>%Q9GNNrNh-$W_2nfSLjh*eL*j=hF!Q(7uen zU!TTj@m`>+DwJhO9_w)nfe<*80|W(@%I>Ww#+QD46#ZA5uYeF@i1{F>fHNNeSZmQV zO^h$fvYg6LDSs7RH%K1vNf=|I@tl2wT?GJED}h@9zy=eB%CK!)HUV}Sx)ew$e|!UY z@&g0~eB)VbA*FJ5D?Hy?<->0)K!@vM;7-RrDK^=gC0dSbXv4G*A`mNnOHU$A#K>z;@?;^Tk$nf^_mZB-DVraKD&00000NkvXX Hu0mjf4|%8c delta 807 zcmV+?1K9le0<#8?8Gi-<0047(dh`GQ0{TfrK~#90?Uq|e6k!;KpUpL=+{m;HI#6v| zLy%eo9jQ$r5u#FT1j(=h5rn#mqNSpuA|j%wo4GIv2^yooo9ZGc(A2qY6OwjwO+b1(e>1F;`y<0|mBmR&q136~+m4424l!8W8Jc050#G zZ8+_3dru#b|F8&;#{FCeZ6v$4*{1(>DGkgaRPJ^09}V>)9v$7vF{vGu|OdBhS0MIlwJBZVM1S5XHvxD z3NYhfQxj705&+I$y^0_RsK;i(NCYwj#FN8uG3(ZEfV#gxZc+j!jb~_WZf4-s7XUJ| zT`VstA%8Dxnn5a_97a7>U>oae^d&_;p@2{@h*Z7?<^B`q&L3?$BN0^ZJjk4?jU$n` zIPuI|ZA{_<8UoawjyS{O!m(Taa%f1KWC)0--@u;|)6Hti*RG|<{||+me8z|{x8&cyBCKq?!t24OD7_JmAK1f*OV{E>=+&n198c_M^Q_Jd l_aGSaP$-nrpN}-`@DH^J93Q-lhco~H002ovPDHLkV1iX-g0=tv diff --git a/Resources/Textures/Structures/Storage/canister.rsi/blue.png b/Resources/Textures/Structures/Storage/canister.rsi/blue.png index 412994d96c8a01d3cbb4ccd96d80e4157008154f..c39f1ff26e9569c5932254727626659431ec0127 100644 GIT binary patch delta 379 zcmV->0fhdY1d0QY7=Hu<0001iRAmVo_wl8G+Ks z4s~)-)@3!hB^QFnm2G+PN2ykq7T8l!+z|lp{Uni+mRHXJ@ow{b3tz!)mYp}(07JT) z5%mV#p(9eV&~(D7>M#z~uUW)xbidsWIso`%dJI_`a46wYa+a9K%qUBQs7bN_pqp4c zGyv`+8=)o_W`-BweMJMCc87}40D3#j_=f*@Rq005>I1<09F*#RpaY?{*LrBtB<&b< ZJpY16O<2m#t&IQx002ovPDHLkV1n6(uTcO1 delta 528 zcmV+r0`L8b1Dynr7=H)`0001UdV2H#00HDlL_t(|ob6XVO9Md=eTtQ_3ncylxlNHu zun|()2q%aUkrY>LX&Zv|5p69GgdpJv280M{QVRZpfS&jVVkDiZ&*F0Ho=I+Jl7Nk` zNiIxg-ps03z_LT>`mFfg(kKTlgx=Pn4PXR9j z#1e48Z$bcvwQT^v=SlQ@w;6qk!T{b`4ze{Q`&wUwKpHr~0ZImDj9s@rNIVPedm;mt z9h&+eJp*y`0e?{g5}Hu9hH4C@>l<~0)&m-epdnLDgE%k|>?r^+cM`Z004&giX=C{G z{>3K1SHejNgyT*91^^}I+BRoEZ@hjJ!to#+PX!GcQjrmkm)HZ8onR!;>vj|g{nR>i zGJ5b{x3fHf7^D00+zHS#008yl4Am{a2X4xF0Kh>5cz>?ufoccY!V!Qd1Ebf;smC-$ zG!nRIe;A#ppgJ-+(tpV%$ey;Trl>uP$+pG}=yey4mpIk__4EmKF*2zpK*>O{q7;zg zFotw}k|eXGc$N??gLDGXD*f4r%)pe_GTz06xQvtnuIy&?n}`X-d*MF-;2VOPt|IeG S!e0OY00{s|MNUMnLSTY_r|c{M diff --git a/Resources/Textures/Structures/Storage/canister.rsi/can-connector.png b/Resources/Textures/Structures/Storage/canister.rsi/can-connector.png index 7996e1b26dbe64d980dd740285fb66b53173a8ea..9360a41c58ba355632074d216c2ce7e9c6f61de5 100644 GIT binary patch delta 253 zcmV-7=H)`0001UdV2H#008+(L_t(|ob8pt3WOjOMQ>B&P6#A|zQF(g zn7$yWMFg(0AZO7ePNP#YIV%qYB@fPhPb(l2i9{j+sq0#u)np+9R8<843IN)+P5vGL z0Lrq&x~>4AY#|;YIveQXYA%qZ+QtGvD0bCy+6R#~e%1y>`M4G1h`HI{-fDKdXBfcd7A;epF#Op&uDFq=! pUsvAq+u)pAe;lo@^++Ugl_ymqU5}tdx+4Gp002ovPDHLkV1kDMe8>O* diff --git a/Resources/Textures/Structures/Storage/canister.rsi/can-o0.png b/Resources/Textures/Structures/Storage/canister.rsi/can-o0.png index 5f13bbacae63b8754c7402d03958efa8a4e27c19..89f617973f8bca28041d61e91bb0ff746df11552 100644 GIT binary patch delta 188 zcmYd4$2dWlBSEK+1tvy{F zLp;3Sp54gHpuofIc goQ2~93kQS5w{PMP_cyXc0?lFYboFyt=akR{0E8<(Q2+n{ delta 84 zcmX@dm_9+$kBxzWVbR>W79geP>EaktG3V{Mjl2vBJj@$9{@44(CpeUB)GuISV7NYO li|2NE{W))eDj66K_%r9eW&XcYUUfN$>*?y}vd$@?2>_|D97+HH diff --git a/Resources/Textures/Structures/Storage/canister.rsi/can-o1.png b/Resources/Textures/Structures/Storage/canister.rsi/can-o1.png index 2e548fcaca256ad4f71aa1d235df5e812667be34..6f9566ee13cfef2cfc8ec94125469f1878b8dfcc 100644 GIT binary patch delta 95 zcmYc&njjIy#LU3Jz$Y>(9Y}Eo_=LFr|Np;7M&rJYg+s97M4%vJNswPKgTu2MX+Vy+ vr;B5V#MI=31^NXIhDHfIyjHs#Oc)qCS1??hJV8PcsD#1O)z4*}Q$iB}2E7}R delta 77 zcmXR)m>}W7!N$PAP+V2@1xTrTx;TbZ%z1mpQINragL#A8KihISw(~9yLJW2$nUmvU fiYGEK95}{Y6v_NQXIJV^pcV#CS3j3^P6?0s#LU3Jz$Y>(9Z2y6_=LFr|NsBYOosnw7!+Ie{@Uz24HRcA3GxeOaCmkj u4agDlba4!kn3|j*p>SXu<6J`xMuunS7<0w$#99Jn89ZJ6T-G@yGywo^SskhX delta 80 zcmXR&o*?1P!N$PAP+V2@1xRUmx;TbZ%z1lmBQJvi&tZeb|L@Pf`gh?=4><)5#)QOK kewTe8|Cz(9Y}Eo_=LFr|NmdHRgdAGxVX~Sa-bk%NswPKgTu2MX+Vy+ ur;B5V#MI=31;z<2h9-$Tyj9kXA`A>BZyAEse%6E3GkCiCxvXbIO&;K94zizIIdw>k<-dc7^2_Pu4 z5udnp{v!bn-oTWEiZ2~Ge?z=mQjKL#TyhUoN=Z0yM!9RrvPPgiZU;3aSef}41k=Pj UUrU{>1GLXPh8W&ce*Vz|a_yejG>%1^9%x{{R2q%`Lc~pj2DixWA_-EG*vi**$%rEMrNK zUoeBivm0qZj<%PnS ZU?{rGtZM$1=P*zkgQu&X%Q~loCIE{qC7S>M delta 109 zcmeBYte+r}&cVjOz))OO^#w?|dAc};RLpsMUn`U!_CQ_j zv(P#N^(bZrh99jJ5D?Hy?<->0)K!@vM;7-RrDK^=gC0dSbXv4G*A`mNnOHU$A#K>z;@?;^Tk$nf^_mZB-DVraKD&00000NkvXX Hu0mjfWq+tL delta 740 zcmVMg%<~rpmk< zOJ^jnzepIhWGq`YO_c?D!RCr=_<_W|&|TaYW)n_(>hl_sR&a86A7k)zP}7pN;rKt(>s z<@%>AeEJ4JRgGCCPm@Z+VIf8bz5!oRSBFzKAr%BY2CYM_#P8+D*(daM z9|K@@v`q*Z4#T;LOmYw;I(gLbw2&;3;?>Gtg+wxai3W6TP z`m?DOF+ZMjADsF9fX|EXa0e0$UAf4O(fj#Dl<*vHJW=OaZH)U>I~I$T^yi}tJ^TY_ WMhU6HdbU0Q0000ouZcz2f_HNo zuOFECrj&JCm~7$Ot=pD*Y+SpwswFFXcI?_+jrqPVbsEe5HoHAyI-t1mbRaYT+&jzP zRT({dn6b57$R>UvXTyx5fUM5i(1?a4yKaU<2dABHNo07J5Wz6ZkI$pNF)rfhmdK II;Vst05z?{#{d8T delta 463 zcmV;=0WkjS1KtCW8Gi-<0047(dh`GQ0i{VqK~#90?Uz4F#6T3rKgCL|7cU?gi>(C9 zTtG-=A(A51+(E2^o?$>(WC>dfUcf5^B;o~@wbeQn*^Co6JM+C5u<>hlv&_Et+xK?| z_+#zRC!?emS$=(_Y;yonQtP}B`8PLL6a)<*^4^L7*rSb2Q-7eGhmA%_ZO;4!l&&qkDl^t;HPaSGWu~(Sn4J&=P?@n1?yq*`!nn@2ofiT0IqHS<0FDN* z&AA%^+k&6mL>#mW`XDxRFrmIX`Ywya( zFE2Pmo&WCc?i_T(^YinFwE7_;Ey&2v%G35VP2D;G0004WQchC!S2EGZx^prw85kH?(j9#r85lP9bN@+X1@fZ;d_r6~!-`LxI%U1{ zIfHGKVEu}xPoLJ_{PptXOA!%~w{PEGzkXedf#Ji455)`&oGgs*-n|3riwj|p0Z|Of z%F3@_zm}Gke*gZxprD|-pncV4-+A+9?rKQ3IjK;>`B3JZ?XS3% zj4DAK4u)|}Q>0fhd=1BwHX7=Hu<0001iRAmVo_wl8G+Ks z4s~)-)@3!hB^QFnm2G+PN2ykq7T8l!+z|lp{Uni+mRHXJ@ow{b3tz!)mYp}(07JT) z5%mV#p(9eV&~(D7>M#z~uUW)xbidsWIso`%dJI_`a46wYa+a9K%qUBQs7bN_pqp4c zGyv`+8=)o_W`-BweMJMCc87}40D3#j_=f*@Rq005>I1<09F*#RpaY?{*LrBtB<&b< ZJpY16O<2m#t&IQx002ovPDHLkV1g4U}oXkrghb7(7*O7r?V?XzwL{=c*KENl$ zl{2ik_U13a`W2^6ow|Pg`u+R&8KhLKcRnv>V2BF=Vg?3o0cI<|*RNkcefsqM`}ZF{ ze0clz?aP-h-@SVWG((b!DFH}{mIV0){|AG52n8bT-AZ)9w-&p4wTbV4CrY^g-^F~z zHPP&oPDsYb!;6j{sO)9yeE{S>#ntNKVVMeQrVpIK}ta@gW(^Gq=xN-&mJ<{m?{J78Fw7Lr^5VI;;NP0 zW`?kxu4-QQqTl?IKEV>kYp`@mL62BE_xU4EYdpFQZm-#MScxyiGyW>?hFp1}Dw7b) T`KCcYzcYBc`njxgN@xNA-%7y< diff --git a/Resources/Textures/Structures/Storage/canister.rsi/grey-1.png b/Resources/Textures/Structures/Storage/canister.rsi/grey-1.png index 1782cc29e89c994d272294a0482149c88e96f776..d7bef4b366c90cc62db43143e81611e14e66a9bf 100644 GIT binary patch delta 309 zcmV-50m}aR2E+o87=Hu<0001iRAT^C2QFdTz-K00001bW%=J06^y0W&i*H(Md!>R49?%(7_JDKoADtU2ia1 z?uZAd>{jZg+1=u-33{z9?hTI&g`S0Qh-EO-S&*qC^#~QsE0(!jz~T*BBdS6i zSdpnse?(}sM7&-6bL*0+t%EJ%)j z?AE4GttCwRzAmT*v(cseiB7o>P(O|UpYi(nR+{ z0FopDP%f8sKYypwsoR-M27u7eklxAfajPhTXg1I)#*9E9U|QtYj~@;1R#K^^v6WPc z<1b(MFgdA;p`oFsuTQ7bOiWC0dV1QFM0=D3s3-GAL(mY0`-Z*6a!B5e(r2AWZ; z)v#DB0KC-ec)ecL>-Fl3Zfa@@fM77l+S=Ni`I^>1Hk(D3Wm890Rk^#nqr1Bs0Jq!C z*47rZY-NC7N+o_P7AX`8KPEsE(aP1;70F~$FP_b2>Fet=O;{`z0T>$_YpVm6w;cBO z_gPw6(tq3T^ZA&cpC^$>nELnk_wz3C?#;q&2`H6HY;SJ^P^nb#`Fw0_YyhynzHSg9 zNfO0k5$_*fE-o(G5@31`Xx!Y~=yp#}59M;1SS*Iy?IsqBnZ^_f1r84n+nRs)w*!8^ z-*m8At?G6(8pY{!lFQ|IdU_(4%i(glXpAou3V+Pb&I0Jqw-A4_+5QHsW+D_t(e06u z5t7Ly(P$KaL?Xe_(NUAX-|y%6_!vNcLi56IJ*EZtb{FLHd4quK>ubZd93LMi6bdmj zGo$Ycjp^xW4h{|sc|J@|0;Wf?F5q)MpO0z*kw^rf=`z~e+tU*c3=AMi5{rwA1_6J4 z{b*_s@EW&@A~apcS{EXbi0OH-y1L5A$q4{4@s?7Ll6Y4Rx1ED zn~i$CPNh$wu^TF_y+>mEsB-!5dZ)H002ovPDHLk FV1i)3rLX`1 diff --git a/Resources/Textures/Structures/Storage/canister.rsi/grey.png b/Resources/Textures/Structures/Storage/canister.rsi/grey.png index f7ef5a60f9a279d62c0a97812e38ce805f32648e..6668cd6789b8f7a26c8ef1bb6d718db9ee55ab47 100644 GIT binary patch delta 326 zcmV-M0lEI?1l0nN7=Hu<0001iRAT^V!+i z$jHwpDEkEf0004WQchC4tt|OVY zbG9h^0zM#J1n0C<`2CSqF*(#Xo@`@GQ9KPmtqJm3wD&kN$bXXnI3C_IQ0ZKUJ2(#> z%C8+X+K@3BL;|HuZYl;phH={6GI+1+DVMZmlBsJm(4TWZ$RO2=jZuwutC6N&C%-fd zx9YoX-{((;OSAScHA5hbk#J!sBLQIS80LQQKJ*pC2ldYN_`88nsAJS*x5pe5*;In| z#GsbiUuOn+qdx=z^I#R+GiC;OWB@P3K6)tLhs9>`fig&V_5PYG(#qDq%^O@LMe#iT Y0pU9~I%jRoy8r+H07*qoM6N<$f{_E2y#N3J delta 602 zcmV-g0;T=c0_Oyf7=H)`0001UdV2H#00J&aL_t(|ob6UIi{d~O{%*N#js*!;_5*?Z zgDnLi5bR8ug#$^kwt^6_UpTQ%69$gkHg+Ne0x7k!6b`nsu{b4ITg(=cT-Mc@H|xPR z_ca>lz3+Xz_q{m4C*un>&}2;L5dVI8A#sy}OvXf#raJXuw|`nB5npu(KMf{hf^#k? zW6+5OG&)c%pqnED*#iJD2m)A^C5>$~8s)hDsRs%ShePQ(=Uj`AEMO1>`0@0ljI&!U zBxy=EtyTx9BhZ2N2mm0yzXt&PagWcxz8yd3k8{|zjU-9PTsI#PAcIbEfY5<+Yv<1A zZ=N43->V%k8GjS1O^|lLWK0Z#0C%+-!Z5^gxm4*zk|gMKI=HLVkff>dy+QIouh#x+2c)sr=&vO`tf$4Or z#i#5*)p+Ca7@Tu(&hh=>p)4Ln5da{HBDCA>GJZ4~U4JjY^Sn|-v)O!ip65AS*G0Wv zhwHk?^SmtXdEWH`s>rhJ-EW3rAdX|~c00sz48t&VC}{%r`~AhUD2m|wK7ivm3J(-H zH@CM^ZjuSN+pYAx@PJNE0a6Fn>otk&T+ZQexK2Q^cEEWPs&a*p-{6!Z==b~O_bkgu z&IW+lY*PjRa2)440jFY$j{JOn)=9kx<)zWGEK%)(&W*@%9IRF=X${h?*s?4E{2hnt o&!}j-syJD|sSp(?h5w_#E5U`$Gra>DdjJ3c07*qoM6N<$g83a9Jpcdz diff --git a/Resources/Textures/Structures/Storage/canister.rsi/meta.json b/Resources/Textures/Structures/Storage/canister.rsi/meta.json index 95d67cc8ae1..7c2915a3a7b 100644 --- a/Resources/Textures/Structures/Storage/canister.rsi/meta.json +++ b/Resources/Textures/Structures/Storage/canister.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Frezon canister modified from tgstation, the rest are taken from tgstation at commit https://github.com/tgstation/tgstation/commit/f8581a636acfc1517611a680b7711a74fc7ef335", + "copyright": "Taken from https://github.com/ParadiseSS13/Paradise/", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Structures/Storage/canister.rsi/orange-1.png b/Resources/Textures/Structures/Storage/canister.rsi/orange-1.png index 4d0714e54571088674675b1319e933b835138375..136b36ca3cd675473e6325737069537f61a7a4c9 100644 GIT binary patch delta 335 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 delta 501 zcmVHg=}FV))tb& zB9E|0>L7AYV0CpK!}>t5vP>btGRRieDJ(=J4^*7nTWdA>!MQ?0Lc~(Ldk+Z#k$(aJ7RZ2?NYDWkDd2>0 z#RLGpf%AwOOHDuxff+CXM#i*0cQ_o9ILATX1UyE0-g+3+*D=wxGewQ?U%oA4~E1!rV7v4?Lwdpn&cp;(Ey55N*{oD3DP`Y^#H`p zs8s=PDzB6#G=Br;ky9|WmZVC4Yi-m;MXu(NwWhA|6qF%$8dOc_$!sfw_5?tOCT#10 z&xO{8A_^QgTuZAS$O0mvJ8CIJ6_^F<>nd?(%!N%LW_)Lrv$c$N$ zIBB?lM6E!mMB?0%1Z^^Yiohc4#3YEjk$<$jHzAs*q@=>p%bi00DGTPE!Ct z=GbNc008VsL_t(IjqQ@ja)dApMDZrs76JwS|6kL##~Csia(_=%T7?hjxzWP1{OhmD zIgita5FGR-9h3LS6X#rFd_`O=sn+U~@LEdfV(#b6vu?E}*0sdIirDuMRCN$8m%y9Z zrZ8Y75#B{qcV0T+N)E|V17N^}yEK6h9tL_ClyuFk$TtH3vUAV|tcA7)7y+OY2Im0I zFF*#6E&!Ui0%M15M>Tr_Drn^!U~)*cCqS6Q1ac8NOh{0xe-zmrW|1Y6l2$yIHc`Wz zL$e@maWkkf>Jjfp-3e;Dxmi|UH@<*(H|y>Q9QpCT{7nC*PxpuqcjWjYhX4Qo07*qo IM6N<$f<$JcIsgCw delta 822 zcmV-61IhgQ0>TE68Gi-<0047(dh`GQ0|`k)K~#90?UqkS6j2<va89K`n?7?G!9b}uutP|H zg!CZlz79J(zMWllJ-1&NnBV)o-~0Z4-`{)l25P9Gh8k-4-+v)gBLVWLfN3}847?eG zzJvVLBBYW}q|*STOq1K1RyKKXa}$341mFVDrTF^XSWHtMCkf#ve`}gJuJbi;8aV0N zb5bIN5IeRl0W!J{z}3Y?0495Ss^tX=YK7E+x26f~SEg1tCMCN|OBBgf{QCIOd++l3 z`qF7qzI7d7Vt;%bEK7zGAn&>r6rHO;yKkX+A;{P^b-FIpB-H9xDQ`>4G*MgYho?X& z7{q~!y)R;TXvkCG$-n@gf$PB_A`$^$$`^aGp#gwPripD?KtXnOvxkc0M`2S+p3Tn# zkkoaq$K!lFJ^ zulmE<1%HssR+mIY1=?q41>p62b!5cz6-f^ww>6Eg{r!CH@2@@qQCC+oxH>ZOPP=lY zVt}duKrkAGeBSf-x{383qK*o06AB@S7)H@Nf5Wo87X0n*rlr1~3Bw@ep68iduJAR> z=gDtx0}wF`mfba$4TE4T2Ed1xFFiv4h3DM`_kW$j4e(=n8h|ew8@zh)!kc(&c$io? zT(OEXi3EXgm^+=Fg`^ZT-@M7><;y_%r#NL<<;M{4s)YT0kkoaSg`nBp@eh1N1OjET z04TPj45uus^y*H4+;tqe>o_t2az)eRil)iut*vs$w&jj(%X24A$mMuku4tMZ0{MM> z+%J37*orb8fU15-GH`Jh-j6}Pl3&Gfe@JTh2heUP(J#@8od5s;07*qoM6N<$f>|bx A82|tP diff --git a/Resources/Textures/Structures/Storage/canister.rsi/redws.png b/Resources/Textures/Structures/Storage/canister.rsi/redws.png index 8390cb6539a4d06f8f66c9ee27f36208e0654894..630651777084e1e28ef3dc2219bc16052c314c80 100644 GIT binary patch delta 388 zcmV-~0ek-61d{`h7=Hu<0001iRA>-68(e*?Ht00001bW%=J06^y0W&i*I6iGxuR49>c z(7#TEFdPT)a!hR3Hbg>VaxF2e0x|v@eS-4_d;)efq^xMnb$>K*LMP&6;^t(^6UZ$- z0JE=Q&r5%0xbN0a+HZd?LVJS==M3AmlU-#xa{zbYU_754TVQ@sEXf3pa)JHp38Xw? zQDniR( zELsd%N_UUxnDy{hFdn*OG$ElF&p}%;WNJ6>ri+#qEg?gfYAS`0F$o?jb+Avl&`S5t z6?ExaY>TJ&zI*S#dp`Kb7DydOQ1}F%2xGUU$%jWrKKWrbD}N*qB1+%Y8Tu)MBoy`FExlvmIBR*Jd!;danc$EAsO`Ye4NCV>};pXy^sn%ux zD=o`-cXb6}NPd6sjO_$iXw6}glpvj*9l~}Sf^}sJYk_%AzFd+omjL{jO#U7K;KRWI z0EbCJad*d0AnbO@Z*L#@wRU$2x3>6xav}*U2e3iRkbfCiVzk@hJGPzM&=y|0PCT&A zg7YjZVFpT-0t9$tecu@1RH+i;TZNAeV<$g#Y*`V2Z7(XG+ZFIN5kOU9lhm$&(Lmih zwt0`^Du_+3@mbI~fGw;l5lY_O7+@I3BKIA)-+Q3 zND>whj!R=R5ufev({8nX^9j4%hk!v)&Vsj5QZFw! zV_;zO^Yh5a&w6xpfRp$l00001bW%=J06^y0W&i*H)=5M`R49?%(7|rPFboFZgg0=5 zIKyBm$2M+LwCf}upjFtq(;BPUc3daK8}I^1+;`wTNehVV6@TWNzk~hTjQ#V1DVqVn zz0V#-QC`wbIIi8I>KXu%g76^l(>;GkL9_$cBp#X-?u)rKg>gSTVO)fEpw&+ozqA)r~1rQ#`0OuHK547=H)`0001UdV2H#00M|fL_t(|ob8seOB+!f$3O3qATdO1CkqY^ z!i5k7mw-!09fTIk4f+RUuUIla3NBfaQ4mU@LTQMfm!!cz;raDgNW=2!N$p4aafD zCSPA%aC>(r0364Oh_yC1_1cl=CNiMKH=0d?AON5OT$>KV5Fv!<`F;qn+h_prWq%)l z{Q7!QU9F!r?>3rE0LtYu0DYi5h~3=W@N{{J5;ysEJ+!ITD$e)zR8@2=2m)N!WoKt6 z%mU$`PDd|L*?*5&6@s4cldD#RX~N9@9dH{XZnkz5U4d*SLl6Y9y;tO_Rm}2xo=3Z0 zN6gLwuqq|1#{3ugJOCTD8vgOI&IMz$T1q?#J>SJx3a@dwxpybC7+~B^vuW} za2yBE^I|8yT38_GdD?`O5-BBCp#WmI>3?^-04&?~^nV7F2}QeJ2c9$jd4CT)mtGp# z^&cL{%+Krlm$uED$z2@7niNo#$W^O)OiGF8c{+Pd7=1B5A9SZTU=<3Hz+lJI^L={0 zuSJ#cn28a-caxbIYXJ;Puljv(da7flfjHhv$;WmZfDbDx|21F%h+Hl*xZ7y3yuBT} zVAMcnZhsE?eH}j>j2}+>76>6C8_@GS-GWl71fWhYZNPP1==bSAJ_1lGm1wyx04>)g zQ!E1T?c~JNjBFVFEqJ=RdKNZ%r^J-_Bplnunwh~Wm&fM4Ef&ddZ2_@Ial8Rj*gSkp zOd-d%vGRGWL8YcZL_WvLM0Ra$;(5^NbT~UZ8!ooMFrn5m#pigG*q@Lkc)d70!xR0m bq$K4p+5;fR^44i500000NkvXXu0mjfH~T{} diff --git a/Resources/Textures/Structures/Storage/canister.rsi/water_vapor.png b/Resources/Textures/Structures/Storage/canister.rsi/water_vapor.png index ee8b7979ce93f380310768eae43bb3dd28b33d6a..993c5ac4ff668b4d96f876ebaf3beab7c7c7fa91 100644 GIT binary patch delta 468 zcmaFD@|byoWIZzj1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU$hQfKQ04 zqLQw@z6B4DL~=qxRY^%uP>{R3Phw(jXXo673)i1GasKAbo1fpm|NQwgP)Gf8*$+U9 zza+>n_&*9@xN>L4LZB39fk%C0F#`kNVGw3Kp1&dm=n5527sn6_|JF&3lUfxxTm{8N zi~s&Vf0sM+=8H4;%=dEjg}1EuznE2F(St*WIUL_Be_W($^KNf(fpENB1IHDbTirt2k##*K~EmcZ|j^H==Xr zs?@}<Z!v+ zODOawc*&6Ej@hzw&EDZrx|9rB3lA?HgO&_gIu|qq<4uH2DQN2)8$+VkK_8JC$M0TM zrO*TBN%qyb$M@ZjC*U8$6WH3n!Oaz5wbml#qAre~zUBq;F z=2?igATtIpN29HVgZ+Js4iDM<;t0GuKHmEK{PI%7$BsZ|45m@UGM=BERZ-|K0@EnM zx6@PB7JRZeGO5t@J0|0(f@%`5q#Y#)U_c+FTLC^3d0yvO32Y3;9Qg%Ox zTKBYky#AtfQ-6eoBM)2=u$eIcfHX~!rm4fch(Oi0?-z?oL}%E{7`sXmn;BDeH|Hl$ zQ=4C3+xx}B*%6&vFpVP2XEOl6DoHTh-Gv_nfLBJ=Hu&=#`Ff3fy#@e$y0~!uLsk{M zJvjjY%x5#$WfS0u!hBh^#Cc-ep zhohtVK2JC}*y@LKB&$Wd3PS{g!4m_2Jbonfym}V6oO1;LWj9+TNkP0p1ORx$Vbd{- kU;5_4o$bB75&i%81xkV0Vt8IZHUIzs07*qoM6N<$f@!Q3=>Px# diff --git a/Resources/Textures/Structures/Storage/canister.rsi/yellow-1.png b/Resources/Textures/Structures/Storage/canister.rsi/yellow-1.png index 3937104ebe712d965fb33bfce47906ff84ddba54..c12694850d30dc69f9d10326dfdb93d5e23f9445 100644 GIT binary patch delta 351 zcmV-l0igcF1@8io8Gi!+002a!ipBr{05DKYR7L;){~8(^M@LLZKmaZ-E}@~X*1!^h zauF{tIQQQo{N_QdkrVUt^C2QF$jHzC^MrhFVk-au00DGTPE!Ct=GbNc008YtL_t(I zjqQ@%a>O7Ag%?o}3HttT+oPuGw%zP~X9^Q9^yBcC$K&7rntu@`oQWwj6Tf)QB_+Iz zQkG2o17Xdj)|!fG6TD7SUFR9E>PM|bp+u|>Z;jdAH$geG9uWubNnH#=X6{WN3qS~$ zC=+PnDu|VD0LtcH68Gi-<0047(dh`GQ0*XmQK~#90?Up@DD?t>7pOrKs*lcHPL=e)% zHm#&d1W6%G{=kx$a@Q)2g^iV)G8+5?*;X)VF1EH}k?P__)^f{m%elqL>_>L>MsIoZ z!f@u}e7tjJX3xSJYpk)x8vi@2rLhL+bYN>MnS6g&00co0>whbybh#Wbn`IqLr#YXi z!FADq4nwr-qP4c;rj*iYU8R&(O6f2}cRJF-P+Fsb{vbpl3|kFQt-`|tTwf;&MY|8f zB*^Y=qT6UdtF?OYUJt8e2GuImYSKSH7wLH_V~`G`p_i%P* z1CcJdF4`;rIDZaQDlnVD_BI4T07%*$NBU;{?oMnjF5vA==8J+G|BfRvouxPf$H!2w z!(?Iu&~Ddr&di#D=S9rtLcr{>T(+02A{@uqMogzztyYrBjln>I7s2cvU_Aa&s52TR z_9l3{T`$}~5#kIyKZ|j*8BwV~xg4OBib;50lr#2y8-L%2Za0eWz*kX92Z!ttq|P7T zFU|nK?XAsdlqa|fHe6Rahli^<*t8<{tcXoZ^t)Y=jmEd)QyL6lK3^^Po)z(1+Zp)_ zczTN1+4&xU4UmhJK8C-MNK374YBiWn|ABzk{ZEzBFW^<%83}R+mi0e+H8}$24nSvd zo*kgWcz?W)Qt~CVESZ1R{Y(a4bwAcOKIF9|5@0gv$NlA6VSyB)!9XUKv(awsf=G<gLlERy8X}%|6|W74IkQjE z>!nJ!l;FOGd^t8Hc~O=%poc@z*SfD=S8S?PnJ@neiNYU}1)&TM4&d=Isg6fS0Y%8{ cYK;}}2Mq}}POJcZ;Q#;t07*qoM6N<$g1f~>Gynhq diff --git a/Resources/Textures/Structures/Storage/canister.rsi/yellow.png b/Resources/Textures/Structures/Storage/canister.rsi/yellow.png index 595ceb298b04731eb854e73e1ec909e4e419851c..fc98a4568223f3bd173b79308edcf15ead4c003e 100644 GIT binary patch delta 371 zcmV-(0gV3M1cC#Q7=Hu<0001iRAK~yM_ZID4vgD@C|%edfeZHbKA z3I_Ei)F@XpLHz;!0VpYYWHYPYL>3)4(PZQ2%C@xSu=my{?|=7xUta(Y3L?)VP`?ej z(^vs>YCt$1U1&gT#u79DCn<;a%>YE6PkdhkqX!uKI@CycR%H2LOUk(yCS*I%mEBE)jU4en(IG delta 593 zcmV-X04GnIMW%7&EPV zvIcH${2Ir85N$TV%Zryuh3!^#WHN!Zsl=~oXbr|O2sAZN$yLbvGMUgAbZTMD#%Kx_ z3*Y9<+|&VMO5r(mr&_#rB>quLu+IEk9@ z=lOIhCJ8vFY7&dZ+uuI{wfEHu0M@3E{D}z~L{Cp|_kIAK2=wv%JR^Z2{G#eaV8^gY zc+g$Y$B^ez%zhWlO5pVsb+rS-MK}g)OWfU!pBYWTdJPmsBe#ois36;L&X40i1p$Al z#Ic`*%}SITzKoj5n2=1k*Ks(EX-E`>Uzf{ Date: Fri, 31 May 2024 00:14:07 +0000 Subject: [PATCH 32/44] Automatic Changelog Update (#406) --- Resources/Changelog/Changelog.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index fc0b5c906c7..d0b3206f26d 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -4118,3 +4118,11 @@ Entries: message: New Tools Sprites! id: 6115 time: '2024-05-29T01:06:42.0000000+00:00' +- author: FoxxoTrystan + changes: + - type: Tweak + message: Resprited gas canisters + - type: Tweak + message: Resprited gas tanks + id: 6116 + time: '2024-05-31T00:13:45.0000000+00:00' From 6d3e0784feb3d73557aed926aeea46bda1b071d3 Mon Sep 17 00:00:00 2001 From: LovelyLophi <111106265+LovelyLophi@users.noreply.github.com> Date: Sat, 1 Jun 2024 20:36:58 -0400 Subject: [PATCH 33/44] CorporatCoatsWavetwo (#426) # Description Further expanded Assistant gang colors and added them to loadouts VM is bad at helping so image is in comments --- # Changelog :cl: - add: Added five new coats - add: Added loadouts - fix: Fixed the coat handhole --------- Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com> Co-authored-by: VMSolidus Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> --- .../Inventories/clothesmate.yml | 11 ++- .../Clothing/OuterClothing/wintercoats.yml | 63 +++++++++++++- .../Prototypes/Loadouts/outerClothing.yml | 77 ++++++++++++++++++ .../equipped-OUTERCLOTHING.png | Bin 0 -> 9460 bytes .../WinterCoats/bc_corpo_jacket.rsi/icon.png | Bin 0 -> 6403 bytes .../WinterCoats/bc_corpo_jacket.rsi/meta.json | 18 ++++ .../equipped-OUTERCLOTHING.png | Bin 8610 -> 8727 bytes .../equipped-OUTERCLOTHING.png | Bin 0 -> 9455 bytes .../WinterCoats/dd_corpo_jacket.rsi/icon.png | Bin 0 -> 6135 bytes .../WinterCoats/dd_corpo_jacket.rsi/meta.json | 18 ++++ .../equipped-OUTERCLOTHING.png | Bin 8514 -> 8689 bytes .../equipped-OUTERCLOTHING.png | Bin 0 -> 9750 bytes .../WinterCoats/fa_corpo_jacket.rsi/icon.png | Bin 0 -> 6348 bytes .../WinterCoats/fa_corpo_jacket.rsi/meta.json | 18 ++++ .../equipped-OUTERCLOTHING.png | Bin 0 -> 8865 bytes .../WinterCoats/ge_corpo_jacket.rsi/icon.png | Bin 0 -> 6116 bytes .../WinterCoats/ge_corpo_jacket.rsi/meta.json | 18 ++++ .../equipped-OUTERCLOTHING.png | Bin 8310 -> 8433 bytes .../equipped-OUTERCLOTHING.png | Bin 9341 -> 9422 bytes .../equipped-OUTERCLOTHING.png | Bin 9025 -> 9418 bytes .../WinterCoats/id_corpo_jacket.rsi/icon.png | Bin 5955 -> 6131 bytes .../equipped-OUTERCLOTHING.png | Bin 0 -> 9578 bytes .../WinterCoats/zh_corpo_jacket.rsi/icon.png | Bin 0 -> 6141 bytes .../WinterCoats/zh_corpo_jacket.rsi/meta.json | 18 ++++ 24 files changed, 234 insertions(+), 7 deletions(-) create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/bc_corpo_jacket.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/bc_corpo_jacket.rsi/icon.png create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/bc_corpo_jacket.rsi/meta.json create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/dd_corpo_jacket.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/dd_corpo_jacket.rsi/icon.png create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/dd_corpo_jacket.rsi/meta.json create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/fa_corpo_jacket.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/fa_corpo_jacket.rsi/icon.png create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/fa_corpo_jacket.rsi/meta.json create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/ge_corpo_jacket.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/ge_corpo_jacket.rsi/icon.png create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/ge_corpo_jacket.rsi/meta.json create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/zh_corpo_jacket.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/zh_corpo_jacket.rsi/icon.png create mode 100644 Resources/Textures/Clothing/OuterClothing/WinterCoats/zh_corpo_jacket.rsi/meta.json diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml index 04cc2e3e19d..2c4c27137f0 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml @@ -86,10 +86,15 @@ ClothingOuterDenimJacket: 2 # DeltaV - Clothing addition ClothingOuterCorporateJacket: 2 # DeltaV - Clothing addition ClothingOuterCsCorporateJacket: 2 # Einstein Engines - Clothing addition - ClothingOuterEECorporateJacket: 2 # Einstein Engines - Clothing addition - ClothingOuterHICorporateJacket: 2 # Einstein Engines - Clothing addition - ClothingOuterHMCorporateJacket: 2 # Einstein Engines - Clothing addition + ClothingOuterEeCorporateJacket: 2 # Einstein Engines - Clothing addition + ClothingOuterHiCorporateJacket: 2 # Einstein Engines - Clothing addition + ClothingOuterHmCorporateJacket: 2 # Einstein Engines - Clothing addition ClothingOuterIdCorporateJacket: 2 # Einstein Engines - Clothing addition + ClothingOuterZhCorporateJacket: 2 # Einstein Engines - Clothing addition + ClothingOuterGeCorporateJacket: 2 # Einstein Engines - Clothing addition + ClothingOuterFaCorporateJacket: 2 # Einstein Engines - Clothing addition + ClothingOuterDdCorporateJacket: 2 # Einstein Engines - Clothing addition + ClothingOuterBcCorporateJacket: 2 # Einstein Engines - Clothing addition ClothingShoesBootsFishing: 2 # Nyano - Clothing addition ClothingHeadTinfoil: 2 # Nyano - Clothing addition ClothingHeadFishCap: 2 diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml index d45e8c3f3c2..f3610178b9e 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml @@ -32,7 +32,7 @@ - ClothMade - WhitelistChameleon - type: StaticPrice - price: 70 + price: 50 - type: entity parent: ClothingOuterWinterCoat @@ -555,7 +555,7 @@ - type: entity parent: ClothingOuterWinterCoat - id: ClothingOuterEECorporateJacket + id: ClothingOuterEeCorporateJacket name: Einstein Engines Corporate Jacket description: A cozy jacket with the Einstein Engines logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven. components: @@ -566,7 +566,7 @@ - type: entity parent: ClothingOuterWinterCoat - id: ClothingOuterHICorporateJacket + id: ClothingOuterHiCorporateJacket name: Hephaestus Industries Corporate Jacket description: A cozy jacket with the Hephaestus Industries logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven. components: @@ -577,7 +577,7 @@ - type: entity parent: ClothingOuterWinterCoat - id: ClothingOuterHMCorporateJacket + id: ClothingOuterHmCorporateJacket name: Hawkmoon Acquisitions Corporate Jacket description: A cozy jacket with the Hawkmoon Acquisitions logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven. components: @@ -596,3 +596,58 @@ sprite: Clothing/OuterClothing/WinterCoats/id_corpo_jacket.rsi - type: Clothing sprite: Clothing/OuterClothing/WinterCoats/id_corpo_jacket.rsi + +- type: entity + parent: ClothingOuterWinterCoat + id: ClothingOuterBcCorporateJacket + name: Bishop Cybernetics Corporate Jacket + description: A cozy jacket with the Bishop Cybernetics logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven. + components: + - type: Sprite + sprite: Clothing/OuterClothing/WinterCoats/bc_corpo_jacket.rsi + - type: Clothing + sprite: Clothing/OuterClothing/WinterCoats/bc_corpo_jacket.rsi + +- type: entity + parent: ClothingOuterWinterCoat + id: ClothingOuterDdCorporateJacket + name: Discount Dan's Corporate Jacket + description: A cozy jacket with the Discount Dan's logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven. + components: + - type: Sprite + sprite: Clothing/OuterClothing/WinterCoats/dd_corpo_jacket.rsi + - type: Clothing + sprite: Clothing/OuterClothing/WinterCoats/dd_corpo_jacket.rsi + +- type: entity + parent: ClothingOuterWinterCoat + id: ClothingOuterFaCorporateJacket + name: Five Points Armory Corporate Jacket + description: A cozy jacket with the Five Points Armory logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven. + components: + - type: Sprite + sprite: Clothing/OuterClothing/WinterCoats/fa_corpo_jacket.rsi + - type: Clothing + sprite: Clothing/OuterClothing/WinterCoats/fa_corpo_jacket.rsi + +- type: entity + parent: ClothingOuterWinterCoat + id: ClothingOuterGeCorporateJacket + name: Gilthari Exports Corporate Jacket + description: A cozy jacket with the Gilthari Exports logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven. + components: + - type: Sprite + sprite: Clothing/OuterClothing/WinterCoats/ge_corpo_jacket.rsi + - type: Clothing + sprite: Clothing/OuterClothing/WinterCoats/ge_corpo_jacket.rsi + +- type: entity + parent: ClothingOuterWinterCoat + id: ClothingOuterZhCorporateJacket + name: Zeng-Hu Pharmaceuticals Corporate Jacket + description: A cozy jacket with the Zeng-Hu Pharmaceuticals logo printed on the back. Merchandise rewarded to stations with a safety factor of uhh... seven. + components: + - type: Sprite + sprite: Clothing/OuterClothing/WinterCoats/zh_corpo_jacket.rsi + - type: Clothing + sprite: Clothing/OuterClothing/WinterCoats/zh_corpo_jacket.rsi diff --git a/Resources/Prototypes/Loadouts/outerClothing.yml b/Resources/Prototypes/Loadouts/outerClothing.yml index 7923d9e66f0..078cf530ba2 100644 --- a/Resources/Prototypes/Loadouts/outerClothing.yml +++ b/Resources/Prototypes/Loadouts/outerClothing.yml @@ -32,3 +32,80 @@ cost: 3 items: - ClothingOuterWinterCoat + +- type: loadout + id: LoadoutOuterCorporateJacket + category: Outer + cost: 2 + items: + - ClothingOuterCorporateJacket + +- type: loadout + id: LoadoutOuterCsCorporateJacket + category: Outer + cost: 2 + items: + - ClothingOuterCsCorporateJacket + +- type: loadout + id: LoadoutOuterEeCorporateJacket + category: Outer + cost: 2 + items: + - ClothingOuterEeCorporateJacket + +- type: loadout + id: LoadoutOuterHiCorporateJacket + category: Outer + cost: 2 + items: + - ClothingOuterHiCorporateJacket + +- type: loadout + id: LoadoutOuterHmCorporateJacket + category: Outer + cost: 2 + items: + - ClothingOuterHmCorporateJacket + +- type: loadout + id: LoadoutOuterIdCorporateJacket + category: Outer + cost: 2 + items: + - ClothingOuterIdCorporateJacket + +- type: loadout + id: LoadoutOuterBcCorporateJacket + category: Outer + cost: 2 + items: + - ClothingOuterBcCorporateJacket + +- type: loadout + id: LoadoutOuterDdCorporateJacket + category: Outer + cost: 2 + items: + - ClothingOuterDdCorporateJacket + +- type: loadout + id: LoadoutOuterFaCorporateJacket + category: Outer + cost: 2 + items: + - ClothingOuterFaCorporateJacket + +- type: loadout + id: LoadoutOuterGeCorporateJacket + category: Outer + cost: 2 + items: + - ClothingOuterGeCorporateJacket + +- type: loadout + id: LoadoutOuterZhCorporateJacket + category: Outer + cost: 2 + items: + - ClothingOuterZhCorporateJacket diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/bc_corpo_jacket.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/bc_corpo_jacket.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..5eadcdc1c1ab3fbd2bf67c5055286b407e2e4a60 GIT binary patch literal 9460 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/bc_corpo_jacket.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/bc_corpo_jacket.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..dbb09f8ed0689a7cc79066703737e71083792db4 GIT binary patch literal 6403 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 Wzt56b8L0!Z523iOa4B*Mi~n!Kzyx{# literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/bc_corpo_jacket.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/bc_corpo_jacket.rsi/meta.json new file mode 100644 index 00000000000..42d21c3d8ab --- /dev/null +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/bc_corpo_jacket.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "leonardo_dabepis on discord / @leonardo-dabepis on Tumblr, Edited by heartparkyheart on Discord", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/cs_corpo_jacket.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/cs_corpo_jacket.rsi/equipped-OUTERCLOTHING.png index 73e230e8a5f2088cbea061e045059ab6e5c52140..631fcc2c946a0131aff878e41b8da273a212dd19 100644 GIT binary patch delta 4796 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 a2hi|>*QIHm6bl{BIt>*a<)@0*ZvG!trPjOv literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/dd_corpo_jacket.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/dd_corpo_jacket.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..c7fd65e30b5729faecb62cb354319e5ddd4feec4 GIT binary patch literal 6135 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 N002ovPDHLkV1g)L8iW7< delta 4777 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 DpPC*5 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/fa_corpo_jacket.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/fa_corpo_jacket.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..fa468b2390b544d69d79019d254584a10abd39fb GIT binary patch literal 9750 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 W>=TC`4&;HXLud}J_SLpQ+x`uCitNh( literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/fa_corpo_jacket.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/fa_corpo_jacket.rsi/meta.json new file mode 100644 index 00000000000..42d21c3d8ab --- /dev/null +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/fa_corpo_jacket.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "leonardo_dabepis on discord / @leonardo-dabepis on Tumblr, Edited by heartparkyheart on Discord", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/ge_corpo_jacket.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/ge_corpo_jacket.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..87fd745850387bc5509c30d040b8fe3bf1cc706c GIT binary patch literal 8865 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/ge_corpo_jacket.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/ge_corpo_jacket.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..2af90d92f711ed7cc517ee4d09db2cbd81d78091 GIT binary patch literal 6116 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 DdDeA0 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/ge_corpo_jacket.rsi/meta.json b/Resources/Textures/Clothing/OuterClothing/WinterCoats/ge_corpo_jacket.rsi/meta.json new file mode 100644 index 00000000000..42d21c3d8ab --- /dev/null +++ b/Resources/Textures/Clothing/OuterClothing/WinterCoats/ge_corpo_jacket.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "leonardo_dabepis on discord / @leonardo-dabepis on Tumblr, Edited by heartparkyheart on Discord", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/hi_corpo_jacket.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/hi_corpo_jacket.rsi/equipped-OUTERCLOTHING.png index f18a64ab9c0c4012305f51ab70dc2710c1131824..e1f137dca37aea0a072e0ee239e01b3a91f13b5a 100644 GIT binary patch delta 4499 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 lZjWG%0D>S0f*?o~{s2YO>&z|kfSdpT002ovPDHLkV1j7No_+uT delta 4541 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 bLn~v%yfLqYE00000NkvXXu0mjfrURt= diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/hm_corpo_jacket.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/hm_corpo_jacket.rsi/equipped-OUTERCLOTHING.png index fb400585e5a6645107e6e2117da976a2b3bf5dd9..2d103cfa66729e5d5cc4a0383788456b758095c6 100644 GIT binary patch delta 5498 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 delta 5582 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 Ef|()i4FCWD delta 2184 zcmV;32zU4MFT*a7BmsJnB_MxxC94hmXBAmOBM?H%K?2Un4zm1|==Qb8a_m#&z=5(4^?fcvh=2{UHDY3N&}sK-5)*Q`KsspeCWA_-#?6}*A2o@ zL0j&hGM@Qw z_Qz+3zj_}Wo_@IT$>CI=@$$(}?bW`<)5jZ`zjo~L-bV_I*T(dNMf%R1pB=kr-{;IY z#i$KlY|o+IPI7t)6XAdATFzq)m*Ah#mvbquevQk4=DhqeT%I)(kl4BAnMdAv<(bg& z?69%YB0)>!fFj0v5mIu1k%0@Yyh)0dSvt`2gJ>;uo04icQqSdQw~n1>##G8!EaQY%c75J}E(WCuV4rXx1UfIw!Z2_vbN z(tu5;*cy*W%4aSy-Q&-0XA9&z^awOAE_N28eF(Cb7SGo%A=K58@HC4v=Fu- zMXIng5$U2bdg*_)b8lUG@7jlw7U&*pQ_-%fV_?sLl?NUkJq?T)S+Qzt&BVH?4F`R^ zI(u{R?&@RGEECc&+mzX-&av_Wl~!H6+LE;T(ls`?w#%-YciXc2);(URJ*fV4eFL@p zphgF&m?tmPFe>r{H0Y9Ik-!XyQO!VH06_+!DKNWwu9bfRxxnmFLR2upNDgdf4#a?9 zT{#i&j3;mG-jVw@ZmG3j;zr*=E(LUd0l61$X~~1z7pTq1ZGI5DqcCFdDu_PZUwu#? zk*`jh-a3D^{d=MR-GxjDw6>nRpfF=&S194|IuN%p4b=z~wle;rpgD7NvN&k3>|V~K z0Yx|+B;J2tw&`~hKDX0{W!^kzL)$X1C9YNzH{sUj)!O8~>Np4TJ|Xr4u~bJiqbpMM z@P$(@*g2812e+~aI~dH5ShF}R6lL8m~>XF&lKOFiHa` zKo6(DTP;t9NTxbG4C1cUoA^BT@PaZ$3%}Jh;7!RS+YQ$ru2J1%Cya#`}7O-(HOATK}nl}8jJPV z$DDuUnmg(fn;Xi9GoZ}V4TNP9^pY@t7J=Ss-gPM`a#ISf13E5xyd<7PQMyL|wjnR@ z$=4KPxEI^+2|uLZoia0a@$n;J-#!ODj8w~=%wa+{Ik*<}-73ofUL$OYxM(t-nzD4|Nu@Z5jB z4ak~)u?x=ychGQs<51r^03 z6t_P^&~81oCiLmcq0KLxzIYh`V^vbF&qp z_7%e-sPm0NGvEvq5ZQa9U?1=z+=zdZXGqI3=UWC*N}wbjhF}|PK{6mszDGy7VcVzA zwzSOwZf;A8aKHvQ`~l(Y0uatFKWzf%2R9;iFcrkV1{^GI$09-vJ|W@TkEIb}96lfw$B3^X+|I59LdF)=wZG?RD>Zw)j$GcZ&#F*-CkIxsYo z^a~*kG&(adR5CF-G&wpjG_xWM4FR(b4qyltdz}L600006VoOIv0RI600RN!9r<0R} z79f8C0Wk!IZF0r{00B-(L_t(o!|jwYOT$1E$Nw#X1`3W2xj@0RkRi}a*&IZK7Nm32)14X#s67Jr+_x|_t?g0vgLh+wq zhE101(Jq_idc+KyWMej~2-y@-CaP8eonC*R!f*% zV_?C5<^q6|#jNlYzDqy8xrTmxl*f5}er!k!ST9$54J~p0uQ-}aDSe&6F}wNt6hLG; z`Fgf|!ASBqG;v@m3lRMwzEzRxSZ3HHnyWaHi+i%KK%r154$c=Wk(z;b9!Avw0000< KMNUMnLSTZY-xx~( diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/zh_corpo_jacket.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/zh_corpo_jacket.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..b138d1416b77e292cf051eef49a9c7946a8b51e0 GIT binary patch literal 9578 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 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/zh_corpo_jacket.rsi/icon.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/zh_corpo_jacket.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..d85eeb0592b6b0649873e858d1b644dd8dcc91a6 GIT binary patch literal 6141 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 au)1IWQ9F0`NF*#jg5|W{v1CnP+ Date: Sun, 2 Jun 2024 00:37:25 +0000 Subject: [PATCH 34/44] Automatic Changelog Update (#426) --- Resources/Changelog/Changelog.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index d0b3206f26d..000caf90200 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -4126,3 +4126,13 @@ Entries: message: Resprited gas tanks id: 6116 time: '2024-05-31T00:13:45.0000000+00:00' +- author: LovelyLophi + changes: + - type: Add + message: Added five new coats + - type: Add + message: Added loadouts + - type: Fix + message: Fixed the coat handhole + id: 6117 + time: '2024-06-02T00:36:59.0000000+00:00' From 8e27a833df67be6e0ef67abcbe316117d618829c Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Sun, 2 Jun 2024 01:38:16 -0400 Subject: [PATCH 35/44] Set RollForward Behavior to Patch (#424) This is apparently a more desirable behavior for global.json, as it allows servers running any version of Dotnet 8.0.1xx to automatically switch to a newer version than the base. This update was apparently required for DS14, NS14, and Syndicate Station to work properly, since Linux servers can't actually run 8.0.100, and the earliest they can use is 8.0.105(which is still a viable version). --- global.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global.json b/global.json index 2244195a209..c8526b0a8ba 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { "version": "8.0.100", - "rollForward": "disable" + "rollForward": "patch" } } From 9de58f9f151e04cfdc70ef3a46383b76170ed94b Mon Sep 17 00:00:00 2001 From: stellar-novas Date: Sun, 2 Jun 2024 15:59:03 -0400 Subject: [PATCH 36/44] Update to nixpkgs 24.05 (#431) Nix devShell user only change, this doesn't affect normal building. --- flake.lock | 14 +++++++------- flake.nix | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/flake.lock b/flake.lock index 6ab38fa41bd..7baaa468ea5 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", "type": "github" }, "original": { @@ -20,16 +20,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1708210246, - "narHash": "sha256-Q8L9XwrBK53fbuuIFMbjKvoV7ixfLFKLw4yV+SD28Y8=", + "lastModified": 1717352157, + "narHash": "sha256-hbBzucWOhwxt3QzeAyUojtD6/aHH81JssDfhFfmqOy0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "69405156cffbdf2be50153f13cbdf9a0bea38e49", + "rev": "44f538ab12e2726af450877a5529f4fd88ddb0fb", "type": "github" }, "original": { "owner": "NixOS", - "ref": "release-23.11", + "ref": "release-24.05", "repo": "nixpkgs", "type": "github" } diff --git a/flake.nix b/flake.nix index e2e119eb997..095e6b017c7 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,7 @@ { description = "Development environment for Space Station 14"; - inputs.nixpkgs.url = "github:NixOS/nixpkgs/release-23.11"; + inputs.nixpkgs.url = "github:NixOS/nixpkgs/release-24.05"; inputs.flake-utils.url = "github:numtide/flake-utils"; outputs = { self, nixpkgs, flake-utils }: From 47672c902d17d1c0b8e2097a0d35fa2a9f1c4e76 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 2 Jun 2024 18:39:59 -0700 Subject: [PATCH 37/44] Update Credits (#429) This is an automated Pull Request. This PR updates the GitHub contributors in the credits section. Co-authored-by: SimpleStation Changelogs Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com> --- Resources/Credits/GitHub.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Credits/GitHub.txt b/Resources/Credits/GitHub.txt index db58663a2b2..8c54ecb084d 100644 --- a/Resources/Credits/GitHub.txt +++ b/Resources/Credits/GitHub.txt @@ -1 +1 @@ -0x6273, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 4dplanner, 612git, 778b, Ablankmann, Acruid, actioninja, adamsong, Admiral-Obvious-001, Adrian16199, Aerocrux, Aexxie, africalimedrop, Agoichi, Ahion, AJCM-git, AjexRose, Alekshhh, AlexMorgan3817, AlmondFlour, AlphaQwerty, Altoids1, amylizzle, ancientpower, ArchPigeon, Arendian, arimah, Arteben, AruMoon, as334, AsikKEsel, asperger-sind, aspiringLich, avghdev, AzzyIsNotHere, BananaFlambe, BasedUser, BGare, BingoJohnson-zz, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, Boaz1111, BobdaBiscuit, brainfood1183, Brandon-Huu, Bribrooo, Bright0, brndd, BubblegumBlue, BYONDFuckery, c4llv07e, CakeQ, CaptainSqrBeard, Carbonhell, Carolyn3114, casperr04, CatTheSystem, Centronias, chairbender, Charlese2, Cheackraze, cheesePizza2, Chief-Engineer, chromiumboy, Chronophylos, clement-or, Clyybber, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, coolmankid12345, corentt, crazybrain23, creadth, CrigCrag, Crotalus, CrudeWax, CrzyPotato, Cyberboss, d34d10cc, Daemon, daerSeebaer, dahnte, dakamakat, dakimasu, DamianX, DangerRevolution, daniel-cr, Darkenson, DawBla, dch-GH, Deahaka, DEATHB4DEFEAT, DeathCamel58, deathride58, DebugOk, Decappi, deepdarkdepths, Delete69, deltanedas, DeltaV-Bot, DerbyX, DoctorBeard, DogZeroX, dontbetank, Doru991, DoubleRiceEddiedd, DrMelon, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, Dutch-VanDerLinde, Easypoller, eclips_e, EdenTheLiznerd, EEASAS, Efruit, ElectroSR, elthundercloud, Emisse, EmoGarbage404, Endecc, enumerate0, eoineoineoin, ERORR404V1, Errant-4, estacaoespacialpirata, exincore, exp111, Fahasor, FairlySadPanda, ficcialfaint, Fildrance, FillerVK, Fishfish458, Flareguy, FluffiestFloof, FluidRock, FoLoKe, fooberticus, Fortune117, freeman2651, Fromoriss, FungiFellow, GalacticChimp, gbasood, Geekyhobo, Genkail, Git-Nivrak, github-actions[bot], gituhabu, GNF54, Golinth, GoodWheatley, Gotimanga, graevy, GreyMario, Guess-My-Name, gusxyz, h3half, Hanzdegloker, Hardly3D, harikattar, Hebiman, Henry12116, HerCoyote23, Hmeister-real, HoofedEar, hord-brayden, hubismal, Hugal31, Hyenh, iacore, IamVelcroboy, icekot8, igorsaux, ike709, Illiux, Ilya246, IlyaElDunaev, Injazz, Insineer, IntegerTempest, Interrobang01, IProduceWidgets, ItsMeThom, j-giebel, Jackal298, Jackrost, jamessimo, janekvap, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JoeHammad1844, joelhed, JohnGinnane, johnku1, joshepvodka, jproads, Jrpl, juliangiebel, JustArt1m, JustCone14, JustinTether, JustinTrotter, KaiShibaa, kalane15, kalanosh, KEEYNy, Keikiru, Kelrak, kerisargit, keronshb, KIBORG04, Killerqu00, KingFroozy, kira-er, Kit0vras, KittenColony, Kmc2000, Ko4ergaPunk, komunre, koteq, Krunklehorn, Kukutis96513, kxvvv, Lamrr, LankLTE, lapatison, Leander-0, leonardo-dabepis, LetterN, Level10Cybermancer, lever1209, LightVillet, liltenhead, LittleBuilderJane, Lomcastar, LordCarve, LordEclipse, LovelyLophi, LudwigVonChesterfield, Lukasz825700516, lunarcomets, luringens, lvvova1, lzimann, lzk228, M3739, MACMAN2003, Macoron, MagnusCrowe, ManelNavola, matthst, Matz05, MehimoNemo, MeltedPixel, MemeProof, Menshin, Mervill, metalgearsloth, mhamsterr, MilenVolf, Minty642, Mirino97, mirrorcult, MishaUnity, MisterMecky, Mith-randalf, Moneyl, Moomoobeef, moony, Morb0, Mr0maks, musicmanvr, Myakot, Myctai, N3X15, Nairodian, Naive817, namespace-Memory, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, nmajask, nok-ko, Nopey, notafet, notquitehadouken, noudoit, noverd, nuke-haus, NULL882, OCOtheOmega, OctoRocket, OldDanceJacket, onoira, Owai-Seek, pali6, Pangogie, patrikturi, PaulRitter, Peptide90, peptron1, Phantom-Lily, PHCodes, PixelTheKermit, PJB3005, Plykiya, pofitlo, pointer-to-null, PolterTzi, PoorMansDreams, potato1234x, ProfanedBane, PrPleGoo, ps3moira, Psychpsyo, psykzz, PuroSlavKing, quatre, QuietlyWhisper, qwerltaz, Radosvik, Radrark, Rainbeon, Rainfey, Rane, ravage123321, rbertoche, Redict, RedlineTriad, RednoWCirabrab, RemberBM, RemieRichards, RemTim, rene-descartes2021, RiceMar1244, RieBi, Rinkashikachi, Rockdtben, rolfero, rosieposieeee, Saakra, Samsterious, SaphireLattice, ScalyChimp, scrato, Scribbles0, Serkket, SethLafuente, ShadowCommander, Shadowtheprotogen546, SignalWalker, SimpleStation14, Simyon264, SirDragooon, Sirionaut, siyengar04, Skarletto, Skrauz, Skyedra, SlamBamActionman, Slava0135, Snowni, snowsignal, SonicHDC, SoulSloth, SpaceManiac, SpeltIncorrectyl, spoogemonster, ssdaniel24, Stealthbomber16, stellar-novas, StrawberryMoses, Subversionary, SweptWasTaken, Szunti, TadJohnson00, takemysoult, TaralGit, Tayrtahn, tday93, TekuNut, TemporalOroboros, tentekal, tgrkzus, thatrandomcanadianguy, TheArturZh, theashtronaut, thedraccx, themias, theomund, theOperand, TheShuEd, TimrodDX, Titian3, tkdrg, tmtmtl30, tom-leys, tomasalves8, Tomeno, tosatur, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, Tyler-IN, Tyzemol, UbaserB, UKNOWH, UnicornOnLSD, Uriende, UristMcDorf, Vaaankas, Varen, VasilisThePikachu, veliebm, Veritius, Verslebas, VigersRay, Visne, VMSolidus, volundr-, Voomra, Vordenburg, vulppine, waylon531, weaversam8, Willhelm53, wixoaGit, WlarusFromDaSpace, wrexbe, xRiriq, yathxyz, Ygg01, YotaXP, YuriyKiss, zach-hill, Zandario, Zap527, ZelteHonor, zerorulez, zionnBE, zlodo, ZNixian, ZoldorfTheWizard, Zumorica, Zymem +0x6273, 2013HORSEMEATSCANDAL, 20kdc, 21Melkuu, 4dplanner, 612git, 778b, Ablankmann, Acruid, actioninja, adamsong, Admiral-Obvious-001, Adrian16199, Aerocrux, Aexxie, africalimedrop, Agoichi, Ahion, AJCM-git, AjexRose, Alekshhh, AlexMorgan3817, AlmondFlour, AlphaQwerty, Altoids1, amylizzle, ancientpower, ArchPigeon, Arendian, arimah, Arteben, AruMoon, as334, AsikKEsel, asperger-sind, aspiringLich, avghdev, AzzyIsNotHere, BananaFlambe, BasedUser, BGare, BingoJohnson-zz, BismarckShuffle, Bixkitts, Blackern5000, Blazeror, Boaz1111, BobdaBiscuit, brainfood1183, Brandon-Huu, Bribrooo, Bright0, brndd, BubblegumBlue, BYONDFuckery, c4llv07e, CakeQ, CaptainSqrBeard, Carbonhell, Carolyn3114, casperr04, CatTheSystem, Centronias, chairbender, Charlese2, Cheackraze, cheesePizza2, Chief-Engineer, chromiumboy, Chronophylos, clement-or, Clyybber, ColdAutumnRain, Colin-Tel, collinlunn, ComicIronic, coolmankid12345, corentt, crazybrain23, creadth, CrigCrag, Crotalus, CrudeWax, CrzyPotato, Cyberboss, d34d10cc, Daemon, daerSeebaer, dahnte, dakamakat, dakimasu, DamianX, DangerRevolution, daniel-cr, Darkenson, DawBla, dch-GH, Deahaka, DEATHB4DEFEAT, DeathCamel58, deathride58, DebugOk, Decappi, deepdarkdepths, Delete69, deltanedas, DeltaV-Bot, DerbyX, DoctorBeard, DogZeroX, dontbetank, Doru991, DoubleRiceEddiedd, DrMelon, DrSmugleaf, drteaspoon420, DTanxxx, DubiousDoggo, Duddino, Dutch-VanDerLinde, Easypoller, eclips_e, EdenTheLiznerd, EEASAS, Efruit, ElectroSR, elthundercloud, Emisse, EmoGarbage404, Endecc, enumerate0, eoineoineoin, ERORR404V1, Errant-4, estacaoespacialpirata, exincore, exp111, Fahasor, FairlySadPanda, ficcialfaint, Fildrance, FillerVK, Fishfish458, Flareguy, FluffiestFloof, FluidRock, FoLoKe, fooberticus, Fortune117, FoxxoTrystan, freeman2651, Fromoriss, FungiFellow, GalacticChimp, gbasood, Geekyhobo, Genkail, Git-Nivrak, github-actions[bot], gituhabu, GNF54, Golinth, GoodWheatley, Gotimanga, graevy, GreyMario, Guess-My-Name, gusxyz, h3half, Hanzdegloker, Hardly3D, harikattar, Hebiman, Henry12116, HerCoyote23, Hmeister-real, HoofedEar, hord-brayden, hubismal, Hugal31, Hyenh, iacore, IamVelcroboy, icekot8, igorsaux, ike709, Illiux, Ilya246, IlyaElDunaev, Injazz, Insineer, IntegerTempest, Interrobang01, IProduceWidgets, ItsMeThom, j-giebel, Jackal298, Jackrost, jamessimo, janekvap, JerryImMouse, Jessetriesagain, jessicamaybe, Jezithyr, jicksaw, JiimBob, JoeHammad1844, joelhed, JohnGinnane, johnku1, joshepvodka, jproads, Jrpl, juliangiebel, JustArt1m, JustCone14, JustinTether, JustinTrotter, KaiShibaa, kalane15, kalanosh, KEEYNy, Keikiru, Kelrak, kerisargit, keronshb, KIBORG04, Killerqu00, KingFroozy, kira-er, Kit0vras, KittenColony, Kmc2000, Ko4ergaPunk, komunre, koteq, Krunklehorn, Kukutis96513, kxvvv, Lamrr, LankLTE, lapatison, Leander-0, leonardo-dabepis, LetterN, Level10Cybermancer, lever1209, LightVillet, liltenhead, LittleBuilderJane, Lomcastar, LordCarve, LordEclipse, LovelyLophi, LudwigVonChesterfield, Lukasz825700516, lunarcomets, luringens, lvvova1, lzimann, lzk228, M3739, MACMAN2003, Macoron, MagnusCrowe, ManelNavola, matthst, Matz05, MehimoNemo, MeltedPixel, MemeProof, Menshin, Mervill, metalgearsloth, mhamsterr, MilenVolf, Minty642, Mirino97, mirrorcult, misandrie, MishaUnity, MisterMecky, Mith-randalf, Moneyl, Moomoobeef, moony, Morb0, Mr0maks, musicmanvr, Myakot, Myctai, N3X15, Nairodian, Naive817, namespace-Memory, NickPowers43, nikthechampiongr, Nimfar11, Nirnael, nmajask, nok-ko, Nopey, notafet, notquitehadouken, noudoit, noverd, nuke-haus, NULL882, OCOtheOmega, OctoRocket, OldDanceJacket, onoira, Owai-Seek, pali6, Pangogie, patrikturi, PaulRitter, Peptide90, peptron1, Phantom-Lily, PHCodes, PixelTheKermit, PJB3005, Plykiya, pofitlo, pointer-to-null, PolterTzi, PoorMansDreams, potato1234x, ProfanedBane, PrPleGoo, ps3moira, Psychpsyo, psykzz, PuroSlavKing, quatre, QuietlyWhisper, qwerltaz, Radosvik, Radrark, Rainbeon, Rainfey, Rane, ravage123321, rbertoche, Redict, RedlineTriad, RednoWCirabrab, RemberBM, RemieRichards, RemTim, rene-descartes2021, RiceMar1244, RieBi, Rinkashikachi, Rockdtben, rolfero, rosieposieeee, Saakra, Samsterious, SaphireLattice, ScalyChimp, scrato, Scribbles0, Serkket, SethLafuente, ShadowCommander, Shadowtheprotogen546, SignalWalker, SimpleStation14, Simyon264, SirDragooon, Sirionaut, siyengar04, Skarletto, Skrauz, Skyedra, SlamBamActionman, Slava0135, Snowni, snowsignal, SonicHDC, SoulSloth, SpaceManiac, SpeltIncorrectyl, spoogemonster, ssdaniel24, Stealthbomber16, stellar-novas, StrawberryMoses, SweptWasTaken, Szunti, TadJohnson00, takemysoult, TaralGit, Tayrtahn, tday93, TekuNut, TemporalOroboros, tentekal, tgrkzus, thatrandomcanadianguy, TheArturZh, theashtronaut, thedraccx, themias, theomund, theOperand, TheShuEd, TimrodDX, Titian3, tkdrg, tmtmtl30, tom-leys, tomasalves8, Tomeno, tosatur, Tryded, TsjipTsjip, Tunguso4ka, TurboTrackerss14, Tyler-IN, Tyzemol, UbaserB, UKNOWH, UnicornOnLSD, Uriende, UristMcDorf, Vaaankas, Varen, VasilisThePikachu, veliebm, Veritius, Verslebas, VigersRay, Visne, VMSolidus, volundr-, Voomra, Vordenburg, vulppine, waylon531, weaversam8, Willhelm53, wixoaGit, WlarusFromDaSpace, wrexbe, xRiriq, yathxyz, Ygg01, YotaXP, YuriyKiss, zach-hill, Zandario, Zap527, ZelteHonor, zerorulez, zionnBE, zlodo, ZNixian, ZoldorfTheWizard, Zumorica, Zymem From ade6808b43bbea9970776157249317fa531bab5c Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Mon, 3 Jun 2024 14:49:56 -0400 Subject: [PATCH 38/44] New updates --- .../Abilities/MetapsionicPowerSystem.cs | 6 +- .../RegenerativeStasisPowerSystem.cs | 7 ++- .../Supermatter/Systems/SupermatterSystem.cs | 45 ++++++++------ .../nyanotrasen/psionics/psychic-feedback.ftl | 3 + .../DeltaV/Entities/Mobs/NPCs/familiars.yml | 2 + .../Smokeables/Cigarettes/cigarette.yml | 2 +- .../Smokeables/Cigarettes/packs.yml | 2 +- .../Entities/Structures/Machines/lathe.yml | 8 +-- .../Structures/Machines/vending_machines.yml | 2 +- .../Entities/Supermatter/supermatter.yml | 9 +++ .../Structures/Research/glimmer_prober.yml | 2 + .../Prototypes/Recipes/Lathes/devices.yml | 58 +++++++++---------- .../Prototypes/Recipes/Lathes/robotics.yml | 20 +++---- .../Prototypes/Research/experimental.yml | 24 ++++---- Resources/Prototypes/Research/industrial.yml | 24 ++++---- .../Structures/Machines/vending_machines.yml | 52 +++++++++-------- 16 files changed, 146 insertions(+), 120 deletions(-) diff --git a/Content.Server/Psionics/Abilities/MetapsionicPowerSystem.cs b/Content.Server/Psionics/Abilities/MetapsionicPowerSystem.cs index 78842c6443d..98d79d3d9a0 100644 --- a/Content.Server/Psionics/Abilities/MetapsionicPowerSystem.cs +++ b/Content.Server/Psionics/Abilities/MetapsionicPowerSystem.cs @@ -142,9 +142,6 @@ private void OnFocusedPowerUsed(FocusedMetapsionicPowerActionEvent args) private void OnDoAfter(EntityUid uid, MetapsionicPowerComponent component, FocusedMetapsionicDoAfterEvent args) { - if (!TryComp(args.Target, out var psychic)) - return; - component.DoAfter = null; if (args.Target == null) return; @@ -173,6 +170,9 @@ private void OnDoAfter(EntityUid uid, MetapsionicPowerComponent component, Focus return; } + if (!TryComp(args.Target, out var psychic)) + return; + foreach (var psychicFeedback in psychic.PsychicFeedback) { _popups.PopupEntity(Loc.GetString(psychicFeedback, ("entity", args.Target)), uid, uid, PopupType.LargeCaution); diff --git a/Content.Server/Psionics/Abilities/RegenerativeStasisPowerSystem.cs b/Content.Server/Psionics/Abilities/RegenerativeStasisPowerSystem.cs index 5f22f728ccf..2e0431832af 100644 --- a/Content.Server/Psionics/Abilities/RegenerativeStasisPowerSystem.cs +++ b/Content.Server/Psionics/Abilities/RegenerativeStasisPowerSystem.cs @@ -61,9 +61,10 @@ private void OnPowerUsed(EntityUid uid, RegenerativeStasisPowerComponent compone && TryComp(args.Target, out var stream)) { var solution = new Solution(); - solution.AddReagent("PsionicRegenerationEssence", FixedPoint2.New(MathF.Min(2.5f * psionic.Amplification + psionic.Dampening, 15f))); - solution.AddReagent("Epinephrine", FixedPoint2.New(MathF.Min(2.5f * psionic.Dampening + psionic.Amplification, 15f))); - solution.AddReagent("Nocturine", FixedPoint2.New(20f)); + var amount = FixedPoint2.New(MathF.Min(2.5f * psionic.Amplification + psionic.Dampening, 15f)); + solution.AddReagent("PsionicRegenerationEssence", amount); + solution.AddReagent("Epinephrine", amount); + solution.AddReagent("Nocturine", amount * 2); _bloodstreamSystem.TryAddToChemicals(args.Target, solution, stream); _psionics.LogPowerUsed(uid, "regenerative stasis", diff --git a/Content.Server/Supermatter/Systems/SupermatterSystem.cs b/Content.Server/Supermatter/Systems/SupermatterSystem.cs index 125be39bd00..420725079b4 100644 --- a/Content.Server/Supermatter/Systems/SupermatterSystem.cs +++ b/Content.Server/Supermatter/Systems/SupermatterSystem.cs @@ -19,8 +19,11 @@ using Content.Server.Chat.Systems; using Content.Server.Explosion.EntitySystems; using Content.Server.Explosion.Components; +using Content.Shared.Radio; +using Content.Server.Radio.EntitySystems; using Content.Shared.Supermatter.Components; using Content.Shared.Supermatter.Systems; +using Robust.Shared.Prototypes; namespace Content.Server.Supermatter.Systems { @@ -36,6 +39,8 @@ public sealed class SupermatterSystem : SharedSupermatterSystem [Dependency] private readonly SharedAudioSystem _audio = default!; [Dependency] private readonly IGameTiming _gameTiming = default!; [Dependency] private readonly AmbientSoundSystem _ambient = default!; + [Dependency] private readonly RadioSystem _radioSystem = default!; + [Dependency] private readonly IPrototypeManager _prototypeManager = default!; public override void Initialize() { @@ -347,21 +352,21 @@ private void HandleDamage( { if (sMcomponent.Damage > sMcomponent.EmergencyPoint) { - _chat.TrySendInGameICMessage(uid, - Loc.GetString("supermatter-danger-message", ("integrity", integrity.ToString("0.00"))), - InGameICChatType.Speak, hideChat: true); + var message = Loc.GetString("supermatter-danger-message", ("integrity", integrity.ToString("0.00"))); + var channel = _prototypeManager.Index("Engineering"); + _radioSystem.SendRadioMessage(uid, message, channel, uid); } else if (sMcomponent.Damage >= sMcomponent.DamageArchived) { - _chat.TrySendInGameICMessage(uid, - Loc.GetString("supermatter-warning-message", ("integrity", integrity.ToString("0.00"))), - InGameICChatType.Speak, hideChat: true); + var message = Loc.GetString("supermatter-warning-message", ("integrity", integrity.ToString("0.00"))); + var channel = _prototypeManager.Index("Engineering"); + _radioSystem.SendRadioMessage(uid, message, channel, uid); } else { - _chat.TrySendInGameICMessage(uid, - Loc.GetString("supermatter-safe-alert", ("integrity", integrity.ToString("0.00"))), - InGameICChatType.Speak, hideChat: true); + var message = Loc.GetString("supermatter-safe-alert", ("integrity", integrity.ToString("0.00"))); + var channel = _prototypeManager.Index("Engineering"); + _radioSystem.SendRadioMessage(uid, message, channel, uid); } sMcomponent.YellAccumulator = 0; @@ -409,15 +414,17 @@ private void Delamination( if (absorbedTotalMoles >= sMcomponent.MolePenaltyThreshold) { sMcomponent.DelamType = DelamType.Singulo; - _chat.TrySendInGameICMessage(uid, Loc.GetString("supermatter-delamination-overmass"), - InGameICChatType.Speak, hideChat: true); + var message = Loc.GetString("supermatter-delamination-overmass"); + var channel = _prototypeManager.Index("Engineering"); + _radioSystem.SendRadioMessage(uid, message, channel, uid); } } else { sMcomponent.DelamType = DelamType.Explosion; - _chat.TrySendInGameICMessage(uid, Loc.GetString("supermatter-delamination-default"), - InGameICChatType.Speak, hideChat: true); + var message = Loc.GetString("supermatter-delamination-default"); + var channel = _prototypeManager.Index("Engineering"); + _radioSystem.SendRadioMessage(uid, message, channel, uid); } } @@ -430,18 +437,18 @@ private void Delamination( //we're more than 5 seconds from delam, only yell every 5 seconds. if (roundSeconds >= sMcomponent.YellDelam && sMcomponent.SpeakAccumulator >= sMcomponent.YellDelam) { + var message = Loc.GetString("supermatter-seconds-before-delam", ("seconds", roundSeconds)); + var channel = _prototypeManager.Index("Engineering"); + _radioSystem.SendRadioMessage(uid, message, channel, uid); sMcomponent.SpeakAccumulator -= sMcomponent.YellDelam; - _chat.TrySendInGameICMessage(uid, - Loc.GetString("supermatter-seconds-before-delam", ("Seconds", roundSeconds)), - InGameICChatType.Speak, hideChat: true); } //less than 5 seconds to delam, count every second. else if (roundSeconds < sMcomponent.YellDelam && sMcomponent.SpeakAccumulator >= 1) { sMcomponent.SpeakAccumulator -= 1; - _chat.TrySendInGameICMessage(uid, - Loc.GetString("supermatter-seconds-before-delam", ("Seconds", roundSeconds)), - InGameICChatType.Speak, hideChat: true); + var message = Loc.GetString("supermatter-seconds-before-delam", ("seconds", roundSeconds)); + var channel = _prototypeManager.Index("Engineering"); + _radioSystem.SendRadioMessage(uid, message, channel, uid); } //TODO: make tesla(?) spawn at SupermatterComponent.PowerPenaltyThreshold and think up other delam types diff --git a/Resources/Locale/en-US/nyanotrasen/psionics/psychic-feedback.ftl b/Resources/Locale/en-US/nyanotrasen/psionics/psychic-feedback.ftl index 26d2acb87cd..baa8fc27d9e 100644 --- a/Resources/Locale/en-US/nyanotrasen/psionics/psychic-feedback.ftl +++ b/Resources/Locale/en-US/nyanotrasen/psionics/psychic-feedback.ftl @@ -14,6 +14,9 @@ sophic-grammateus-feedback = SEEKER, YOU NEED ONLY ASK FOR MY WISDOM. oracle-feedback = WHY DO YOU BOTHER ME SEEKER? HAVE I NOT MADE MY DESIRES CLEAR? metempsychotic-machine-feedback = The sea of fate flows through this machine ifrit-feedback = A spirit of Gehenna, bound by the will of a powerful psychic +regeneration-feedback = {CAPITALIZE($entity)} demonstrates an overwhelming will to live +regenerative-stasis-feedback = {CAPITALIZE($entity)} holds the life of others within their hands +prober-feedback = A mirror into the end of time, the screaming of dead stars emanates from this machine # Power PVS Messages focused-metapsionic-pulse-begin = The air around {CAPITALIZE($entity)} begins to shimmer faintly diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/familiars.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/familiars.yml index 2e310914a34..b1934e736d7 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/familiars.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/NPCs/familiars.yml @@ -85,6 +85,8 @@ - type: Psionic removable: false amplification: 4 + psychicFeedback: + - "ifrit-feedback" - type: PyrokinesisPower - type: Grammar attributes: diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml index 659cbaa28a2..18ea198697e 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml @@ -80,7 +80,7 @@ - ReagentId: Nicotine Quantity: 10 - ReagentId: Omnizine - Quantity: 30 + Quantity: 5 - type: entity id: CigaretteOmnizine diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml index bc9079fb2db..6c01941c398 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/packs.yml @@ -182,7 +182,7 @@ id: CigPackSyndicate parent: CigPackBase name: Interdyne herbals packet - description: Elite cigarettes for elite syndicate agents. Infused with medicine for when you need to do more than calm your nerves. + description: Premium medicinal cigarettes from the Interdyne corporation. Not endorsed by the Terra-Gov Surgeon General. components: - type: Sprite sprite: Objects/Consumable/Smokeables/Cigarettes/Packs/syndicate.rsi diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 7300c0b9ec3..3a3a439e0b7 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -323,11 +323,11 @@ - HolofanProjector - BluespaceBeaker - SyringeBluespace - #- WeaponForceGun + - WeaponForceGun - WeaponLaserSvalinn - WeaponProtoKineticAccelerator - #- WeaponTetherGun - #- WeaponGrapplingGun + - WeaponTetherGun + - WeaponGrapplingGun - ClothingBackpackHolding - ClothingBackpackSatchelHolding - ClothingBackpackDuffelHolding @@ -592,7 +592,7 @@ - BorgModuleLightReplacer - BorgModuleAdvancedCleaning - BorgModuleMining - #- BorgModuleGrapplingGun + - BorgModuleGrapplingGun - BorgModuleAdvancedTool - BorgModuleGPS - BorgModuleRCD diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml index 6efa5a63711..2c9dc4826ac 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml @@ -14,7 +14,7 @@ path: /Audio/Ambience/Objects/vending_machine_hum.ogg - type: Sprite sprite: Structures/Machines/VendingMachines/empty.rsi - snapCardinals: true + snapCardinals: false - type: Physics bodyType: Static - type: Transform diff --git a/Resources/Prototypes/Entities/Supermatter/supermatter.yml b/Resources/Prototypes/Entities/Supermatter/supermatter.yml index 72348a4bb63..6d63f162083 100644 --- a/Resources/Prototypes/Entities/Supermatter/supermatter.yml +++ b/Resources/Prototypes/Entities/Supermatter/supermatter.yml @@ -63,3 +63,12 @@ maxIntensity: 10000 intensitySlope: 10 totalIntensity: 10000 + - type: IntrinsicRadioReceiver + channels: + - Engineering + - type: IntrinsicRadioTransmitter + channels: + - Engineering + - type: ActiveRadio + channels: + - Engineering diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/glimmer_prober.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/glimmer_prober.yml index e157f8b7ff4..951e75183b6 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/glimmer_prober.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/glimmer_prober.yml @@ -5,6 +5,8 @@ description: Probes the noösphere to generate research points. Might be worth turning off if glimmer is a problem. components: - type: Psionic + psychicFeedback: + - "prober-feedback" - type: GlimmerSource - type: Construction graph: GlimmerDevices diff --git a/Resources/Prototypes/Recipes/Lathes/devices.yml b/Resources/Prototypes/Recipes/Lathes/devices.yml index d41b5fdce87..3b9c89692f1 100644 --- a/Resources/Prototypes/Recipes/Lathes/devices.yml +++ b/Resources/Prototypes/Recipes/Lathes/devices.yml @@ -76,7 +76,7 @@ Steel: 100 Plastic: 200 Glass: 100 - + - type: latheRecipe id: SignallerAdvanced result: RemoteSignallerAdvanced @@ -178,15 +178,15 @@ Plasma: 1000 #DeltaV: Bluespace Exists so less plasma used, no uranium Bluespace: 200 #DeltaV: Bluespace Exists -#- type: latheRecipe #DeltaV - LRP -# id: WeaponForceGun -# result: WeaponForceGun -# category: Tools -# completetime: 5 -# materials: -# Steel: 500 -# Glass: 400 -# Silver: 200 +- type: latheRecipe + id: WeaponForceGun + result: WeaponForceGun + category: Tools + completetime: 5 + materials: + Steel: 500 + Glass: 400 + Silver: 200 - type: latheRecipe id: DeviceQuantumSpinInverter @@ -207,22 +207,22 @@ Glass: 500 Silver: 100 -#- type: latheRecipe #DeltaV - LRP -# id: WeaponTetherGun -# result: WeaponTetherGun -# category: Tools -# completetime: 5 -# materials: -# Steel: 500 -# Glass: 400 -# Silver: 100 - -#- type: latheRecipe #DeltaV - LRP -# id: WeaponGrapplingGun -# result: WeaponGrapplingGun -# category: Tools -# completetime: 5 -# materials: -# Steel: 500 -# Glass: 400 -# Gold: 100 +- type: latheRecipe + id: WeaponTetherGun + result: WeaponTetherGun + category: Tools + completetime: 5 + materials: + Steel: 500 + Glass: 400 + Silver: 100 + +- type: latheRecipe + id: WeaponGrapplingGun + result: WeaponGrapplingGun + category: Tools + completetime: 5 + materials: + Steel: 500 + Glass: 400 + Gold: 100 diff --git a/Resources/Prototypes/Recipes/Lathes/robotics.yml b/Resources/Prototypes/Recipes/Lathes/robotics.yml index f42e2851c78..44a9e2f0f24 100644 --- a/Resources/Prototypes/Recipes/Lathes/robotics.yml +++ b/Resources/Prototypes/Recipes/Lathes/robotics.yml @@ -427,16 +427,16 @@ Glass: 250 Plastic: 250 -#- type: latheRecipe -# id: BorgModuleGrapplingGun -# result: BorgModuleGrapplingGun -# category: Robotics -# completetime: 3 -# materials: -# Steel: 500 -# Glass: 500 -# Plastic: 250 -# Gold: 50 +- type: latheRecipe + id: BorgModuleGrapplingGun + result: BorgModuleGrapplingGun + category: Robotics + completetime: 3 + materials: + Steel: 500 + Glass: 500 + Plastic: 250 + Gold: 50 - type: latheRecipe id: BorgModuleAdvancedTool diff --git a/Resources/Prototypes/Research/experimental.yml b/Resources/Prototypes/Research/experimental.yml index e2733c6928c..bc0a26b58ab 100644 --- a/Resources/Prototypes/Research/experimental.yml +++ b/Resources/Prototypes/Research/experimental.yml @@ -139,18 +139,18 @@ # Tier 3 -#- type: technology # DeltaV - LRP -# id: GravityManipulation -# name: research-technology-gravity-manipulation -# icon: -# sprite: Objects/Weapons/Guns/Launchers/tether_gun.rsi -# state: base -# discipline: Experimental -# tier: 3 -# cost: 10000 -# recipeUnlocks: -# - WeaponForceGun -# - WeaponTetherGun +- type: technology + id: GravityManipulation + name: research-technology-gravity-manipulation + icon: + sprite: Objects/Weapons/Guns/Launchers/tether_gun.rsi + state: base + discipline: Experimental + tier: 3 + cost: 10000 + recipeUnlocks: + - WeaponForceGun + - WeaponTetherGun - type: technology id: QuantumLeaping diff --git a/Resources/Prototypes/Research/industrial.yml b/Resources/Prototypes/Research/industrial.yml index edcc9c66364..d3bc03bfbfe 100644 --- a/Resources/Prototypes/Research/industrial.yml +++ b/Resources/Prototypes/Research/industrial.yml @@ -105,18 +105,18 @@ - RipleyPeripheralsElectronics - MechEquipmentGrabber -#- type: technology -# id: Grappling -# name: research-technology-grappling -# icon: -# sprite: Objects/Weapons/Guns/Launchers/grappling_gun.rsi -# state: base -# discipline: Industrial -# tier: 1 -# cost: 5000 -# recipeUnlocks: -# - WeaponGrapplingGun -# - BorgModuleGrapplingGun +- type: technology + id: Grappling + name: research-technology-grappling + icon: + sprite: Objects/Weapons/Guns/Launchers/grappling_gun.rsi + state: base + discipline: Industrial + tier: 1 + cost: 5000 + recipeUnlocks: + - WeaponGrapplingGun + - BorgModuleGrapplingGun # Tier 2 diff --git a/Resources/Prototypes/_ds14/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/_ds14/Entities/Structures/Machines/vending_machines.yml index 0a474f90817..efcdb040a44 100644 --- a/Resources/Prototypes/_ds14/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/_ds14/Entities/Structures/Machines/vending_machines.yml @@ -61,7 +61,7 @@ map: ["enum.WiresVisualLayers.MaintenancePanel"] - type: Transform noRot: false - + - type: entity id: VendingMachineColaDS14 parent: VendingMachineCola @@ -80,7 +80,7 @@ map: ["enum.WiresVisualLayers.MaintenancePanel"] - type: Transform noRot: false - + - type: entity id: VendingMachineDinnerwareDS14 parent: VendingMachineDinnerware @@ -137,7 +137,7 @@ map: ["enum.WiresVisualLayers.MaintenancePanel"] - type: Transform noRot: false - + - type: entity id: VendingMachineFitnessDS14 parent: VendingMachineDS14 @@ -145,6 +145,7 @@ description: An exercise aid and nutrition supplement vendor that preys on your inadequacy. components: - type: Sprite + noRot: true sprite: _ds14/Structures/Machines/VendingMachines/fitness.rsi layers: - state: "off" @@ -164,7 +165,7 @@ normalState: normal-unshaded - type: Advertise pack: FitnessVendAds - + - type: entity id: VendingMachineGamesDS14 parent: VendingMachineGames @@ -183,7 +184,7 @@ map: ["enum.WiresVisualLayers.MaintenancePanel"] - type: Transform noRot: false - + - type: entity id: VendingMachineHotfoodDS14 parent: VendingMachineDS14 @@ -191,6 +192,7 @@ description: An old vending machine promising 'hot foods'. You doubt any of its contents are still edible. components: - type: Sprite + noRot: true sprite: _ds14/Structures/Machines/VendingMachines/hotfood.rsi layers: - state: "off" @@ -207,7 +209,7 @@ normalState: normal-unshaded - type: Advertise pack: HotfoodAds - + - type: entity id: VendingMachineCartDS14 # Laptop vendor actually parent: VendingMachineCart # DS14:TODO: Placeholder @@ -226,7 +228,7 @@ map: ["enum.WiresVisualLayers.MaintenancePanel"] - type: Transform noRot: false - + - type: entity id: VendingMachineJanitorDS14 # Lavatory vendor actually, for bathrooms. parent: VendingMachineJaniDrobe # DS14:TODO: Placeholder @@ -245,7 +247,7 @@ map: ["enum.WiresVisualLayers.MaintenancePanel"] - type: Transform noRot: false - + - type: entity id: VendingMachineMagivendDS14 parent: VendingMachineMagivend @@ -264,7 +266,7 @@ map: ["enum.WiresVisualLayers.MaintenancePanel"] - type: Transform noRot: false - + - type: entity id: VendingMachineMedicalDS14 parent: VendingMachineMedical @@ -283,7 +285,7 @@ map: ["enum.WiresVisualLayers.MaintenancePanel"] - type: Transform noRot: false - + - type: entity id: VendingMachineNutrimaxDS14 parent: VendingMachineNutri @@ -302,7 +304,7 @@ map: ["enum.WiresVisualLayers.MaintenancePanel"] - type: Transform noRot: false - + - type: entity id: VendingMachineRoboticsDS14 parent: VendingMachineRobotics @@ -321,7 +323,7 @@ map: ["enum.WiresVisualLayers.MaintenancePanel"] - type: Transform noRot: false - + - type: entity id: VendingMachineSectechDS14 parent: VendingMachineSec @@ -340,7 +342,7 @@ map: ["enum.WiresVisualLayers.MaintenancePanel"] - type: Transform noRot: false - + - type: entity id: VendingMachineSeedsUnlockedDS14 parent: VendingMachineSeedsUnlocked @@ -359,7 +361,7 @@ map: ["enum.WiresVisualLayers.MaintenancePanel"] - type: Transform noRot: false - + - type: entity parent: VendingMachineSeedsUnlockedDS14 id: VendingMachineSeedsDS14 @@ -367,7 +369,7 @@ components: - type: AccessReader access: [["Hydroponics"]] - + - type: entity id: VendingMachineSnackDS14 parent: VendingMachineSnack @@ -386,7 +388,7 @@ map: ["enum.WiresVisualLayers.MaintenancePanel"] - type: Transform noRot: false - + - type: entity id: VendingMachineSnixDS14 parent: VendingMachineSnack # DS14:TODO: Placeholder @@ -405,7 +407,7 @@ map: ["enum.WiresVisualLayers.MaintenancePanel"] - type: Transform noRot: false - + - type: entity id: VendingMachineSolsnackDS14 parent: VendingMachineDS14 @@ -429,7 +431,7 @@ normalState: normal-unshaded - type: Advertise pack: SolsnackAds - + - type: entity id: VendingMachineSodaDS14 parent: VendingMachineSoda @@ -448,7 +450,7 @@ map: ["enum.WiresVisualLayers.MaintenancePanel"] - type: Transform noRot: false - + - type: entity id: VendingMachineSodaFoxDS14 parent: VendingMachineSoda @@ -467,7 +469,7 @@ map: ["enum.WiresVisualLayers.MaintenancePanel"] - type: Transform noRot: false - + - type: entity id: VendingMachineSovietSodaDS14 parent: VendingMachineSovietSoda @@ -486,7 +488,7 @@ map: ["enum.WiresVisualLayers.MaintenancePanel"] - type: Transform noRot: false - + - type: entity id: VendingMachineTheaterDS14 parent: VendingMachineTheater @@ -507,7 +509,7 @@ map: ["enum.WiresVisualLayers.MaintenancePanel"] - type: Transform noRot: false - + - type: entity id: VendingMachineWallMedicalDS14 parent: VendingMachineWallMedical @@ -526,7 +528,7 @@ map: ["enum.WiresVisualLayers.MaintenancePanel"] - type: Transform noRot: false - + - type: entity id: VendingMachineWeebDS14 parent: VendingMachineDS14 @@ -551,7 +553,7 @@ normalState: normal-unshaded - type: Advertise pack: WeebVendAds - + - type: entity id: VendingMachineYoutoolDS14 parent: VendingMachineYouTool @@ -569,4 +571,4 @@ - state: panel map: ["enum.WiresVisualLayers.MaintenancePanel"] - type: Transform - noRot: false \ No newline at end of file + noRot: false From 244669f74d751f30f3752297098a96c3d4019bf0 Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Mon, 3 Jun 2024 15:15:51 -0400 Subject: [PATCH 39/44] fix tests --- Content.IntegrationTests/Tests/PostMapInitTest.cs | 6 +++++- Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Content.IntegrationTests/Tests/PostMapInitTest.cs b/Content.IntegrationTests/Tests/PostMapInitTest.cs index 07a6ddd89f1..1fcd7dde730 100644 --- a/Content.IntegrationTests/Tests/PostMapInitTest.cs +++ b/Content.IntegrationTests/Tests/PostMapInitTest.cs @@ -58,7 +58,11 @@ public sealed class PostMapInitTest "TheHive", //DeltaV "Hammurabi", //DeltaV "Lighthouse", //DeltaV - "Submarine" //DeltaV + "Submarine", //DeltaV + "Packed", + "PackedSM", + "Pillaer", + "Saltern" }; /// diff --git a/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml b/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml index c6fae9a1eb5..c611b40e873 100644 --- a/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml +++ b/Resources/Prototypes/Roles/Jobs/Wildcards/boxer.yml @@ -3,7 +3,7 @@ name: job-name-boxer description: job-description-boxer playTimeTracker: JobBoxer - setPreference: false # disabled because what even is this role + setPreference: true # requirements: # - !type:OverallPlaytimeRequirement # time: 7200 #DeltaV 2 hours From f175e199b1fbcd323d669686bb1370ac0c2c4211 Mon Sep 17 00:00:00 2001 From: FoxxoTrystan <45297731+FoxxoTrystan@users.noreply.github.com> Date: Mon, 3 Jun 2024 21:23:50 +0200 Subject: [PATCH 40/44] The Floors! (Resprites) (#417) # Description Edit/Resprite most of the floors in-game because in all honest TG Floors... currently... are extremly flat and old... even TG already has upgraded their floors... This also changed some minor edits to decals to fit, This PR is recomended paired with #402 and others updated looks PRs This bring new floors sprites from baystation, paradise station. --- # TODO - [x] Import Sprites - [x] @VMSolidus Edits ---

Media

![image](https://github.com/Simple-Station/Einstein-Engines/assets/45297731/01a4351c-b72a-446f-9db5-ca50f63f140e) ![image](https://github.com/Simple-Station/Einstein-Engines/assets/45297731/bde02ff6-38d9-49a5-8594-a53e005a4075) ![image](https://github.com/Simple-Station/Einstein-Engines/assets/45297731/9e4b508e-9512-481b-8e7e-a2f500a6375c) ![image](https://github.com/Simple-Station/Einstein-Engines/assets/45297731/34634648-c489-4581-8d5f-ee088744255d) ![image](https://github.com/Simple-Station/Einstein-Engines/assets/45297731/4e0b666c-ba84-4c5b-ae63-ee2af3c44b96)

--- # Changelog :cl: - tweak: Floors Looks Updated/Resprited. --------- Co-authored-by: VMSolidus --- Resources/Prototypes/Tiles/floors.yml | 46 +----------------- .../Decals/bricktile.rsi/dark_box.png | Bin 417 -> 4791 bytes .../Decals/bricktile.rsi/dark_corner_ne.png | Bin 354 -> 4242 bytes .../Decals/bricktile.rsi/dark_corner_nw.png | Bin 325 -> 4244 bytes .../Decals/bricktile.rsi/dark_corner_se.png | Bin 351 -> 4247 bytes .../Decals/bricktile.rsi/dark_corner_sw.png | Bin 320 -> 4249 bytes .../Decals/bricktile.rsi/dark_end_e.png | Bin 407 -> 4748 bytes .../Decals/bricktile.rsi/dark_end_n.png | Bin 387 -> 4741 bytes .../Decals/bricktile.rsi/dark_end_s.png | Bin 395 -> 4258 bytes .../Decals/bricktile.rsi/dark_end_w.png | Bin 384 -> 4493 bytes .../Decals/bricktile.rsi/dark_inner_ne.png | Bin 222 -> 4491 bytes .../Decals/bricktile.rsi/dark_inner_nw.png | Bin 218 -> 4477 bytes .../Decals/bricktile.rsi/dark_inner_se.png | Bin 213 -> 4232 bytes .../Decals/bricktile.rsi/dark_inner_sw.png | Bin 235 -> 4478 bytes .../Decals/bricktile.rsi/dark_line_e.png | Bin 297 -> 4231 bytes .../Decals/bricktile.rsi/dark_line_n.png | Bin 256 -> 4230 bytes .../Decals/bricktile.rsi/dark_line_s.png | Bin 269 -> 4230 bytes .../Decals/bricktile.rsi/dark_line_w.png | Bin 256 -> 4477 bytes .../Textures/Decals/bricktile.rsi/meta.json | 2 +- .../Decals/bricktile.rsi/steel_box.png | Bin 456 -> 4854 bytes .../Decals/bricktile.rsi/steel_corner_ne.png | Bin 373 -> 4351 bytes .../Decals/bricktile.rsi/steel_corner_nw.png | Bin 343 -> 4340 bytes .../Decals/bricktile.rsi/steel_corner_se.png | Bin 367 -> 4341 bytes .../Decals/bricktile.rsi/steel_corner_sw.png | Bin 338 -> 4346 bytes .../Decals/bricktile.rsi/steel_end_e.png | Bin 430 -> 4377 bytes .../Decals/bricktile.rsi/steel_end_n.png | Bin 428 -> 4352 bytes .../Decals/bricktile.rsi/steel_end_s.png | Bin 414 -> 4365 bytes .../Decals/bricktile.rsi/steel_end_w.png | Bin 412 -> 4367 bytes .../Decals/bricktile.rsi/steel_inner_ne.png | Bin 234 -> 4270 bytes .../Decals/bricktile.rsi/steel_inner_nw.png | Bin 226 -> 4274 bytes .../Decals/bricktile.rsi/steel_inner_se.png | Bin 220 -> 4273 bytes .../Decals/bricktile.rsi/steel_inner_sw.png | Bin 241 -> 4421 bytes .../Decals/bricktile.rsi/steel_line_e.png | Bin 306 -> 4253 bytes .../Decals/bricktile.rsi/steel_line_n.png | Bin 270 -> 4317 bytes .../Decals/bricktile.rsi/steel_line_s.png | Bin 277 -> 1621 bytes .../Decals/bricktile.rsi/steel_line_w.png | Bin 263 -> 4292 bytes .../Decals/bricktile.rsi/white_box.png | Bin 444 -> 4305 bytes .../Decals/bricktile.rsi/white_corner_ne.png | Bin 367 -> 4283 bytes .../Decals/bricktile.rsi/white_corner_nw.png | Bin 337 -> 4285 bytes .../Decals/bricktile.rsi/white_corner_se.png | Bin 361 -> 4247 bytes .../Decals/bricktile.rsi/white_corner_sw.png | Bin 334 -> 4290 bytes .../Decals/bricktile.rsi/white_end_e.png | Bin 418 -> 4301 bytes .../Decals/bricktile.rsi/white_end_n.png | Bin 404 -> 4294 bytes .../Decals/bricktile.rsi/white_end_s.png | Bin 409 -> 4299 bytes .../Decals/bricktile.rsi/white_end_w.png | Bin 401 -> 4290 bytes .../Decals/bricktile.rsi/white_inner_ne.png | Bin 230 -> 1914 bytes .../Decals/bricktile.rsi/white_inner_nw.png | Bin 226 -> 4272 bytes .../Decals/bricktile.rsi/white_inner_se.png | Bin 220 -> 4273 bytes .../Decals/bricktile.rsi/white_inner_sw.png | Bin 241 -> 4494 bytes .../Decals/bricktile.rsi/white_line_e.png | Bin 306 -> 4272 bytes .../Decals/bricktile.rsi/white_line_n.png | Bin 270 -> 4271 bytes .../Decals/bricktile.rsi/white_line_s.png | Bin 272 -> 4271 bytes .../Decals/bricktile.rsi/white_line_w.png | Bin 256 -> 4274 bytes .../Textures/Decals/minitile.rsi/dark_box.png | Bin 394 -> 5238 bytes .../Decals/minitile.rsi/dark_corner_ne.png | Bin 363 -> 5199 bytes .../Decals/minitile.rsi/dark_corner_nw.png | Bin 343 -> 5088 bytes .../Decals/minitile.rsi/dark_corner_se.png | Bin 331 -> 5238 bytes .../Decals/minitile.rsi/dark_corner_sw.png | Bin 315 -> 5132 bytes .../Decals/minitile.rsi/dark_end_e.png | Bin 404 -> 5242 bytes .../Decals/minitile.rsi/dark_end_n.png | Bin 373 -> 5188 bytes .../Decals/minitile.rsi/dark_end_s.png | Bin 354 -> 5241 bytes .../Decals/minitile.rsi/dark_end_w.png | Bin 405 -> 5159 bytes .../Decals/minitile.rsi/dark_inner_ne.png | Bin 229 -> 4962 bytes .../Decals/minitile.rsi/dark_inner_nw.png | Bin 225 -> 4892 bytes .../Decals/minitile.rsi/dark_inner_se.png | Bin 220 -> 4999 bytes .../Decals/minitile.rsi/dark_inner_sw.png | Bin 236 -> 4941 bytes .../Decals/minitile.rsi/dark_line_e.png | Bin 283 -> 5134 bytes .../Decals/minitile.rsi/dark_line_n.png | Bin 280 -> 4938 bytes .../Decals/minitile.rsi/dark_line_s.png | Bin 267 -> 4996 bytes .../Decals/minitile.rsi/dark_line_w.png | Bin 263 -> 5013 bytes .../Textures/Decals/minitile.rsi/meta.json | 2 +- .../Decals/minitile.rsi/steel_box.png | Bin 425 -> 5312 bytes .../Decals/minitile.rsi/steel_corner_ne.png | Bin 368 -> 5223 bytes .../Decals/minitile.rsi/steel_corner_nw.png | Bin 352 -> 5225 bytes .../Decals/minitile.rsi/steel_corner_se.png | Bin 336 -> 5265 bytes .../Decals/minitile.rsi/steel_corner_sw.png | Bin 317 -> 5258 bytes .../Decals/minitile.rsi/steel_end_e.png | Bin 409 -> 5291 bytes .../Decals/minitile.rsi/steel_end_n.png | Bin 378 -> 5255 bytes .../Decals/minitile.rsi/steel_end_s.png | Bin 359 -> 5293 bytes .../Decals/minitile.rsi/steel_end_w.png | Bin 397 -> 5280 bytes .../Decals/minitile.rsi/steel_inner_ne.png | Bin 234 -> 4961 bytes .../Decals/minitile.rsi/steel_inner_nw.png | Bin 226 -> 4952 bytes .../Decals/minitile.rsi/steel_inner_se.png | Bin 220 -> 4992 bytes .../Decals/minitile.rsi/steel_inner_sw.png | Bin 241 -> 4973 bytes .../Decals/minitile.rsi/steel_line_e.png | Bin 287 -> 5109 bytes .../Decals/minitile.rsi/steel_line_n.png | Bin 285 -> 5050 bytes .../Decals/minitile.rsi/steel_line_s.png | Bin 267 -> 5099 bytes .../Decals/minitile.rsi/steel_line_w.png | Bin 267 -> 5083 bytes .../Decals/minitile.rsi/white_box.png | Bin 394 -> 5307 bytes .../Decals/minitile.rsi/white_corner_ne.png | Bin 363 -> 5198 bytes .../Decals/minitile.rsi/white_corner_nw.png | Bin 347 -> 5242 bytes .../Decals/minitile.rsi/white_corner_se.png | Bin 331 -> 5238 bytes .../Decals/minitile.rsi/white_corner_sw.png | Bin 317 -> 5281 bytes .../Decals/minitile.rsi/white_end_e.png | Bin 404 -> 5257 bytes .../Decals/minitile.rsi/white_end_n.png | Bin 373 -> 5250 bytes .../Decals/minitile.rsi/white_end_s.png | Bin 354 -> 5297 bytes .../Decals/minitile.rsi/white_end_w.png | Bin 392 -> 5303 bytes .../Decals/minitile.rsi/white_inner_ne.png | Bin 229 -> 4936 bytes .../Decals/minitile.rsi/white_inner_nw.png | Bin 226 -> 4941 bytes .../Decals/minitile.rsi/white_inner_se.png | Bin 220 -> 4960 bytes .../Decals/minitile.rsi/white_inner_sw.png | Bin 236 -> 4983 bytes .../Decals/minitile.rsi/white_line_e.png | Bin 282 -> 5045 bytes .../Decals/minitile.rsi/white_line_n.png | Bin 313 -> 5043 bytes .../Decals/minitile.rsi/white_line_s.png | Bin 314 -> 5092 bytes .../Decals/minitile.rsi/white_line_w.png | Bin 267 -> 5132 bytes Resources/Textures/Tiles/arcadeblue2.png | Bin 546 -> 698 bytes Resources/Textures/Tiles/attributions.yml | 45 +++++++++-------- Resources/Textures/Tiles/bar.png | Bin 1614 -> 1583 bytes Resources/Textures/Tiles/blue_circuit.png | Bin 360 -> 508 bytes Resources/Textures/Tiles/cafeteria.png | Bin 1328 -> 204 bytes Resources/Textures/Tiles/checker_dark.png | Bin 1334 -> 204 bytes Resources/Textures/Tiles/clown.png | Bin 851 -> 185 bytes Resources/Textures/Tiles/dark.png | Bin 1129 -> 536 bytes Resources/Textures/Tiles/dark_diagonal.png | Bin 470 -> 4304 bytes .../Textures/Tiles/dark_diagonal_mini.png | Bin 281 -> 4282 bytes Resources/Textures/Tiles/dark_herringbone.png | Bin 624 -> 4316 bytes Resources/Textures/Tiles/dark_mini.png | Bin 302 -> 1962 bytes Resources/Textures/Tiles/dark_mono.png | Bin 536 -> 4245 bytes Resources/Textures/Tiles/dark_offset.png | Bin 439 -> 4251 bytes Resources/Textures/Tiles/dark_pavement.png | Bin 667 -> 4273 bytes .../Textures/Tiles/dark_pavement_vertical.png | Bin 828 -> 4477 bytes Resources/Textures/Tiles/dark_plastic.png | Bin 471 -> 4283 bytes Resources/Textures/Tiles/glass.png | Bin 2350 -> 5977 bytes Resources/Textures/Tiles/green_circuit.png | Bin 360 -> 633 bytes Resources/Textures/Tiles/hydro.png | Bin 445 -> 161 bytes Resources/Textures/Tiles/kitchen.png | Bin 477 -> 185 bytes Resources/Textures/Tiles/laundry.png | Bin 843 -> 185 bytes Resources/Textures/Tiles/lime.png | Bin 952 -> 178 bytes Resources/Textures/Tiles/mime.png | Bin 845 -> 179 bytes Resources/Textures/Tiles/plastic.png | Bin 564 -> 4283 bytes Resources/Textures/Tiles/plating.png | Bin 352 -> 183 bytes Resources/Textures/Tiles/plating_burnt.png | Bin 1565 -> 1407 bytes Resources/Textures/Tiles/red_circuit.png | Bin 0 -> 702 bytes Resources/Textures/Tiles/rglass.png | Bin 3158 -> 6911 bytes Resources/Textures/Tiles/shuttleblack.png | Bin 1768 -> 506 bytes Resources/Textures/Tiles/shuttleblue.png | Bin 767 -> 463 bytes Resources/Textures/Tiles/shuttlegrey.png | Bin 724 -> 393 bytes Resources/Textures/Tiles/shuttleorange.png | Bin 767 -> 414 bytes Resources/Textures/Tiles/shuttlepurple.png | Bin 751 -> 473 bytes Resources/Textures/Tiles/shuttlered.png | Bin 2109 -> 556 bytes Resources/Textures/Tiles/shuttlewhite.png | Bin 704 -> 421 bytes Resources/Textures/Tiles/steel.png | Bin 952 -> 1927 bytes Resources/Textures/Tiles/steel_diagonal.png | Bin 501 -> 4304 bytes .../Textures/Tiles/steel_diagonal_mini.png | Bin 300 -> 4272 bytes Resources/Textures/Tiles/steel_dirty.png | Bin 1257 -> 979 bytes .../Textures/Tiles/steel_herringbone.png | Bin 677 -> 4380 bytes Resources/Textures/Tiles/steel_mini.png | Bin 321 -> 1962 bytes Resources/Textures/Tiles/steel_mono.png | Bin 547 -> 4299 bytes Resources/Textures/Tiles/steel_offset.png | Bin 452 -> 4251 bytes Resources/Textures/Tiles/steel_pavement.png | Bin 697 -> 4232 bytes .../Tiles/steel_pavement_vertical.png | Bin 768 -> 4721 bytes Resources/Textures/Tiles/white.png | Bin 1129 -> 536 bytes Resources/Textures/Tiles/white_diagonal.png | Bin 470 -> 4304 bytes .../Textures/Tiles/white_diagonal_mini.png | Bin 281 -> 4272 bytes .../Textures/Tiles/white_herringbone.png | Bin 641 -> 4275 bytes Resources/Textures/Tiles/white_mini.png | Bin 315 -> 1962 bytes Resources/Textures/Tiles/white_mono.png | Bin 536 -> 4290 bytes Resources/Textures/Tiles/white_offset.png | Bin 439 -> 4210 bytes Resources/Textures/Tiles/white_pavement.png | Bin 670 -> 4273 bytes .../Tiles/white_pavement_vertical.png | Bin 842 -> 4664 bytes Resources/Textures/Tiles/white_plastic.png | Bin 515 -> 4286 bytes 161 files changed, 29 insertions(+), 66 deletions(-) create mode 100644 Resources/Textures/Tiles/red_circuit.png diff --git a/Resources/Prototypes/Tiles/floors.yml b/Resources/Prototypes/Tiles/floors.yml index 59fa88be2b2..b5ca240d5ca 100644 --- a/Resources/Prototypes/Tiles/floors.yml +++ b/Resources/Prototypes/Tiles/floors.yml @@ -201,7 +201,7 @@ collection: FootstepHull itemDrop: FloorTileItemBrassFilled heatCapacity: 10000 - + - type: tile id: FloorBrassReebe name: tiles-brass-floor-reebe @@ -1207,12 +1207,6 @@ id: FloorShuttleWhite name: tiles-white-shuttle-floor sprite: /Textures/Tiles/shuttlewhite.png - variants: 4 - placementVariants: - - 1.0 - - 1.0 - - 1.0 - - 1.0 baseTurf: Plating isSubfloor: false deconstructTools: [ Prying ] @@ -1225,12 +1219,6 @@ id: FloorShuttleGrey name: tiles-grey-shuttle-floor sprite: /Textures/Tiles/shuttlegrey.png - variants: 4 - placementVariants: - - 1.0 - - 1.0 - - 1.0 - - 1.0 baseTurf: Plating isSubfloor: false deconstructTools: [ Prying ] @@ -1243,12 +1231,6 @@ id: FloorShuttleBlack name: tiles-black-shuttle-floor sprite: /Textures/Tiles/shuttleblack.png - variants: 4 - placementVariants: - - 1.0 - - 1.0 - - 1.0 - - 1.0 baseTurf: Plating isSubfloor: false deconstructTools: [ Prying ] @@ -1261,12 +1243,6 @@ id: FloorShuttleBlue name: tiles-blue-shuttle-floor sprite: /Textures/Tiles/shuttleblue.png - variants: 4 - placementVariants: - - 1.0 - - 1.0 - - 1.0 - - 1.0 baseTurf: Plating isSubfloor: false deconstructTools: [ Prying ] @@ -1279,12 +1255,6 @@ id: FloorShuttleOrange name: tiles-orange-shuttle-floor sprite: /Textures/Tiles/shuttleorange.png - variants: 4 - placementVariants: - - 1.0 - - 1.0 - - 1.0 - - 1.0 baseTurf: Plating isSubfloor: false deconstructTools: [ Prying ] @@ -1297,12 +1267,6 @@ id: FloorShuttlePurple name: tiles-purple-shuttle-floor sprite: /Textures/Tiles/shuttlepurple.png - variants: 4 - placementVariants: - - 1.0 - - 1.0 - - 1.0 - - 1.0 baseTurf: Plating isSubfloor: false deconstructTools: [ Prying ] @@ -1315,12 +1279,6 @@ id: FloorShuttleRed name: tiles-red-shuttle-floor sprite: /Textures/Tiles/shuttlered.png - variants: 4 - placementVariants: - - 1.0 - - 1.0 - - 1.0 - - 1.0 baseTurf: Plating isSubfloor: false deconstructTools: [ Prying ] @@ -1940,4 +1898,4 @@ barestepSounds: collection: BarestepWood itemDrop: FloorTileItemWoodLarge - heatCapacity: 10000 \ No newline at end of file + heatCapacity: 10000 diff --git a/Resources/Textures/Decals/bricktile.rsi/dark_box.png b/Resources/Textures/Decals/bricktile.rsi/dark_box.png index 153e7d3cfce199ac5433c14a92d39b415453e786..d9b23d56766cc0e57537e7ef03a3582cb65e294d 100644 GIT binary patch literal 4791 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 CuI;4& delta 327 zcmbQF_=stONGZx^prw85kH?(j9#r85lP9bN@+X1@ff>d_r8EoSYOD72Vz3 zTwPoo9Ua|VUG41bY;A3U@_XcuGyo~ik|4j}|4_gX>|Y@S5-jkDEM{QfI}E~%$MaXD z00nn@x;Tbd_%EG&o9~DMhs)8|_5c2hzvsE2<{eg3;NyE#x#!k2g_Zj!1x01;OBRVzopr00&=txc~qF diff --git a/Resources/Textures/Decals/bricktile.rsi/dark_corner_nw.png b/Resources/Textures/Decals/bricktile.rsi/dark_corner_nw.png index 7f28df096187a10c2b41ef8d847ccfdbe886892c..d249245bd4eddcd5f71b7270d3896e6b969b533d 100644 GIT binary patch literal 4244 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 F{vWo?>7@Vw delta 298 zcmbQDc$8^^NGZx^prw85kH?(j9#r85lP9bN@+X1@c7$d_r8EoSYOD72Vz3 zTwPoo9Ua|VU4b$Wt8WJbDfW^ezu^C1z#!$#>;@F#EbxddW?^UdveH!FXpUb#Xw=`8q5Wk&mCR@R!-PgaYul&bj5$w#mriXEhXbexnssrb* rGAfJfKH$H={DghN>4gm6_c1IL64>={#hE^!n;AS^{an^LB{Ts5sA6zL diff --git a/Resources/Textures/Decals/bricktile.rsi/dark_corner_se.png b/Resources/Textures/Decals/bricktile.rsi/dark_corner_se.png index 2cb5db32d35bbda4d249acea530f90ccb6f5df68..c608bd12e03d3a1e3ad4149f65a61d4db65b7a54 100644 GIT binary patch literal 4247 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 O7(8A5T-G@yGywqcfPMP_ diff --git a/Resources/Textures/Decals/bricktile.rsi/dark_corner_sw.png b/Resources/Textures/Decals/bricktile.rsi/dark_corner_sw.png index f4d9633ba273d80daa4ec733d86c138000f17e86..7d47c299ba6ef2b4305a2d6d034dc3bc91bf4ae5 100644 GIT binary patch literal 4249 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 Jm+kR7{$Haz>zx1q delta 293 zcmbQKcz|hwNGZx^prw85kH?(j9#r85lP9bN@+X1@a{Vd_r8EoSYOD6}+jqfs!p|fu=x;qa?^L_&)?N+-u$&2^8Zj@Q5sCVBk9p!i>lBSEK+1 z=X$z0hFJLDo#e=OSb>Ly_r{n1_V4P~MQ-iV@>z1ns$He+ppKH-t?cGVf33s@FOS8y z4!Ozi6_I#2(_yjL0-2WNHs|)_6NSntm66?hFSNXpzp~&~Q~QtE{}b6+HJ&*!%ZJUK zec+X>lZ#J7c+2tzPbp4To}JH~YJwk>rnB29`1np*f56OSU6Xf&?ljkfk~2Ts1@AZ@ jH{py%!0R2-QPs>_eh97ManY@NP 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 delta 380 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 delta 360 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 JtaD0e0szPKlq>)M diff --git a/Resources/Textures/Decals/bricktile.rsi/dark_end_w.png b/Resources/Textures/Decals/bricktile.rsi/dark_end_w.png index b010ef23997674afea7d83439712745f22898b42..dcb96039e9db7f84548d7f3d1712b5268ccc81a7 100644 GIT binary patch literal 4493 zcmb_e2{@G9+kY$(m953jm?GQk8fIQZj3qmhC}hlxF=1w!8Dotp36-*BD@#a(M7?$fme(#{j;NnlE1m zuy?nr-%}O2Ql_o_eq5dgTX>JC&}4+iHDT6+ZVca1d@28|ry%OUXci!Q`Z7*YUsgWB zNYgGEUfXpfODR*|UqREqN!whuJrPGrS!24Of2kc6C{x}C|kwd)$DFz_%lD@8#*Euu4gO zCk(jze8KO55x_rN%2a*STrcflj7StVuTQGp=kA^%n|TW@CqEHKD<&{52opGw}f^Ug zzLC62H^ygv%s(|Jee28Fmbwjzy>qh8y>$>R6SR7U{|U$F{4j3vsr zt~?hjBO~E1vcX35JYV{fnc8DfNpsX=iCO+$XK^KSOu&j(^UX#pI%Dl#DqR&~#4h-* zv**)%H(V22B_m4GKwBPorLo>-ZEt)BM2sR`XWry2vreLAn}m$C+_vy;|563r*s_9% zQpHbdc!}KjO0(E*?|{{(4oAnoxUtgy;Q1=KiWSPYR)h8qSiIc9622zZ8Mo@CDogVj zpdRm$jMXNBm5`V`YwTIeGk z5T=X5x)lU##lj$$yi(_Nt7^n*)OH*!vr@GRITPVx=t3^_?6WpdypYguJ#eP6TXs~G zyP;mj`v7Cxl_EqTvuJboMU=woHAP9)H^cm(DBG->EV&L-d*wGO{xX>3*|+?vr#$vo zsP?P3-oo7oZRp?!420AEPI6D?CPr0MBl8`&RjpTxLQvwy&5?Ajy{g&WRxWTQt zNXnT;rBX864!8NY_utLSP%YLlfSr<(viw8PRl zCr9qCZ>wp0o)Nj(DKj+9DPvG`P-n?msQ65YOlfj))t;fkn;ouiT?dLQiV1cn5RD}( z_1@};=~V78E`5B_sN`(LtAdl2#A2>F-75RsSZU5#ugWN^@Lh3*eiv`<(AkMApE?P* z3oR_^))O?&cMDy9MEv(?+Kv z!bqN$Pg+5CY2D7tP8=V*-FjYumh?ygtxKFqi@ zZu(p~qAD-Wr_d+qMaX`SLD&59W~Z2LAlNtfIwkz&Mxc8s^2O;nVW%GnxA` z-tXbH9`qZcRX;3j9gZzd*Brd`ko|P~E#3aI{=J9HsiMg33Yiyr`aAoTE1W!=YpVa0 zeXMe2{(gTq_Q`C*`#$#j*Ez3~+FRfEjb-uv<`vCy7d#e3W{afCr0nCx;#-fuJs#Am z)oQ!hyJS;Ikz-e`L(Y8X`_5@N7XHqwvkqFRR!OK7VW1fWjE9U9&mKNo`)v0!nu)$~ ze?-o-W#p%@@hO!Lu2X*DTO#jA><+&;J^r`GyyyaP!FcxJ^y>xQ!j0$`(G8!~D!RRH z?CudrFE%cQE^J-hE#2ObUm~##oOg^X;taD(zkz5NX>U{CqCnyRG>L2sOw0|5jq?##~qw7V9Jzd0RXX~p3qYQe!XWG1$p8h+_S}qpR zu+sT2TZWq8h_4eyElo^!q+#4@CRy28!cs+10_h@M3MXN^+c1O2rNdxZK^V?s$`1fXa7yon ztAxks{RW>#lP0{H-|gKJbb(n^vtC`K^-ybGwEDv5$$j}FCYu#D?~3VOEU3-x_30A| zdByGEY4MKp2)s3UGp0`-1P?s_Qq*%I-tl~184ea%KeKws{zkSFjnmbcYq!;qV>+}L z=49XXd6ld@<8QH9DX*Eju=&)5;#K<{_tOvq-licfZ|=2~A1lv&q<=AFX7|jMCCUf4 z1^#QZ){ydd-i8%St~6ZT81o9r{c`TzeY-2y7~Tzy!?Q10qm#KQqbWUqjQ!yj>NehV zH8Y$!^yQBDs5n8oSk2woHL7p&@_1KpQASZot5@qMb@8oDTRW9vX6^1ECN@jvCFc|E z%j~gE*$%mWu1!+kh;Cx zgwpk-lmS3&C!OfQ^>DDqlbOMA5{2nUg@*;RKs5M$x;2bNA_r2r5I-u7&M<*aG&DmY zbczXd=N1Q~1IvOMK(~otQ{5sQiR6etGL8b>YPv?!I1CRm1XH;rNLX+XgM$wjS0%%=F`T`jG?+XH7N&;Tx%g-0MlLqp-A7&wznL!fXt+%gRs z4FeG{PB?>03WG5?8^4i!r?I4R$ZR@`OJ_15%d{jvW(d~=3cCC)mSEOTZU*Oj!obua z!bmIx3XWWk?JJN%{)uCSu!FvOKp`WjLDXO>gUbQ2sGnF?0F%q)1Tg;_>YuOwVF1jr zgTqf7zx5?J_@@aDm%szV_@0&DqB+EH78T)2ZUM)^a5Tzj3j|3uL}73g9SB5wC!IlIhH`X%;i6iSxKtA; zsAK>`qF_ig5skqk4e>~n9ugcNzd;?C6uN)-KcOfj5shB10VMVxP_V2hBrfTH1XIX( zery@lBix@d1-hYnp-!1>|BK%DO|9?mLjgK5aV$i7IVGW)Ezs78g zSU%Q%U29{+@5&|!Lt^efqFkq`sLZr+k(mft+K(pK)ZHv4|tE5*jkzs zjhx87zLrAvSy5u^t{>`Dca_Xy30)QTSMkl#=10h15e`_CF5M_71?2fU{6lvp@5?(+ d3598;X?#b>K+RvCyKQOUzaZAi6Sx1itd6s7RjTePD3^WAWCq(nz zp2!ro&&6cjDSorkHD7oHLdvY9x5r^F|0oOzvu6J5(8}^MixO`LU)8 wr=*fD*TE^4^2=M;eI{9oy}153&!C#Q`KN$^`)>^+pf?#jUHx3vIVCg!05vg)^Z)<= diff --git a/Resources/Textures/Decals/bricktile.rsi/dark_inner_ne.png b/Resources/Textures/Decals/bricktile.rsi/dark_inner_ne.png index 08f219869f02dd498d71087e8ea56679208cf741..7a9da46b878a4b09b9d16267bbf0cadc76d975a2 100644 GIT binary patch literal 4491 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 H?LGWok>oF2 delta 205 zcmeBHzQ;I0vYw5BfuXpn>I;x!EDmyaVpw-h<|UBBlJ4m1$iT3%pZiZDE0E7w;1OBO zz`%DHgc*frs^iQe2CR`n!55OZILDUrs5WbyuG5U(&Ma zL#Bbr#Nxj1x!HGLa5PTaHot48=F>k{W(MglbQ4mT?zDQVGv`zW+nH|uwhe~w^Os9G y#Qi_b^3MC|*V?O_clkZq`&=UVHPAXB*e4KM@KEzuB%cfqi0kR<=d#Wzp$Pz2>Pznc diff --git a/Resources/Textures/Decals/bricktile.rsi/dark_inner_nw.png b/Resources/Textures/Decals/bricktile.rsi/dark_inner_nw.png index d716a81e8319080e908275c88ff9e3d22fd71984..d0ccf15f35393ecba904416a35536767dfb0b8c9 100644 GIT binary patch literal 4477 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 M3HIjYJG_tl7v4xNfdBvi delta 201 zcmeyXbc=CeDe5=|WS6-mq44$rjF6*2UngCcBPA>oe diff --git a/Resources/Textures/Decals/bricktile.rsi/dark_inner_se.png b/Resources/Textures/Decals/bricktile.rsi/dark_inner_se.png index fc60f8969822474fce58fcd81dbe08cef94d1a37..70b3944d6c6d42ff0932557c5809eb1c4842e839 100644 GIT binary patch literal 4232 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 delta 185 zcmeBByvjI1rJk`k$lZxy-8q?;3=9k`>5jgR3=A9lx&I`x0{KD#J|V8!+S-bWicU^W zwzjs8jzDRK+eg%@ffQRwkYDhB5MbE6f60EJ2xoyuWHAE+-(e7DJf6QI1t@6c>Eak- z;s5rWAs>SRhjU=p*MH$=5#fmi#(#dQ8m&FMh;3ElFKG!sbB1tEiQPOCO41h0N#Jy{ dnGFNM%1 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 diff --git a/Resources/Textures/Decals/bricktile.rsi/dark_line_e.png b/Resources/Textures/Decals/bricktile.rsi/dark_line_e.png index 99cb16a6ad86009b2a7bf569127ed6185b83efaf..f2f3b75fd8f043c708099afb7ffcaed54fa6ba53 100644 GIT binary patch literal 4231 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 delta 270 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 delta 228 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 delta 241 zcmZou>}8suQqNc%jC67SAu1SI+s`pQxKq%aUWgYFgx4 z?S{=Br}7p(;<3Ilcr=#KzXEa(iKIaTc;5i|*;+)D?Mic$Q h`%32{81EVHX2^{ci&-t)xEg3JgQu&X%Q~loCIGdzT*&|c diff --git a/Resources/Textures/Decals/bricktile.rsi/dark_line_w.png b/Resources/Textures/Decals/bricktile.rsi/dark_line_w.png index bfae586a073c539c5c4cc8928e2550f7671ccd8c..1bd29e14973953767bfe2ae14f38c72b99d13c07 100644 GIT binary patch literal 4477 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 delta 346 zcmeyb_?2mbNGZx^prw85kH?(j9#r85lP9bN@+X1@aXGd_r6s8ylS*9eaCv zI@{V>T3YJs>$^LF%(j}Enu>}FpsL)M{bE3hyCldj_&*#lc=WDUTcYd4tI;lrt=d1#7H=rZYrOkZcgOAEUmh*z zbKMeE{g|H%wu)vmemgXyxNjoopQ9;+QA)+Y{Q7Pc#SQ&tv{ywX$Kh igs$KW!8fe#Us-=ANxofd$+ivXCk9VfKbLh*2~7a!(U8ml diff --git a/Resources/Textures/Decals/bricktile.rsi/steel_corner_nw.png b/Resources/Textures/Decals/bricktile.rsi/steel_corner_nw.png index 9601a55f50d42cae220d05306cd3bffd26bf48c9..86fa0e9e007dcbea205ab665402f92d320c8d747 100644 GIT binary patch literal 4340 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 E01%jZ-~a#s diff --git a/Resources/Textures/Decals/bricktile.rsi/steel_corner_se.png b/Resources/Textures/Decals/bricktile.rsi/steel_corner_se.png index 134997a61124debf52a5a5e812ca21acebc6746c..203dce3f83b504d06118be5758a1b18ccbdaff29 100644 GIT binary patch literal 4341 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 hc(n(K&`U7q@G)n{ delta 340 zcmeyW_?~HkNGZx^prw85kH?(j9#r85lP9bN@+X1@aXGd_r8E936Xmdg|-z z8yg#2T3R~W+PXVCYiepLDk_>98-c2HHiTLNDejUWzu^CHz~JT2_z5V?S>O>_%)r2R z7=#&*=dVZs3LfxuaSXBW@10zKTc}ws@mB+b(CF0->iyQF=Ca+>+dM>2AaCQ9|N1abk7HwX-()Zbm z{YL^BFIxMDKd^tnI$_%ieXb9)^cA=t@RUv3&aJ^7BfR6%0#V22m7;-@Ya|$Vmu}3` eN!$~dEx-S%)bTwLXR3g{VeoYIb6Mw<&;$SpLx=GI diff --git a/Resources/Textures/Decals/bricktile.rsi/steel_corner_sw.png b/Resources/Textures/Decals/bricktile.rsi/steel_corner_sw.png index bb107cb037e01d6903abe78fd68388f6f88272e3..9eb1cfc533fe8e7801bc396b20c9b64b41448240 100644 GIT binary patch literal 4346 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�V*A+Bc=Pw$|BQU)Gx__~B@98L8wQAlXg^ z_)=~uhCz`!+-Gi#HZB%QLJb&-d3} nGZx^prw85kH?(j9#r85lP9bN@+X1@h$rd_r6s8ylS*9Xs3F zx;r~tT3VVL8ft24Dk>`K>+69^w6zv00x7PNAiv=MFu<_sjLvzWC})93WHAE+-(e7D zJf6QI1t_@O)5S5w!vE}~i$X05^&GCEkxT#ofA~(d?ATnjiWjNpotMfnP8R#}xbfPN zlP!!!j+q&1Jd%?*<6Od0bTc$pggHez3og_t3TgW6^unbP0l+XkK%yD|% diff --git a/Resources/Textures/Decals/bricktile.rsi/steel_end_e.png b/Resources/Textures/Decals/bricktile.rsi/steel_end_e.png index 58c70fb94851f327c9d1d4e62dd9268844f1aaf5..fb05cd35c4f04fc3ba8133d5f43cae1d2d80879c 100644 GIT binary patch literal 4377 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 diff --git a/Resources/Textures/Decals/bricktile.rsi/steel_end_n.png b/Resources/Textures/Decals/bricktile.rsi/steel_end_n.png index 36092d5d0fefad6b41bdb32db7ee9e74241f7a08..e1e2e04c39447957fdb57e36c82025095c0b4ebb 100644 GIT binary patch literal 4352 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 delta 402 zcmZorTEjd+rJk`k$lZxy-8q?;3=9k`>5jgR3=A9lx&I`x0{Q9zJ|V7+jg3x@j=eoS zoo#I`EiLu+_1&GF%?%B0ZEa1BjWsnj6%`dgwW+^sLV*--NswRgen*L=ln7p>nD=FQU5 zcb9UkoO~~CsnXIJXJb9`=Y&r0u)OeraZ`{K9N8gP0EYG!;gL-NGEQ2i`r~^NmsGq`$`228Ipi!uS{T8&;_&yhyWFF4;GO zcZ#q?Mg+ql@u>`F5(GXhdM^0tdPDSsK8>$8ea|;~3Z1z1mt{e;WrDPa@)|3SR}+{O pm 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 axTgP6Uiep{xQR2+^9-J@elF{r5}E)J^`B7y diff --git a/Resources/Textures/Decals/bricktile.rsi/steel_end_w.png b/Resources/Textures/Decals/bricktile.rsi/steel_end_w.png index e9fd6a0579757e48fc8788f8df98b3dcdd992935..0eeb92f6f71316adf6a1e9edd2cb5c727c4ac20c 100644 GIT binary patch literal 4367 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 Je8+*~{{?w`Bf$Uw delta 385 zcmeBIn!`LnrJk`k$lZxy-8q?;3=9k`>5jgR3=A9lx&I`x0{MyoJ|V7+jg3x@j=eoS zoo#I`EiLu+_1&GF%?%ATH8m9#6+l%2Aw^6;in}DpFZe$kFnIYhegX<}7I;J!GcfQS z24TkI`72U@f^R)t978Ppmrky~DAsJi;k+_o?eG8mag#Q!{Jh0ZM{e!`)3qnwxTo%1 zHDjlHil`R%;!q=QMp5g=8j;jef8 zV(p7%I`AwkSWV`@GS#&`R~k2blJamkp!j$;$AL!&4<=U^&0xwo$@4;r`RA@=g(_3V z8ztW*8`ejrGuX%WN*?H(#dzyTJwv#+x1@2GsA;WTHxb%18R Y;zf~j!mM9ifL>?tboFyt=akR{0E63@A^-pY diff --git a/Resources/Textures/Decals/bricktile.rsi/steel_inner_ne.png b/Resources/Textures/Decals/bricktile.rsi/steel_inner_ne.png index d8e5a50f8cf2b8374503360e0d2feb8933b04811..33f2919865bc505a96cb687a6cfa04f7692a7ae0 100644 GIT binary patch literal 4270 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 P+S)Dgwx$((JR|=Ll=S=g delta 217 zcmZ3d_=<6YWIZzj1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU$hWfKQ04 zlcQr(V`FDqTT4qzV`F1|eSLRlXJ}|BP~Mqc=_-)oED7=p{tpEV!TuFOAi)BU$YKTt zzQZ8Qcszea3P^*ei(`mIkpJ8B2YDG3I9ME69Dl99A@F5+I^!n)8511p`l8&*4=BZo zG8h`CF;u;gXNaF*(a`WnpY83n2T_e{9KNv@%x8Qf=YQi$=tQ7-44$rjF6*2UngA_M BO+Eks diff --git a/Resources/Textures/Decals/bricktile.rsi/steel_inner_nw.png b/Resources/Textures/Decals/bricktile.rsi/steel_inner_nw.png index ea84f9755ff478ebfe5d08c163edff7ed84ea297..644f5448cd00d0bc018ee0b90bfb5b820efa49f5 100644 GIT binary patch literal 4274 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 ZfOMXkX+!#@2|;_e#W`A5>^gY-zW|66{_6k$ delta 209 zcmdm__=s_WWIZzj1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU$g*fKP~P zV`HO}qhn1?O?`cROG`^dMMY?6C{QxoY~KMO#ZeOE7yKUr816OijRcBu7I;J!GcfQS z24TkI`72U@g7%&+jv*HQZ%-Zc;$=|aaK6Z;^gBOCB#%wP;oj2BPY>JJ9N5(lx@H=z wW_X~KFimBGHfLMpKlu;5r3qFB@hq#PCoPql;niBU7HAfOr>mdKI;Vst0MgG$iU0rr diff --git a/Resources/Textures/Decals/bricktile.rsi/steel_inner_se.png b/Resources/Textures/Decals/bricktile.rsi/steel_inner_se.png index 7d29fb22571d9b08a4875d2ec3880800f99f92ff..0f9072cc9e587b91193f2bb0f9e5aa46a82afc16 100644 GIT binary patch literal 4273 zcmbtX2{e@L+kZ%evQ^eFrpPwChM9MW7)y30QK&I9#)O$^7Hgp-6lKYpB_u+&UJ9X2 zQnDo}l~BEu5MB}SJ=#w1Iq&y<=lg$i&OP^iU(fIQUCVvl*Lj{;2Rn-mVv1q_0Bo?b zG;;!H$m&?P2K+a>c|z0WgEKEI(BvV{ci02(?OZS=<;Jx-4^ZfpT$CzssN z!_Rw Fm5W7m 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 SZ`-@twXKMDX63sM9{(@=0QQOi delta 192 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 BP^16= diff --git a/Resources/Textures/Decals/bricktile.rsi/steel_line_e.png b/Resources/Textures/Decals/bricktile.rsi/steel_line_e.png index 0eded8ad61fb41794dbabdf2ac149fc644062593..10b910fe1699cd472f0d0d2eda1d0bb4988a3e28 100644 GIT binary patch literal 4253 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 NEpfJ{mHRzU{TKY&@p1qF delta 279 zcmbQMxQS_kNGZx^prw85kH?(j9#r85lP9bN@+X1@h$rd_r8E936Xmdg|-z z8yg#2T3R~W+PXVCYiepLDk^|V7BceO1X5fjL4LviVSr)N8J+V$QO*L7$YKTtzC$3) zD5~Mr02FNZba4!^@LxLVEMJ2`JxB9I`S$n!4^2B$VX#i-+T%}4-!km{r+R#f4rA*X z$p?bx7(QDZ)+k_O6=7R1Wnco5; To5ak3j$-h1^>bP0l+XkK2@q?B diff --git a/Resources/Textures/Decals/bricktile.rsi/steel_line_n.png b/Resources/Textures/Decals/bricktile.rsi/steel_line_n.png index 8c2112e975a80cb1a2496b2026799a19c37130e3..0a6d337048ba3762d16d88101db0fa88de2f1929 100644 GIT binary patch literal 4317 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 KTCwNw@&5vQ>IjGc delta 242 zcmcbs*vB+MrJk`k$lZxy-8q?;3=9k`>5jgR3=A9lx&I`x0{IdFJ|V7+jg3x@j=eoS zoo#I`EiLu+_1&GFKuJN7IrD)OM@f)h@P7zkxYxWl5-7%5;1OBOz`%DHgc*%37(w~Wu*l~v1HH8^Y8uM z$GrF6+uhk($X&}Rin37Owi>Xa^qoHsU+c36-@$S&X>6@2kDpxs1r8Uynq5&cb+NNa(fUl=a5U(;+`K?)!)AQT1CEF zRqq#VY)9+7<8PnDeD7qZ>6{!oWmmoZ%0jL(puiAt$1)r^?JJ{21(${_Nv zs@77AXy4vN>muf;tYgi=*hHnW?qGroEpiJHO!5XM1} zwK=v2r>feKGNOjj@Avh7UKg=vnB{Ugr6EKEgq9qKk`1&lSsIayX)K;Nu^&lageawD zEzy%z6xtU1L-9U(>1 z5r0EH{e8*+zU;8Q4=8goiSb4vL( zVa#T(@1W&Av$m@I&XikEhQn_kTo~p)?LL3-`3G~4-p4Qh@Z-BbFXQ1) ci^}E8%CBE61`l7f9;S1;zOiFHUORZ_FDv}yH~;_u delta 220 zcmcc0GnHwAW4&B}Pl&6NqhnJe2z0i!wY0R<*Vot7)KpYdba!?#FfeHL9%lhkTqQw% z!T(`^Vbd9%^FUF~0*}aI1_r*vAk26?e?|ruvCx2Uq&uKHkGKW=N89af^650BE zZgaJQG+dobH}|SHnJaHi~l@!>OeVz_{Tb#RS~&ot^loN@O1Ta JS?83{1OSdhSgZg5 diff --git a/Resources/Textures/Decals/bricktile.rsi/steel_line_w.png b/Resources/Textures/Decals/bricktile.rsi/steel_line_w.png index a67b6abc834d0af0824fb51707c3235b504b3ccd..aff9dabab687bfd1812ad2fc0375f20511cd999b 100644 GIT binary patch literal 4292 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 delta 235 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 M07*qoM6N<$f`81ossI20 diff --git a/Resources/Textures/Decals/bricktile.rsi/white_corner_ne.png b/Resources/Textures/Decals/bricktile.rsi/white_corner_ne.png index 292139bfe4cfab3b2366b8e1bfb6b87b5139649b..90cda6ec336e94ae1855c8d8b0f302877807045e 100644 GIT binary patch literal 4283 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 delta 340 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 delta 310 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 diff --git a/Resources/Textures/Decals/bricktile.rsi/white_corner_sw.png b/Resources/Textures/Decals/bricktile.rsi/white_corner_sw.png index fb06423131e937a5ecc56260d6dc9c7e26933d62..a2157c064c4fbb6038230ae50c32bdfee1506f09 100644 GIT binary patch literal 4290 zcmbtX2{@GN+kfqmY%O-CDYDJ3VdhYYv1A)eqHJSkj0rQ-%-9Php(snXvV=s))}ati zi=<>rQYs-GQ$jc*;(Jx6t8-oF`@ZY@e{)^WJkN8#zx#JD&;8uj`^FRPEH+3eNdN$_ z!OGIi5u71wW1SHAZ+7|geQ*+{o7kEFK=s+9OAe`P4=I+8wg3<-4FCz?_zEf=-va>0 zLIHq(1^|r406?*WYZMa<01^m>sVULQ)D%MGuzVQ)Gyt${%SjI=k)Cad?P>}R%YTd% zbUgLC@eiOkJk^6h&Q$c$5|YB`S8pv4lqHy5fLapoMfDK3JDXL@Y$8>OZC|H_QXr7@ zSmym_D#~wto|#!1EoXha{<(f>qN(ekJdje1$jA`27D#%yaXQ*4n=hN}z?%S~1k}8u zv;iAu^9IkV@O3inj~>V5ZsiDi3JXk!x!e+DKk3Fq*@>;@U3TRkJwBcZ$X>jTQ`D1{ zk2BP;PJ-8Uoz7Is(DPBy@M+dEk$n`8BPVazwWL>5nECvwQC(asuK2psbMMK`pXzM3 zTHK4Pj9ZVX&(@P2lB+g9jZD)WF&G&jNnwP5O;-N$Y?pW_Ru&bnF83BXG6uY{6!$#x z@_^nO>iT;b94qUtVeUpb5uR!~{8itJ3nri6Qj6Haf_DK;-K=){6Zc-nCt0^tfGtzY zuIP~$y#zv?er?_F`uZ63*HYqY;4Ew3%Rxez;zB)L=Gy9+kCn^4N`O~K{Nd}fXJ8c) zQJpa0!K)?jCx$@Og>96*&E%}wr^zFMQ z&&_nZ<38DtPe;KklyzYmwhxNwmocs?4a0e{3+iGkfoh^A*&$MScQ+DF#$QQzWGz#B zvF)A2O@~NytKamRj9c3t7zzNJvEJ zuuke3?&_4mSNiRu5sm1J)3{Czt&^Q{GZ^{L_qyaR2?$sU>LiIh+@m@Un0kqpN5R;_ z%s-SDqGe>norSho3SW(quGynDAS_{m8W5k4I!qK(GQs$Yw3+NM6zPn%exr0#fEm5y zwaF%m?zQEX=z1Ap@>aCj@wZzyTW;))?SP0Y))LQk}DTczAFjZJ8t@BKU?sYXlKm&H>zxn zmwR?~Ou40jqFFcO^uJD9S3cHdC%+myPl}6(1SQ*{r+X)iW-~ z%2oT-AKjCviW$(EaF}qNkO>l861BK@^-TwR@}`!GbjG=|KU8n$+}<#(d1QTv_ASlV zqEqMSqulAD1@of@EBFY(mOV+Dz8fdjZ9TdDj^D%{TJU8YzwwH zwG>Jb=`q^gw!cab-(jB-oNAvwq%owuN)#x%R4h}HR8-|TTyUqu@x9|@_S0+lbFS}J7H4i-)Q{Y{BXTSCVT-nTd zxOH$raknnNY0h;&VZZ(U{KHM}qu!smPiSYI>yRXO+|+xNgt&us)>g=2zxi+<(3l1#KhIMQIvCHBUJ&_TAO#FYP~k(u5|A+^3Lnt*5`UU%A}gwWYTD zci91z8;g(oyRpyb<39FrK8|INB|d8V*f)_G^jA>fJa5TmNoc-Ms#MA*Ry4Nl?EAC+ zZJKRXJKT%67Z=)f<=AE~c7E)fg=66#+&b%_6>1fP3Lz$%na_O6JoobH%Z)D&y`&rK z8TE%{&zgmQ37MQx`Q$j`9lA68aoC~I%Gt@kwk`@Uk(P|+pU#dg1uflhG+o?9S_+wpjbS(1Eky|5&M}1u3#94 z8h2YD=;58zitx!Behz-Fe&I8uS?pNiHSWO!EoukVZ#2`RznnU;VWYA!R_(Rf!1-JJ z;-jg{HOmJs-Zco8*V^o_r!X{9T~tIYNb)qSc^c&R3fqUBtULbk-C$W=q@K6DI}EE` zp%vkIN2mTvBHtiw=;#aC7Rsf*8s4g1hu!PWVRxxUsSK-(vGl~L`N3BXb_j${WbF>0 zuC&v%&4J ziY@)}>gSRv-|oXDhH<#e&}l1*3uWj=0_)<%O&3mI+@&(2s${IfyLsbzY5ii{NOJF% zn}h-MG5s&&iBoPZ9}e&Izs4%8-K;LucCsxuLVfA$^pU(#;~fe+4n}q_=hx-*dh`hd zzU6fUX$GAQA_Q&7o!j;NNx?ylkG z5PO@huj^&ynSY7SOS#R}hb*Qn6|FyJcZ`l0bl(-&`tD(SSwdOPGrh{dxkGa|R;izy zmZHY?v;~%Za5pGt@ucDEMwquq-pZ8^kF9UqV!Agrjm*Dck5A_$k0yupph3SRGZEkH})Wvo;@9tEJoVUJ@nA#zco0Lbg zDYe1cXW8al2+C{z#2b4OPv>`S@sWs3TdAF|@0?YS;4WW_#Civfh^)324_SLWY%!WU z{Jbo;KC0fL(#aFiA>Wi7$z6br1`IV$2dA!govNPF-8~*LzA`@h>2`6SecpFizMoac)1@ercpv&K531I)^W^#Wd3``v& zgv>^u;K;Suz5%I}pE!0P$N!rLR0@LTPYa+id0Y^S`iW)xvUn`6FYCXd{`vSH2EZKK z+Wxfhuf7BX{4~Mk5rV)leq`le(Ogm}n}%?taan;J3XKp1y18vF8aCdPLnHH891@G= z|M!Uz|8^OI)`w#uT5D&7+zGA&;AoWLP6(1_fWqLY+7O7=0S1%G3g&A6!bLM9^JvCU zP)Q$#M8S|~5*mX?8sL#AT_m_beuvt!s0^Rbe?n165*m%i7~)are?Y;qqLO*!{}oK7 z;C)z}05X^hMgW;kL$H~2DCB2`@un<)76&xE=H0Jy@XPGShnX>y>u9kTVnr~;qHtI& z3=KzpbJx}uZ^h*D$V>{&%FGxF<_*qZQ1J#hZxqGQ01KmHk@_$+P9F!uA$@2tAKFeb zhJrCbp=jU31@+BXl)$y>_*Sadwaa4+rL0vAjSBrCX8gy=`A!?`O9M&&hm!dYGZx^prw85kH?(j9#r85lP9bN@+X1@ff>d_r8GK7Cq{oBQ_F ztM_l;zIgHC!Gi~P?%a9&_%Tqv)Ub0lkm4)}@(cbC1q{Ld6+$4v0*}aI1_r*vAk26? ze?kTAReTh=y1%T)VLIg4j+g#R`QUmFMC{4pW=je{|PXsBMrp`F~85 zYe)W3iGqh`6kUWO_LvxM<~5j6$?>M0Uu46RbL&~(i&WedWaQU*b4O&!U#=Uxk98CR zbhz9*HaHb5S@3k9^N&W?O~+V1+q~mV-ot4AUL@wK`>P*7M>BZ3`njxgN@xNA2B3qi diff --git a/Resources/Textures/Decals/bricktile.rsi/white_end_e.png b/Resources/Textures/Decals/bricktile.rsi/white_end_e.png index 548bdd6303952fc6059eda24fee40f27fd3bc640..6b857400be333fe118d58a1eb932227c3d5ca9f9 100644 GIT binary patch literal 4301 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 B3Q_<7 delta 392 zcmX@BxQKazNGZx^prw85kH?(j9#r85lP9bN@+X1@h$rd_r8GK7Cq{oBQ#@ zhqtd@y?F8B@#Dwu-@bkD;K7|ccYsPh-LhE-q_|3g{DS|(0K=v;I_H6+oCO|{#S9F5 zhe4R}c>anMpx}2;7sn6_|K7=rLWdOUd03iRy8i#)P(FQ2*p@4AExaNoB^*>c^>}hp z*y`$YO`jgD;543o;iJQ+C~MZk{Cqz)3K+;g_F8zc{fz1E109b&6{l&O)@+_|AWQJI z;(@b#j8zP8{J9mTaPz2Iw?5DJauzh5**LQ)Zm|nn+6={QK=yB;8+UiHl&I2zzhqfSB<`po>;tZ zTqLrg{@_HG^TEB&C#n;h%Zk@dNGNRjUM;w@wCAtD6vg+fMg>MEgnR^2IDJ2@4z$o^ kc(2BJeCJzkuS&*GD+GUTH<*=n01~;h1^@s6 diff --git a/Resources/Textures/Decals/bricktile.rsi/white_end_n.png b/Resources/Textures/Decals/bricktile.rsi/white_end_n.png index 68fe5bcf7b6287ebf51726575fda5fb634e5b824..739e4dcdfcd5b140cac617cd7bb8d827ede462ea 100644 GIT binary patch literal 4294 zcmbtX2{e@L+keOsm9^~4m?GQk4CbX0W63rcqL48&#)O$^X6!;qD9VzpEFlrH^->6J zl9DY+sf6mKY~d9V-=ppHp7Va+cfS8O=iGDO_x1d)-?iM=eVyltC)k>A5tb7M0AP!y zg{cELL)OQ}4dB1&rBnC8iH~M%V+;V*XTq25Q`aAoEgWnBAXXFr62S2lR64c?0FH(L z!1!qZFnk99vK<`5m>>WUM$k=62$m)$5CWU&P4}Y$fJIwQdJvKLOe(gkDJV4mF_PEe z#4p$1fx@}Qot*YH$4xvAl!@UA?$EAtrpu#tPwq+nQjEyR5U}D&dMG&)ZJ0eSo@~#Z0HS!5Jfk!K zYiF~DLselL#o8Y|j>%PF^B&^knF)2d$;*1ujft`qT+6%UIv##(EE5pFaLqtgTUTSnEpS>0ItQM>^udCRV4?V7^O=T{8t;#v)guQ@*Vn%efM&RWI% zUR-6|CQN;{w)l`lwb?0Tn%0Qk$N*6UvjNy@=_k!{iHBmvQSr(WZ=oaafHxLGhmO45 zul0Sog(yD8iBPqepRZNG!>U(kC`14yz5sQ!aE}*8B)lPfj-s|ur>!t!AHNE1B z9(mD=$Jgo9*8QoYgF$~SC9DO^G55V3#D~f**3-nUuAQE&TF<5BI0?C8xpIJI6J3{XWT_gNY9IYwTo@ZuWY96*fn)_ zw%gs{lQrp76ud%S3#MxGpqO?E64kvDyo5 z?}cyB4RINt^Ug1d-d(-aS}zsfyC_Z|Cq(rHXzq!a6jT=$hx9DBx~~;7n-`Igh>&5; z)YF``X}zzs+eIU)(HCY6I#tzAbV|%(q(9&5lDNpjW5KJLB=~TT;uv7!DNr5-WAQO= z$uCBWi3vGxkh0*r5+z!*M`?gh*cde+v=DWeASh>y@!@YX-l@;u8Ey4O?gkGddf9WU zbrj80>ZZUZF+P$C+Vt34m2DQ1y|En-0g7n7aWg?|t5EA+Au&;jy&>J+B{G`PrTL*H zvR{;NLOHP&d!oDDeKwyz84>&X_D1XDSE?k+`Q`6!2JIa)dE><5y(!Qcv+0c@OZ6q7 z9P`JUxf$I>tfBDk=)c6G#Kh$aPRT$w-{b#eUXT=g;%vG3sU+b`Jal|R@~*dP=u;gK zroGHoe!RJCfuDVD31RD|T7g<6r{kq&ie>>9L+$nK$tA9R<~p)hG4@_BL=-R!cXn5zWHxUpOsu{W>;*+xX4Ym(bnLR0f3M&zhB=dU*Q(I0S3JG^8~y_k~`OyOQd#-GS4)mF`H7 z94C%TjBoGVf2o*Kg+730p#8FVv!c<`l=~VR@i`-VN%mMrIZ#oOxY_B#2fR&zlw(Vw z2!TeWQZm|4wtGM7e~_E5Sfru@J1-53ao+cbt^DPtg9U%yqYKg67gVoWolNg|1WV(b z8-1{?y|(>Tde~08jG$Dz^dZ$DjWq&K(Zyo1lBA-lL&F7kIvhSY3>K9a;jPXhnu<4S zeb5llsBkhY8K~4RzEu7;|6B#Jh-*wY%ep*Kl6}doBHS$GKum#GJeu5^%#S*o;P2XPw=2Yt z=Bjz5=4X}E@4sfp@vu6m<>p)FT-<-IF1s!xup;pE!Un~fGtr%LIRZHc8)V#1GHRxF zy^;^D%8l_T@JM_eaMWeUA+M~(F0vc&_w>Jo@j=R;u3S^ zePzsLr_ocGRUa=>idU}>dx&_yZ%}9G&%ya1j1eZ?HSsx&Q&Zo#Brpe`lYTUxaU^~6 zP+;3}uVGsC(}K2<=%O^$p_-@c7yIsN_Lue_K4DDdL++EwxZ2a-*)Lyi=h{+R{ipbV z!u6%c{oUB-3vrWu?8$f8?-C!iP4-P>2L2sbxWHX@S>CWvC{ik79V-yqcILwwzc#ft z%bo7UJBkZ!yK-!@mpUgq=ipfQN4L&;XoXS*zG4Fd&B$jwWt@Ha^rhs>gD+`D+J^n1 z*>k30UxKG*6+Su4dWGnQJq|q>QaLyEx5^UVGI7~(;pyDF<-q0J5w9Z}zbch?yWKw6 zGcLN)v=X$udvmvli{uO$qK1T2sm)j>(Fq=eLr7J9wMC1Wk79o%^(HOn|EwP@>)Xem39E}SQe+JzKtxtBhA1J9Rxm;48#?bm)o*h>g2TxG)C~DFSdz$uC zxXjTx?@V$6>3((`zU^e2QvA`bc^Ve^*T~J0!=v7=@bac|nxA=~LD+e6o5ra1{lV6Z zRy)-J)d|~7Tdqa9MfPw5tE?W8Vwn0N<$dbcR8iH)eL{A0tJb3Xmvi5?&!mJj(I3*E z)1$|~jK_=@`ug=xxMCiC9@eAoku5_v@DY2uh%E&38+iS6dY)_QlA4zGN7Fhk7SXud z96<}~q*R1WUH7&3b@dIKCC*{rC0^wm*x#abK>2zzE&9vJ<69)lkW%1>LRthq}^dyjSBUM zLw7Xmza)<9r45C@5N{!0?5p9f*>>2z?i_X(X%xw@%y^fcIK43V%H9@%(2T6z>D`rf zin=WzOeicS%v|fJR%5A7X`pjcrEPh$`>5L!=Q5YZroag0u%YgVwy#$M_64*COpCBY zUtalKGVRlSxI{nBATwmflI%hrx}LziaAE8DQx|qAj3~+(DR6IGe_mR@6gQIGD|G`u zfIh18Wh`;pt>xokUB9c$!rE=h8`@5^lznv9D`#>=;mU@Xw@B{l<&Tf8uHR(1H#UtdykU*a zm*8t9u$f>@#OLJXR8>{kJ2-&?wa^ba;KavuuytHpTLboJUYQ5?LM#hc4giSUTOT}W zS|aiQz@I=Tx^P`=tZ`(fKb%BidQsuQ{wxp;zMt+6W|7FgR4&AeN~1H3pwo>lPzar3 z1l_M|gS26pP<`kYp=_#Ss4bBk>Pt4DKzHxjB5W9p0~!3OToNSM-;cq;1sg%X5#zx1 zx)=e4e1mX(jiAQs79lP+1c(WfO@$c1kuWk6iGt`Ez{yB7QpXFe4M8K(7z7fHKpMc1 zSR5LQL+L<%{Ggyc2*i+0@y0orn*Fc`?u?*5TrLZTKm-K^!GkbxCYy#p85kI>)1c8X z5CP+aFu0^(7=yF@JIN0kQ!0ndrn9(oCIhlgOY&j{aE+j#%im-1XZ_-4aDF5VOdTSa z#6qCp$o1I10V(8PI934L@0$k{GJ@(y^`|np91x58g=P6LxlE1^^S`0~_4pqKz#QAy z{Ic<{zWDq9GQr{E1HmwUWaVGc9AXHIig2KEm;r1u6(0z?xqUqv7S4oCC2^T-B9rO& z^TY^0U521_;8=+I`WYd0!L>gejndbJAgOvNi~&Uh0#V;jXHb|y9F5<&sHP+?)d&hI z>A;XE7!plHV{k}491^941Q*EfP#Y$N?j7<^C<;kLqj4BL9NOR?P_V2hBrfTH1yjg4 zZzkKH1m=S7Pohx~ECvk<`ITXu3Db|s1`V%!_q!bYGW+piW(4IpnD2#H;!Ut911uJX zhNHf@Yh#16WN^472AOJUY6J!I2B*_0I22MBLq=k}VI-=q9?V-;2Mg2pCh5blIw&kk z7m3!xQYb(5O_}6?_3HSkPx(LU+p+23Jtg`5$2{L|)B4pi{8n8!3pxip_mE%WA9uu& zdgM3J51}6&@~y~lB=Y*@F@loUtA+{&_gzf?kCXFVKgfp)lKu}R^Bu-vdUJzFY^pI0 zOyvKoS`oj+Xoy(v1;58_i1@b@eaHRQL%wl*mx2un+<|&O+vED~SBs@Gz`n``8>p+M z%?Ysi8e5tg6ZP%Lo}Q*W)|ue~TW_7{RCW-~?B=mnsECr?wpov#z$B|j@wkNEA^?)g pa<3Jf0I8kjfZU{vFeEBo2nfH%pI>P`KC|A+E%COd6?;98{}+4&`&$42 delta 377 zcmX@6IE8tFNGZx^prw85kH?(j9#r85lP9bN@+X1@h$rd_r8GK7Cq{oBQ#@ zhqtd@y?F8B@#Dwu-@bkD;K7|ccYsPh-LhE-q_|3g{DS|(0K=v;I_H6+oCO|{#S9F5 zhe4R}c>anMpx{eS7sn6_|D}^|3msOd=Wtp0XzBm|hwqAR^;J3PY(801-#voW(lg$D zrH5BqviK$O^qt;EtO7nTZkocyc(6hE-y?=^wevVqJ~dRPF~u0xFn>_CJ>}oBj?ZBB z`l+lnv4@yl>i-@v=$trD)gw|YVbS}=Cf}bjN+|X8YPMdV%9JCK82j1KRf17~4_x68SpLAu=D}Rue23h%SG^7doZaNU;>`?JmhBlDGnfzcaWPnB zu>84rnB!;ufnbj4H;0;MrR0AI;l2Ccx)yaw0he>r|-PH7d2 UTwNPJ1L$oAPgg&ebxsLQ06QL|vj6}9 diff --git a/Resources/Textures/Decals/bricktile.rsi/white_end_s.png b/Resources/Textures/Decals/bricktile.rsi/white_end_s.png index 4b96c7858aa986659186f00e22771f874babbb0d..03b4eb7593e119247b267c9d732e22cc8558b0ef 100644 GIT binary patch literal 4299 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 delta 374 zcmX@4IFWgRNGZx^prw85kH?(j9#r85lP9bN@+X1@h$rd_r8GK7Cq{oBQ#@ zhqtd@y?F8B@#Dwu-@bkD;K7|ccYsPh-LhE-q_|3g{DS|(0K=v;I_H6+oCO|{#S9F5 zhe4R}c>anMpx`r47sn6_|D}^(i!~e6b2P79y0-eic%0CT>6L5jd(y=pWOs?a^-r~2 zJ>%-Dd7&$GdS<0OW3tk7h|5+__;I*Fo}1xohjyczoWb=!3~4gqOdDPF*x5Z9%DZFk zH|+Ih$XGYiC~mW-j&3>EfweVxDhD1;_~?4`N%P^$V*Y$KlOzRpv41Lyw^+cQ#r7cc zTfXE0_v^K61&h)eW>v5kNZ9&6)?%`FmAhnyg%(4uP;hik&qk*ol8ZSVCbqaRXr5Cw zWhqd5+Mus;O{XZYoFP=uoxzQ>rB#Em_r2QdT+srd*(v>+M=E!lYdz(j_eZE||ED=~ QfqrK2boFyt=akR{0COUrfB*mh diff --git a/Resources/Textures/Decals/bricktile.rsi/white_inner_ne.png b/Resources/Textures/Decals/bricktile.rsi/white_inner_ne.png index 0726c4506607ca9936c02fc425388c469b526188..e8d326d08d593c9bc875490fc1b66c48b91b5453 100644 GIT binary patch literal 1914 zcmbtVO>7%Q6yDGlK}sSddWe9-Xe(81!gyzYy!Ni_7AH;{OI;)~fXQ$G3lj$@yNxX-Lx7pIrQt zUV!;)o432`cRTlvj*gCxkHPTAuWi9{KJT=*PEJmwcbC6<3iDT!jrTH1TKqx0bDyp( zz9mU79|zs-eA~Hgvp6hKFLrrp7$$(0q}q*PLfJ0Qk;{8QRF{AM_B$B`UR}Olc8HU# z@tt7fAmv*J?JhgmWtJ!3xV|u78`{7S@|>b!*pD)MSeFZ88^*${$f$tiyLGuCBBE_) z6RpK5M^=eoMu>_kR*4af7_RmX(uk%jL{o@`iD_%5tr}?j$Pf>qTI%_Br+IT64`y|F zC(jdGQ3iuSX`q+lw5O<+WeFNh!+^lqew5Q8jiQ|>4m3kK3DLz*aRiHOoH3JTlGqdEOou*YmaPD2V>1R?ElC5d`6nksCs z#r-&iz>u9@WZ^h=E6Q>jG2Uv{Wssv31fK1xZq?Meg*{WRU_&)bT=o4jE?ZT`-HPw4 zsyFd(#%xb4`o!P+kN$Vk0NRiCUzn$8645cWXN6A48cFx)Lg?XySk^Fo?lZ$3xSj9(#cbF>kN^uSq9~XimO%X zV#76b?80usW`$Ndphf3U-W^dH)4 z1j}MSAJCLHdax`1S4S%|HI8(gt-Ge2CD8~sbIukVBP$%@Fay8I6(VNSYlug1_oQ&i z3|dz%!3DL_YBsvnJM6)e#igaszCWD%@}(;`$qNdp^mEeZ WKV9^{c|<-C7h7w+-F&?I;L%@JgD?UB delta 173 zcmeyx_l$9ZW4%OxPl#(lZtl~kPv5?J_2R{g$B!SsfBSao)Ts;%3~A>!o&-`HB|(0{ z{~>_kUi02apcrR?M`SSr1K(i~W;~w1A_XYu?CIhdV&VVx{7GI01rFB0u$TLjoiEI; z diff --git a/Resources/Textures/Decals/bricktile.rsi/white_inner_nw.png b/Resources/Textures/Decals/bricktile.rsi/white_inner_nw.png index 5e75689308a7147a179fe2e84c44393a9dc76f16..1b6e902e53513f759f08b2f44e7ce2224510a2be 100644 GIT binary patch literal 4272 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 X#wpCmD)P3jHFrzAt!eqbqo@80#Ss2i delta 209 zcmdm>_=s_WWIZzj1B1(wu46!ou{g-xiDBJ2nU_EgOS+@4BLl<6e(pbstU$g*fKQ0) z)2B}ha&sR%c<}h~;}eQ(~$;|(E&I2iqk|4j}{}8}%uX%4IP>i#{BeIx* zf$uN~Gak=hkpdL7_jGX#vG9L;>Yx`dg93;1MJ}b^`8gtaY!VLlmS%o>*v96-u71!p z(_l5j1Eqv%DigFh+amwTf8Z@muri2eStUJbsniUw*0Qxgvlu*G{an^LB{Ts5ao$j} diff --git a/Resources/Textures/Decals/bricktile.rsi/white_inner_se.png b/Resources/Textures/Decals/bricktile.rsi/white_inner_se.png index 82013151cb9063a11de552c526c4775eb9589f01..f41846183f00e2e1eb4f23ed25921c676d6ad939 100644 GIT binary patch literal 4273 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 KEZ^#L=)VAjqA|Gu delta 213 zcmeBE{>V5%rJk`k$lZxy-8q?;3=9k`>5jgR3=A9lx&I`x0{PMbJ|V6Jxw%uPPW|}d z!{f(~pFVy1;>C-%uU@@>`xYp_dFF*HK#H>@$S?Rm6fgw)R|tUw3p^r=85sBugD~Uq z{1qucK`&1i#}Etuw`U#s8VopG0!94VivA0GvzX8F`@SsS{gbhW&YJ~q7W`4kaKA5K zH0|Z26{{pY9yIKpn2^FKc8B|mtCY?L7WIRR-%s!0mdur#Bz^8LH_%uHPgg&ebxsLQ E01_Qp&;S4c diff --git a/Resources/Textures/Decals/bricktile.rsi/white_line_e.png b/Resources/Textures/Decals/bricktile.rsi/white_line_e.png index ecbc891f6f73e096e7178607deba107adbd2991c..1d70a2d6ede2b64f402bc1c95c4c77b1205b51cb 100644 GIT binary patch literal 4272 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 diff --git a/Resources/Textures/Decals/bricktile.rsi/white_line_n.png b/Resources/Textures/Decals/bricktile.rsi/white_line_n.png index 1d7203daab84c4e3fb8bce397fc3dfa0c6a7c659..cfd681dcbbee6a01b89120c3d38dda22945d3395 100644 GIT binary patch literal 4271 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 diff --git a/Resources/Textures/Decals/bricktile.rsi/white_line_s.png b/Resources/Textures/Decals/bricktile.rsi/white_line_s.png index 408d3220d75c1f3aef6efdf56d7c94afee64cf32..c92bae8346ac2c311cfe3336030c58b59e4a9d21 100644 GIT binary patch literal 4271 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 Rg4tTnw!+()RqXLP@n2s|_p<;1 delta 244 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 p%P$#w;ulECv9W(7^D3iaAR%{{s*>%gF!$ delta 359 zcmeyS(ZxJLB8`KYfq}tgN!KwT#aJBV?!>U}oXkrghb7(7*O7r?V?XzwL{=bQF2Et`8&&cXKDTf2)GaPt zn|kfov%UFg>>JF#Y}nX&bz0kO=BaH>64K#i3d!nG-5d9miVbo$+E zML??+6a)uAa6++Gc@-S0f&&EweNwBa737JcDELkSDz4YH-g2$ie>lv-fxQ z*(WFKd4c{D&1RV4aJY$_0Cos?;&qpiA-HGoV;gZeBY6rxQXPV5@d~9}B$i-!b+Q7( zV@YBW4wrPZB0_rfv6JcG6^GlCto#z_4V#X1Pq_W`PD2TcdrQ?Ve!V$t)&gAHD#wlK zZx;=Wouf<#NfX8K4N7;^h)Quuc$%488`586JPJ%<2yv@sWQ`q zoH@UdAZ@JI#5nXeRcW)$eb2a4NCU;?GqcC^j346h`lZMD)H^c7dftI>7f#ZiB_TO?Ehih@TfDt8BE$b$)W)E- zf#p$*w<~|_Zq8nrwWbbVHaC?S6!YWm8lQBO@#su%vWJw|^Hqo6oivqZNBosmzm4OH z0~_~L2D_Ljtrr!F?Q8RkTxNY^b-g=tY3_}Qdz+$F*4_6v#Ga<5_H{&f4n`h+Wirj~ zi_Qt_jweKZKZ7z&=5^JO)}E#`x9=-DT?4hE|JqMV+X_`S*X%ji&SJOuZe7NC+R3dt z1($8f><_G}&Rq8ER7ovzuFaH;?|fjvUu{lAVoppA$W9jw-jx95lCC-dL zw$lotXmR}JlEq;gTI%hK#0xm~)1cDpWS&y*?L=o=u_sdVgi`-HIJqh{@@~U1K}j@LoQLko(sg&#l{z+&A0pwB~NfbWw-3 zzza6NLK!rk*J%^%+ilnG&^TH4hNu)a{gl;iC%eLXteJ3RZEMWhsr+fYRQi&mg@=y@ z@9#f{a27Y!X!40C4?A+ITcQu%q{k!_bu4^n@y&y+mx>pjeU?+1=szXZeCdIKxO?{2 zeHFRI;|6+LYBDLC_VjP?=?VMV_ziF3&io8}f@X!S)r|Ctf^MsyD+c;Z< z$Br)PxRv+S)T5UoiUhOw))pr+9NDF%SDzj++m@n)M9$1+7 zU4>rRPd|8K&h_=BwGV#iWqO!SA9PljPgg$ZDl`49^w5&at4m2~_f9lEsW{kN_4_NT zfxbnheLm9d=XBX7d%i> z)?t$4(S?;AY<}BxExfgBb&O`;qJg4<9S*5Y7XxV=+rAok_KW8+nrj#Cm&nqG-Wpz{ z%}yKNN!*9S8DxrmeR&*T-*=@46rAm;x$^=Hy{-I$Ja%OX5HpK2(De(e%Ckz@!A6F& z=0A<7ts@7Yt3=!csAH>%^Bd}rnRUDrk{EkGH55pZ(l|RL^?M`BU+D0!cQ3a$eyu&7 zo=1kx6G-rInrYc`HB7>< zKHeEwzq&q}b1{ElsLgWD6uHw;%45;-AR2P5hUHSBZnIegbMmIoFnN4n^DO_!z@=6N zwe9{ZUf$X;R9HJ9p+b<2=Fpt`cG*53`}3j1P{YB}1zd~ruX|5!l9k`d@VWi$)FxJy zVoXMCZOz=FBX-k=tXRvMPnZ{D?>aGwfY+<2<5`4AE)VZ3S7LZ7 zkxGOiza+7SLhvxdyDNnvW(a%!2n1-c2ytq)f=ME2wOXRqg(z3XlE@4Og9KAZ6bb}1 zAXTzVjU+)bm7NY^7=w+eP^DO*7RzOL9VQ}>C#qQl0_exT^G~Yaa^J(tR3j_^K1fN3 zf@uyU`Fr^u4_zQ7O@fBScA< z1d{?)6&RKL(UATeF7LgCj)GXRRH3&5WPhZo7K=WR^^tG79(_2Y9RcR=aX-?27rR~= zXmPnrwj52=xyNC%2)gl^LOCiHGWD-?h8x`tL8*`%6&6BNsv8U;3_1*08SJG92XZ6hM}$~LsS%G2VH=nEECGLst;X!u@nncBRW3GZs1FyP+=IR zxX~$;4@%*fQU!8Rhf0QtF2g;#iD80p0JVrNQvrb90z|{~Rbq%*uH?(*5*9({6kccf zzMBgcln_xPY($L#P?$nx!ZfA}%%@P86jvq{hF~BWr7stXMaln5Tep1h?!%KFAXb6# zll7wEH5G~_47Y}x60v?U;qm%q!9>vE5LAc;6YBj0Si@at93qRwK>Zj=*mrXAUnK*` zCxqcjhIF|DQ3bF7Vjw6;3%ZCQ6ks$Of}kIxtK=fJ7Exl}v4BUw6-ZD$S9ph!sdD^S zUmJ(%<^fO!!8B+TWdzbluq0i@co(fZ>A(1J*DH)FF~DwE21*yGgrxVSaD*>i(fJ!c zBlGY#jsT!P5AsR;ex~a)U7y6jCn^ z05rxa0v4-qIP-t%E`vsSxey4)syST0v0cWtV`exg{8Ent(OeGOo9}Q1ofHxhGQVL$ zc4lV%xkA@54RNas#=)yQGMsTOKB|mh?eY_bxQ6Iy0WoG&8Zg6g`~umPKFc%z1I2#F A8vpSdqob{@t+uu{P{~~FPx(NKt0c%T_&*FVY&xTJ9w^FL z;1OBOz`%DHgc*SC-u;s@86igOQd7?~x~Uc~2s|kh3g@?K z+B|uX&v1@a_@IBii0zi^@W3AQJC4}iX5@O1TaS?83{1ORI|h)Vzf diff --git a/Resources/Textures/Decals/minitile.rsi/dark_corner_nw.png b/Resources/Textures/Decals/minitile.rsi/dark_corner_nw.png index 428ce9c617fbaa32d7a508075515e72653a8fdb9..92590b4a514b1f75ed12483f25a9290bb9fb8a21 100644 GIT binary patch literal 5088 zcmeHLc~leU77wyVz+J(O81weKoJd3y$rSD5X#q)a3JD&6UpUIibeD}Ne_uc!u z_q)lL{Ftb4NBU$sjYe}6M}$bhongAHEWzh0nc^&sX8A{kEP;}u28LFrNhXy9gIb{_ z7=)2brqPVoYZt0Eobj-GdD-)coki$x{4lKj`=v#Vqe^-<_dKY0us^~6%xGipr=QgS zF)*!fl+*1E9?R-w(j@Jfv4t{^`d`D#<3GG};!^PX@P@{+U5_lAWFI^9*H)h%KrSn6 zkJq&JeeRZeHurIFQ2v_i<2uTUzW!Wn-|1MvRO>F+hqt%)Tu720c#&!UOZ|ncr2K!m zKd)BxUwOVZJ=4{v?%ITsAbez5GuNui!YaTmj~=?*5uGfTZMDDV{46l%lkS%9o_ho$ zQ9k%*8IF$dVl_+h3lI0tSQI!-A8+WP_;BW zj^3f1=~56;!g7aj&nsWg%;h>v-w4 zoangNCIp>+(IL{~NxThjmh96BJF2pD$kmwk?Xe3=lDSY)Tm+k(=jpB~;I5hKnHnWf zT$mLXGWhbf@)qY!p zN)p@Z(l^78dzQ_L*)}&F z>k@OaPjGiE{XG0>|E$|je?6I#)nM}vm!(^3vJa24FB;Wf?R6IJufAmw(6gyx-WfRS z!NecFOnmG*Y1gCG*TW{n!+ReH9`$$hZGDb9K0fy1e$np-FMhOf@}x;UKd#@|=+M(r z*}L&Y!R5C7ks=4X#+{{77>SQUz6>wO|8REIly5?g_&4q! zKkj64RiUiyNYulLhQ1krQ!?#Zr-=G@m)+mPJsBU_mocWiko+NFf9oH$1%K8tq@TR*urgG(lHeKCW3?9TID0IV0?0e8X{e z?74j?PmXzZ+I;W=8K6%|RY6MYpof-n6eS7;-_t}+(ud_?p5UJRs1SFewH5g5a}siZRef-XKzD~c{RpbPdqIUW$N*L885cG(w|CAzzx znCW+@_`>Y($2o2G%8))=+;FYfCeL-Fy7ZZ3`LT1miMdfs|JhT=c3fGYlpQ#FC*f4? zsU_kIpZz}2HP(HCW_CU2m*k_-T=cs-kxwnvH7$}QE_I%4^UK~1Gr|+17LDK3&>g<) z*^R=1vId9cwekXN9ruI2D%Z!hjR(`>EMHd7lZ>fZ`P+#ibiDZ`V06+lxTEZNrSM4htwMk;x!&5i_1EVM(;XL<$*^p(EllqGVV` zDki|00seG9qYwb72nuBwRZ6v9XcRHcxI*x362nY}S%pd!F%u*)j9`t9U?ARzHwy|i zlIa|#Kb_&H!;^*5kgy>LFcL9SC`v1YVS~ZoZSe8d=oBzpAP~ST4$R>|Km*dRP*bQ8 zQtRDJ5Q7*YgdWq8T8h-D8753ru1TXrOeUCTyz)<_l}KL0tMx-H06t(Ns)gC!ELf$2 zhg;~W&~yMYe={W`RYV+xn)qb%z?;KCSZsuc@HxZm7ZN%> zs6`Vho8|4pF`JtbBLv|9YEe_A0syldL?aB=5h$h6$ut_Jh-q?)VX}NZEdd(}M=3M} zr3e7Z;vhm6SLnl%aX3PbuMlBFEFc-CuffUW75_`yw0#(UgGrAd^@&G7< zSX^irWlVS|SlHAtUPbE%{}&&AW`$ub2G|YCKMB= qY@y_FXkI&x(mK^R>u0C&1{%#OauV&XW?eS0qlrVKLiWvFn)4slX@KSc delta 328 zcmaE$ew}H8L_G&H0|SH0lCEPwim^Dz-HBn{IhmJ04okYDuOkD)#(wTUiL5}rT!2rA ztD~c%larI8qN1ydi<_&fyPKPxot>?%t+uu{P)TG^Wg(E_Dhcun{tp8To6hK*2a0kQ zctjR6Fz_7)VaDV6D^h@hYwA5+978Pp-%hj^I-?|p;Q#ZltK+1v8Jm+YQZ#Qqo7Bcl`%sy`Fu|K}?`+EHp{&(Crn}0ifd$7-Og6$4C z|4YF><{yd+H0t-U9y2tUV8QyMyub0fcNK5{??e09H(g`zvz1s<^2Em#=yC>6S3j3^ HP6<>WFQFyuzgmsmI|mK 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 diff --git a/Resources/Textures/Decals/minitile.rsi/dark_end_e.png b/Resources/Textures/Decals/minitile.rsi/dark_end_e.png index 15f5068670c907475bbf3f1ea2fda67b6b78bfa7..82b0087a0370b9326385b12597b1a857cf2ebe66 100644 GIT binary patch literal 5242 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 delta 389 zcmeyRF@<@8L_G&H0|SH0lCEPwim^Dz-HBn{IhmJ04okYDuOkD)#(wTUiL5}rT!2rA ztCN$HqN1X!i;J79tGk<Sdqob{@t+uu{P{~~FPx(NKt0c%T_&*FVY&xTJ9w^FL z;1OBOz`%DHgc*qb)Iyv zvs2LO`mKZy?OEcMW=`iV(~6hhd#(4DAy&BhhF`1o)q>Y*}Os37G_Qx&z+ywCR}l3N2OQupZxXbL->rWrZ)HZJylp7YoSARAVZ#-N-k-+pI|CA%O`e^Xsd%r`a_rB-H_AUJ+Szd}oOoFLSOqh~JHac< S*USV3G=rzBpUXO@geCyM5u@q= diff --git a/Resources/Textures/Decals/minitile.rsi/dark_end_n.png b/Resources/Textures/Decals/minitile.rsi/dark_end_n.png index 3bd2d26686bfc0c989613551392165db0da77f52..b642ce1bf4b58ef371cd5fa7847aa8f123f794ef 100644 GIT binary patch literal 5188 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 diff --git a/Resources/Textures/Decals/minitile.rsi/dark_end_w.png b/Resources/Textures/Decals/minitile.rsi/dark_end_w.png index d6e3ca96ea6716ecb87cae91b3e1b75a5e80042a..d9099511d8ca2131b358f292af00e6dfa30d077b 100644 GIT binary patch literal 5159 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 diff --git a/Resources/Textures/Decals/minitile.rsi/dark_inner_ne.png b/Resources/Textures/Decals/minitile.rsi/dark_inner_ne.png index 82cfac92064a29ee1999e785d13d7e597448d792..7dac62620b8f92af311b697e69bbf2eab23f9769 100644 GIT binary patch literal 4962 zcmeHLc~leU77sSPTeJg9uS@p>;Adfj~BrfgowhL^GV|T<-rslc z@4NRVUp|eFig2Qjqtj?KCuw9@47fvv@WSXrob|W#TWi+%2Or;i?_7^p%#;;-x{-DC`Yhz% zUt~FV?+=dawH@hka#Hy%c?|mSl#4^0&mVzb)TN-E`<^t!xvdO7xM7+7ZYgx@`S#2F zzH3n?+b_#5^lUC^-=FjN`rJ-3IQYZ5DK1Z%j=C3>7(R3fnsyh7K2J{EOFXMv8!$(x zo!We7{E>Uzi_wGw;+Hw=?>dP^Wg@%p%ffr9kmp-M{anN08v9-HBO_|*2|FR^*G_5` zU9_+(dHJ-vS*H_rKl$aS?el+5*(kCT-njL{wRhF}-6&iC81dyncW@D|%nDeMxq@ z%kl$je_dHssI%MU*@4>~-zL7UZ)je+1%syFrV&>h1@N_CQs?@GhGB zgd>PGA2`aJj3e{6oS{u$yLarl&px4*<@tD_*{vH#H93Zi-G|$z+S2g!D z+qI(Kosy}!H)W^o+jfjw_`P;YQ|_2FC2jqpwIS^jY+Q#7}=yQCRBQXM|pudaq)9_trY);x0erpwL_m0ovdb*JXuJJ?qBj948bC@tI5RB*T0qp#@q zy{F*SqsBS8t^T>83zk&0R5uo#Kj>fiQAB%Vmw#dWbLNPBb-(XD@?o*KR+M1Qj4W;Y zve7B6v*rBLa=aztq~g%mHf|j`;}2bmK$dH&Cbx+%dUb|;_g((%0;f$kPH2}nKMY;B zXxf;Ql2bwN%X_`@`ZzuK-Np;KB_5LFt)KZn7x@093nq`X`rK=oPovqaR!Jn$QiUl`C;D(yY6or2OC@pu+4ih%7;&FX&oYBzAKk?;=+-(cIy^l;59n3r9_v0An z?Nc*jdKVvV$s4}TW2@HOD@(0wDkrB$F@pRixLmt5Pc5(hrZfKJnv)6AGlft4T3x)y z>iiBN_m$tw;bWI;#N0}%b>eKc)a*WP`2DZ)Cq=|ZEpjb7+#ZqK`@`nGZHFCGD;1mY zY`%ZbE{{j{#}A~%+P)~ADH~n3?6)Ji+Om$U=|6TK%N6g}zn7JGxMpf!t*3jRtN7!K zbzff=petT;ZBf!48Vc zoQ27(YuoBe(63i@n7g0Zyx42V;O;4G1>G}U1-fLsY&MGPG)#=pDM)69Mi06ujV21t z&|`QCNkIxSQKc0#eyu;wfK-H-5yzLYWqJvjq>9Wmkg=Ijay&By7ZQx%Ai5|61ppe7 z!k`R|T5Ciz#0)Dg3Z5-u76Y=XP$^@U11tbOSQ(g}#bL5p8Vzfxg^>zR2Ot9u{iTIb z4!&$yF{DwKX28ktbW%%s4uv4_L3@3gL2V6(z*(f4)Bsf@Se5g}k`Yo_^q_@>f<%=@ zZ?ytszoAK~l&{Hp!#B%}HJqW20P{iIH?&{HZdC?aG8r1C!_zG8NyEep%lasx!&L-o zeH3!|3Y^P9U?I*|!aP1HgoQ)^4;JzQ0u=%dU&%%IL!hKuBZX;k(gFp*nJR$8CHOd3 z$O(i6Y&HfUz?KGbc?cX3$S3eXA~1kMB10hN7*rrDG4)WdEKmf1Qt$)$ToU2KN{)hn zc|u$XD>w)VBT9fF;0gFbw$chk;OGpUL4$$qRB5n8lBL%sS|==oqoL7KF#}<;UrVCZ z7^MUTpaxW0LT56*o|3CHWGsbQ_~Zz{8$oy+j*un4x7pCkH@kx zC$wD z5R6zlNm%^^Sp8FY5~fWgLH`&?*jIAZUnGNo48*x?J_7SWUco#g1AGBr|IXLIKKz|aK+wBI-iqIMbiJeNtr&PK z<#*Zjj;^<2;H{M3W!L|WF8b@k6sZNjfK1@1)TX}K0ghQN(X-{@xK7RC@Iykw=Elqm z5THP82-sND70pI5Dv+IE-=z)&JC8!rcqZ$0HHl4 zm4(~iwexsy9QP@7a2^m%l7@xKea_=cLTEEc9G46yY&^ZZ!rL6)f6u1D$K6b$t$Z;o UuR?S(7%0=E;Zb4xrY~9jUjf%kQ2+n{ delta 193 zcmaE)_LOmgL>vb*0|SH0lCEPwim^Dz-HBn{IhmJ04okYDuOkD)#(wTUiL5}rM1W6- ztD>T!o2#pNX%5g122WQ%mvv4FO#mM*Ly`ah diff --git a/Resources/Textures/Decals/minitile.rsi/dark_inner_nw.png b/Resources/Textures/Decals/minitile.rsi/dark_inner_nw.png index 6cebbf93f45eb3bd64bb8bd70b1a890f96a03bd9..e3ef1166304bf63b88cc21943eadb8c68a4a8944 100644 GIT binary patch literal 4892 zcmeHLc~leU77wzhxKt5vd7v@4usF$NUnCG92oZxAB7(S0W+pI@jbwm;r7RY;PYN7vG5qF3KAB^-o5)X#MY7>z;j)a%l~RE&l!~x?rFkCVMnYfV^+@ zJHdBees6498eJGtpj0&FWuM-ErBN~MaAR)y`1fC}`{Ip#>9U-8=eKNTylwDpblEuf zWT?OAA1RRAiUH&2wzbPH;-Q5hb@^X;c^A=|Oxbk%*SDh1o_u=Ob$L=td*v|yEkA7F zo!@;KfBH6+B`x=vkek-81csMfboGK8Z>=Q=hV*ecprJ=P^%^FpFkF3nC<6o;>!u&j}vU|_!J zrx^kB3&oFBbE>k($!4#e@K5K*%?obuTE>0(Cb#m2Q|$G6x5CK*1^v&&Pdq+6vGvyh zrajvw&h4XpT2I#G4C1>Ux*9l88b2@Ks{4OpGwAs{v$pQ>EcZ|hxqerfLvQGUVYFD+{ z`1;9%-%lns(W*EH?x{|Oc^#-#=RU|g=wp{4Ze8i&K5F@w*PB9w2|;ZYS1RtS&&3i4 zOhwDzZGWh1T=+Qo7m4>W4tWnb5i&BFcD3Z|^(E(hwQZC3-!7XQow;-V)+xiex4$dg z+E|9vKPkznPcF_MnUxf3*IYS-x-E^FAMW*nc5vOvT7k=$=J$nVs&wFy^%I05dPWiuS+MhGae{E4%mD@p7P(h?Qac?;o?$3AoNuXw2naU6Oax^gC~bm&sw&D)u|V|n;{Nd&)9L#F!%oO_+TV)~|3WaiG6!~U~O z#v9z@-}hg!E@tAynsL4rtLnUO4;#GRCtcAxr|Q}&hukr1bp@^Rr0Splg$ITMzTBMZ zFU`~__a17Fu3c0+S5{Zp)^WpWqKn?UlJ%SV&~z?xd7qfQo4nyZ4VD#*80GNWuGM2h zqQhgIi>hvgB(yf%K?#Cr8@0@0cndTDtH>%?e%Vo$SEd zFORGcmmB(I$5rj~={VpqqQhA{|6=vvZTJBC9-j?+2NX5@(o%5M{YOuG>|Lan*?*0G z!=n1w_&J{UqmDd$W#hE^>XkuH#z>~mPGHopJG@PFF!N5q%Xc>IWkxgmyTTiw_oWb^ z$3@GhiBP?kj$nEfPB&`}pa)VYzW!zdf+pf5RfWe9Ix+3p;iEJvfr)9exN=x-2*Tru z&~zgnnI5i0(-To4M)UV`^fikBfEFhas#&YinM7tW&5A1m&lWL*MzyMtiDFu`Jc1ge zH{w(dokNGAU^9`zqWL*eeT|q}q>xVOf&e2iEuJI|A_gNhHI<&qrt6Jy45m;hWWX#2 zivnR$&;#MsX&@VR2Lt!ogS&Q>_wk)Hue) z1b7c9na)HaIuy4+0dP72a9BJZ3uE%x5TB(MKpYj92?0PDV)8gRN1)X?ogiK6h(czDh2n|B2fdQxiLWk*7O&_O}gcgq^5euJ8J~&t`4wKD+ zd3-+mqf!)ZG=W^SpfX`Pn`ND`Y>Wtm1E@tTnF;``auAIu$cQ7P-l){;HDa2@DXPV? zds+?(3PVUlijX(}g;^XC%oVX=C5r|46mi)Q3?x1D^%$W}`(N6Y@}c^6Zh9zT0_&$) zMV&Pji6?cAI)@sLIKU&|3M8nNE2?MLR(bW- zPmRYd`v53|U@p{yG8&^RScauze2CVU@n3xSS`~V<7+}{a1FZ{mLPmEh?BdJPbpFOq z*FOA>D*))vi+mElpXvHc*C#RXNy?wI>oZ-S#K0#hf6lJ|8(oecU#4&!_yv>-UX>V} zXHnoa%PC@-G8o(?0n!Kag_$b!SAdjc2a{0Uu+B@tAbCoti z2rX3K9>FOkTBFwOoj%7}Yg!}c+>g)Wp6TMb6g8{nQl2dN{LQQFQCxHeVvICm451`t st=+b3j3Mv+(QgO<00000e@Ao!TOK;KZzr-F3;+NC07*qoM6N<$f|Yelu>b%7 diff --git a/Resources/Textures/Decals/minitile.rsi/dark_inner_se.png b/Resources/Textures/Decals/minitile.rsi/dark_inner_se.png index f6890fe52fe1860faf81ed110e823717841fe3e8..3ddb20a5f4d00775aa55c5659737a18bb1d04b21 100644 GIT binary patch literal 4999 zcmeHLc~lcu7Z0*k6sgo&M3E4+f->0`GZF+zSkxdUfC#NRnHfSPo5?^TYL!J)6i|#I z`e9pKDt@S+Af+fuD`>T#1ym4PE!w(PTybBpF98wH*K@w(IbZ)XIg^=p-@U(g@9*7v zlb6*|kzuYbo-QO3$u%NeC;@k}^>VNWpXt%^<0O*(zO?8#LV_5`TAe0Qp~T6=A}vnF zjfzAP$@t5y!i4h6pAOFMm?JVTAL}6FTc)>kk{cRnowti>W}JF(d7RsE(@-<+^B_I9 z?#1)tF3T=mv`E6^{m&JR$%~d=$<993l~nzWCH1gdjr!8FVDH;Jj|u6fuG9DNWoOP@ zIO69S|LoZMhc|z`XWaHp!}kLILD)V2#5Rw@ZE1Y>Kuyz?uea3Y9Eg7kXQ5x}&WFmb zjX3mY*C_b&!-9D`Gdf*YNGv;pa^tfaNkTg$Wd=V|I z2srzo^?G{!VbPt3mo~-z-XQ$4py$TODq-Ff!MJ}JE-RyHq>sM99}S%R#6qc(Z|WW6rEZ7I4;SMfVx%lLK-vY*E`57#vfTZ zZppJB;%kPj+Im61qRJv@|Df)tMXsz5i&MtM7&0_ho@)0F$oO;4qj8e;ZGR98eP2HR zbe(Jb{E~IoJhwBc&f!B3#yW%y81QxIR+HcGt5dUto+M6Ip5syH57td^bNDG@Y-Vnm zAverLC5_F7gYpYUg!{J6w)@uv*L@Pn$*&3q>q~YeNm_P`#HE$~eEbx@u#Q6>|k@|=9>8qq)qxE7qbOU-(El`pMPYwr2|%9T{~$ zcC2`nb-2){yY^zP|D1~FE9bg%O>J@4wvOOue3-^*#IY{8K9ZWwb}C%g@eqKlXBgd0TTlYa$XM9R(DkdUZ|kdW843o5o~>H5jx_QAtMGXuA- zk|8cbk3eVZmzS*CA)Mu4?-P1=c2zZF)``6cPlo!nIr+a}ce{*CRzXU~;JfxR6|y5~ z46<~CgZt4*^plrvip%BRdD?Tjq=(e`st##rlQ`zkM`h)5J8%lh3Not#?}Cy-{s? zB3^j##J};Wk(9s*qug6h$0(!A4*VWhn_2sLM1%QRcf0%ek2Mo2nKu&;%;X?v$_1=F zM7!4vdW6Zt)9L2!0-vzB$b?~qRp-MNJo$A^x20)PoZG&6nyt<_Rp41c$*!_@WM z?&U6>k+t324mxbA0(8OOMN((wIi4-u!s726ZoFL0^xk4?V+^PPa zLRMe`%5099F4l(NNs90^9WG6aj7HOvQ9eeQ66g|OgaLpGClInxrBv%-qkv+=g~78` zOrwx(Dnzn?5+{x#hiG&-nN4L=>5#~%NM%w2UC04CED@FnLwg~>NI*#<2rW#b84L!h zfkoBm4P8I`p>|`e^WlM3dlpO^Oc1MX9)& z7}FmDL;LKtDLSPs91Nx5N?Zk0^p-6l~)?2<= zXKdm0cLbRC;l8E)I(C~f&=QMbp$1K{x)&i7P^|02m_LjIsS*4GMq`2xQFlds-=_$QYjlix4$PW-;7>pflX#K1c#zt67sbiES;@1*=b zyZ&!rH0>>=(s2R~B(%n-G1}7+3I7<@4<-tIFFYi_}xY-es zNGU1kY8&`xi)1I89wsEMa`XxZgMr%cIeHRlNS*bvJFY3gfY6zU5R06zJ9-cBU}oXkrghb7(7*O7r?V?XzwL{=bQG{7gs zRa;wIQBl#!$;sB%*3r??)x`xUBe$sVB#>e+3Gxg64+acU-pp=5AvToMus8KyJ2sc{@w+#t#GK{FvSF)``j ra)uOU?KokMos1dGu6->GZf*?MH;V0@ADV3pG>O5})z4*}Q$iB}rxrTK diff --git a/Resources/Textures/Decals/minitile.rsi/dark_inner_sw.png b/Resources/Textures/Decals/minitile.rsi/dark_inner_sw.png index 0a5c96d7621e2ba51bb0ca672bf023da287efd48..cc8919b283d12924049fa8c1ab3d3c640391ab76 100644 GIT binary patch literal 4941 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 diff --git a/Resources/Textures/Decals/minitile.rsi/dark_line_e.png b/Resources/Textures/Decals/minitile.rsi/dark_line_e.png index c50102d604cba12ee357b1d13c207d7702d965bc..544580f150f2fde2b1a53af9ace64be19dff1f9b 100644 GIT binary patch literal 5134 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 delta 248 zcmeCvn9VdnB8`KYfq}tgN!KwT#aJBV?!>U}oXkrghb7(7*O7r?V?XzwL{=bQF2E(b37t$<@Wh&DB*~Tiedg&eqlzsAR$eEf*lgRTAVE{2vAwHl5KqKY5L? zM16s$i(`m||Ih($ diff --git a/Resources/Textures/Decals/minitile.rsi/dark_line_n.png b/Resources/Textures/Decals/minitile.rsi/dark_line_n.png index e1ca99dbc64d221658c90e766fec0cb6a36c9e02..ba8bb6a1769a8b22eb387f46611429502553547d 100644 GIT binary patch literal 4938 zcmeHLX;c$g7A^#_K~M=gqoNXG+k#L@rIHX6iELq00x>Ki+fb=gLP<800s`9FV$*^f zDu_rcuCyE4ic2HXDk5OFyNxL7$e^|xj^fdF0mXRfLwm_wN1P zy*GKumqvs*+K;q{AjmN+R4fB`y7{uP2A}hzRgDm2osk_KN6D~Ey568ul4^oZW$6hz zVIq|fWV-tA*o2kW=?<^&4i)5#a~slF>$AhKV3aTXa8`y=6}9HJXN)zmJU7*jm$LB5 ztuBXFsmYTqK2tnpipvzQz53jgYttUgBp2^Y%01^+(|W&-cT8%REl7sfJ?D#(ppfZq z_Xp6^?jD=#E4`Vo8|=4r?2|m7MRWVDat?hte1r3bF{iG|_P(BF*EO+oZbJU($c`VD z;`gcS*>eg;w6xooBZKFU-1UX4Rh}<9G8`2Hsr!H>8+^E zlVX|qW$kri6IMhzXN4N7JGXZFb*^2ts&jDJ=5@5z_C~v52Nyo<;;4Q))Vw67sbu*B ziuvHz(t&%fwH;4NfReAGWBQAe4{R8jkzN;jFX387Q*iEZO0uYF`^7DLJA)nFg2&9~ z*xYHTEc$BAKt2*o`}yK+ub}GTRqDmh-RIN?oYJ(!$K7x!n^aq5m$Kixb}_F;h(-9? zi@#4g6p(njO#N-!>8ybqB;aZIj@>q`5Aa#Z{T+6wS_(q_v3hPcq_Dw%se> zgdSQCg*qjA=D1l|rz{nFTqs_{aiWp*Z47D@{YEXc-4L>TR1mF-opHHjCAp>&ZL-Qv zRHg)sYx{P@@Evr|;QH=gF6>#jV^MI7r1aAMRLM&D#Ufe6T#sfi!FLsc-`B#c6D3}y z@s(<2{meE-75BiFm5W!&X6Bx=zrCnsnC*c_HK)d8I?lfOR6DyRt?oIwmz)ao)5gA9uc`*0@NIA$d~DuQm$|MT>u-Ixn)bxydWToa zh}buc_4ns64$f$)pVZz_`s#9X8}I4&JX#xVuBrxqd!gFy?bW06Z}{mp@Xx#4duvU5 zJz`ad^N_l`!R`6^ObD{dAp--YVS$0~DiGA&+OJnk3bpnh8WcHsQ=S~NcdCV(e*I=! zUb%RhjkQ~F$MmYh>}e-=V|+R8amCi_HMiT|B~1gX`}=oT%QaYe>R9aSLL1tNiOA`; zv)3DEXC9kZ#D@7-1{AL|-gI`-WN4Fj&MRLQ@!C(y|EHSD_VGXSM|wfzx=bu)=kvq9 z(~X7}UhP)9f|42I$Jc!6vwy{@2{)Vvt?|s3y-cjSyuvoub(Oa0rDRt1$sI&M1Y`1q zQMBfZG3w~Ohi=9lUvNAr>{M}QcMEO&Fx`ZMXuI-IBoF(oQpDLswTuo&!it8Ev~90g z=@t?fkuY?1)%B2>FRv}`E~#>uwM)JTU&8Zxw#oI60Y~?xM_IoqpCWPEHv36Ufp%N# z{D2!zj}(Z0)c2dOs;cztJ}`E8_fXM4E>sWNNDO4|_AK2yaP_tG&xppUqXI^CtTObgy z5R`?YFwlUFSy~D+!CK>3Gei%Dm@wi7QcsaOE!~WX$#v2>H&EsW9NYlS5vjJk9KP6TBTT54=x2nGJ$UY~AI zTf$M`EJ96afT|I!%Km7{kT8k#y@i1d6d?4B_%&j8O8~*hDTtaM3;x zkp>cEC8qA{l^IF_pags_M#uq_k}oF!6oJ74oP)v>mAF#DLj?j9>w!|>!eE_2gMsZN zHJFNE>9s1$8fLC_^I*(ti& z^8K^~6qEv^Ffm3E02D#FLWC#eAkio)MEODlfe|3-qpwqt%B=sTZ7v_WPtT@@l18w8 zmPOQ4Q&GgMo>9+GOY2h*F|CRK{i8Qw-^s~8Nd_(l z;V9Vz7seC<9?ZoN0W9b8y_>eQMXM2gafEBNzj0M{ayRHK#A?Q`vH+_nAkts{Tx0-CX)p> rI4sJ^IexOlyI(`D4zZ}N}y-M{0s!&)^gm`yAO3r@(TFN?9 delta 265 zcmX@5HiKz`L_G&H0|SH0lCEPwim^Dz-HBn{IhmJ04okYDuOkD)#(wTUiL5}rT!2rA ztCN$HqN1X!i;J79tGk<Sdqob{@t+uu{P{~~FPx(NKt0c%T_&*FVY&xTJ9w^FL z;1OBOz`%DHgc*Y#;uQM?XF_pJHJK( diff --git a/Resources/Textures/Decals/minitile.rsi/dark_line_s.png b/Resources/Textures/Decals/minitile.rsi/dark_line_s.png index 1005b61e5338be443f7048f796c4d5eff06a93da..d2419e8cd3b2d19e76105aee389dd3e766ac0051 100644 GIT binary patch literal 4996 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 diff --git a/Resources/Textures/Decals/minitile.rsi/meta.json b/Resources/Textures/Decals/minitile.rsi/meta.json index 313a68db1ac..50dd3a3a1b2 100644 --- a/Resources/Textures/Decals/minitile.rsi/meta.json +++ b/Resources/Textures/Decals/minitile.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC0-1.0", - "copyright": "Edited by Flareguy, originally created by github user @moonheart08", + "copyright": "Made by github user @Morb0", "size": { "x": 32, "y": 32 diff --git a/Resources/Textures/Decals/minitile.rsi/steel_box.png b/Resources/Textures/Decals/minitile.rsi/steel_box.png index 25643de33c01e5a95e71b45f0f45670c77dd7a27..65bfc266e917bfd76435e1fb146a8c5eed49d4a8 100644 GIT binary patch literal 5312 zcmeHLX;f3!77j8!5m9ggff^%KKr>I|mLNkIVhvD0WfX3bn-Iuka!CS+2+EU!iXtF` zP@$!@RZ-xHinB6VM?`SI*(##qNYOgbo&;1}uWP;KTCe|1)}8k7oxQ)a&px^NHaO6K zti@Cd3f95RpGsXx=OIsfFc!asz!d(?|HNjKk~4}4*jJ9E{!z8x;xp6=Ehw7-~}S?XX} z-2mO+JL5Gnmu(lhb`vgSVw&BrC)U-cniGwYaVJ)8xX zYf?lfy6H{qFIiVk?CxuNR#8~;YK8c_g{LaIS6pAw--35PP+6&TP&R%PI%cE=jqb9a8cT%Un*Nl6KblxJWeqsmCZ$w z^6KtKP*>g;DGz_{S!^~gK=N|>jMZ-E+P;^ryL>nPd6^W>jk^47;iGN%$k<2Y!f!X1 zme21!tP_vjPQEsOCt+6ArVP?UoMp@RAsDZyJ13n6uDPmzEjd29-g}N`j;brd&UnSL zorP-@SJq#(TX6T_tuO#Bt2!Q*OKm<2Ih-;HqRilGtmW?-Y-+8uPQeV18oHoxebolVb@g!aepoY%Z` zWng;C;2883bs%ZVIgSuxh|73;Rt0TuJWd6=y-L(d-prdXV> zBlPa_@l#Rw7i^rKU7u-PNaPgnj^P%INN87^0_mF>*0dEN+^r05^w@XWqS_~}%wC=F z+luBxMeB2VrzUcGcRr6UNeP|YUy`}Dm)+_=rQu+MRpx@$3sOZuXP9I$3$q^ zsaY`{Pq(h_eNd=5UR=}razV?G>N@Iv>3ror2IGvn4;kM#3-|W)4O%9KUf4J>ec(=b zjA?rEi?i}EZ(b&J{-{+QQZ-dhcpU4n6_57QM1}h5Be-eLlhQ%r(!S z{yb(zsqCmOe|pM#)iP+=Qs5E#c#6LRRI#MSVab!&=^g1#PKO_SP08AV!5C#qe0+kr zK0fa{9O!GC($;?!VC*%~H^`$Zn-5!9AHkphb@`U;YR)$%#?$?tEZVb={7qX8%;XDP zE}G4GLmRZPPn6-Mre05s`7*dVeg>Sj!NjJ?jdb$n=_{?N+QaDuWIXetc~QCg)&y&r zM!tA!diC1CH=e=Ft5P(@-RsovNqIr#T6n?Mfqioqsa2QgM}8WeR~#{G)_y1V|ExdZ zdToML$?TMnm(hDJtT)S=Rwyrc$y?Ic_6y=2i1ToDu<1ItKpIxN_g47P6-Q&ZCyHJT zUb2}rN#WW+c_7*wM29=-*wpRlCCB+BZh`Govj^Mqr~8KoMorwf=Zb&A%kJF4;ysp2 zw)1lYtLbz4tET;KeyBbv)c9@nJf8KI)TjINdbx?awM5^@pNMU?0**zM%a#7hEFR7hw_V3;5!QNR-7=6YDT z>mUFiLr@s2lS$=jNXNz*a3OH77ZY(G3T7K=qBQHT@@9$4Vj$#N9d;pOTXdWazm z4x$#QBuZ4GkYn|jFkg{`vT-<|$G(eCrsVP7!^_pfEC4=;I#@|06G%jvj5yLmjrwW; z$Z$Y^>!A(<+cq%-Q7e*E0>oE?$k7=iA%ueW{>mhk)R2x)Kt!a744A6HsN|1^^yl(| z-+SmO5KClAgBKwCBTG~w`asr4vFSC2bVddO+~4DVWc@C8gE6q;@gR;ukfaZf%VFd6 z<3mD)Kq7<;w`4au%op)#crr!6z|#GzLtk^GPJUh>lS4G$EOWhxt@0p2;B7seFb|z!15OfCy4aKvlxhkx}WPgaC@= zCWL8B8WqncxzX@678$_fL1veqvjtozWU2T0Ul{A7b@XibG8ONO3? z9;Fh)V!~n#%L0N0Ln)|X4I(te39yD#f_PXiMnL}9kRHW5-Khv4M!r<#>fTpAn1?2?_CQvCPTLJla;w z7}XNL+(^naAsxGFG+}v}SCY}rtHBu=8goCLWv0#uW1s6nS(?s@1ppYXZy=|}J1+At Do;>!3 delta 411 zcmV;M0c8HbDX9aH7=H)`0001UdV2H#0004VQb$4nuFf3k0004FNklO^$;w z424Y+ek8VchIx9y>fCTZN)qERDQ`;{MwjRaz_4=X(hR1{Y z^Lc4`mvuu#RF)+X5izq{Y}?j-R!Wi9I=HW@D!3QqcTLl{?|+n_swShbJVIw%sO zl$sUh$1mkKqDWNx=jj*luW_L`d3+?yJb8wkfUfIil?g|$7nik7FK-t9)pum0r1@;3dupdBy{QwH&2T=aMA9%}q!I8e7Xa_%l z_<2#jUhoe702KQ$8?+?(@Y( zv1moK-~bL)5JjH_RHP!7;s6d<#a2Y02-JbTlYolrb*;Bt>-C?>O71;-_|D$n*=L{J ztPKkZz?)4m!{KoFpg^7gTnYNmXk+l5A&jrb;YNR(B8<`qU@bwZQivr|jG$Sn#0Z#9 zBF5o#Hx5M3ul&Qs;?1wKQpN=aBOVref6!jJ)MM;)dhO;{G;X!@aP8IH?CIN%|25d% z``P%4y4>gCzGi3dC@;*oP_*xQ4yQ+Y>(tM_tyVh~_cgP}@+N)XZqF=#W9wmW*5`me zIAkqZX#QKW!^x6Gq3a49=1jm_%VvK0Rc?N2Mq%cuYRu=VuG{B&U&TUB^PAmE%5FYk zlM^4t+gjE(_y0kOU>zb*sU)h3p zt8#r_N1-l{F>1cxZ$-7- zkCcYV@}}DaS0;7dCpA0WEYG~emS`i#&*ofqijXXbh>~X=I2Tq&AJ@To)NY$%Us5aW zU1OtMn-ynV7bm|}fzMJd@_s?DEquP*BDUGl8GP%tjbry@7F%?=5N5`u*A$v;yjPCDe zoh>$TI)!)3+$N$osG1zpc1PR~>ua6Ullru|EOf5v=P^$mR@(VTG&cJOG}li+uN5JY zWg#^t8-Ccza1NTpZzES`P0_m zy>)fE!zPj}TN}=ewf5UHC=T^;obhHGuh87-7n?4`$(72%#iy+#$ZwB+g{#cb25tp$Sz2 zPWnKRGwH?S*8?hh$2*IbHLF&{+U?l5w~2E)@zwbTuW!1&%&(Z+-Yr|bza?kU3g-C6 zU#~pE9)}jUTx$EytF*8pw5tVe`pP3>~E#o~?z`IMRecG2}@pBYoV9qB(>zP6{cFTAbm zQQfz2btvm4G&yHwn&pht^L>+Nq>$U0x1DSHS*sr@^6KM?I(7|&TC^1AFEQ(Tn7?G@ zhSTL)=$?7AI`caM$c!_E{wcZbr8POR3Ez-ysHqFTSP!Rsd(ZQyY+&Y?+>2pTV_R3P&7Biy>}~BAI(PRP z1U9og3thXIzHdzlFMPDIga6ZcC#tF84F_Qsg3fF+nf;nEX!d!c43duVerk-!;F1JK zICb-AtMl%Z#=A|o>X&J2)AFbgtIf1vhx*<`OIfl!wk)kAJLI)j7^_{XN#S^3evyE~jX|v-7FxoTIsyW_3&)zr{60Fc5R%*IbiT_WAO>0sfMz zh95AW5aQffQ>|LBek~PNoV*uxZpFEUL6-_%4qmr%wo%MFPWwZAGL#9oRC4JDG}osE zQ-bpBrkMOuzR4jVDkR#v@Wicv#RE6j4;G!USaJYahh{Nn_wKfTVS46BQiSoFk}vs| z`<6XBl_TGGJHw~r`RN?)A?2uy_!E_`gU1~02Ccb^nybd|!punrUAI=47v8+mm-oxG z8kaGmR}nLHo|_e0SF}ba#JKzxdHP|mk=3SOuHhfsdxb7oOl~cz-o^eg?RMVtS4MC4 zt90}|1=qpBkt_iRL=-=mjVfd$SfoHOl1`=s2M7+w@zg0{G!fGf5G-CI=MsCW&kzX` z5tlfR$*1s@zF2}JFhzw$q=X33ltk1+MD(0%#?i3>fDF^X1f5JOSF?3oq5+o;?)73a zkzg>&wmFmR}ZrQ_#o?GC7DX1kYzIRNDsBfFByOg2lTfdY9Tmh$pTERNK&DgUos}w zIF5u6q3`^aNh+x!9T7^#q?ints==((52g$V;)lKS&{GgEktq#cfb0(}H4^cAvOb7S zuQ8-EG7#YY4)+7=x49dPffb+6<|)u5eRx4UE>S-}TckiGBDUdH%y6S27>f>xC@2Ck z=nN`^FflPir?FtMJ0ikZ6l?@kkX)^SS<}bYxU|C=q~SQRpxWL){=T4RMDUG>is$FenJ*#z0t@ z2!+Ln2i*WALfQTbl?(>UDUreP7+EQgHz@Rkv%SNDxI`L>@?H`qg*9T}0QP`HE>dXK z?^QyH42#gfdOoQv@TSq|R3^=xMRTLQH;TkmYEX-MR4Ro;AJXU-h7HmI)WZ5o1po#Q zkPX{cg~1wyN~lmsxkP$eYqGqmV|5;d5AsX;Wfry{T=L!+UgRASgn1cG5(uwis41vQ+Ei41W9 ztRWSe0L$Ys&_9L?_N`pYt_Uu}OEvSuXtW8KejNa15QPbipo~Z!PL{0i7;m%XkpGJh zj=^9=ivfN^GSIp}CnUdXg~NP-SpUh_@H+gHQxFKBCiy6SKhgDxu8(5iql`aQ*C)C@ zih++Z{#0H6H@eK;KTKhA@C!%_9+kd-z3v2f%(4m#7W&~_j3n{#+N2~eZ(eLn3=lgV z?@k04BaI*=0_XLh4g6t;GeW)!;NjMcnHC5JD@ z#@LUV{MjI~%@T-QgLvLTm!HuI0)fE4&SG6==DCIx8R6Qv aDq~#TLfgPtGX@j5;ez}^cn5vrGXDd)OUG6K delta 333 zcmaE^@quZAL>31#0|SH0lCEPwim^Dz-HBn{IhmJ04okYDuOkD)#(wTUiL5}rVt`MG zYhz=hlcQrxOG{^4TW?QKO-)UGeSLRlXGKLtXlN)<)w?RY6F`c)B*-uLKO8W4`7?f+ z{6|=#{-CFeV~BsNKKsEe!MJIN{Qvm%CTq;qPOu z!-f}^rm0=(TU&fTfjuMth2rtB9lfl<{%cHhbb5P_@vYk^ymoq9ez-_WSwR(J=sJfI z&2L9<`W7_FFPto1y7B+hzjMztx~Uc~2s|m15n{wHH8mWGKjV-y-#@ko`w|p>JnZ*a z{Kzq~hq0H7tKdL#sSloKZsizuwLbFekG;(@-j;p P(3=dNu6{1-oD!M<2}F;^ diff --git a/Resources/Textures/Decals/minitile.rsi/steel_corner_nw.png b/Resources/Textures/Decals/minitile.rsi/steel_corner_nw.png index 9cd5e7d03a449a47e55fa53e585029e13136a799..8216073046ed9714b7cf2327f838e7cfeb71a213 100644 GIT binary patch literal 5225 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 NK>;ED2Yh2w{ss)1(scj; delta 317 zcmaE<@qlT9L>31#0|SH0lCEPwim^Dz-HBn{IhmJ04okYDuOkD)#(wTUiL5}rVt`MG zYhz=hlcQrxOG{^4TW?QKO-)UGeSLRlXGKLtXlN)<)w?RY6F`c)B*-uLKO8W4`7?f+ z{8w0_exs+0V~B>CD#)jQutooGw_uq1~{Ky-$iSf8)k%ptl%2UHx3v IIVCg!0Ne|R#Q*>R diff --git a/Resources/Textures/Decals/minitile.rsi/steel_corner_se.png b/Resources/Textures/Decals/minitile.rsi/steel_corner_se.png index 1446f6856eef81f7ebd9fb34bb03a799da79826d..2535334eab0e225b62d0fa562a210d90bb46e130 100644 GIT binary patch literal 5265 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 Zb&rc!voep%Mxe79JYD@<);T3K0RWO0b4LIG diff --git a/Resources/Textures/Decals/minitile.rsi/steel_end_e.png b/Resources/Textures/Decals/minitile.rsi/steel_end_e.png index a01e46cc97f51936b82321f73d9efaeb97892412..a5bd0f3807f11eb5cd7222d9ad676f1f90018c4f 100644 GIT binary patch literal 5291 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 a>#&$SzLQL7otOhmF`OVCyCPso=6?WN<@^Bv delta 375 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 E0RN?)9smFU diff --git a/Resources/Textures/Decals/minitile.rsi/steel_inner_ne.png b/Resources/Textures/Decals/minitile.rsi/steel_inner_ne.png index d8e5a50f8cf2b8374503360e0d2feb8933b04811..b32452a8db8c0639e6dc9b810b8bb855c6825900 100644 GIT binary patch literal 4961 zcmeHLdsGu=7M}=+Me%{?Vq2FXXo<=slNTf@0RrI>O9Da=YSlV3nS{Z-$P6SxeW21> zL|qi|$!<|OU<)W(tu)qGx5}a|J}3)5&sr6$E3HM;Q`GL4@DR`ToIRei{m;xvX6AnP z{_efM@7|kCK2Fgj`1-u=13{3lDp8pV&amt4=>a|qwT4p=rU+BaiQ#=nZi??PwA!SF)#^ z``fmPE|w78fxW?nEFd|t#a&ns0Pk8!u4=8`*P`&Q)B(w z1NKzjA76E^`2_lQd(P&>zhEKQZk%^&OGX>)P#;NpZiD+tdZHMiStqi2@8UoKpH6xd*BxCFSkUs$ zg9q8=T~RxJ8~tG5I6BJzt!Mjnk9b~%O&|T`X>BY7v6fS@u_>z9*nzeL&A5GW>D!4O z3jes|$Q`S2%xBzjq_ufj&8jNpEKiT1_@6TlIr+1i>alQ~nASc#^oi)1&l?L(h|x>& zvj=X%s7PAxMrF{p4)O8o*Vb)*Hzefnl!(tuPfx!(e)N_Z`KgcR9{OkL z@S?zt=Ca4?oG+U`C1W(~$mwtTwVh8lY8x7_XP#JbVxH=B`LEA9{6Z#JrXLjC)i)-K zu?zd;!aAm7auTX43wV9_-P-j*37MMr{5KuCoRIza(&}fM4~@#H!;6U$ap;2`fj!Ov|L{6<&9%aqtKCP|$@f@?6&eohoAK;GaKJNv`TOU-99>C{3qQQTmOBl@4o}1ljmgf+BQ2Y zWnV14R@U9idb-=@5bi4P0K+qn0z)!Wog^bHCN8G4;3U^!vVtKBK@m|7D@H6N85k!G zlv&RH$$69wQ#v_2L##&C)>tx&O3b&BY55v0k-w0T>ex|{J`oNX05FjZ20KhfGc9w- z*=}4JxORzoY}l>BER?e|)hTeS#YVy+u84~waSkd^z>f5RBWyaoEL9ob4*~Av>@0?{ z%6L4x-OjZOxfYv&$CpZ_JXF9F2oRuw(2L9r=0MDJunVFOLrKzvjj}S7#SFVJG2D{N z$k}YL4iCgosN#+kw(%4RB7Oq|ANZ|l{#h6!bO3BGFjbLfb17E8A|`0 ztQTT)t+>+}8VE2S#C<_~Aa}Pi&{C^qN(+(e3Qwh!vt9mWItxMRWbR8`hzY{6FeyTa z2tFbra2%0J#Cn7vP@FH7NW_F*Hv~#$rWwpkkS-_y&ZPhjAD4=RVPSeiN(d#02*oi3 zmts;R97Xwhsa_()!_grS$uiA7u^8oSR|v4na&TD<8cK&Tm=a@10E!AkGE^)RqFRAKCJ@U+0t5w;A^H{_ zrC;>Fv|a53NAzuaB1HrLi`=5Vo=PKg`tJH}jg-5YVA$OjGK}a;fyVO4K8^ua-x869 znGGbEAN>V8Ag6w(7;r$FPK*)=E<%Nf2qUD3G@JxidNC#mM{%iMCv>wgh)!Gdj2*L) z3IpH~a0Lp~%@xe)->PXZ>f5tO*FFHs5LAo|p^VMzPnPGJ7z5cx@cxUB2)DwJ5d-Y{ zWMFiGNyr- z`c^ym(+XnY?<6RpRbG=5!Od&d#CK^38vV8F%{pbN(E*`1qf*Ct-}VX|Hfj0+ee!G| z3Q{Q*T22eGAR3A%2_km5jukw0YTU(u);>hCoYyAy@FU!*zH~G();852WWw@@`~-`J ohDZ8rZ?8RwYFy*+jkRDt;~P2u8&^Un0xeb%7 diff --git a/Resources/Textures/Decals/minitile.rsi/steel_inner_nw.png b/Resources/Textures/Decals/minitile.rsi/steel_inner_nw.png index ea84f9755ff478ebfe5d08c163edff7ed84ea297..0bda9148f10a82520ed91d027111675096606892 100644 GIT binary patch literal 4952 zcmeHLc~leU77s+QqG$`QC=!EKR3>{!G7u3-fT#%&P;dd6$xO&7SxAN?(Do@~P;>$^{01zZm*ygBS)a^9(uO=X8X-MxLW37w9c zzU;WPncJ1VdYEFuj?^Efc-ElnHV*dqTS-hC-!u8rtJ{@>TQ+yzdYn)(K-nA`Uf3NR zzJEp3@V%WYy!A1m-PdyN+`YMZTpab(Dvk6kGxRs(#LvxV?rteL4=c^Dgezf1n-{m^ z+0e=*cS_*6e~1G^gJ0CmoYEA$B?M|nq*Om1UACpPLb`9ltolQ|$njCqnelgjIn1FK zPrLB)+eOj~rBG3NO09b*e-240Db^uW=77Z2YaRVq`R z4so3jGCtka_1=l<4U7{T$A-C8l%B!zeB;LXUOh2>WqYh<*x$29zR;}8@vqMx)U07< zcojT3KkDA1h3WU7_{U_ePMtIs@ikUvj>$T6Fn5Q4efHDOp(@9Wy6S`b!a~pozige_ zZE|aLhFH;!reV3yPdg~TEFDq5emSKg$7d3}rY&oI*uX6rXLhI8WKgynL)VX!x?L9T zD(zTx)(^)ksGY*5*2B3Io&Dy!Bpk1Z4IJsYw4y>2eX(p?)%@AH!}GS~`|b?hT@*WH zTR~G3v@p5j{;#KgyuPQfX}&?TMA26LbII)bBBxD*Z!lOs<;D#jm6^pm=I*L3$h>L`PVt;x3vVEmOpCvy}WC= zN8AN#-hxbX)QZ-Jw=!Cjx2_(uJUMH??R_671U*B|!sCsruc2n_L{&t{`nsZ&1;=Kv zhN9neCX9MHv97V3sjI&|S=Y7r)XJ5QzxwI0@iXbpT`dt;k2S~D9+>$u<#i4GBs)gCH zicn3_dit1;cYBG3J$NPmoEn3@)cv6VYSYU)lnMdC_Zv0x83$%Yqo?hOz zrdu741UCF37;|{3b+(6Ul4fmVt^csq?t#@A-#sQTtQnHCZ(mc(jRy{cnxB!kPm1%H zoUR>rzJ2=We&6xYk&xCS8Bd z+?`~b=Ny(Sf3%15gYR-DgvKfs4lk^^7P{o+)zz310Z}c*Ng9eL5;`%x z{lF1Ajljh87`~h(Hw5DvA}q~_N2MvERcT9AB8(n5-6g;Z0{|^fA~dTuNoRtsV!9m{ z2KP2GlTNd%kW0n%Sa}33SZ~B>JO+=!f}~c$%%M+rp#>N*HLR3`^g@7bGRQ zZgIRo-%Zlc3U=APV@gWwF^wZa4 zggW(qY1_(&7SOZlVT1{+pK2HN)KnCn+%xJKCK2{xqS5SS0VArO5KM>}$LxLrtez>A z2GJ$rpnvox>>D}pC&?fL+lL||HY7qo5Ihb@3)Bzf6RyTEE{X~`eyHeObdz39S`Z^1 zln8hPT!93&b4By%-Kr_?>RU9pZ65$-5Q`7>qm0h%4VG!^7;mBtVEz{$0d|FcEe6>2 z$Uy4?osikr3VZpoHJ!ik)4LCU;R*oy!y@m+?+3a*(DhynyqEHa?D|00dol1{${(`p z|3;U~+m|U^2cCc|;8kh4yVF+in&lQTCt3=gJ&D9bOG?U&AW8h9ML>+bXfFmA2U4ks zqRhB=8T?;GaX@E>N+?-Qo?&1x$PhN)M4=4*-gY{i)K_3YIFOXdr33Ffc{z@Ora4}D z4n&?ZNl>&;i|S*gQmLNdyecE3VecrGvtwo?>%IfU%b7as>Y5XmfFeaERYgQu&X%Q~loCIJ3VNWB06 diff --git a/Resources/Textures/Decals/minitile.rsi/steel_inner_se.png b/Resources/Textures/Decals/minitile.rsi/steel_inner_se.png index 7d29fb22571d9b08a4875d2ec3880800f99f92ff..de8f47511a8131cb4d901f4e0d4d81542cb50797 100644 GIT binary patch literal 4992 zcmeHLdsGu=77s6}5wwEq1Es{Em4}l_CYg|=1i=JDl<k>(%uEPGsVHsN zvQ`BV(Q3CqL0SbBQSni&+KSt%6%`clQC(UeRo7R$9JOq}1VlXBbM|=7_CJ#|nfdN_ z@9(?!_uYGwFCQi)D14a#Oa_DDtBjMUfIG{1d3u1)rD}Z(gW>VHL!C~iV0ML0)Bt=+u8C{@t(s3>^+9L18`bvGZ7i7OkTuZ_ze{m`n06-V^m^M-edw^nRfyGnMW zCG@&!Qtsu$TNZAVZ4U2zNQFg{VP!`azjm%JwkJONX+lguK=Iq!@l}G04at?^{)`9A z%}-{Rv_4RuomK6fb{BHgkNDm=`Cxqa(C)?S;9r(LLc_;D9#OJp9`x?He=pp}yg#(y z(D@C!f34sZmm{B^I{&Fz)&X6xy?5{Q=pW#gWpl4q-A+mN+3Cm%J0a32#;HGyIbS7T z697qePY|ruTno0u6y)+n!j>k(f%32thRTN^rr(^4xPdWEVC+36vRgBCF5t#{KW!aDEq1`##?sLzVi`=Z-?@6|^xIJKoP##UDFp_ zE1RN)t?sh-BhRze=8GBf*XrXw@boD}{c7TOaL2G223Flf+f>%wtU`4@TbaNfcX8~Z z>;oy;A2%ZB+#E(-*7V7<+#+TN9G|J=Et!d&sI0A0&fYm1t?z8?E<>+pHj>5lamvc< zf7FZ$-zD&$Ra;(Pk+CanFH@+h-&_99uJ-oVcOIsWcKHsex7|IHdj2#8Uvk_rWj$UY zpu3Yl_(;;(9qRw2<;2eTk8Qh)hR4?g2Rgc|C*+>1hT?Zk#%gN9w>28u+U{PBzO z$3qTYY}6-yQdzK6*5mtLVD<3G%=Xh&w5exVNPUO4k#AXH&vV_jvHUg zL}xj}f&}POkJzR&o`o59F@xc@%pj8`DP^)}MGH!GV?oJVaUL|*T|DSJtoe$H>Y_&FZp-_7NNmIFASObRM5*DpJRfIUNQGPG$yPjI~Xfi|ZS@<3SM@yvsLH*ZfDCa?SI%EU8(U@H9Fp;*ybeM8=%_#kMMOlO3DA z<=6ew=1|rS^zi1Pt12?4OgS(qvZ>^|u*?3#*M~b&dNP~OmkfD7Xsx-dN40R@@h^z! z3GAq_34ZNoW*gNz_FhXrQgmdV^1JfKy&Zm2{z8WBMt;`qO+>M?jZ%I+-4PhiRhEqn z81nPh(us=ngt?>EHD6S`)6@00-il_Qh4q?Zd<8o7QB}|{-iLPDQaygFnW-9Cx9I+X zRpz=YOQ&CccyN_;o5g*pzPT~HcUSP(-ciy8t^0;o62mwR;Tv`gTi12^*Rr<2FGIYv zPf|nkrmZ126t&OI&J6i6?cnuCZhob0=X`GmMJK-f4%}X`zf!Vi$(6E)Puza{+?vP# zth@uX)?5Q{fF2rgI3C( zgQ~bHi;T!N#5t@)sv|*-J92QbmOU+s8JQ;m049RQSa~L+nUds5*)CiOcy@|mHp`_# z=SbPzRKhi%K;B zZ>IWL0DQoCm<8r>xUk6t54ND_*jxb8@6aDwP-^f^1g8)bX|v))Y%XD@g9k%s@d0~_ z&1!Uoqs3vuNSJ^s1y<#~u%tq%N*b_mQlK}OEG{cR_6wS{LHC@j7kqQhxWXCi2rwVO zeL?$K>@H=XrBX@cByMxMr<6~wKz{JKy;{( z7zB}MHGr(djDx*$LTLdMA4j-4L?niIgb+Y+#W*BFg*YUP5a@U!4VTbF;4UaFE}21E zO&Hitg9+0Uu*Ix*O*jdc#3U)DY=pyoE=e+Cv; z2BD6?xf-4b66pjyNDzUdkQfsSAij>vMMXk^Mu7J1-~c*B>S#M=C1Uh|N5B z1$_N8U;X>=XD-2Fy;|g@_Hv(3-U1mgBD7IcA|8=aDn%835y0{Bad;ij3T zkTaHh1;&BFP)l3}#b69S>b%@q$T}?$decf(toIGCAop?nR^RL8K*UzcW7Hwv<5^?9 vihQ_Ccemog#vMB*78jP3ma^}7Mc-vG=I3~}TR$Rh18s&fHbLGnJ!{$TzuZfH delta 184 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 b2D(Q*y~71sKK<6efhI*387r+0PcQrriE2Yz delta 205 zcmaE>_K|UdL=p!x0|SH0lCEPwim^Dz-HBn{IhmJ04okYDuOkD)#(wTUiL5}rbbwEY ztCOQ+XlQ6}PfvY)ePd%|OG`^w@B6ZR_fN(iI&T)dS@1_C!~MQ|(X^M7R;-fr xc+jwWVnPa|*d6XKu2MQ1SkwNBRF zA9_^Z8QCDh{P&)XaYdT1m(O2+N8Xlu{lT|ibPP0MKOg(8Z0j1&po_9=bY! zzHr!j4ix$IPFJc zM~`^WA#r6v@`l>e+|`-;PNZKLyUpqJr1xW;XJy1NF;jHN`RcIHjBidjHu9J4*?h>j zsZJkVym+$YL}|PicguI%rw3=P-r`qg6>V5#at?2+x;%>~|K^Z7!}Uy;duUoqA~LUq zIj&EA_owmseo0x2Zyt4BTH^kxS4);wKzCoQ?~m>pcf0!XlA<&hXVb@m>FY^18>Ra~ z3R4`pCAkx8KHcQZ>n?DNdbj%3=1GJ!6eJZTD1aCnp9&w{ndDVv8E|Z% zPnvrzaNR)Sg5{g8#L>wUTnohd@^o6enD|dfDH@56$I)B^L`a|lGkXoc{SFP%d z)Az~$JnQ{>SZdOjDLZ%7__5EY*Z%v%Dcq{0U!|GZ`xefH%vBlY^95f|%fH#3+~JZl zt9JY?k8X=nIx`u~5~LS#TiSdCttFoAQ5)Y^!qZ%w;B~c8uT*)q zhm3DI`mrwT!h>VJU$)%H`pHM<^Vmc8OR$kuv#k73T;E6gQcu!lGto`1E;Xe^55MXU zE4{w7N0|O_&o#ESd&chSfrBwQ!8A|n8=+Ue73{2J=%gbY2>o@)l>oZ=0<-oz9sV9=$v3-07KD4&9D8ZQfO#J>~!$^osvXb@K%6qp6?h znui>9$F(VUb%5eNsZVqc&G$<=$7aH-uJ$%3gsJzV*JTW{*KjT z4!9jZH@>x@z1~V#r7d@&nK%1;A9tNAy*ZTe=*Ehx=7a;ZlKZQW{FPTb;QUvuZ%ibT zCatV4Z;i+TMQC-Rj9pIX@-d@b}c z0ITo%d`+a=$v=MkgZx%`h^zIJ3+qWFhj&!5v5At{*e8_&)Q8Ol>t@B1qkY8lXKyc- zBd%V}(D~N4Yl^Ey3&xQB=iE+fu+kTt+JkWAXmF2n*zc?%*C{y~NbMATn=IEL)!6|^ zLHQW(6A|#~Z`v=NTxLF6SV4!lJua17j8`XkX>zrTcNJEzN%%b~k$YK9>9L2rWp;r?B@TBTf1>#U|`d9!GU#cA$=1(KM2iFy1%I5>vhg6{Qjk_xG!DW zcxopelR%vvGS$2LT#8z@@6grsV@1c_khE1k9P0HBd{q}x$M{ikXg(Y1+%II-61~3j zU`fTq$<9CSUhf~5o{;IYq2W^8oA)o44sC33Us@|)g|23Y-QDhY&*jKxreyNt>er=S zHOuZat<~1_FOTW__4BpDy?V#x%7*=+Lk9yU4*3X|oNe^nhP#FD3H@-N+lGr@4OVpd z9u9KC9wi4`BFl9j7IkN4FABPz`uV_J2k-S==RI!vMa|E6lh(b_x{Y67*kAGMBZtR3 z3>IcpWiP1bxhhb%)1~wHs7@1(U^+P-ZqevLT_=$Qkrq9I=HLWHjw@AKA@yhL5h_K6 z38`spDJ<2;;@PVBd;^}GpCCi?b5I^ejhyW&u`vao0vwW z*j0!eAvIl^NQu=Ma0)A&6%IpUiz=5vo$X2y7%&AtNi=5!0`!E`Y=Y49X*9Fh9ByWY z>kLX7oyX(RUnjH|k6V6c^{>S|VUH z1cpAf*P9G#dpHjpR^D!N&!ua;4g2Rxba0Cb9VjKiwu@o?b zC^&KmWAR|7oUPz7aC{V$L~A4vEsEQq0C>0x;4l>^4`*X?D1ysYKr9YZ0YyaM3J8|7 zF*Z!cSg1T=6vTXk3S=ds9_^J43Ik9P3TZ2n8?zdqAbdbY|nTA(={p zCliQ`PdXQTZ7wjG90rFq%03l07(p)DQ0Z_ulVLZvEes!o1E@u8nF;{xau5wa)_@~~ z&LGq2)IzGwDT>YV>97=RC=4MG5klYq6lSpaFq_YWWef(N!QsP92nLc-`Z`Rd$opT~ zw(Ua^3@>`T$_VDqvx|oJR5HGFxHsHYtL&SJLa}cPK7tO1U_^3p%vj z^A@hVHqf0 zpc2xamckLfY(?j9{EV!_-#7z+emTht@%xglmvp@l123ffGP_>V^+F81kn+py`oGcT z`s^@;Yr!udGdL<0pQEGTnB|=~PbNl;P*k)?rBs?trp1dE0r6S??SA0lKqMt3lcK)s z0so_s9OQH3M5JOT-+0g&r;lG~B#}Ii+b)Nbx*7}!T?mO(>~h1&&v7#O(t~#&01;Ip zik1a+pjlC*IXH^OI%5t2GiHb{xQ%smI9@Z$xq22!b=Et&xwV1=v`G?if@n`n);oU! DQRRzO delta 272 zcmeyWKA&lVL_G&H0|SH0lCEPwim^Dz-HBn{IhmJ04okYDuOkD)#(wTUiL5}rVt`MG ztCOQ+Z%B9}XD2{24z1 zg*gj6B8wRq_zr_GSBU-ppRip_zxVFF(!P{K zlX#2vDM!06Yg#qSQn0I9)2&6e&G_Lx2jv6jSj<%>bU4cu8GM>7w~1v!v*5;aF)IWE zwFLvFNQnzLw3a#Qm}v+XD9_-2U7w-eu=7JFP}xN8{?+nVvwpFbgIvVm>FVdQ&MBb@ E00*LEE&u=k diff --git a/Resources/Textures/Decals/minitile.rsi/steel_line_n.png b/Resources/Textures/Decals/minitile.rsi/steel_line_n.png index 953586a1c506fbd30ce854a1205f297192aa69be..f73aa627b9f16e247f110c702a4243507d3e9d63 100644 GIT binary patch literal 5050 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 BY;ynr delta 270 zcmdm`K9^~NL_G&H0|SH0lCEPwim^Dz-HBn{IhmJ04okYDuOkD)#(wTUiL5}rVt`MG zYhz=hlcQrxOG{^4TW?QKO-)UGeSLRlXGKLtXlN)<)w?RY6F`c)B*-uLKO8W4`7?e3 z3Ud~CL>4nJ@ErzW#^d=bQtE-Cd7dtgAr}5`drylt7;vzN3k6=TKd84qM%Ur_gvv(N z0FUV7GhF@@J}%(7WM=H}yzHFp)<(HgvNLY4$zr{vZhgwlnr*Gwj^s(JZwGGIW_sx8 z$3LZzb%NRRN86gj|Fo!-@4Q*RM*N?{C-zDHEZ3?S{;4V?r!5h<1GJgJlik(NWt~$( F69BnUX-EJ7 diff --git a/Resources/Textures/Decals/minitile.rsi/steel_line_s.png b/Resources/Textures/Decals/minitile.rsi/steel_line_s.png index 89b0fe63f0b47ca60ffc8cbb48c202199dde5208..fe8804e8c99fd8f0dfc63e9e1181741fe15d5c74 100644 GIT binary patch literal 5099 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 diff --git a/Resources/Textures/Decals/minitile.rsi/white_box.png b/Resources/Textures/Decals/minitile.rsi/white_box.png index 995c63267d043764170fb9a1de8544d63503f53b..b8f0174c49fdeaf118c053329491215cee460b1e 100644 GIT binary patch literal 5307 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 literal 394 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCil&0(?STpFVwBkemDB#f!JEUVZ%V;lYCkj~_q2bLY;~sZ)VUxMD0lKvYSP zU+{kzVAym<=R8o9v%n*=n1O-sFbFdq&tH)O6uj^0;uvD#-#h8H5R)N?^TO>{|Nl=E zo_3{h#p22jXQoY=7U8|~MwR@8&+S`0b&Ctvrd~VtY;S%V`v&tb8#Z=coz^y+d1_me zgmieBLb7^P_r`te3|Op9GCXdH8i{YzKbO}gT+wpBN@eNav&tIvb*r9DU|op~KMCLo zy2Gf&wpM+0;-d#A?I%u`WoK@R`pA>eX76! diff --git a/Resources/Textures/Decals/minitile.rsi/white_corner_ne.png b/Resources/Textures/Decals/minitile.rsi/white_corner_ne.png index c584d3987646aec972c4bb627b00f0f19453ec5b..f0342975d290a315f560ed73ef83d7ac673b4963 100644 GIT binary patch literal 5198 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 delta 348 zcmX@7@tSFZL_G&H0|SH0lCEPwim^Dz-HBn{IhmJ04okYDuOkD)#(wTUiL5}rT!2rA z>(i%C3vzQ`ym;~U)vJ#mK0J8v;PKZ*{d0Lu!hbmSRtAdyj=y*Rq)bML5xdmXGmUPl#R~#Y%7nuC zt(rDZ9^^BeV--H=U+*F%%6}?}CnF@Ffmx3G51SpEiPlBMXDx22=Z~*^@ZIKz=z*ON f^otU>R>?11D1L(NiQWUCZx}pX{an^LB{Ts5M2nW0 diff --git a/Resources/Textures/Decals/minitile.rsi/white_corner_nw.png b/Resources/Textures/Decals/minitile.rsi/white_corner_nw.png index 04cdc186e58679a64f32022a2d88b8c7cc69b197..8d751af952eede58c569afe2106dc9e69ed618d5 100644 GIT binary patch literal 5242 zcmeHLeK=IvA0K(!D3#cdGEFLE%$@6wF_YI&$aoo3=!Ndg++mnEGs6tpgla<%dRZjw z(pD6E=X<{2&-s2o=X<_q z&P@;WUpiUOOb>^{P4@BjWP&?hb!lmW-xOBl1sqOmS0XD^&O{Y>iB!zv3oyJqL4x5i zC7*}GDQ{P@nlyaXhBwi2>g-GIIR|Rf!bS@5w}t(~ef`BPP5AVLBFpHO#O}Uysqa2XE$d$7xT?d@m$0{YC?#5c@a8>aiH;2nlizYGtm~){}dS&k!UP@2uaeXb{FlB6J#Ba7}`m&YJnKl>q5868S(g$rVQrFVVjuHu7Z}6xmnEqEAr00-_B0zJCUbZJ+Z%gohGHA z?3tUdc2|m7Jg0qmPS*6G%Q%yn0d7tBj017Kzqa_ww9h{)_t?xV zuXf7iRpk}bHJKcXwQG4O)k|8}X6ADx{Lv+t*T$aK$kysKU-QJ!gmK+=^&--u;D_t2 z@BD4J{YJM@eXd{n?A956%jrbSYpBu`x!V=RUt{*@E0c3(JEsimQp_${?+aZ!0iEn& zGCiE)YE_zJ+VHhsNY|X*I;mo@>4ERd2H%-~TTwvT2p@51&iE#f{Pb#XhAde;T#bnj+%oz-q+XKdY+8J5FOCyK?8xFXe}u%Wuhv^i$b=NeQVwC~~lD-{P6 zKkB(JPudgp+|c>&gMJr7bgyRU=x5k|Z&tTvsFx&U;120u=QVB?TKJ{ z83+#Utr0e8+EBr{2J>w)uZl&u@r>>tUrL_Xq!j2DF; zOx~O2|JE&#dPg8nbaHQa6_*`Qq(GM+d|m4rB9pdK&hDR>ogcPf!AVP}W7{s-bWAtc zwJ?$SW_8WYZ91DQz7y?y!-)N*{s6YvpWtF+ZrIYaT);Yf;?K~!w7NAumvRS3S`8N% zi*0^}`*|k(d#&rTCFo&JjLbC!nsuQJN3X7#MMn!|g28Pm#=o}J7Vm35{p?s)NQw)0Pt2`P~^M;4A$&ovn_a*nw6 zi$MvdZ&$Uj;IMvPTjT4UH)fr((&i2YTPt06hzrtMRzR$2dgO?g0^P49>vTzGn z8BJ=*uPvb;Pww3LVn}1ST&lGHF}D?LCGmW)WrQ;P=p3=o4&{p3n4MB60b2?V=j5uC zpqv;?j%Q<$e33KZN$qI@p3ikAgisg|L*ju&@x2qJSa700i<20`p>YYWE_zN%Isg!2 zaulx=3Pdux(wU&frGsacm_)#kC{iKI{{>=gEPVre9aOrz0A5KMw$BG4ep5=3%TNfgQEsvt%&JTVzZ z%9qIbVi8`2iL%9Ua%Tbo^yA1CTL? z{?S6l0y{5>iOIxqQV!-7kBQ`S$3t*AAM7P@Qh_=gE{B8(FdY5%|GE zML{HAC{bGhvOm$3^LZc1`ouR?k2;+3jsWuyxSwdhk6o<{v=|J!rU5Xh2}`4I8wr0ReX}E;0wd{RD|YW?*LIgDy_hzGLVZZ zR5D~|Kk9^PV(1_oKrO1uQ~;p10MXDrq!=m}OIc#Ez?qI%&K`k0xQ^8p5Xlt}7 z;HwuC9&bd)n1f((tvxN1KE)@T68k;KXPxTd1m}(vXWkiTV z97h>}G!`sLRWaU2>qPo5KAhAF<4O#$8Qh=k<;|JFp!7 z?nOmKhYlSIVlL0j%mhu^Uv1&wrXgqg2jkp&Zh=>LI1To)rJlGg+OxbtW1_@6Ooqc5 z)Tu5FV=LbcK&UJCVR-5GYFkV&Gbr_b;|WBzKA!F@tE-%;OeS;5`AHe6sde@F4inBt rZO{-(i%C3vzQ`ym;~U)vJ#mK0J8v;PKN_!NOYG1CgzQK5l$99SS(UlhswkjukEOC37z)a6ORQ)AaPWcs+WnHZu3dO=L-No2Jl-ca517XEaOZqTJtF_+;l6sA X7vhWU(iFY{UC-d@>gTe~DWM4fJZqRh diff --git a/Resources/Textures/Decals/minitile.rsi/white_corner_se.png b/Resources/Textures/Decals/minitile.rsi/white_corner_se.png index be5170a0e224871a72970eb0cab3e714a236233c..54eea747f037150e2809d90da72c9d12e60cacfd 100644 GIT binary patch literal 5238 zcmeHLX;f3!7EWZ2ii*$*$|D9Sh-SK(17R>s5dz30Dk?WOHxS4~5=a1NpU7ZE5CN@- zq9{}awTd8h0Bhxmt)hYhii&lpP^+yX&jH^_K*jaC)?2Ri`p;w~_nv+B{?6Xt-e;fO zvr4$SIlRSQ|03FwZajRZLJDX>EEu6fm%K^X}cglzZ*3-lVM4yg{~B;QDJt zJ1qhlh0W?OiYd<@d>L?QJ*(hczPH`Rn$|Yb?V4?m;l?;MH+%oytXocnzr5jh`lm}h zx>zR`kF&bgi}PG4e%|Le??lKk{VUTy>`VfB-^ArK^-OF(Sa4~g%P$_`=l7i4@l*WR z()_S$ub{=e@VX?kO(CyCitc`QVvAd6N_60(aV7k%&Ybgg=y|us(!Q?5uFUShb2*jS zInihAFFO}gTaKE2bx!+L!x!6WEBW@vZkp-L_e`$7us}2V@sF#`RPreentNYgX=f=^ z)Ye%=l=0G@GvaSUt;b<(ihYSEQbQ?zif{gg zb*u^Q+G|_3VCj9_(%iU%ce1A@5=*cXx+RfmE(5727H03USeZPx-ey{G-@!d`#cw^W zUSqB!+beIStdFX|ttXVlvQPcP62s^}8@qszYoB`#Q{9qgyMBi6@|dbq0;}$zgbk-d zk&vDP(a{uP*%{c}#rFBe<-(_S39Gl=4#(L~`SuZ`I{EU>x%r(BksJpkwB7pj=Eb;T z`sw1xFxQSgP3vYPjPsxho%h?tC1?KKj)e1GT7Rn*$H-?&(EC-1PswJDvy+|4b&y~}-6`Y4&9Rom>`iS`R!&l9Z<@aH+lUn# zlFQPVKP*p(o2$KRk?!JInSFzJ!+rHc#UD|>v~J6q*jUi8V0-6p)XV0gEW3G;jhujZn zB7RIIZFS9 zf3>zM__>`N)5>rE4VU{Y#IENdkWAU>>GHbSDnr=fYymXttn0hdX6l0V-zC+R@5r*N zOz9}Mh)uz-JnOYq+pN4aPo_&>WhqHaypZvrE%4>jpG&{KynAoY1IKLYy78e7KF&|g z)|{GoIExL>m1@NHUgKDI@(%Mu{+ThRqN!n5!hI{8)7>T2)4Nqp{Vx@nq?0MvchZ(Z z6>Hd6p#+mVvx|L}S^0)pX5;Pe->B|b{E%3JgtmIk!0&|xXm}BXSdeEED_Xw=sj&AY7%%I3PceedFRsIbkWd!qHG>6wuO z@eNlB%~v~ZR1^;gQ;)WOi_Q!qczaB->AV;ti$2iU6W6k;Wr3irRLv4jsLp!&eSxC-){2?ke;zO3)u~3UNNhMbeekgJq(NKWqV}WK+tJaa z+Uc7Qj4tiE&|lo)c+A~Q{3>di-e-ey^QzAIN%8LYVvj#~hP5f`xIDJc$v1pnGP$#? zX*>7GvRlP}zQVq#QR`_tORj+vBwY$lia22?7g5SduvjTVNqV^ooFo{GmyccrBPpmB zFG3Tg3LfG2rV|9bRLmpHVF)Qg6(3EK24||#sLZfvBr^r!hzUO4I4?aH0LW1-jMvL$ z3Jq7!BN%bH;NBo66YxeAZ3>SNCyc=Jm1-1EC(%h1Vt`(n4iUU@crUeB!j1F~9EJcR z9wAAqRdLB=olZy6(MU>lBALqJaL5#h3_(PoLDXa@w6LD2&^Q|)hA{k54WgE+v{I!4 zZ@`2_$}}yHKmhajcmBy$Lg9OOg=Uxqzz10mtH@Lmg)EnoM_OpK0qFo_*rC6)&_sg+ zmmG;|lxb=N4M;~7TIZ1vV&uKODorgjh9gGEs0@_@RSj5``q7d>0%62^3j+m-Qn|`# z1<3wLQ!ABxAnPOF3^T@XMmhq_-{XFy{VsN+GSCtVx&BHdÐEpGPpP&lM{XshDfL zWiZ7|k(fy*vS}!tNQdYUkghr(iB^(4H z(j_!Dkwc}k0Vs}%`MB{{kaIRm3fJcBxln;^! z8LX861F#3A3b9hB`7jkNm7`Hw*uW>11>O)uV=);tHjT~spcIR$HJ}y^s8kAx1{r4z ziQ$590JX58QUQQb4x-`m)hMi0s-u-k8INFa3U9D{KP?0sN(^gZe^`qGPzprnQW#ts zB^rXb5R*$~5-C73LSHGCN;3YJwqg6=y@rw=EY*PZGmN64Jr#wf4vmI}GO2Mh;qk_8 z!G)2b5HxT)DmMBFu!g3PBv_G%g8ngFuKbr;wB;!5DNEfN qyh8%!+ShCCeb26^%1tla#9|(lC+c4Uc7zvYU4nJ@ErzW#^d=bQhOEZ?LoEECPR!;zqQKEI@p#tz`iHVwHZts#na#RBJxkDOQT*zwxGs6$}Ejvd`8 zS^QrN-QKe{EQrWr;PpD7E}^eqz?$I3;qc4 diff --git a/Resources/Textures/Decals/minitile.rsi/white_corner_sw.png b/Resources/Textures/Decals/minitile.rsi/white_corner_sw.png index 756200c26313fb6bd6f6f47a9bcf0c7fb0256e64..b57417997e597ab1ee94a0227adcd956f1f3f596 100644 GIT binary patch literal 5281 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 fk><2Lc~FA~RAMFi_QEKLhb3Z delta 302 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 GnSTLv6X6H| delta 389 zcmeCwoWeXoqMn19fq}tgN!KwT#aJBV?!>U}oXkrghb7(7*O7r?V?XzwL{=bQF2Eea^&A09k-@c8lLJ9q9(ojMh$ge%6<14NYs`33)n0ftRybj|}s zISV`@iy0XB4ude`@%$AjK*5*wo-U3d7XGc1BKepNIh;=#Wmf;^zMjV8vEuaa6`{_P z4t915T3x@D@S#0R+|tbHyk%PP@_VoK-ZI1rSKsh!wZ2;L+AVdFz$@1pwi-Rpsya00RVEn}* zbx#ghGu)TfW2yfrlv*Nj zZ_k!qr;Ic6EjMhq;?VokxP50pVzbG!^D-6hby|-7S@=fz=R`X@u7wj1iyy0CW_Txf UW%-(!pnzuZboFyt=akR{06SE%$p8QV diff --git a/Resources/Textures/Decals/minitile.rsi/white_end_n.png b/Resources/Textures/Decals/minitile.rsi/white_end_n.png index edc8a69135da4e654a790c71792abaabf8f35f1a..a8ba5574771c95858f3c658b2c7de8edcfea8ec6 100644 GIT binary patch literal 5250 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 diff --git a/Resources/Textures/Decals/minitile.rsi/white_end_s.png b/Resources/Textures/Decals/minitile.rsi/white_end_s.png index ca2528efd15673be15318eb4f99c6505a07fca92..55823a70963cef9c17de55b68f28a075d0cd5d27 100644 GIT binary patch literal 5297 zcmeHLeOOFs8$YS^;cF#nC5>UX51rB*Sr6jxz2OWb3ga}d+z7=-1q&= zneRoxQ-@fOwuT^Rh#<&c4DKYuWo8Q66_V(a5M*{HK@v`g5gkdbQQ&gmE2f(_2jByO_#bdmh$h9iH|t9rXcCy zH+3T$VcSk*Ua}P{*J{r%aGPyWP?L4Uz+IDys0V9U2Og!O$5`{!CuVxKDECzj9cB8s z&dTxLg_{HShs>=o72Ho|dvaghUVYK0%;90})0R=u_}Qk@yRq=GL#JQ!{fS}oud5vm z4)+?xYUSA%b89KMklie5f0l~*)Sb_gl$qVS-kD#KKyulH!5fn54*CU*cu_t=Z+acg z_ZiFTs1LVZPtLL9-0}JfT6iHXO*#GCY3>BNX`c0!P@m@I%SW`CICJ$*D}*>}ZDhv& z?e0Gy$2n{UXGkNM>Xrh_PGV!Ta(MXD~f5C*);=({Dzf5~HwbHezJuGj6>yAu~ zTQR=XFMEvk40q$)L8H=zVbk1;+r`sLO6TMszWpfGyqvA9S@msW)O7ez{X&bS2_5xl z2>(TWXKR~9SNia&qvJC}b%&CtExC%NFS-77eizTT{C8Q3E8_z5sr&w$p^>FE<-Vpj+*Y;~y5J{VqkO0j z*I|_oadj32smS%Mq|q4l*(~&lKgLDpBB~79y}TO>z_q_ zDVjfyB*w~~M_w!&k}_uQgL_NTz7Aux`Z~W<+!DMVz5Yn*!+OcU%zN`Q8g18$AD(^e zQLXp!92NMpx)S-7F*YpfwUg9srZ_9VJ~{H6p_|X>i*|J$D7i39>X6T_+x?&O?6=4C zxufU1pGa!{S(doIVKvW{*;!XD9Lv_(UDeTNx)rqTh)7g+*Rq%UUVrYyK8Qo+X_j`> zwOPAKt&eJ2k|Z&&((HPEvChp|s`aZ_*zC5oMgJrz@pg($>;{WBUEFOQ1H_vP2L&m{ z{$^gtzEBUE&4fwu+S!Jt!O#dnBQ(gv4873zz4@1bNHA*sb-7{8*b8m|PwYz<1to=z z4prv)u9IfDLHkDdoV@X8S9Q~hVYOb~@+~c|)Z2nLBs^}unUb00nN_fVPj~eIRpU<8 z;de8tSEtrmaJ(i4eD64j{|t$C2pN2=^K!%wk9R&-nko4@=Se=k--RE0S6-|vLQm~MJfl$8s{`G;nLXAHixjZj-1muTlmgivGagy`qnS+| zhkCB^WQUcTp_$EJtm>X4bc zx~jZqYcpLb~4t<0xyOx_l2^o+vn zYvAmOlYuiPTsVV=suUiGR27AJ=oM;k20@UQw_c5)i!g!|g+nRCK*+T zMSOC&P(<=mX)qGggXuwq1N5>uI(f1+$x9=}d1C*-J_yj`lVb=%&7)9sI-Q4(;i1w* zQ)pZ+mqMje=yVupz}k2vf#_kScDwl5D$BgW4|fgTsi`KQt2F+Nu}d3 zhlWyNDVKxbG!_SEG8z4#1WGM|C{fG+1;9OI0Ef#(Fg62a!E7#$00PLx4ju1F7068F2N>w`T$03PKfrSx> zflrzz_|oYN4xP(n(Adn6O0zJH7Q~_fl}7bo(2XO8jp2di0BR9Kqyhk=9IS@tr@;_H zrIDyqaz5GM6v<%uVOR(fN{SGOKSE#tluBpvs4O0XDxuQ>2|SP)R3Pc6uae5}`2VGC zNFS0{@1_UIv|#>tqo_Bh!m!1?z22@|W=tj$$(R;A1npgd7Ky{8Mn3^o?+_Y;D5Eh@ zKl%dpywBC)z`&fhJ65(!BiI9k1{f)Z?P0Z#dyD3FUo)M;bm0lS7Lx&uMCtf zPzfm?N?{*ghNANie){&|ADjU|f0^X7`29lH7rH)+fzML@5?x>D`YZ-MOZiK5{om-a z{`fM5DZwuw9e7nL9&%_Cc+IjA&5#5@ut{!iZfR+0sCZ^tS{e}VO1j|;ZYG2{I1KW+ zcNP5S2bn}opXv{-F?S3C9V>Ov94!P5Jz=;^PO6HeKxjb-gaH;E=1v1f+m%gNU;{*S zfxoZBUhe2xB1r%fl!Mh#L|%~ U-bqY$18YbS5bVEa%7Uc703}cIAOHXW delta 319 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 P^eTg=tDnm{r-UW|<#ePT diff --git a/Resources/Textures/Decals/minitile.rsi/white_inner_ne.png b/Resources/Textures/Decals/minitile.rsi/white_inner_ne.png index 7f8448e50263556316141b7e5ed46b769d742dad..76733f6c22477899613f7678a2108d5682380b3d 100644 GIT binary patch literal 4936 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 Cic`t} diff --git a/Resources/Textures/Decals/minitile.rsi/white_inner_nw.png b/Resources/Textures/Decals/minitile.rsi/white_inner_nw.png index 5e75689308a7147a179fe2e84c44393a9dc76f16..b368cd57316156fed3590adb454292b0264b132f 100644 GIT binary patch literal 4941 zcmeHLc~leU7EeGCQ8|L*3KHXjsFO@~5))*Hpa~G7pip&^nLs2P$v`63M^S4PR9pa& zCst5Ur~-;2sLuuUY1Jw!DwORhRjasQQB-QNUjibY*K^+SoY()%oMdM1ckl1s`}^*_ z$z)xqIB=NVI6DG?FiaTaCjn=Y`8~iIe5OcaE)WRT%af#$xCAkhbb75qslrJ3G95<3 zOiBfTVEXxKR#aB&w4rNS7M!0+6xy!4ucJMDX|H(Ou_{+OCHL9mob4B~$2jEK=7rP^ zzR)sT@n*>Az|Kvz{B1iXl}IIbQ&TQ<6d&K4op_3RvatORZ`WrdhGu$QdV8w_OTKxt z>5TjIfUX}mzmCfnh%@lFuiXOg_#7fH3|oIWtjc-t_akubzK0buist*HH5Hi+My zIQzIOUXxpLYv(C9-_A8Y?pMC^+OTN#H3Hh?9(3O8dYa1jaO$k*%_TvbHbpEuws@e! zPfkmdlrO#Rd*zR#qqbs7k4bp@__w{vh-!|#mlsHMgcji==sKm#% zv=N@UwGl5RVo;Y88^k zA3hyA@fstDO&JvAkTrjRua(uVfcy;iapevZH`{wT<+T#xt%;KRDJ1SXv@CwnoL0Ah zhK$TS`3j1TjwP35tTx7 zzBtV-;+p2!q7$PiE59quir#N>FPOi7!QHBRcbsgFur)U%H*56e4-OpuIm}a#@U$xG z^`ayfKKh@xwBO3^?p~i%lOo~W$P4s*(!Sd{A-}e8_4dN6e0A5%^5&wiB9oW4>Ai_cFR`%Qe%fO{3gckNn6OB1`lARo;>U+v*^$yPGD+&gWIZQ-g& zx2C#*p6e+3_v@m{UY_3Y9;zy?XTy?sInHnjGorJ8|I>7Oq2Ylu3 z)y50Uji-|{Xb`7vP*$$t-UtVEqGr(#$pst5@4P}eO)5Nz@BP!Og!GVHBQo!Y&f~Kq z4ElQ3nZ1M4vlqCzotVr&y!rC<<`MSWXCz79L|5L~Z1b&arY7T!DE`>RV$4TO_MGnQ zc>BgYmGofMy~yfS)n5rOXLWVgJGwb(r&rM16jdQCsq;+Rk4vjw`OO>x@&3u{f`fAXr@`P~fKMI0H4*QnBIFYW|*OKDX z+;K8pP^z;^iK#p^qx;CDG2J5ti?1KE&%=gLN@nC79I~yUrZeM~%fF@#M1K!=H_hIv z%~^FjDmHrB{rM*!z9c$sxm7#tiK|!0!ll&P*~jyEN0VDJI({eqQKUC9_GHzAVVS4| zLore`mnYY%DF~{SVHA^E2Zknrz@Kf>A@Vp3C&{oFrA9!0e*6@fq(lYe2$l#I>3p$R zWl)kH3r`YDv&YE(P*R?85FHPhDzgdxm1`= zrPCpx0U4HQaKr>@43o?dJs5tNL9SQoaHUp5GGih#Z2~SJlfgRaLwstTNYn?fG4!$k z_@J5)9hF9bscJQ~zl8z!PXr*n0sW7IGX*h9wa#J%$o@nVS1LY|^+{~z6-zq(0|DlJxSwc$ z$lan0v_vAFpH`k=4o~POAe;U3P_0~v@+_B3h646r(K!%HMpHmc510vY5g3LzD2>fQ zS#&N!L;FDqH3l5f$T2e%0H-Jc4u=LS6kLV}B%`Bjh$&}sAVfiDK?)`lK`@$(#YVaP zAVTy?P?d8Q8YJV;VTjIv>2!o8W7AkY(V%i(fL5eeHqywl$%#{iNEOL+y&sUEjxK=OKYE=TV zIVh6ZvTs=g8VW^l#1FwS01DHYJeb8}z*0J$M`!cEe!xJ|PhX2F70dpYwz+*s{GLq@ zQW}8&WfoCSPlaRgJ$F5~Dy5~FNF+;J@DO=V3I-$*>){w+^(@I_5lsvR=0|VAevm8w zq8OM67h_{IHbmnnUWrwbD4i<8gd_X}NL==v-MK1=yab$y}hvl#d+=cr2(;MOGXtq5pjt)oZ$7K4*W?) zAj;+h`VrO+bO{1CgLOd*36=r8sw@maF+Pl?e_sQ>@~ delta 190 zcmX@B_K0zUL>vb*0|SH0lCEPwim^Dz-HBn{IhmJ04okYDuOkD)#(wTUiL5}rM1W6- z>(i%C3vzQGJb3W<@#7aSUfj8JXX@0cK*`Micg_PTj*=k1;QtW7aIbl9JJ9N5(lx@H=zW_X~KFimBGHfLMp kKlu;5r3qFB@hq#PCoPql;niBU7H9#3r>mdKI;Vst0FK~H{{R30 diff --git a/Resources/Textures/Decals/minitile.rsi/white_inner_se.png b/Resources/Textures/Decals/minitile.rsi/white_inner_se.png index 82013151cb9063a11de552c526c4775eb9589f01..819ebfa14df9b07b6c5a954d78cb20529d939c52 100644 GIT binary patch literal 4960 zcmeHLc~nzZ6AuC|L8;(|3nfNB#pPvBNFree!5Tn_vZ$4pmzxmDM)CpyZ3R?{xF7)$ zQR+$yE(o}=)wNm>wOUk^x*;yO;6hdOxL|JrBA&13e8+RX{zr0N-n(;Wes|_~XC}E> z5ga&u5OEZdKp+eX@b?LUcarI{vV@<>B3TWAV7Veu6pn|W@g$8_EtM+(2~W@f5-`Z6 z1cKqu$6?G;)43XzJiRuG5G{hY1^?asA4FkzIf!NlAWV-yk4CRyXd#U0T&W47M2kff9Gd`lqAzZPsowT^dYnr0{?BnRv+We?GE7|@L$2ML%^!Dhc zm??u3s#}N^xnX4%7`;3)H`y+4Vo}wQ#kuZ|F3>u196csmN_#&_9r>>oL2Vu{F|b~$3{6e7?=kJ zUdU%hhgMZ?(QmrnJaE}9#4E}bA(m`Oh`qPktLfym<}eD*|ey>*Se2ezA=aww^){uvfk-r#=+DD z1zU$b-17Ri^VPPe1#jz`Jd2%e&KT_~ypZ_>A$Qulk{wCwsVVMyebb{DNp0Ga?R!a8 ze+}QUz#AXoH-6^<>mf)}Yi-BR^R^r&v~)O}$-+0=zy6_V%m+a(a{cL*Lq~-JWB{zq z(?$>|Pbv@oemM{KeLM2`)FGSMk3PI`pSkPO-K)h@D+mOO6uGx|aDcb>$D)L#xaqsh zY5ta;Lw$qXwxx+tqTMm%VqH>UT7l0jE6cHd&%!FI>9cB!Q5P{b=}O~dX!C%Sr`eW}j~%8y59?`p4h57TKI*~fk!kdYfPapEuIUH506o_u47?S?6dA+P6E zT+Zyf+-aRE`?WB(s&*&v3M9Kt9%J87KU*Oxt!xfIzV!I~fYUi|IvVXK4pUD)$ao~J z3}T}f$^^_kc%$P?T0pkLsJ@SO8^=x$51c!6eZ{ru3twMd*^yf@Fm{hP9b3ho`eK{Y z%YH}p=|e5w7t9da6)tM~B|}wsGui9L^TQc}y_!DBvWl`P9S6oabPN?N_@l~pE3lyy zPsuB_S%39>d-f&AL(bNcx1o~^?pf-*r44hV=Q-b5Ng85p&`Boc^rf6MkKjvB~pHfk6#xA90|zL zIIiJSsqyjglz1jZt(8&fJRXlqV^A3k1Zp6<1Qm`N5S4D638E9j2k0=ZT!YKiDv}8k z6|42QfJ}z-q>uh7H9}!Gyh_)_0_1~gKs8i4g+^5>sXZ-pxNjT;>2l~FEp#IIO+yU< zI<;Pl0pB>F!pHT5kYL^R8ogFw4o8AffdVL@st&G7|7^+W0m9&J3ljx0xl&`cf@FWD ziOZ#*$okAT(~LQso{m8CZrsnbKgMoWhFU@)-$#wtI)D-)CiLa{h546YR8ARLq{Mp!O@fuI26 zAq*PI5wlP_Q_955P!f#qr`9S_xSet(Dg#uFN@kug5zhAv4iJzT6xt_AumZ)U&;Zte zTqRM*>po41jWqa@Yte0aAn|W^xhO{y7MnB|#Yy2?oTB z&V1@d*Qup=JgNnrGRPz33MQzTE0S~9R!#ccoA_v8+6PD(LSrL6C?iw5f~A@|#>Z$~ zssF`?t68B(i-C5XGT6FcC!}__!Y;m`um9$&Yajm2B}k;+MZSpNUb=ee`XUCtNVzw= zdg=Ni2EItSH@p6CbP+!trhp3m0*Z%6rG3SA+u$+FK6s|c7oHYoh0M;+&o3z{S-Em0 z6t@juvj^TR@Q}bzg2%lp@GmQZh4`E4K7=%DM}IgNpz)8;5eT-wnl6hPb)f_b`{4mX z-+uS4o%)P&oX}pG2SwxnA5W3(r@J3vzRxK7D%U&Yj1PAHR6<0w}XfAP9_r=Ofn%Ek`P3t)D}TO zPy}hYSFIpLORGi2Ck0!zT3<+2E?T`*5ky+GXw@S2Bp~9tUF$B_y8UOeCNpQBy}z^f zclO@N$=ayM@KMeaok=9pC~1Tw2HYvu%bpBAv*bx9NhI<%i+mvw1Dhy1J+8vkD1}JZ zp%m1NsYoRAzq{k&i*EUj?7icbVc)gp+f;LD&d~<1Rb%hfbk@|Y-}29v^B*x9=S-7S zuGR}*Jk6-Ak9ra%OYu5*YsJ>&i;eE({F)fk`yc;e9DnTN`+dRx@*j8R>lpt9N+5J9=kQnzcG%q*Gm?2ky%S^9lfvZ`;zv2`_)GpJENVc zW&ZL^tS75DykKe9C3gJj18YTDpL##62rN9RLPK6?RqGF*^nR3 zdvdEMMBT}Vez$qSaO0@h-Jkn3BnD0{Xjt>>;wbW>>xIrgcZ7#@%X5OSOsxnm{zrMd z@vc+!)4BIL7^cl%j7+6nYnZyW=Dm$eaz~EPweY(AdUMu1uD#uXogY`4K6>t!o9m3O zEA~`=*|+T6KKGn_^RhK{rQ@$UAKZC7Y_&PCo*mHUP zHxsY#exOR3@GP5~eEmkk1!1H*)v=L3BP%u0jj}C0)oB0uLxncg=ysxp5w>AJe^RXn zIosmex`X$NYvMXudtc6hThFq1eM{P#w*Qj%LuPxo`*LJSNG99Z-RN+4%GFGd*`Mi~ z(^@i%I_n*e`PF-7&U$9->F#K~NS{@9qWDY>^04aKM{V10t~7t2eQ$SNv9EVi{4p8% z24g2z7MAj4Tvh88?^8XNpvY^pLPi(u=6(0*V#f1kjaWZvq`B1$c@Dh^m5Iz9YiF|sxF}+t(mg16!EHV2ZqBRy`CwD^6LDpDuhW+=aF5JJb^fEy zr}WIWMlaEv=wcGd?gK0&BuW|*^0HV#iGG?{I4go2>=rsNaC?pdb{^9JHJ@Hxl~W;! zwkJ;syB}9~m>GSl2IeV{8CM-=_Hz21CoR`NYKP$aWQ7K?%V+%XpL5qv zW|+QNwTTJwt`6T^ZfF}jMq|`2-LuROcRfBlJIfC8k<>uH$*z~1 z=Bwp<4z?|9%x+vFJ+t{)UyJK>cieA3t4noo9v8l}SIqu`Xz`rOkZ$sr=-9QpXiE6P z$auGsx@+MnPg?W(O6x|Zexb-k)^TU{Z1;XNy#DL7Sn~6V_he(LG9DZ$&{o~Zn)B0d z#|p$>>V{<{)$R4~+vnra=O#|Pc*tcN`VOteziiJtC9M}8Z~D>msIPc*zu{;+%gx!%m)vAG4bR3ipj z=R($a0jRD9|KKE2jQ>xSmSElwxWeSH_U(LeOL^ z!lFlGEs=7>vK$d8sj~x}MP?xY(4YiNF>BOXgU~Fd+Hi&7*(#<}DK-^ixtO|87DWlc z^(ciyM+S!ZnF40QyU58}S2{W5l& zGSHIAgc2M{v$`jhh^f}~g-RU3ltSAhmlL4iGFVIqY-j)p_Bkh0P|s3A>cq@btc47Din}{4WO7zj)1KSfEkOtLIn&!4PaU&ZZf=@l4BY)mVm8%GI`+5VzC7b zK99j-_j_$aT!88gAQ!EuOa_h3vYA^qMhLNLN-IrVhLFR-~nO)$q;>9iK){6m$tQhD5CyNkH8FI z{dAkCzouf*)c#TbP>tD&i9)fJg%C#iLomQbRB7`QVD(QS$*?vF1^r_nVPDFzzeolq z4}tj{E*IjdcpQ*Ls0!k9Pyxh+VGajoB20wezk`G523$p$U_Ba~1b75ofdsX2Me!Zj zsu{0)V@gJ?`v53|7+h!wWmNh=uykw3cp0sT{$G5EYzjkK46y5$fz|~&A$_nF4)6th z{X1U+`|x)zL7}`|Z`oGJRq(PGv|Vv9T5{5OA2bg3jWF>*(u%+ zmymKCJR`thgf3!{fkbjSZoTYI;#Eo@98O4Op~E{IyoXKns(;Zz0ir2VNwD1aJhIHg wA=}Prm|gDby?gdd$z5GoR7CA|xNzN$RGeaecE`Q^)j*jf4ULr4%vtuqpJ9Dri~s-t delta 220 zcmeya_J(nSL_G&H0|SH0lCEPwim^Dz-HBn{IhmJ04okYDuOkD)#(wTUiL5}rM1W6- zYe8=A)TvWHe)#bC@#CjYpT2nU;_a(fK*>PM_X~g&M@f)h@P7zkxYxWl5-7%5;1OBO zz`%DHgc*x5cFeO%cQeI>_zt?oexb42Xo)GpAlx{m%8xQAgcptDubu1 KpUXO@geCxi%~(VL diff --git a/Resources/Textures/Decals/minitile.rsi/white_line_e.png b/Resources/Textures/Decals/minitile.rsi/white_line_e.png index 99edbdd838eac5905376de555ad93d72f0ce3647..8b81f03389733939b9ef2e99813cb553a717f561 100644 GIT binary patch literal 5045 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 delta 267 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 AcmMzZ delta 299 zcmV+`0o4BFC%OWV7=H)`0001UdV2H#0004VQb$4nuFf3k0002=NklEo3FtyIOwv?DL^tzolFpl-H?$N`6h%=KMNt&x z&rG&$dm9tin+;CKzZRt(NDxX+y%)hP~;XK4dT{z`i9 x2j7q+gur^P(IjHE8g3-+B^_VXU;YPv!5w2!V^9}0k17BF002ovPDHLkV1ifKfJOiS diff --git a/Resources/Textures/Decals/minitile.rsi/white_line_w.png b/Resources/Textures/Decals/minitile.rsi/white_line_w.png index 663ee84761eca24c67ad83156ffef23d9980bd83..53b8223cb19ea0de8593e25a66305aee77d2c7e1 100644 GIT binary patch literal 5132 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 diff --git a/Resources/Textures/Tiles/arcadeblue2.png b/Resources/Textures/Tiles/arcadeblue2.png index 013af9f36f723033972d1b6cbea18c5c025043b4..3def0f19c7e54275f848dacb7d2c7bb29264b0d2 100644 GIT binary patch delta 685 zcmV;e0#f~=1iA%~8Gi-<0047(dh`GQ010qNS#tmY4#WTe4#WYKD-Ig~00L}DL_t(| zoZXi}XcIvchX0TewLMiqB1DQUq%?Swwq6Pm3nB={Lk`9DKNG$QMpzcwIF&>$kZf_Rfu3Kc5AlSCa0mMNT_}b%PBBXxleXz(ne;XGbEKB#=uAwld{piS_)7Lfz^|&{ za#KQ|4}ft346c3EgkCEtewu=|%>HxRs@(HR=u~Z!Cof@0>VeV&SiNVqo^wa#PW4Pc z2Y<5n1b?m{{fcMOPnSw+oQXKEXT$CI+mP5Tn3{W9w%31EfIgsh4R?k6E7X<9kP>ZE!q^`CM6zQ|SjzKsTKBIsZK5Q0H^j zhTnn!Pbk`WSlFo*uR);oiAy+7#7su}e#vke{w73VG_(ZNB?0FOMKeJ_1>dkAEPGqn TiZn1^00000NkvXXu0mjfKg&n~ delta 532 zcmV+v0_**{1)>Cy8Gi!+002a!ipBr{0E$pdR7IsZLZmuDxt>lRI$R?&V4^ua7c)w@ zpiQ=(Nt&IenV+T=ajzGuF&1*N7jd(yu(ZG(iV|Cx6{;+RiI9bek*u+}6iG zFcp(46qG8zABw#lhJuKU5|byB8f}poX}ujHz#S&PA0};Zd4Ftic$pa@DrBIdrLJml zbe9<(EM=p>xhB85CZhn&?f?J)ae7o(bVOxyV{&P5bZKvH004NLQ&wMjza$WB11SAch{_xqLL)7q>EsUtXM*6&95umZdVhj9_t;p51#fGYbD#Na&;?(u zH*IYYvTd~M5n@RA{zV{x8y$N7L}rM)`XC&cL-Nxkj}wFwCj8r7q*?muA7;qTc~QRK zA0yBgy(fPH>i-j?gySS W7&&6tpA9Df0000m^MCyGR^%VvmzyZI7`h zO?DBYloJwy6C8jQl{g?IR4qtIl{kQe1P4U9AP)QiNSwGL!GW=pSSeb*8p*NWo8SAr zk9qIC*516bx^i|!lBCsEv(XXn8{z>=i{k&nN&g}7T8KMWE=#xXp8G`zOZ}QvlcZ1H zJn;uUF60N>8{M^!`sB{dSFd)SJ~%iyJUo2y$I4IQ=z*~LY%ED9P9@KR^v-){BC?cJfBpOm8BoWRw~7|D!a5ny=6*!3 z?QeGN{axE|iIMnD)T#_p2;Vj3TH+CGTWwHh5dpZ-0Q0-?lv0mow{h|f<*rZf!_+Yt>pWdTTNagPnTDT|0FsrX^W z9mLamiOQ*C9I9FlCaI-B$Ifu!F!Is}99tzG@kzjAfz>i>IAEN`1NJx6+3`INM2Rgc z^KoP>zMr{>`Py}n#)Nu>WPD7%0O>O zJ+9Co4b`$xD~LG`Y|?6&vZzgtQU{fwqq}aesJKqvQ3_7MP%1^JD=yY?v0Sj79@b{| z4Q3CM4w%_H|I_}dh>B6f-hK0=6O)WjHSHkOq_Mc$y-YowgKOl4In`9@QIIwg!gews zrfesjK^%FiruSW(3GHY=1nEDt%LEoPmyd8nYJE}2|J0G{TrO2Lnd|xds_IdtnBeC2 zLCP`Fie)1tVK>`!iIiohL@sU#x!%%+fd+?>S zym9yIot?&`FaL1k>f-w9t+yARJbi3A`gY;W`>#Cr;a9(Xu>AU2_`LMl$y*;6+MQ$4 Y8^8a2ap|RJ&Lyk4wYJ%~eR=2RpO?PhYybcN delta 1609 zcmV-P2DbUH49*OY7=H)@0002({D2n#00DSuLqkwWLqi}?a&Km7Y-IodD9@FVy-UMD z7{;HrYDFs*bP!RpxKX6 zbji%N=CgA-{5d}F;1l&WCVJt2qqm^i4DfXmCz!<@;u+%fx?>66CLUxZxj=kK9OZOC z;wzym9zP2%di*Y!=Q6W&H_=lnwz1O2ti%oC3F3&MS6K5r;wB;0T+C7(rZoZ^8KjVe z1O*kWL5G7FRezH*``s6B_!dwm52M{e6`UMJl*k(;wL)E0sv7AkO&wK{`_DXWZEDi% z9!dh8PpZgP!Ob*nisx#_9j?>NlieXW$>LGtU43 z076hqR7HJKNkTzERaI4ujEsU+On+2MgM)*FgoKHPhImaxdQV1tQAmM-fp~a$e0+R= ze}8^cN`zQXgH}z8iHU}WhJaN}ZII7g00009a7bBm000id000id0mpBsWB>pJE=fc| zR9HvFmVeQ58Zit-*#c#O1=^(j|6lDr_sZ&`}KP)((&llv1NIy$XrzIkN%&om*f4kl8$ODo7$MJY%2|qt$ zFLP@j*zZ0DfM^hr06=sg9AVmj4gmJP+bMYL9e*AO{77G95|K#n-7QN(7ytsCm}1&5 zk0gLNvld(~wnnZO03cumZVVs?Sd$0o?{~XK9(MvfVFRcN6@aag^uTf5Km(`> z1%E(#FHnX6nB~9O8(>X9O7M8hZIcT0Br0G86YX7$XY`a5*v9Gfa@=Y51$gbwzYl(FqS|7CJ;hppc=dY zUP`b!Z~(Rc2w(ysBm=919K*_wyVw96zkejb$M6-vIdB)_z^5ScH2}viNl=731(60| zV@UuO2ZuomwO}p5*o3bDG~rr;)`X~F(7FL&ZNe}r1{sLf8#O??NH$HF9JLZafCHa` z8#mAf;F@EYL`#on+2Wv1fvw%;5_(|aHdY~i6@V_|+{OX0wY$6kWG>6xcmU`!&VOxO zJ>c6|h4@_nGM6bAW$u9iz$%5G6(0bGLB)3feeD3WbF3ZS_G|nEK&9{p#ZL(gKzQ3{ z!Bd7|)f_zK{rahwZ}sH7Kaj${cxd+F13 z)^hHBW?D;NKg@qxq8fq#ws+G+1b@()qB$7mf6%O>_12~<2TM+c7f9%OlSyc80T8{t z52Vkj^8$$ha;|aD0-d!c%zvRJ0mPXNkb4970M=}Mw)43FDnkL-z7KHF&wqab*cMR? z0rd0V09By^ur2ZmfP-Yf2nOih2Lph6;Ax%`4D-J-U<3oK38)g(c%;a7FwB1exc-Wx z_W=Oe0!7xEXAd|-0dV~l$MauJNNhyY(Ez9=tp^GKae!g`0$>6mBmwp!&O9{I9{1w3VeIWfX|9@K(K2O0g|Gxlm4mPJ?13(iF^Izpd1%uWN0DTh%fQ!QZ zStot>J}`i7C2I+?1Gx`CyGW`Da}2Xl9B2zzD^A@5`kovq1{sKZZ`1(oBHJ`!a?}9Q zK3r4*=;pt^Z{7z6Nc-f*Yd4|0TtW|Y^Irg)_W=NQfCt1SFo455g+l%O*EclUA@2j} zg^szyy9WjUtJe9ybngS{^|c4+MB}nFB>-&X{rdm>9+;*-uySaX9B-4(00000NkvXX Hu0mjfTKC34 diff --git a/Resources/Textures/Tiles/blue_circuit.png b/Resources/Textures/Tiles/blue_circuit.png index 021c5363d6ece3de600a6fe274eb34937345dd0f..529654b467b73fb0f651d09cfc8cb46ebd57e2c7 100644 GIT binary patch delta 494 zcmVAfbYgkW26g zUZCY$GIV!)Gy8L4ub-KA?`HP9+4b`+s=KwDs(-Ha3;g(gAE_p2qF<<% zVG($Fx)WdSbT`yz^=irI>x-FnNq=c&jVC}aaadU1RGk3H0rBD<7kdOpgMpS;z24v2 z;rX%t?~{@Z7qtYS_;~xEw)b|db*zO*R|obu608TXxx_pK&?hf&s3pK{tV#Xku1|*8 z5((r)FadI9h<}VZI*R~O5UGS{rhqa7kpj~viHvDu*uSi;m=*zDOq6|Ybfz#$hJayz zG$RjAPkwbA50DLS9SHG&giIdb8xN6<@<3&zO%4xyeY{y8T$ue_Hwrm$lgS>CK%Ff_#$Z015ob5aqzoj!sfhJ}Z;}ZCH(7ZJ zaFa~RK;oOMSP#@GO*^41B^x3E)B)+Lg%qMxlBA?B62PUwcg>>b)L5vto9i){&os+kwJ2UKnw(xGQJxb9uU>eJt=s>qWyr({{Jf(t?f&4i8xR-j9Stl zA~Wlzv&fB)%ExZ3qUv7u@};63Jvwv^py5!t+9*}SaLR;))_UjOgbW5hP++iqIC2JsW$c-Z2hZ-0k=WT&0ME8`c>Wo# r?wP|&05_G*kLriseRId>Kl1nia=KE49-V9C00000NkvXXu0mjf%CDUm diff --git a/Resources/Textures/Tiles/cafeteria.png b/Resources/Textures/Tiles/cafeteria.png index 69e8dc47f05ea2126e3a88bbbf58befc22acd2ec..451b0825f55b7cb6fad5dfba38f989de279660e7 100644 GIT binary patch delta 140 zcmV;70CWGa3d{kJ7zqRe0000e3~d&XAs`qJP)t-sot>Squ&_~5RcU8ucXf52Nf^)PPX~Mh&2r0ZJ4C26D>* u7@vV$r^EQ828lpYZEaOmRZUDxhK7cVii(Yl zj6y*{m6et4>gwp|=!ArXiH3&U+}z;c;N#=tfq{W|czAq#e1Cs`@$m5P?d^hsf`EX4 zi;0Pcg@uKLgoA^FlrLvW00009a7bBm000id000id0mpBsWB>pJWl2OqR9Hu?mg|2~ z<1h?`lP)B*4UO9@6qfgY&pj78v7P>5;7oUiiEQbMBwOif^@l%C&qJX;459uoh9UG_ z`%7aVyY2{`PO+dHpU%)U;U9i<@cR0Cp=PQZhY32LlLfoC%Q|EKaJ^n{)I!02g1Cgg zzg^G$*e>gm2=G<|Jip&*p+G_aMkjxSB8jC_Et;0rnt+Kmq{0T}loi z020uND8?ZzP5|RfaB#V3H#J`fKmx9y8v(!pcQX&L-)?eEEjQS^*$H5bqX6K5yO{@- z;4Ki2N5lX?iU4~6{D~5L1i~~K;FP!T0B!#Q0!;9q_X}W4fJ?9}Q+~3aEZ0m>c_p#fBX#Q8v%vI!ZRngc+al_3E*g)B1Gun8HPS^_}z2g4hBk*7co7{mZ= z2>>7hAVdbD!2@7dg3W=BA=-bx1rPxcoPo`Ok749TT`T||KPN%Qa1WpysEY}pQ(!#? zh?@Weh!Cg1$^hC786YV*8L$uzwi2{WxCdYpZY9V~ND~>bt^wGZ(2R(|41E6kgjFvp zfP9e@P3Rou5|DrnbPBG#feL`x$Iyv(2}nQ(aSF6sT@JAazLZ|Y5CDHJW8cOG&~9~k z0AM?I`o<#wE@R)u(F3Xh{|f+Y$5vjHz6TnBl{qhtA1+l<9XKD^|cOTt$4iZr}me4zN&L7S1Bch`t%hR zYj3ahZF|SjgPN!%P?UeMng6{yl1um-V0Y8WilX-#UAZN=pB={~{9*pHC88l1K>O7+ z765WnWC!*9?^E@CzyQ&7;UM``XaO`DO*XbR02n=gAHeQYrv;Dze6H!93vkx5F#nOl z^7}vlzBlNefH51iUn#EVKQ05KLCcK*B(MjBAV4{vYXJPo8rpwI3;|U0A0_bBOkpi+ zY$Gum0Q`v(`0A&ymOW6;=KzQd8KC?=po41u6F_?@!~j4&{{;{g3IOe;_5gI?3Pw09yj01Th|2WI3qkKLJ#K#KHFg0sIOqGS;j;pbQy6^+z1d ze>5RuQ<#ndpc#M4JrDqt0@UMI03rZ_Gf+%F253vr%zwOg9Iyb`m7to>j{wT=1K8{N zzc%4|3Yz)<06;k?PC)^{CamW_n~)|lU|j=HH=zM|QOG~n!CrkI2ta$Gtpt7pxHmw) zNTLbL?*lr(D{wdB#65uL&JkiT19q<$6+phoiY9c9GJts7hZmIr%K6V8D83H_;P&y2 zmv2IKIm8}N4ftOG6yFB~kOO+4R007gyi!=re_lkz_W|s1%k2uU9%uk$Lim{fsro*E z9Zze3O5=e8ybu8j{l2}6v7B{?xxFf$XZ^Ch@BagIQJl596Sk!Q0000f^)PPX~Mh&2r0ZJ4C26D>* u7@vV$r^EQ828pJYe_^wR9Hu?mg|2~ z<1h?`lP)B*4UO9@6qfgY&pj78v7P>5;7nmUl_h4gjP`um`|bwBREUrpW-O?7joI2|!I2f&tFieFe}03X1`7jtn5o0MUP;0FXE3 z88~eZkO87Y27p})P$2?Lh@brhuob{9Se7Y2Wa13C0zweLRsgr41fahwAOr!-^D!40 zQEGs421IB8^&fdYFr^$q=BDNVkh3Zz0GE(W#u^SGb5lzIsQ+Mi!z^+aC;*cfpltyF zL;!@SKn!>Q>{_q|&^E;Qw*Y@40D>#91@JbE`e=#;!0qQEXdCVUR0B;h0kjLO#{h8> zfB+d{7g!lU&X56;l9K@o5nyXUJA``x4&l~2U601jiH#xVox0sdj70N@T+9+W-@8i17U?{}ovoFV`(gUGK0__YE+TzV_L{I~o% zie+;8Xn_Ej9{vCb_E2+KGBsP2EXz(+HM zwd}Et#ApEU6)o`5Phl-*puC?0ASz^l^8J7Ts{5Y+@}-ai0QLPZfap*F$d}p!a0Xlf zAqb#)KWG3n1FO4R(A@t~0U-!rD?qd$u17W*Ys$-qw;uu2f8@dY0Rj97Y%bG^-TxRu=B9seI|_hiD9=CuP}+v|^(z1o0KpX~Za*eyThQG9c zDBlkdpuYdtAzXJsbN@d8Pz{P*PylcU>-(QWND~>bt^ufr&;UFr6rby0uig&?AYW)} zfu8{34Ui9#7{c=XfC2Cb^hTaI2k^UVgdD7Z!|Oo>kPm*cVhCNM4B+wML1lpQ{^tx7 z?*{_#`1r)jC!wYs;tZ$<_{S6kDBceUpa6_OsRaU1dd@(7|MMU!-VYD}ap|t~nt=vD zCZ`ub^?u+7r~xXC2VUTX2vF$v?Oj~US%i_@%07*qo IM6N<$g5kq5rvLx| diff --git a/Resources/Textures/Tiles/clown.png b/Resources/Textures/Tiles/clown.png index 74e59719235270dea7548f50c3c36cd42108ece7..d81a759b12ce181c638f86b27a80b756b9c9647d 100644 GIT binary patch delta 169 zcmcc2wv%y!L_G^L0|P^2NcwRg#aJBV?!>U}oXkrghb7(7*O7r?V?XzwL{=c5Kfou% zb$VFH%8X10N0*T5=@}DO-V99%0!ncfctjR6Fz_7)VaDV6D^h@h#-1*YAsXkC6GT{; z6@|qO3X%j87?{=4lMM`{?lE~~G%$+sZ75JmY|w1Yl)cBaV&TFiEDSS0T6S*`I=309 OpTX1B&t;ucLK6T6DKd2c delta 840 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 G9{C@~<_Z-6 delta 444 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 delta 253 zcmdm`IFo6DNGZx^prw85kH?(j9#r85lP9bN@+X1@c7$d_r6m6%`#F9c^uG z?do_}~`3{=2b;1OBOz`%DHgc*FybujS`6|IOSrTWdmno#J(%%NRUe{an^LB{Ts5S+``3 diff --git a/Resources/Textures/Tiles/dark_herringbone.png b/Resources/Textures/Tiles/dark_herringbone.png index 01e0c4ef60e3fb97bc51ec25f388e0315521aa4b..88b13a43b3fc088524fc1ea453ab110a9a7cff37 100644 GIT binary patch literal 4316 zcmbtX2{=@3`#<(jmKOUmrihrG!GwshWM{HvY0QiFNN?{ zBqdvtQpwg!*}^L#{g1Y*@4DXq|9^eocdqL>=REiM-M@Qz?&m(|B-q)QZ4r_Y0svr( zg}I3Xc#Q@JgqH_At8NaE057~$BWoi7s5*CS)joCOA<5jq8UW%%0pKh+zJN-{4FMn` z6aXgA0D#^&07!SR^FNBITuG0%&Bf?tO^PSmbEbf3E``I< zYJioKX}wov_$IOT$4_E&lvvzeyj*i(E_b+@PrEVEHUeLBueweiJ3f&Ch+n>`E3F|e z8Ly*knFO!xI-MbtuHhr4?9-%bB>p%-mzcc8U{#~KAmhb#z1sLz-J+Y0FT7`Ve5|!n zGHZ#ih!@7xWod{HZLKmrjl8HnqCGM|5W(;O+b#ShnJx)XtT-w`aqAd#WE^;FF6edi zm9xfMvT#c}%fhm2n7wT)A4fh7{<`nwC8JMc58>p8Q^e7!jYQ`XJF+* z(VZ~h;pH1YKN=&h2AqF-#|n)51}sJjei z&d+yy=zg>!o{ol>%c{eatsfRquVP%~>W6dVmK6oo0~Pp+p5PSiY6H%|(w{ zJ-pp2ntE8`4!^J%FHs3?a(ql_hxxYNxDE(ES+vfm$xdv$VC#NCG10C2L%V&7rS`;> z;rnQopA>TPe3{wlB%!NZG<@)-rYyDLyqo3|7sR^1EnhN3JoYBIKV7+A@^lk*Y7oXfoLT{Z6# zQ6}H7__#%=GIn6kl>LS%2DAEwL2 zrG%Uf$<#4DW|^Wine1-fvrCC4Fex@EHwm9q&a~=>?oBCp$UQH@!mMzwh_58_;_sQ? zvpfN-GRim2H}*CksoUl0;Mi-ysv(z?W5)#BKcrwBLeyYtl4{rb!mi6)Pj%So!0z2n zbEHL05+=7!?(B8GT12iyyP@f5|4i=87_=n$f!Zc~_Q-ysJ=ReMRNO|`eDLynymh{W zV{?Is9hE{Mr?;PK_j%m^FegpEP)QSZNfH+8bYQQI?6t;2`G2&~1gY&y$~P=erFA@p zU1VPveYm5&ru}tV_-@|>puXbF8SBk`nlL{-nhV$=rIJ|clEG#R;Tb@TW z7Hv|0ug0%deo(J?phBnUYS~!cg>ph6$B1T{d2OmV>#BSCG1E}D*nIDbdk58=bxY?j zz%7IGi@Mb(8y8&<;t$#$%sbNfKKlKMOSNvrZcT2NUm6FVz!~d%Ho7;OMK~Gb@7wOQ zEx?cFsCcI4Wfs>t-?U|WS{_n&_bYWO>c3E%Rhu4E9&~1jN51-8Os7mXfA*nzDUVb1 z>KTLAvSF1uv7Y&!iEjcUT!tKSOPg(@x`BYh0e@nAky5B#(l}`!nOdoH(miL7CC(?} z5_4qzq|Bse(KDEJUvFZHcdsvNi146qP;=;y!Np*VJ|@jI@db=sUDvR}zW`s5e7u-` zG;P`|sO^OJFtzGge%nY);YH=4>SwH%2k!6bFX=yW(ul%~JRp^Rqo=>KU$)HFwYjG1 z5AgxHTPsicyRk2p;-~vq)8kp=iI3Z+`=&C2{thZw;;g!?@+=jIl!#cx@yE5Ddw-x#?iO*`Hb;V}AR(11a~4T7J5M_=q_U36viaNxvA>dflUDO^dH1?= zknNQdmG3H7n9t{`=Xy4c#s`W&hwgyZC41Np6jv5sE3UgpSN~L&6<-?O=n(fSP<8{(#xvr@zD(V^^Olmn; zM8iHa1U0;qTpm7i%g^4=)h~RWuz(#;yuo&JZdPzpywyaF`F!fcmTj{7ScNwx0~hX0 z79C4nt6p=yd|x|QQgw&FhSbnVRbioBev+3?^|K(q*VsPnOzrXMcY~$1Q5xQo9x$w0 zxoV`>y*+iG6DPGV4jp?b-b}jESIzlq(_!+2o%iAxVzHA^jA}^ya$GLs$MM>RC{77=I z#BKZlIzsdFMB=P_^M@l^{x=u}H9Hh}+D^9RL@KU+nLC<0s=r%mw_8;AT3&5-uV)`u z;25VPNG0f85I$&2&Z5DKrvZbn*9&^i$Jt!ZDba<6*Dr1!wz`{XOJ#R;W?SylW*ZEz zh1gnkeGwLyr2oyoB;vkU7qXJFS|}W06G24`dKd(@zI)VOdbTwCxkg3c;-SS`U&$XG zSEI)b+X72Jcxaa~IHGVxJorStoePSQ?6n(FSnr?_zOSuCLzbS8n)Mcs zyeQ47i>@=PaP&fSNH!)%v6o?^0YeRQ!KuQovsJU|`z9hM)+ZJ|-Yx30&0Xi?$yiup zsJsF{D*-_}D+1o$;UEg7WoTrw7FDypA!M4nvH?J(Wn*w%R2Pv20KT&{f(ysR+6qTv z1i*=8hBpNs62Jt};K%5`5GIl2N8v!cDO4I=A3EF64296h`cP*rYos;PnBq$_4`Wdr z!)yqoFh7zm8M@D4i;!Lj4rB^8Rg9eR;fe08ol+GcB!07Cq-${PZ zm{8ax7LCcFG3byDTB0{2kfRR;UH%?R0P`0&o&6(WVCoPdL?!|SM{dOS4M-;a!Z8C` z{@*+xlMobtN&tnan>#n6Vd9Kg6e5SgA}|>KKUd7|r^^tuCL9Y<-B=@} z7I+^3N27GKAV`Wf3ZqL_gFsZBX>>9pn63637sZ6gq3A~zcP$7X81E$py3VgewTy4VL$%D^r37Av;7bYyfGG~i^amwaMU+pvS{EwCHnuzJl}TH#@5pNR$VxA8XH{q&|l&od&H4)^f%EDp+61st;ldh z(#Gb|hmtm`hC+t^5YztSC|CFNdxZirnH;(U8ut9+{Q154Z+?f4pu@pMkS6N^K70Z+Yn>295!o-MR-Zp)~ zQUp-iWZWam(#vG^t?dGdsrOQzJ8Vs3IhlV?{?EP`9EfNKY^s2F0?A*r;|l9xU1 S3%(Wrzyfb$QojH2iT?pPE)3HE delta 599 zcmV-d0;v7mA@Br{B!2;OQb$4nuFf3k00004XF*Lt006O%3;baP0000OP)t-sM@B{= zAt6FSLPbPGMny$IK|ww~J}WCL#4-Wt00009a7bBm000id000id0mpBsWB>pG;Ymb6 zR7l5_RBcYfFbs7e9AGyfZX5oxHvI1vbAWXX{6`x1KLWPXj(fJLy9^a=av&>V{Dtpp^vo~f&WNl3!x_?da`NCSClkc^l#KRfjw5(do z3JYsJC*Rwz*4Yxz4a{j-wMNf_g0+sx_o6d5xX;6Eq#$W6w|r);WAeSd%+8j0h(x-A zXpJV=nTulby_J8y#HR+^CGn#L$@hw5ftLoKxwf;XmmJ3e4|21)&ucL^pc|j#in~nv zdpyXD&rp57;cX6-cy2&9KF1Yra{voGq#6I~^9^rvpu~foGxPa|w>ePae;cemzZPWL l-{W;2NaDu#H2o9rc0X1;S*o`JJeU9g002ovPDHLkV1nr&6W{;< diff --git a/Resources/Textures/Tiles/dark_mini.png b/Resources/Textures/Tiles/dark_mini.png index 02c75c56c4f9f115b1042561a2a2f8eee948dea9..aeb982b732bd360e782129ebb809445935856543 100644 GIT binary patch literal 1962 zcmbtU3v3f*9KXtYvJG`il(>93h#9c!eb*Q3(F$9;M<-?7C^Et$yWV}>&b4>t?n=8M z$QIrPkjErq)P>g+%>YSws1XJ%3q}Q^m=FRiKnNf(g-Ak(#_!s$DG6%COYZUg@Av)w zkMIBgt?|vM$j*8>iy(+>Po=vSzn9?~3?77^g(JiH1YwAYE|<^aasi(r2gMM=KTfxA zbiRJVH)cik++Ew-bJ*3z!Y5bGl-7)@__TiOtut@zyR~VjXVQ4FvUca;EMv})VP|{x zcE8>6S>GNod@ZZa5E1#=(XF6zJjeO}coMbUlp4r=#`?Yo<19f=n7 zzxrHH-FN$Q)pf_p^TnNDTIuMfGku_2f(I@yIkj6hjBXLW@%~hQwx;y`OU36Vc22xK zF}h;I%57U8opywy%JGj2Jcf(aU5{*8%VW#RFGi29pLb~C$mIpC&+fRh7k1vvz4iOS z{3*ot500Hjb2l$)y-(HO=+2||PgrrdZBN$MA3gKOkovx%H|GC#;LRnyr=0Iz?xVjP z`rtt;b9Y16(m`l#!->upzP*Z1VuWwHzie8GyQX#)!&pzgxUN+f$Gkkz8UPOI}yXL&hnH6G#kCZvG?Y7iwS+5gp15{QD6oNe_& zZ^VTf#mW{1&1{+B=UbY1yFgBTEj!B*XE8$;`hZJT5U?8|#Y4z|$#x?TP0$iB6#)}8nQ3UEp`C&@)?{ND3rJlg_6LAN5rS;3 zyFBF&ubgC~rbSqqj>TfenAs>R4K!o7+jSa~iNXjk*PHh7#8|@NvZX2@C|hvK#pIF0*P zu)woHSqXEv7GjudKy*ZEAVIpqtV<5b3U;hVmubgxmQph(sn%AMfLiKuC zkECjx#3PT}N#dFrMNwe+fM5x5wjhN#Yk)!)3r7VQ8=``ifSKWKybap9f&FfokLsN< zuwVF(`>PcZ&nOpqYM#U->0{+cbQW7Fs`$*C)8^EC%tQ+_OeteX1c?S?IbI(eC&}v_ zg9I{V7N5E}N!nN=!leJuE=iaw2elZdppph$$p6);bViO2TGxThydCtDN|eN9=tqJh zX~p7%S9srmH0rCgydnu}s)EJy+}fI6EWFU;F7a3P^7VOndD{n@heHT!+A6X;RvN1E r+RkclTTc0p-Hq%R@30*=3B#5x1hQ6@NFUM*bk+8h&2V>>*0=oyaj=jg delta 276 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 Hu0mjfU)rZJ diff --git a/Resources/Textures/Tiles/dark_pavement.png b/Resources/Textures/Tiles/dark_pavement.png index 1585211593ba1c002831ecd27e2a28870037ef5e..6ad0bc4209b9aabb252c72bfef30076553239111 100644 GIT binary patch literal 4273 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 aeZbuqlfw3Hm5TL2Zi98OsM_m$;(q|5WAg0) delta 642 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 T7UDSThms}U*0g-L=kb35YacLv delta 805 zcmV+=1KRxkBD@BWB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP0000OP)t-sK|w(w zAt6FSLOwn|MMOkKMMXV5Jx4}HJDx_200009a7bBm000id000id0mpBsWB>pHtw}^d zR7l5_RY8uUKn!%#QSSQ#Xi&~OLYn(T@PQ3HfXkkHVWfP2s(*})I_yfT$)zZlG0R&-9N{m&h9v3UqhH%RC3= z^V|?Ci?@~s{iD<+N?hbVgnGOO!PBd84&-T`8ggMAyk*|5H!u2C1O>*X9)1OxkT6X_ z`Gf>;VI2I%ynkJ9Ui9nFxI{_#uIY^j#Hz}Np&^fmli!f{FI@}h$#!G#1m#D8Jzf?l zb$mixe&E**V?&f~2st>v9{E#SSt9*{JI3p}oo zz<6XFoCOXY=(@xT1=uXs12VvSc-$r=nD@$&=Q`1K?SBLILVdR$px5x2ujoCZ9M^{q zJoG62!d|H1t@Z%Dg~v5|-Ft+*MV{-#Ly!IY!d^)5)-8%S;ad8J@d|PB7J04{UDs*U z0;pIPAh(2rmjw=;US3ZgNAuX@&Rut;F3;!l59WG*1Dv?>Zhs=<>^>Bj)KA|B z8OTp)tv^=IKM&0?TVAsJBu~8P7vBe&i0|Y4Grro~C&O%cwcRHhPME#m`(RV-8;&pI z*{rJ#H_L17J}pr0gY7i`e-{{E_rYc!`##uC^M9Ys^V-n$V;^idF!kQ%egk@M=o=K? zm%4Mo6B>HUx#xUuK;^b4a^ZccJC_ZfueSR+-&?X?usx9r?@QgeenPh0Pha!hdcpc2 z7v7h;bII^L+wSLlXCS%niClPJ>dqy@^9Q`;+;covAi3{}jDvcZ_oeP!r}1IlGVon4 jWgZX2(|^SOd0f5#{pcf6u39rm00000NkvXXu0mjfZ}^QW diff --git a/Resources/Textures/Tiles/dark_plastic.png b/Resources/Textures/Tiles/dark_plastic.png index 34c3e57ce68a6c8712cb014b88adfcf666cfbfc2..79e0ff407e60d50df7b8f2e89cee5621520786cd 100644 GIT binary patch literal 4283 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 diff --git a/Resources/Textures/Tiles/glass.png b/Resources/Textures/Tiles/glass.png index 37adc67679ee5ef61ffb63558c06cc608a25d803..bc782a9c6c3cdeb6e7c7d84f26eb7a31975e1adb 100644 GIT binary patch literal 5977 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 JPDHLkV1j>~5Iq0@ diff --git a/Resources/Textures/Tiles/green_circuit.png b/Resources/Textures/Tiles/green_circuit.png index 1628c20ae775e19e5302c426977026e22dd425d0..c215175c49971a78ecbf294b61662905bd608ed9 100644 GIT binary patch delta 620 zcmV-y0+apd0{H}x7=H)`0001UdV2H#000SaNLh0L01m_e01m_fl`9S#0006jNklCW1Y&jQqxH~?9 zFK^us7zg8wPr!sB2zb7@iabGYzh&GvHMa;;YqM$r)akE)ev!i!IRxt`D{gzebL)N6 zdmIP?aP`&gX_(KX0v*e{Pu~08W!oe63sJ#&cz0XQtb%}Erv*+k%}!z;Ex00(P$o0o z1)~sHbq4?+AAioQ0=%|+f(Q;Igjyt|T!AeIBNJ{_?gJt?kT7bAR7K7T;DDmSL~vp8 z!`K5V6C#<32pzN@P??a(bRyzFYeJcf6JY}Ed;F{k0YWw*w_;g@37lphhK)fm6^A*L z1cix+g4Khfa3V0|3E_Wk1C*9NA)TLbKMzj_S`kqp^M48T04lON;CTQEbt0ldn+a)E zD270pEv^9(#wPRwjRTMr&UhRH(p;X8Gf7W zz|YD@`DH=(lVSy+$*g)SK&DGP{*@Et8q!FB37HCXbh#s}6@aAUT(z>0gW7KiR%5Ph z+JXcf8|9icyy*st44T7quK#s4n}`5iJrD-h^>%!69RCgOmX3qYBjwxx00001n2^g7=Hu<0001iRA+kwJ2UKnw(xGQJxb9uU>eJt=s>qWyr({{Jf(t?f&4i8xR-j9Stl zA~Wlzv&fB)%ExZ3qUv7u@};63Jvwv^py5!t+9*}SaLR;))_UjOgbW5hP++iqIC2JsW$c-Z2hZ-0k=WT&0ME8`c>Wo# r?wP|&05_G*kLriseRId>Kl1nia=KE49-V9C00000NkvXXu0mjf`Hq?R diff --git a/Resources/Textures/Tiles/hydro.png b/Resources/Textures/Tiles/hydro.png index 5878bce5b709b0f1f53248618b366c9d3019febc..0d1c6fef23fde3a2229c61ee4b8decd486f00ade 100644 GIT binary patch delta 103 zcmdnXypVB%V*+P@Pl#*A^pN_M84ivv?DGSa7#J8h3p^r=85sBugD~Uq{1qucK}Am& z#}JM4$q6DX%!(3c6%H`4`507HaBD1Vy!gR^&C82n%6%@;9lK9y02MQMy85}Sb4q9e E06J|SPyhe` delta 389 zcmV;00eb$S0lfo|L4PMuOjJd3jdwypK~+^%dX#^6kb88Gd2^0=c#?f_i*|L8du)et zZ;EtEWKS=I%MSnm010qNS#tmY4#EHc4#EKyC`y0;00AFKL_t(2&vlVKYQ!)Qg-2i! z<89WPi+EWG?lVSh3JoR)$PEH+9f(1Yc2D7Lwlt{9&GJT;9e)U9nz29Wz4;O4I6Yoc zoT=dM1;9Ls@4P&p=^=wQ1R^T{@5~}(nu&$kLo$FcK!Jk<^j|?gfE17*a|e%4hcCN& zFg)6cc^JlDNjrHEyP9g1){18*`35{1&z(3k}H(P*kU#w7$p)(eePn(7wkn1Dm0QkuhE6<+|ocDjKG zk6wFMVE+QLD{$B(K&6s01Lj~3O9u8oQ0-M5Hl`j+$N(Eg?`VC##i$YhyrQ8Q!^B|r j*FSF4Zu|I7sjhzj&WmgfSqu&_~5Re5%HiHC>d+W+;D zeHTdpGf6~2R4C75U=#!cArlucaAFW(00SmxV=yop-U3Q!fB_Z`uyA33DTQer-U6th bp`-)=nejP`uoBL*00000NkvXXu0mjf32Z7e delta 435 zcmV;k0Zjh60o?9FoAs~Mh0f5z{ZG5L6BveFX{{Dj%ENJzS}z~QsndUG zHbbvh0_M{Ktt-Cx2zWn$LRAW+01{+G`BY07K(JtocOvr~KxIwH31s;MmTlVtsREio zv?yg=6RGzMnUsL~gV{>`s|5fNK*AwIUQ-l~7bY=gbI37cLNLg2g~aP1(t$t*6~K3| zRWgHm@DYH_Z$PbFHL7ey!0dCA=M{fXjpn_E??a}$HMtr!xiK>$>BzXU+rIAyrH%xU z1wf6z00CABH30K+F!}&Ej&w)*L%^cTvC|X4PiDaVlemD~%5Q)f!a+y^%mDur*sm6! z4xlt9;`e~22>lN*WNXnfkl=AO#m)`&fHoP+7Jy~Pw$B!^YMlZAkCF9Qb*CTi@HnU2 d*a<)<_a9?S8K^%SZ5{vs002ovPDHLkV1lyKx}N|5 diff --git a/Resources/Textures/Tiles/laundry.png b/Resources/Textures/Tiles/laundry.png index 60f079498ab817ee3ba0ba9362cbb4292d7554fa..e89ae3d14cb77d36efcd1d5bf044d810127105b5 100644 GIT binary patch delta 158 zcmX@jwv%y!ay4Tx04UFukv&MmP!xqvQ;Sk64t5af zkfAzR5EXIMC={VWs1;guFnQ@8G-*guTpR`0f`dPcRR<0iRG4n}j03viSm~rBW^=1z?<>NHA%8#}QkZSd$#M!^>+7CQ zQr#tZ7XDZLTHata0ArtXFERbx;1nNZwdk<~nr@Ni1RsGDN7T zp^OR~Bxp5Av44@KeW{Co*z?QeQpr^YBgX=&(4lyK@IUxHTe~nh;U`5TAoSw8A0t5T zF3_yI?)S0lHcx=yGjL_J{nZ9A^GSNWt;LUkfobjp-=$c z&*+s{X6*MB*;KhJpcgY*L-0&<4x^1p`w z001peOjJeX<>hc~ZIzXktk&%9>gwp|=%>->s?zE2?d_z_<)zQ&tJLe`pGG)Y83R4C7Fkv(d}Fc5`h$U=(s5<4eZ z76Nwd?SE6mR~Qvr26hU!DfR>ocBe+hzQ7i)(wp4CAqQ}DhCKb4B#>!@KIT2W8HrHo z{lV2<+!V)0farnbS<>@f+y;;}%`j*Jcqxjq6j5F?F-u4;AO%3jAQsrW1*Z|DgXDty z5gxA&U>cv7h@-A}f&38Q>G* z+SeR4XF{5Tql=ZZraDNlz$3Dlfr0NZ2s0kfUy%Y7H1c$D4DmRgoFKx&tXP!E#>i%n zpfp|1G~r4^AoGgU2BFr3EjAJ$?!#nhhSa5vlY|&p_%s5SZm3}dYG?3t^>bP0l+XkK DMK3Il delta 942 zcmV;f15y040k{W{7=H)@0002({D2n#00DPtLqkwWLqi}?a&Km7Y-IodD9@FVJxjw- z7==$;rJ|J%I*2%AsN&EAb; zNdetYuKP9$gm-{O-F3f?T(@xygdTwlqwTLSr|A#s^|lr}0HT|~*=1Xkc7gLPVCcaV zEwL$uxPqz*yq*I61z_L?=w0!%YJJDaJ&@nvFS-Wy_J4sf?vJj117(V5!>1F<;{X5v zHc(7dMVgXwLP0@QRaH$)Or4c>p_zH3ntGs>cAS)Sp_q7@l5?4nahQ;Bo|Sc-lysYu zbCZi}mX2XZ z>2mG8>lr2lH!m{{I%&Ag`h!`BEiiesDTM#%3q-3=s=9Ia17CA z#1Qq~wxWyX(9E|vQbi$Xe&Ec#r~^?Oe;FbOGJl|`LN|w?8t<#Lb9+RQ+9qzkt1yHj zNC!Y22qGRHizI5w3UA*xyr><5o99Wz>KF+92d@(cDmpOpJgXlhlvf#vaC!rXb!EM+mcHpu4oFRlu~eW z2!GfpSf*U5Y*^P&k-n+}FUN-9PGw#MJfZ_LFAeu|8h0Ugtpqn81kMqKR9-r8aI8{s zo=XxI2~3X;%zP6VZ4)fdL2&a}rI9}cHy;EplE)Cied@r$IYcygIck+IJRx?1n?nG^ z8=A919F{t+5Ov_?7$OP6oFg9A$@K#_A18zBGM_TfukYu1EpPeo|AAV60pd{GuDO~^n delta 823 zcmV-71IYZd0nG-GBYy#eX+uL$Nkc;*P;zf(X>4Tx04UFukv&MmP!xqvQ;Sk64t5af zkfAzR5EXIMC={VWs1;guFnQ@8G-*guTpR`0f`dPcRR<0iRG4n}j03viSm~rBW^=1z?<>NHA%8#}QkZSd$#M!^>+7CQ zQr#tZ7XDZLTHata0ArtXFERbx;1nNZwdk<~nr@Ni1RsGDN7T zp^OR~Bxp5Av44@KeW{Co*z?QeQpr^YBgX=&(4lyK@IUxHTe~nh;U`5TAoSw8A0t5T zF3_yI?)S0lHcx=yGjL_J{nZ9A^GSNWt;LUkfobjp-=$c z&*+s{X6*MB*;KhJpcgY*L-0&<4x^1p`w z001yhOjJdIfq_CnK~+^%aBXez@bHO-hJ=KK=;-L}>gtP$iR0tr<>lq??d^Ymf85;M z;NajJ^_$=T000SaNLh0L01m?d01m?e$8V@)0003qNkl$?u};G<5Qgo6N(>$7 ztAvfQm4A?u*_FDnV5v`F4~$6lkd>iN5abRF9b7e1`T`lk1LPIL9wf|vwj)5|Hh;SR zzyHoG)#7#)YRRs|`T>C7E4|a|dC9I5$gQnwrvP4rkdpDDGRhbY$sR-ioD2v7dJ}kR zK~9kD@m|B@wFGg|L%<`ijA`4$k0h@&h>NB)C4YBHn^L6?cof>~RB3{#d?X3R!Zsw8 zA?ZOWr%c!-fZ}YO)&OkYQ@yXIZEs>NvQ*POcpd8q4+&Ano5B0h+9R7GcZZI~`@sjW zK~Op8mrqi>0c>Ktn)oMo*{LcUY002ovPDHLkV1h7| Bjj8|u diff --git a/Resources/Textures/Tiles/plastic.png b/Resources/Textures/Tiles/plastic.png index 8fd68090319bf1b0ee3014867c9f3f4debaf0ca7..8b004d5164bda91e96c7d8b635125290bba0cf3b 100644 GIT binary patch literal 4283 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 Mt(}QCExnHZ7rMGFWB>pF delta 551 zcmV+?0@(e#A+!XL7=Hu<0000e3~d$w0004VQb$4nuFf3k00004XF*Lt006O%3;baP z0000UP)t-sf`NfTK|xhjRgH{{iH3%RgoJ;8e|&s=czAe$fr0P!M5F)!010qNS#tmY z4#NNd4#NS*Z>VGd00Ey#L_t(Y$K92|PQpMChIbOW!m)VrF@H8dDQDmTHWu$j;Sr24 zpm5!Umh!ev`_F8GhNOskaMNV?KPF9o`p;nG3~xv6aTn{}YFY5*C!2>gU+!l2y5-A{ z!CeCGr{Ga*ze$R=(`W0Jxc;{7^b>Gr!F>)Mwf382F<*@5D?clmx^exN=9`_LfIAEB zb8t5hok_px6@O#?#1@{L$`;<68?yy)mw@{zc+}c&l6$_^ z!K2px>u15(O>-VcI$f9Q6la*8p3YkL0UdFIxm1fMI)A`pP+g)1*%wjEZ$x|WU}V0j z#=HmB6>5-u5w+|KD#7^%G8{FM7G&P3LJg8sI*Qg|E5X?U5=93jEvPP0gCsR-NhB!3c6OjJccK}0bzH6bA;QBqYUB`P*IIzjrhNdN!S zV1NKdD9yycYzzhl5Xu-R;G~2EoPh$Wf*=qQ2&R;Q0*Wpm5F!F1UBLp5U=<=DQgkp0 zsD^?-h$xr>3J9pUAOVFSnCC=>qURLRJck)`=y8h?`$}j402Hm?J)fsoiw*z)002ov JPDHLkV1n3|GYI z6ckWUP#GB+C@3f`EiE%MGb1A-E#uwf00009a7bBm000ic000ic0Tn1pfB*mh(Md!> zR4C7Fkzo#kFbstUdH~=Eo?wv?{+c-S0IYZbUGIMc`&tn}UVpN+`O0c<^x zk%6=US%Ea2WR5N~PxD|Y-hEG;Z7?%&G)n+Z6)zgfy$aYI9=?aU`4v1HSR!e~&E^1q zDOk+ygRgxJYChjUn1THmDKK+koH$#>)tb^kDgFL>98yf!3)x=GM7wNmyW79*ujPt2 XUPW@3VB2Ss00000NkvXXu0mjf0ylc_ diff --git a/Resources/Textures/Tiles/plating_burnt.png b/Resources/Textures/Tiles/plating_burnt.png index 7c89de081eb6328dab96fc81a71e1483b8c23e1a..899e6c918805571db1d80d7defe5a4795dbd1de2 100644 GIT binary patch delta 1399 zcmV--1&I2c4F3v{8Gi-<0047(dh`GQ1x86kK~z`?g_mh>B1aI0oAJO5U<_C}G)o_E}gc9W7!b=Te9b&NZ=x3{PDW*br%^o#I+ zG-S5hV;E1yVLqRQREITyjdU#^(8~U0`16myLN1~4Pwyx;70s7+`@a?aB|@C(oVeJ+7opA8K7~M7Z(>S?SHxplie6CCL35f$K%mu^1N(x zoq%3_tJ;HK9;g-|a-3s`2nFeyTgWUJWN{RAa@RrrTviq$R<4Mem6pXRV65$2iG<-% z_S`t)^Z7e_J9JdZ+A`0{7=?U6K7Q1H`ElYAD=7XLB#_Bn9{WCqQk~Yu> zkjXp=t$$&#A=61V*3({$tqI1A$f!HA8G#EBqC#NCV zIElcG86S)x_(~`+Hz9`#5-b{a&>3Bgz1k?lYV+jlvm9uj21OZ^bAnW+!v|EV$SMcq z9GVAQR}S)&AsrYQe*)DdOn@>I$Z=5=u0W77E`J$e=*p2aZ~~^X0B-s}lTgNpT6qu^ zV^BCD7=iLedmM91=(FYzo%XFYNk|!Lc<`S6K@n)PgW;v;L4Ppt_lCwAgYe`SXJuJB z4?fWCbzO!x2SlfGfHVnnMk-Sccz=KIm`d2JV=HdAQv_(eBrAWkZjunWSV2Wt%pcqi zbbsZCS~)`sS&|UQndkIqX7e}SzG@AYp`9+aXP2&jI5mKCW&$$=Ic|`f5%dRFmibo= z4ZV#y#yLqyFy4wO3xL5A2Tn9DLv4&><^&)ePOG7mo?5!x7SEWrVshhb77!uEi-PZf zm}tsg3_)WL##mJ?jT)0|V(nEGG8&EK*MD;cyQv*MNZ!2p-DNVpMWazKP)L=?VjQF; zrIUi?ylsb5!Xs#skZaeCBkP}Jd^*A4BLYAer4%p(P?{^7xJ<(o#7}9gkzed$5Xa}9 z*)F{iNv`R)7*Kn~IUNm}{-i*o`INK#^fJDYXRpR2eK1eZOhXnBsBeH|0zRhb41fEP zto9mUht63_h4xWOee=E)qxG&5H!CL zJEh7{w+4^uL;n2H;0R1HWj03Yseh(Vafvg0fR%kP`{ zj_B;G>K|u|)_ywP6}i!2?T|&Z-eF zdTLKR>~>zi{=xsB;+opm$#oHB8&X-xe2j*k=#p#O`WK}qpZW~hjq(5h002ovPDHLk FV1ktos)7Ij delta 1559 zcmV+y2I%?!3Y`p)8Gi!+002a!ipBr{00DDSM?wIu&K&6g000DMK}|sb0I`n?{9y$E z00JveOjJcPGcyzv6cQ2=5fKp^5)w5vH4_sP5)u^_5*9KtGB!3g4-XG8FfcDKFDxu9 zDJdx=B_$&xBPS>*CMGB;DJm=}DK;)PE-o%8C@3cF z9UUMZ9wj6sF)b}3A|fFnAuA&zD=RcBD=R1@Bp@IlDkvx@C?qH`F+4mxFE2GQF)=nV zF)%ADDk>^AGJi5HEiEP{CQD08C?+Nx92_$)E)Wn9H#9UKA0J6cNhcv8BrPRIMn)t9aKR-VoARs3vB@PY_J3BifA|n+Q6*@XP8yp-iE;2VUF&P>fM@L5*BN{I+FgiCk zIy5vF7Z@}%GcYPH7#JEgGc!3gH8C+VEG#ZBEiEi2CVx0MI5adg5*89hOhz0O6b%gx zARQecA0S9bMkpvMBPA&u9wHE!CE-NcdO-)HjK`t&OH7+hTFfcGIEF&KzEhHo>B_%L2 zFfJx0Kz}$mC?X;=FE1q^AR!|oIXO8@NJu_DJ~T8nDVGd00VnTL_t(IPk%jAXP4VV6dg-E2YaQNh$hWjJM4PN zM92~{WdySV!hn#>vS?v3fyJf-2)$_Ofk5abl%@CHJD~-B9>W*zIq#hLaL=84?z@kW zmSx#TSp?dawaxkuM_abl>29;S=E0bRcK+MqJ43On#QHmZb%DuFmG?EDM>7 zbBDW)!uB0;pd@m7o<9Eq9z((kzjL8mR)wqO_#z-;A+5v;W=#1PJKid!++VuHQ6*M^ zTd!RTOT>2~E?O(VGno6#S1FjB6nG-j_t_XqXIBGb2wK1*_e< ze>#d=mc97^kOvoHo=GXPOy;sqntxF^F;8K#H6CUyAP+qpb7YDtj&(YTo1xhMh+qso z6oEA}CLirhIns_(x(dUU6q5P?b01UqI4{sT_ymwWO$(K))sw8?UKT@~Gq%q)t9nXR z?b*{no@u5+5oJJWPsjzrMD%W4!jom*zIV!a}gJ{CfX4h~EYle)s(kKmMfQ z=U=pmbHiM>>k{&7b@;d6|M=7Y%LhCn@bKS9b{_bL>!tzgU)Gqwp%BAEEW!W)002ov JPDHLkV1mU$Jpup# diff --git a/Resources/Textures/Tiles/red_circuit.png b/Resources/Textures/Tiles/red_circuit.png new file mode 100644 index 0000000000000000000000000000000000000000..d7cee0fb61f966738f5d6d75e0cdd6e6f3ea9a18 GIT binary patch literal 702 zcmV;v0zv(WP)XqWEAqq1(i}ZM-iB=T`dAV?m5d?1!g~~ES@1=;5?8<0m!ajA8A0OmP> zZuc8bWDYC$0PSNG$TACfdBq~bnV{R5sI6q$M=B6YKq??J0`$^~T0?HO@;eD0C$j>Y z1aC%YG}M}{-i$O-?S>M1X?2CmMifav*VSb(-i$P&`XrKoK1Thhm0R-ly8FER+d@n85b}X;@xy=u-{Xqo?V7*WCn}y}MO#kWE k>`w^D^FUhgzhNH#FNqQA#R%~KH~;_u07*qoM6N<$f(?yA1ONa4 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Tiles/rglass.png b/Resources/Textures/Tiles/rglass.png index bae2908132bbdd4ac4ed025e37c8bcedc775970a..6dd3bb591727d58e7a7090de87d1f52c060ddec0 100644 GIT binary patch literal 6911 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 jtbA$>5^9(X1N@#aJ^STsivIG?X& zzrUM2K)eCQtJQhHF`lgzFAUZm8{jt*M6xg|-ijB_N>@S0c%il8a{|`sqZ4KoXpIY> zntgTxPPnH6c$Rw083bQ%>F3w?Dl?B~Jhv{UzOd}43gBU+4_J7; znYaEbeZazJ3H?jJ>H|GI&+yho7R^&k>gBn{bCT?VmyD+)JcmViiFyD)y?UTUPq=!Z zf?-Sg1gy1BxOyPt@fv+%PJqEnd2DUm(kEbUA86&VSAncg%n3w1)zsRePlS4azh+UN zsAD?$);^Ky0eH(mGhJf7<->ZQMfdZ`bOkcJtgZWp^uQLnpYg69*i!fFIc6W|slbxB wclxjbJv`6wO?m*JwRC^>ze7g9=c9V!4}Gc;Dxd#RivR!s07*qoM6N<$f>=A~g#Z8m literal 1768 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 diff --git a/Resources/Textures/Tiles/shuttlegrey.png b/Resources/Textures/Tiles/shuttlegrey.png index 337fef7d30d20fc7ce42552491c1cd4b4903a319..8ffd372ab06c05803f32c23c915ab3ff5b354558 100644 GIT binary patch literal 393 zcmV;40e1e0P)h0)yK)_!2QwCZd(kR zh|gUc4KO%J<3$?J*y);2;qz{@zBJx7OuvS;`y7ompO58%u{;5(c|g;W2mWV(R3FDG zI1fPDeeT<6!FfPJg-ck24YhN^wbre%LwIUz9?*Oah2(yp(0h#MsdN7rKfeo>0e(6U n$TKz%gyacMz0aZ8Jb{`oqeo!M-DVXC00000NkvXXu0mjfw#KT( literal 724 zcmV;_0xSKAP)Px#1ZP1_K>z@;j|==^1poj58&FJCMW?5yS65f7tE;fEu$-KnmzS5Mq@<6Jk6>V6 z8#@k_00009a7bBm000id000id0mpBsWB>pHLPHetbNT3p7cdYoH*@7g^4$O6%h#Q>Q?4azp_$C7ML?=JR$X_9elQml}&j!L*kl?4{(1 zHvWC{c~c!{bR2oqcnp6C!NLg|X#knucH@WWxa6C9OotUFX#sM^=CY0!)CYniKkB6> zzg!B^LMCR6%pQ9M*;-KC6dbWA2xA_?NC$z>8(x4Xguw8Fz+(7=Ov)8EoSwBXRvh_r zz58JP$GqpSVwPf;V)Hj2IDeyU~N7N_10*ym$fqDX)vwDP& z;gvvRVC@vz7OF2&#bpZK0>|I^VE%s}oc8`#?}U7f%m>$IUo5A+@9%=_|6Jb*)GX!$ z)cU?)f`0G&9%%NzZfX4Ua4l+3>v;;Nz3idRYi0000FYr>LzlYz}ko?1|KyI5bERLdtkHPP^;Za6k(s64jN!^u%5)TBwlH&Y4+X6>{Iyswb)aS^%8Gt=9SkM zk@TJ;3rIe9<$*MLLd*k_@;vZA4TSpGSE=&=B)#XhgO)lEaHz1o=dhtkd{4k;Hc5E^ z(s>}n=PsePi~o8aaPir@AaCHO^8k;&c_2-mP@(U6NS?r&JBeOF{PIr=i~s-t07*qo IM6N<$g3d^`$p8QV literal 767 zcmVPx#1ZP1_K>z@;j|==^1poj59#BkFMcttY+n)%GVFl%<3F@i|*qsR0n+V~i3C@-X zo^S@A$gDL0000SaNLh0L01m?d01m?e$8V@)0007NNklA6SgNG0lSO_MH_dUU5A&{z5s5#6!=fCF?OZdAKL|3B=&{NYiFFz5k*8#6} zbd-=E=(l4;V=oED9Egu$iQqWpx}9=PM|$x02a2^|ZD(|hIe?F2%!d&4te}dX*!Tp3 z1sj256cIj-(H(l`f^_w6Pkizi(tVL zL0hG|t!N=YzZc9A2!Y{+z%b^6ER^e@p?eB~H(d~n6iR=egQn>3KV$Mf`~TgTbq;t& ze%YMB4qvwe!%mjtfmQNhMp(?g5-5gk+l6fk>s)lJ zUAo{YF#b<-Q0)Eh?gV_`E0JASKkAFU?{`7=|G3@>`1Cdh@FiRSOt9bkeiwZIJBAPL z0DR! xHK1B-<=*$Z;QN1bC!()4O~JbGv%Ao|d;(%}8qkYEzXkvR002ovPDHLkV1ggAT_OMg diff --git a/Resources/Textures/Tiles/shuttlepurple.png b/Resources/Textures/Tiles/shuttlepurple.png index 2236948d38223129c5a117ac8c44a7d1f89899ff..05601b839f69deb167796d628831c0db1c77bcfa 100644 GIT binary patch literal 473 zcmV;~0Ve*5P)WHc-5pRl*dxWd?|RR?jPRtiAwsc6@-hk5BIf ze0g$U4@Ainx1$GZ5q2qp;^^w~G))oV_dIXT`;ynMfPXA)U|ujhbU(%Ta*W0ELKorU z5zckD|4>$(Bd-f^`IInnhzi5d$?M|tYOBU5=7ehH^O`v!$?)B~pf8}Uk6X`yrE2h%QyhI+ P00000NkvXXu0mjfT|(O^ literal 751 zcmVPx#1ZP1_K>z@;j|==^1poj59#BkFMX-w4s)f;4S68-=;JA_Erh?3)fXT9q+n;^J zU|?X_HY~#c000SaNLh0L01m?d01m?e$8V@)00077Nklrn)|VxsU5JqHA0H=3i+7<< zea~_oZ{s-LTpwQh6xc@lTq3cQM>+i{<@5)Blr&743Hsap+RxAxmIL%GLV$-3D}oJv z@2u2Y*Eo$$@rL&}vi5U~KCr!aH&xEF+*dnM{ zA~<(Bo;#`p=y$~&fe;w31cosmWT9L~4c$`^yy}8rq|o~N92}ee{xc@;vw!cS7m+cK zY5Zn$0u0~QPL|`2Rr0+<9PhQo(J_2myAn(ViWxb>*><$eZLF3|3keK z@VWRLAXU>-yZ8Mr`2MeVLL#6hf@}no002ovPDHLkV1mXaS6Bc5 diff --git a/Resources/Textures/Tiles/shuttlered.png b/Resources/Textures/Tiles/shuttlered.png index 732cf385d64451ee78b57b4563ec9ca4003c5dd1..8757c81aadc6a99ed81f15e56dd779fee990c88a 100644 GIT binary patch literal 556 zcmV+{0@MA8P);bZ?e#X?JdgYPaeN>DcvfHxj~pE4vfF^JQ-M@0g*KjxM_yIf zg+9WCA=rHGcvpbz0*@&j$Q?(1*F2~0!2hqpXJbCkt- z9A$>5(D1w?ghyKBAp735Nj~Mg2%@Ql_jD}8SOp#47hv%;)&U+dyt_tOTibVl^OSEA z<2j8xoYaW{UUX2?8RR_G+RU$~crNjh)|$>Nq5~RUZW>#E5gpL*se*z6G#!}2^H|$0 zok7V{nlzQ?67R#%8BFnX4$mnpJX#vyHg_@A59IiXs2_N{oVv+Jbn uf&$j`{iFQ=Rk@V!Pkndb-1qrhKk*AdaJJ{n*d_A-00002N#&TLMj5T>2+3BK%qUwX##+|VB74Rz#xi7&Ln4Xs(_tjq zP-96^Axt8fBjGSAvP5=+GrvFX_qm?yz25u&T+j2zn`A*T636bw0szEKj18&68Z8u2 z6eT>T1kqB$0tHZwNT8A{GcIfpcLQ?+0G_1d1T?hp4sUVR`g8&S$tY9`fK|92)H_3=;C-aNZDfO~{W%X9-P&@CcHQ!NdUI1b~g+ z;C|t}#I6~i7e3wE{C`0$e(XyCV4j*78d%#K`Q)UyNE&T#k>bQJ^YXI~BJpop%UNk+ z=9UkmYx+GMJSu#qMmIP0SJyiy_ZZ}#%WRv{30~Apufx&)?RT@WQH=xTBi&Ce+sQw8 ztMP)`3gxfc>%z>+75;9u!&_S|u6M9Y#NRTaPTVyC1TS@ooR=U3=9elG ztObMi8&rkI3+9Y2_F~Wf_s#%4va`2J zWSWxGqLt81@A)E!N;|0P?Yky#zvNtgbzLga@2Pg6A+|uL8jsg+C3><0W1O1Ealvjn zH}|hITioMYUYuWkc#Zw5XqJ{b)Z{xGsdrqX^m%%aj`yRbv8cte!q5)RD(yApO4T1t zVsZ(hj{7PcEIG?0-&PrGiRG%JKPtAiS#cY@1ET4H$iTMa6tB#jpLL|@cB^jxTsZQf z`N^UXrAze2(!gS^w@c^i75%Ts^!=ahoOa4Br1=l%)Cpq=))3$LK;#=Be ztegCRT2~26?ucnnyyB$ID?-4VbeO)9LIHZ`h*RLGuOEqfetGv7lx^vsULYT~Btk z7LFeBgLxJqGQ>QNZZ(mER++k~&Pu*V{pB@&u~~K>31%e@S{gQ%Lb*&<8dC+t280;Zjp24e?6ZQG04pgnzYKJv{pDZ6J zXUwQiX{ATE6Y4A~E`Z`U!>?B&z|3%SUMbcrhWr8V1B;%u`k)(eC}G`Af0}W1Mj~iJ z5oD=}?CgvT-&5!7uFz!~;Q{aWbwhr&yc03#TYQE&jJ9E$n0$JyGF`mmf`PX}*XfHx z!4js2>=av*^tZifPSIOf>{~dyd9z`CeIrU0duD8f7TEDDPIRScGr&`jWaipeQr;4$ z%}G<6Xr;WNO-_r5uMCb7dM||kv6@wxkbZkF4+qVNMD4QcXSJrP`-H>FTXL0t(2kt&jf}Q?eaoeE#gqYh1{GB=lPf!{ z(fGrh&WK9C$i(8F%XJpEu<6%p{cVh z8LvENi1#{_=D+UbFTg@jcWQUt2w1Q!<|Q9yAZlIv=DgmmYj0jz+fWgcwGp(^B)`R4 ztqlzA^grQ61r73!(DpN;qqN^~qz&%79EstWJ*V}@6KU)$KblC?&yMY_N|V*S zigErYS@uPNQUyl9cOx}PNY0;GGlfD_SUu9q(J_sCjzINHr!a1gX4}-lySh{4npw@9 z*wwR)1k^P^D=7`T0Gqkg`TU~wcBAqTrrp*&c+-H(r#`B^)ttOEubmV8NS|vG zzI+!{4aE95`W%@5ENC$7=Zc6`Y=dUtKhEq^c#+04COu95`xFwN!sqwJvc)ytw*UU! z97NiEj^dini}FBGo`BRmpsC6OuhT%Rk3;312O#Y}cMY0%9*|IB6V_lu?LN=0WqHWP zLnaSsJ~!QZyNKsU=l&wTd>2#=JarzBXJ{Vq$rBuVpF^Q}0(*V|+7@{|Wf?+{ P00000NkvXXu0mjfFwVUS literal 704 zcmV;x0zdtUP)Px#1ZP1_K>z@;j|==^1poj59#BkFMb_5V(b3Ukg>TjqAI< zSGX0Dsyn2#WLM zyJ01f;5`!HTO{zE=&uD1&KYxkcFx5oX!+yU*C%2Jx3Re9paO3l=?BwWff&HNT*3OHvPGN$>MgUJ9e^0XyiM}QlHd+tx7Rg+#w?!lj6l_q z2W<$j(sEXdX3-DO8$b+T9{nMEy?q}m=zy{Uf2#t^%N6Wbz6JP!dczCw#IFSE56L=L zdczBa3h4>V`#&G>2I@~lM>g$!0&mUVlYfM7r2d5YK$|;c_}UNly(CDD$|@`gwBuDX zBLQ`0^9XnV{^(~EexQGTt$-fc->87`OmM0Q-~)ODfaV23iq9%sJ;7!|;gMT@_y-?U zbN{D35t|r&fLz99sOCQRg3bSF-V?|fk`Iu}d7%X5+~*wN{O1`t*aOHxF5_~j=04{@ zoc}KG3FI7-4|=n5j7vTDxfeM9^PaE@q^iItg2mkDUf}%Cd*U(^oU8|NUdYuPNPB_v mf3YVlZ+=2j;cxR``}hqvc_MypyesDb0000Sr9K;OR^}b%aZarGZ)(%#rtQ%EE0MqN;x9(i;uH0Q| zH-6j*lOH3<2ri-#f{Y=W0b=-3BY#;4LzTc&APht7>-~$}#5-e)e3? zo?~xr`?PmA7_tsry`J}LHLF3mHa>FEwAi(uXTD}(=0o++UfrOvuQg| zUc6p@xG4YB>g$JkvfB4J7u|b!;adBdzJdi0Zx{95_-@Rs7mH$h7aq{>l{$7dzIr%T z(D%}FJ$2vi%hTRDIwN1)0j5`sZ9Llxj>&NUmF1^)DyFf`!Z*J2!E-eg?_VzcVM^DO z+f!m~8{XQ|@#u_GimAu97I;mUs=FWAb5_M$W?YILS-2RYz$-0KImJBx9 zpy-O$p!^MW=JR6)aE^VxjEyJyB1st&nqIjChmp?86VY0rDT?S?q$x3#N0m#kn-h&_ zqO4m*oUW(=MTzuR%-`=aU~FbPC^TvWi}AZ;W-O(}0HP9$)gepzf8b8Op*0po6tC_oI?mf zyFl5Pl6s2aY{e93XCP%|LRJo1c>#t>`}I8vA2W*HuP^*Z{c2Uj6<2 zO~Y1+8ZKv3Mx1W_xoGhKQCb)gL9%yPjyGn)Me;^7Ac0Ja#iveAiZWIA zytp;@G~TI<*Ha#-I>`se49c3IirJ=Y7$iFiii77{YO;2rmQiiNFP!6y<4-(+I$PUE Y5rc9IYdZHXGZ`z{TRF$mT@hUQ7s@$)y8r+H delta 554 zcmV+_0@eM854Z=A7zqdi0002({D2p+A%+2eHc(7dMS+2VLP0@QRaH$)OooPri;9Yk zjEsqfhJ=KKi;0PXf`Wj6fPa5~hlPcOgoJ~GgLrs&e0+SQ2D=yl000SaNLh0L01m+b z01m+cxRGn^0004{NklXZ>2mG8>lr2lH!m{{I%&Ag`h!`BEiiesDTM#%3q-3=s=9Ia17CA#1Qq~wxWyX(9E|vQbi$Xe&Ec#r~^?O ze;FbOGN7nJH;14a@2j+Pdqk1iCT_let1yHjNC!Y22qGRHizI5w3UA*xyr><5o99Wz z>KF+92d@(cDmpOpJgXlhlvf#vaC!rXb!EM+mcHpu4oFRlu~eW2-qlCrd+9PSl3XIzN!N+$A;j4PGw#M zJfZ_LFAeu|8h0Ugtpqn81kMqKR9-r8aI8{so=XxI2~3X;%zP6VZ4)fdL2&a}rI9}c zHy;EplE)Cied@r$IYcygIck+IJRx?1n?nG^8=A919F{t+5Ov_?7$OP6oFg9A$@K#_ sAA{>MpEA#{@8@|fZ~5^5fm(kR0pd_+rLRf_R7ADDI#XqFq0+ASh6z-p~lP@6K1AatR<09lqFkPLLy`<%HE9E>~fO^k_usIY5Z0^36HnTMCxUZOC&n5CxCDsrNiMG zfVHz(-Jy!mP2z3sPolC_n7oJhcxFOe8h9Dcx>4b_0^f43xQ-t?IhGDcT)Kgg)sm2o z(N(odfYx-KNta90@|IEcZc;arXphAZ5=9J_wW{*dUtZIziFtr2yy5iHYiir)8fz8v zmYDLG&8XT;Er~(NO0zTY6wP6s;eNa*Y6Gy<(odS<5(`F4AYzpzN5RAIfp->yhmO8J zp!JTlxh0KhY1K8v+9J7;t(XdZ)BEb8(U(zD0fUeCKA@(V(MEaZ(c}0mqd@_XnqF~5 z4!`Qb;cB$2Yi??5qmZk`_TM;j^nI@fa3QjbwG{E|-_A~!uk^?PhdW}A+?YEHDH96s zgaD7;EPFlE1;Vcs(G_1b*NNHa!D4xh>f$SpIyu?iLKIMqZl1bgHVK>Xe*CNq=eSlDy2rW5K&CLE!OT#WBF-Fn?({guzF< zBfl6aE-vW2LCS*fTDVx%UZs9MAtOY;;6nHjdjUBkl+VUiqn)}NJ0q>$$=&9mMJ^xS zY8_5FEY-ljS)7lcf;2rjsuOHXtMh@T`@Yt&>fzE$vnv7oq^q;YV!cahAl$l~0P zBH6D>Si!95vb~Yr9zMbsPlrXny}QXe;#!4d=|=hc!d!bNP2TNi@HX&wMs0ql$WVO^ zC`aviH#f6;5v?a=82OiYxVVH|-WeINaLdNe=6MN0r_Ps}pGgq9!b8Q?B^r#XAAC^bY-`QP`kP#NikFUHJx6g!?=ru6%e8kMjH%n|3Sw#JOYSJ%&AKZxq;_<3kVb>rTmI?u zlo8fU!J^qQoi%J2Z}Z*+HJ>dLn^aEixTj{Unw!E%oC%*vve;29aXt2=DfH;}%A}yU zpbTBJV^&Ej|Csu|XO;5|wCk9cQAnW!b+C5feYKHNQvdsY#U zN~1ipJQFXA;o2RZj!r$6%xY2@DQZ-(?NbuUF-QZVA+2$>H{_b!wPeTbj;x-oR43|* zas0UC`1YOyR|-iLNH-)6>6gKq5s8#0J=EBQ%NjN&IG~;6xQbiw!uv0M#M$IYIW^~t z+Ed76Qd-;THt+VnN7<>01uEK*i_(xN=Y4x@<*zm#%)8k_6{NH+s9v`^o!Ze3Nnu?W zd9N-O z)jX4PGm2^t+^}PLS{>AM_bqWQ?7L8tS(6q}7I1c9gJRXW$WFN|{;Y#_G9IUCRZ|9U z z%9zVeBd1VnK3;?*uO1)fApT+RfcD_cf%!m`J}T8U{w0J}Ra?KrKL?$YZl6y(nmTzX zpf$p4h*J4HuXQ-GAVqbs>N)e(zWclSiu;b7G9vTA_sOJPf7;jCCtqsk+FV_EQ=(tt z*3y%{ZuHBAn8{w|U(^GCOy`*_Z;Rjt)> zr$^zA!hGAVESt=w&dJU>C>r|7y|Wfvrc{P2+dxCoa%sEfaSYkZ^P{RDJ56P>^VyY+h3EEMu9uz#hnmyV!lN8)YeN25x zjU4|v9yOlt>(@8oifaEdq(j~-TY{|P!$0l9H`|-v#_6U~b6k^`)HJm|nbxq;uzEvt z7$vlmR2DjQ%h$oz)i-n&KZkxFf1TxapjpXH`BoDp^6TjckuCE2Xr;HN{TCX>3y&qQ zRIMDibYCY>T78?JmdxOAWkG>`Ucw>Ws^t{dUvIq zA#dY^3Wi37nrj}{tS{Cs4sdQPw=He*7;%5*T;fvS7!al$I@lf7x_X_nkMn>tEy@sk zeeFxpv`_buBHb8Fdhm=T(S*j@rtnX&nQCMA_SyqNREQ6tyAUo@> z)y)#pw7>ZmMBV3WgO-w(3pO9OJx+lQco=XVe0bbe5?7M-LaUrJe{lZRH_~UP^9%>ZMUc36~iPfzJnn!)(@WMOB*i2U9SmM(?6MLKjou-;@rv=l8 z)*cFs3E;#El$`Y(kM+*nnCkM+Pt7lEb#MKuEMVAV*eQ2n!RjGwdZ$o!LJr=#*cxq@ zVUu++AgAdw`~9<6%6ONQx6p}{wd#f1&N<~U*2?u0Xs>|bjo%&=4qACWZq}PW^0Fkm zHoVrn-02XkL%K2X1Zxp8;y+kF6PUc&b-Hp|({LwyZCn6irci0N5Bu#k;UwY^4T^1o53I|NgsS*w+-BeVM6wyT7)pkP9e5< zVu&vhLjoHbhzRKgVYv+cWHtd5ufx;m~I2-}e!9a;{BwX7IsRcs9kti4(34>!Ga5NT)#v-&qKYw7ZJrGEbN%F=z znwtHz$KC0Jeb{UU76uCp41@-vpmZh$hQMGj>oiCtgo}W%f@y3*5QN6s{)6NvjVYN$ zWKtPyDxC&erzLpNIc$9}*X19v_%nWU(^x+f#!Ve8h`@j$pz!tBz5_|b-#7+`>G$0O z5)nrBBm0wSY!(-b_>E=w(AjjB5B-0k{{8r03~+O7WAod_Kl3y#*tOb?DJ@??>;-5X@L_Ye5=%>(+3i@7TSORgq zdGx`=^{OG0z(2**|2R26Xajx7T+;ueWPZR{bZ>Sbfk`%^a1;4oRV(a|81-Q5v*6FT z^*R%Y z5db7?e00MIpUASGZx^prw85kH?(j9#r85lP9bN@+X1@ct_d_r8E936Xmdg|-z z8yg!t+uB-MTDm(sLqkKG8XGGrDr#zKnwy(%c^4M})pHhjL>4nJ@ErzW#^d=bQWzK* zqdZ+4Lp+Ypy<+HnI6&aQM{dW8dY`G!ZcoeJ+j7oy;=5z-9$or4p=ICR z*^B31@-6s$`sboMkIKyd8Oglgt6a}9iD~lozGS%4R{|rywYx|a4=WJLZv-ex))LZ;7f*;!_y#02VbM1x0qIKm_ zYhwhSvS+u-$!)ybQW|WrE2`!12M?uY`G~6~*?$lGxZOWR$}cng*IX<2#p|D@-|*%= zIn&5zi^!ymbl9{K?MGFAGh-zVOP1-5<3zjjA@jm~Py=ge@fa|L^myY`N?= z7QAJU-XfdOyp1{MLRkavExrwow;8wXZ(4`UH_Na-fKdFS*v;OjHunF%7mN1;L!ZIZ L)z4*}Q$iB}-R9bb diff --git a/Resources/Textures/Tiles/steel_diagonal_mini.png b/Resources/Textures/Tiles/steel_diagonal_mini.png index 0b56a7794d26461a53bacb878a01baef45bd4cba..51cbdf8b04091c8bdb5cf013ef75bca96881c778 100644 GIT binary patch literal 4272 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 WN(ItROKY#qaZ8-7X~llei2nhjo%S#Q delta 273 zcmdm>xQ1zhNGZx^prw85kH?(j9#r85lP9bN@+X1@aXGd_r8E932}Q8!IX* z>g(%UT3R~W+Io9>YHDhl8XN0tY8vb6rsSEa02OlfQPuM0Z+gYFzqP~6+E<52Ih_$upNhXbrTc&2B!y?NkMy*hu@ z$~wL$6_-rz^opjMc9y+9)7ASTclw*NUBwf>eLSnHJ@53z4U7D@{qNit5x8shi*FMm zC$?RDQXF{gC*%EwZVzTXCEgt!CJ%l!t6gG(FqJMfM1NoK&hc*ZF81!le;E&ZrhoWc UrF5Brfs28`)78&qol`;+0P;b3tpET3 diff --git a/Resources/Textures/Tiles/steel_dirty.png b/Resources/Textures/Tiles/steel_dirty.png index 660fdf886855c3693337de483da74ab3942fb937..fda6fabe1fcca264263776498355ff044ae3e411 100644 GIT binary patch delta 958 zcmV;v13~=h3DXCVBYy#0P)t-sUtC&XTv=sdUT0%qVqRNiVP9%zWoTq!WME!$Z*FvP za6mysW@2DxV_|7!V{B+WcxQ&3N8XJ%1OO=e?aYiMU;Utd&EO-n~cR8dfAW@T}1ZCzSfRZ&i1 zTv=OKR$^aXZfk2=R#j_fWm{KOS5s1OZERCeO<7e_Qcp}xN=Z~wQc_P&QA|l$R#a9} zP*_z{YG!0uRDV)pU|wr!Xkc7gVP9QnWn@=VQC(VCU|m~XSyyFZVP0EVVP0HgUtDi& zYHw?4c5`xicXxGiaaUDUZ)|K{T3J(2P*qb?Tv%6aX=qneQd?J6R#Q-HYH4F%T~tv~ zXk}tmQcssK?uGyW0y0TNK~y-6g;M!<(m)W-f(I}Ht$(!)o1i9y6l@Fi2(Gqhso|Ub32FI|pCuUw7A3DQ!7Nu*jdMiI0lUe$Mt|C^+labBfV`=jSg=eqaY-)%D+L~%I|N7(PDiv* z+VTpls()D4(6BH;>V z9=?3#brL<{neFzDfOJ5n=G)y~1C-sp{{CPv>{nmEIXD~&U~h}>`1`?t^U9)o3QhE@>_by-)HghF-|RyY&F@o23780w-w=MtZ8!~r!ey9h z;D=r(e+H2~pW*Dx5J8nqyV=yrPx#1ZP1_K>z@;j|==^1poj6n@~(tMR|90 zdU$nvd3QlTKwMEwhJ=BIf`EmCfQN*FhJ%5Jg@cTXib6p_fO~j|goJ~Ff`EU2etmp@ zetv;~fP;gBh=qlLfPaR9fr*HQf_{5|fPj8|eSUs^eSLj?et&&@dwG9;e2IsJiin7R ze}8^_dWVFBhJ%8LhJ=NIe|>y{w5Xbj!gN$PDuwBXJIOqsU zEJ@EoLVu$JYV!wF=9Oh>XsKi=)@i9lKP>CdZuaC!-}mmlo1M?j%+3r#%70SvDI5q& zoeuPz2?j!E&mkpD2+=g%SELt*&TE=R2&JsAFB-Z4KtBsJO1V@oLO2jJ;)cPw$rH&W zy(j@I9A=DZl+u(0^!TMT++Z1&Nk%UNK>96+u0;GkH2F z0h3ztMkbTZau&i!xoTN51&B)E+EAP^%gO=4IKA!zP^Isu2^nG7pkQQjxtwJTj@W3F zK)jCpA_0)ZjkIO)nZJND5IaRVzaRN#%Ocywx zahw_e2vw``l%~}mJbX0!7>abzoa@$}B%aPcdtRGgD7~muDlZoogTbYxS0#vm8yGKR zY%k>u2fY zG=RkQzo*NEkA|7q{jeZun@4f5F=uu1@}wqq=YWeQ5>O$yW8>~)CDvEWGyNnwE(7J~4qvhB8Ihh&7vNs-V=nb9!j z=Ed5#@7@jw+WBM4I}iXQqtTyzx=$WEjHv^z_$9>ecDud5+iLB#4yyn(#SsitQP+hd zgvkFX3(*AQXkAqm=Li58`>||n+cy5&u{y%|9|YE#v+lgMrvLx|07*qoM6N<$f<-qd ALI3~& diff --git a/Resources/Textures/Tiles/steel_herringbone.png b/Resources/Textures/Tiles/steel_herringbone.png index 2f676827d7a5c763be93b536c45190267bf9b5dd..19ae3bb8717ae64cc023f8305aef5c4a284702a5 100644 GIT binary patch literal 4380 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 delta 653 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 xV5Q?Sj}$qvj`bGc% delta 522 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 B>(~GQ delta 426 zcmV;b0agB+A;bfaB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP0000aP)t-siH3%O zfq_CnL5+-ze}8|3goKNUiGzcKhK7b!RaJO+czk?(<_0rD00009a7bBm000id000id z0mpBsWB>pGDM>^@R4C7NlCe(2Fc3snLUCJ$Mf>3}Wjlb+^YyEF+RwSE*t2cfj9}XPiOw1OG2n Uu%nX%0000007*qoM6N<$f?8Cw`~Uy| diff --git a/Resources/Textures/Tiles/steel_pavement.png b/Resources/Textures/Tiles/steel_pavement.png index 5b561e9ae651719cf9b1b9b9dcf33c372a7ed2a7..200471ea9957e3eca3ccb8e6f823abdfc5b210dc 100644 GIT binary patch literal 4232 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 E07lJ3#sB~S diff --git a/Resources/Textures/Tiles/steel_pavement_vertical.png b/Resources/Textures/Tiles/steel_pavement_vertical.png index 1c38de21e7a77d70b05507e3abedbe1aa2a38695..950a2c0e5f15c78d3efa5804844986afb6e0e393 100644 GIT binary patch literal 4721 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 YVDt@9uWm9yG}nk7s4g~T>-_ip3x8;KuK)l5 delta 744 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 delta 444 zcmcbhc#V02NGZx^prw85kH?(j9#r85lP9bN@+X1@ff>d_r6ca&td^`0)7g zA{D6KzH#ien4-oo{%awau+vf2v$>s`K~R*P4PU zpVmHZbj|MQU&VdaX4#89=L;`MZTND#S=#N8%}0kTQU-pZ#_=6~N1y)X-O6_4{XZ|| zr2(I=Us`z0CgG*5eZ7Lt_pdE0zEri|pW7C^a@LQC{uQ5o2|bT^Jj3gr+^f`DPc3GC zo*9MD8g)NO%VJCQ;3Y>;Lb(l<>AeVvVdo^H%1h4P_2I*Z4XP-eNS2uvU0xs(r&sfi0W; h2sR~+_P_ryYrJ3;U-@6>DKMNFJYD@<);T3K0RXfH(P{ty diff --git a/Resources/Textures/Tiles/white_diagonal_mini.png b/Resources/Textures/Tiles/white_diagonal_mini.png index 736733753a640ab741a1ba722263211473525dc4..e4e32c65cd99de69b64bfde468000df1fbbbd260 100644 GIT binary patch literal 4272 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 VsX*FkX>I--x5V3;R_yaQ^*?+^^;7@= delta 253 zcmdm>IFo6DNGZx^prw85kH?(j9#r85lP9bN@+X1@c7$d_r6ca&sR)ethT7 zod*vdJbn7~{oA)6KYZX@V?GtAfV03OvY3H^?=T269?xHq0u=1^ba4#vIR5sEBiA7V zf!2rSESuzfU&rk^pmA{THrs|R>>Mxto=<4M_u#DA>N5S+jR(#*-;tX&t$*X9x$hTk zO$m!}c^Noz|IXjHCZkkH_xhQxEjemm*RJ`^xQ|hMB3q1$ zRDodTfv?QYOIRUH*CmYG-#gxK-p5|c&u9Ldxofu8g!($g>p+(=c)I$ztaD0e0ssrO BZ;b!| diff --git a/Resources/Textures/Tiles/white_herringbone.png b/Resources/Textures/Tiles/white_herringbone.png index fef9466a174f1c32aa8b57c8cad04f227b5b2132..80d006810bf1f26586f809a4dc505dbac6e142e0 100644 GIT binary patch literal 4275 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 delta 616 zcmV-u0+;=>A%O*uB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP0000RP)t-s@$m3) zZEfi2=lbu;N#=tm6esxXWZ)m000SaNLh0L01m6W7%Rp3$ z`37T!iW77=$?sGiUJlCEM zk}w18woGFe3a;4hay&OsWGxqr2i8`F0{kubf?ICzn3o$6pYX;B|A%c|) zXZYI?$IeJW`@Q%OEDbXJ?LY8=mUOE16}NZze>^znj(_|((U^Un;tNkZ$HUy2(6kmKP5aGY1I{RuN`Jq6$Ei)nR^=LYIHuUez!MZsFT;Crt#H+am$qft1|M?sr8pI*-BL%_tf?bC94gRFsPL^I% z>@qy~$zi5GFU8z|?tG3bt`qGa@!)rS>hp->9?0?BfbM*bD~@{rGdzSH|IgJOsy|XQgTVE)Cbooqi)wr^cYq#G#^J>q{EuG$Jlcnw5o0`Qo~*%a`17nOdLs{d~K7a>vAtZN9G6 zyN`c1Ze`JE(^ztSNB;S1ugm65Gk>|aaruHnW0c%K=dUQ~d$(m)c2k9&TIY0s|LKf9 zC(mCkI#Q5(YTebteZ#iwb1uI7;M|ohrw8&DKDbpdaP7OCiWdu_J&O+NcMBbRg7c0< z^9EjermyDP{n^^v$4YahPB5!@eDF*^=#}AtODj(8QB32T#jkun)}E~@e(z%8PgA?5 z-kKU+vuW*)?GH~o!%_A4hk0Jph05-S_KelBRiziAM>j4yv~=w1yq2eT-QEYgZe-v5 z{b244V(0tE&Y^`{m$lrZYOnX^Q2VE>Io!H8?Enij${Y?_BDq zKOcGjehYJFQ}@bYXhXw^uIIkFf^TAse|Dgxy}iAsr>ClVUa)&uY0~ z+NNbqB#05~r9h2dl(%~ zX>6oX(G{&x`5Wr==SLji8vA@{ACHYC98SB?^pa&bjZ{@0i`D{75kyxbO^K=kDp`iZ zoMdDZ;oK_Xbwv#*N@(!L{DUC_)@rtceB+Lw4ZnxYEK_I$5KU(+4si+q`ST@NRASnc zAzaAA>&QjoLskkhl!XaEE5{acHf9>Ma1bV;K1G!3n}$MJieUrL!C7pa&GHBox0T52 z{J(-lfvZ>4Fpp~?h4}_VN8|<)q$|w1m5`!h$3}ER?O4uIYUU!f>at=`7nMRfCCQ0U zeLl`BYdS9r$m?;DxMpTa5^+X2D9E#vmA8tN-EOr|Ji_f)?{E|{jKwD4HF(~m2vMUm z2G5KC@qDE!;Th#aPt22;Bx9_ciO%B6B@N$sQ`(%GkGW{+5L3z+l0c%tI9@OY$3+T8 z#~_hRnWZN#PLej(h%o6tv`Z4EDfN1cS5Z*|F695}RC-8`PTJ6cp?N#$$CW6F8=@Zx zj-(Zf6W-x-gVJd1((;OAtf?v%&%Fjq)kwv9lxiXyq4USg=Ww`7i|ySTRXFZ>*hr~m)} delta 289 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 delta 413 zcmV;O0b>60Ah!dMB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP0000UP)t-s?ds~~ z<>hc~ZSnB%VGd z00AONL_t(2&vlY9Z-g)mg)LPuClN;6SUND1UiVVvhHmL#=6{>=Tj*Gcq4~FcPPpoZ z)(hgpFL}>~h^#wbB2i**u6PvzV2RXdpgxU}$AJ)-3J>IANYaY|nZDQJ?tuGRrC=VVp{isvN$(F_U3UqVxMduKG zU&12XY}8;pR;gf3Af~QTcYA)tB8hdC8b*Hy{0(Wr85Tr8N&ZiT`0^vp00000NkvXX Hu0mjfT(7+; diff --git a/Resources/Textures/Tiles/white_pavement.png b/Resources/Textures/Tiles/white_pavement.png index 78fcf0195d2e8fa3a3cc5a124411eb801905ba58..69da122ba61935448084ac323c319410dcdc672b 100644 GIT binary patch literal 4273 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 diff --git a/Resources/Textures/Tiles/white_pavement_vertical.png b/Resources/Textures/Tiles/white_pavement_vertical.png index 5126f699db5c8dc2a77c7444d4b2cbe1ee4be394..20d887903c52836d94de5a4ab641f5e92ed3e4b6 100644 GIT binary patch literal 4664 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 diff --git a/Resources/Textures/Tiles/white_plastic.png b/Resources/Textures/Tiles/white_plastic.png index 99d6c60e88117204e5546b5d46540a917a31a6c8..b31ea0e8553e981fd3404055219f36a5e6582d77 100644 GIT binary patch literal 4286 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 Po^54jXL_IDdg{LbbSN-a delta 501 zcmVlpYZEcm6mGSWK?dt02=;-6)1cjLpm-jE z1`!AmpnpC>92vo1h`@2=Tkya37H*G_J60m(&XfqbV Date: Mon, 3 Jun 2024 19:24:17 +0000 Subject: [PATCH 41/44] Automatic Changelog Update (#417) --- Resources/Changelog/Changelog.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml index 000caf90200..743c0add322 100644 --- a/Resources/Changelog/Changelog.yml +++ b/Resources/Changelog/Changelog.yml @@ -4136,3 +4136,9 @@ Entries: message: Fixed the coat handhole id: 6117 time: '2024-06-02T00:36:59.0000000+00:00' +- author: FoxxoTrystan + changes: + - type: Tweak + message: Floors Looks Updated/Resprited. + id: 6118 + time: '2024-06-03T19:23:51.0000000+00:00' From e6f54f8e809ac7bf5e49f130c52299011be1064c Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Mon, 3 Jun 2024 15:27:04 -0400 Subject: [PATCH 42/44] Update PostMapInitTest.cs --- Content.IntegrationTests/Tests/PostMapInitTest.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Content.IntegrationTests/Tests/PostMapInitTest.cs b/Content.IntegrationTests/Tests/PostMapInitTest.cs index 1fcd7dde730..7b9d9b1f0e5 100644 --- a/Content.IntegrationTests/Tests/PostMapInitTest.cs +++ b/Content.IntegrationTests/Tests/PostMapInitTest.cs @@ -61,7 +61,7 @@ public sealed class PostMapInitTest "Submarine", //DeltaV "Packed", "PackedSM", - "Pillaer", + "Pillar", "Saltern" }; From e3c9073b5af43dfbfccbc2a26a2e7ac038b9ce8d Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Mon, 3 Jun 2024 15:39:17 -0400 Subject: [PATCH 43/44] more fixes --- Resources/Prototypes/Maps/pillar.yml | 2 +- .../Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/gladiator.yml | 2 +- .../Nyanotrasen/Roles/Jobs/Wildcards/martialartist.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/Maps/pillar.yml b/Resources/Prototypes/Maps/pillar.yml index 32fbba6e905..869405260b4 100644 --- a/Resources/Prototypes/Maps/pillar.yml +++ b/Resources/Prototypes/Maps/pillar.yml @@ -6,7 +6,7 @@ maxPlayers: 200 stations: Pillar: - stationProto: StandartNanotrasenStation + stationProto: StandardNanotrasenStation components: - type: StationNameSetup mapNameTemplate: '{0} NSS Pillar {1}' diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/gladiator.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/gladiator.yml index c374cdd9272..498477eb229 100644 --- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/gladiator.yml +++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/gladiator.yml @@ -8,7 +8,7 @@ canBeAntag: false icon: "JobIconGladiator" supervisors: job-supervisors-security - setPreference: false # why does this exist + setPreference: true # whitelistRequired: true requirements: - !type:DepartmentTimeRequirement diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/martialartist.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/martialartist.yml index c33aacf3e07..14c277ff7e5 100644 --- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/martialartist.yml +++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/martialartist.yml @@ -9,7 +9,7 @@ startingGear: MartialArtistGear icon: "JobIconMartialArtist" supervisors: job-supervisors-hop - setPreference: false # why does this exist + setPreference: true # whitelistRequired: true access: - Maintenance From 680fe02895c44203fa47112426c4f7a819af0e6b Mon Sep 17 00:00:00 2001 From: VMSolidus Date: Mon, 3 Jun 2024 15:41:25 -0400 Subject: [PATCH 44/44] Update default.yml --- Resources/Prototypes/Maps/Pools/default.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/Maps/Pools/default.yml b/Resources/Prototypes/Maps/Pools/default.yml index b4b691a43cb..bf952417165 100644 --- a/Resources/Prototypes/Maps/Pools/default.yml +++ b/Resources/Prototypes/Maps/Pools/default.yml @@ -1,10 +1,11 @@ - type: gameMapPool id: DefaultMapPool maps: - - Saltern - - Packed - - PackedSM - - Pillar + - Arena + # - Saltern #Uncomment these 4 when they've had required features added. + # - Packed + # - PackedSM #This one requires special attention as its SM Engine isn't mapped correctly. + # - Pillar - Edge - Hammurabi - Lighthouse