diff --git a/Content.Client/_Impstation/Cosmiccult/CosmicCultSystem.cs b/Content.Client/_Impstation/Cosmiccult/CosmicCultSystem.cs
new file mode 100644
index 00000000000000..5502421ec66bbc
--- /dev/null
+++ b/Content.Client/_Impstation/Cosmiccult/CosmicCultSystem.cs
@@ -0,0 +1,37 @@
+using Content.Shared._Impstation.Cosmiccult.Components;
+using Content.Shared._Impstation.Cosmiccult;
+using Content.Shared.StatusIcon.Components;
+using Robust.Shared.Prototypes;
+
+namespace Content.Client._Impstation.Cosmiccult;
+
+///
+/// Used for the client to get status icons from other revs.
+///
+public sealed class CosmicCultSystem : SharedCosmicCultSystem
+{
+ [Dependency] private readonly IPrototypeManager _prototype = default!;
+
+ public override void Initialize()
+ {
+ base.Initialize();
+
+ SubscribeLocalEvent(GetCosmicCultIcon);
+ SubscribeLocalEvent(GetCosmicCultLeadIcon);
+ }
+
+ private void GetCosmicCultIcon(Entity ent, ref GetStatusIconsEvent args)
+ {
+ if (HasComp(ent))
+ return;
+
+ if (_prototype.TryIndex(ent.Comp.StatusIcon, out var iconPrototype))
+ args.StatusIcons.Add(iconPrototype);
+ }
+
+ private void GetCosmicCultLeadIcon(Entity ent, ref GetStatusIconsEvent args)
+ {
+ if (_prototype.TryIndex(ent.Comp.StatusIcon, out var iconPrototype))
+ args.StatusIcons.Add(iconPrototype);
+ }
+}
diff --git a/Content.Client/_Impstation/Cosmiccult/UI/CosmicDeconvertedEui.cs b/Content.Client/_Impstation/Cosmiccult/UI/CosmicDeconvertedEui.cs
new file mode 100644
index 00000000000000..4f058f3944d305
--- /dev/null
+++ b/Content.Client/_Impstation/Cosmiccult/UI/CosmicDeconvertedEui.cs
@@ -0,0 +1,25 @@
+using Content.Client.Eui;
+
+namespace Content.Client._Impstation.Cosmiccult.UI;
+
+public sealed class CosmicDeconvertedEui : BaseEui
+{
+ private readonly CosmicDeconvertedMenu _menu;
+
+ public CosmicDeconvertedEui()
+ {
+ _menu = new CosmicDeconvertedMenu();
+ }
+
+ public override void Opened()
+ {
+ _menu.OpenCentered();
+ }
+
+ public override void Closed()
+ {
+ base.Closed();
+
+ _menu.Close();
+ }
+}
diff --git a/Content.Client/_Impstation/Cosmiccult/UI/CosmicDeconvertedMenu.xaml b/Content.Client/_Impstation/Cosmiccult/UI/CosmicDeconvertedMenu.xaml
new file mode 100644
index 00000000000000..14b31c1950df19
--- /dev/null
+++ b/Content.Client/_Impstation/Cosmiccult/UI/CosmicDeconvertedMenu.xaml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
diff --git a/Content.Client/_Impstation/Cosmiccult/UI/CosmicDeconvertedMenu.xaml.cs b/Content.Client/_Impstation/Cosmiccult/UI/CosmicDeconvertedMenu.xaml.cs
new file mode 100644
index 00000000000000..5b82370970fa9b
--- /dev/null
+++ b/Content.Client/_Impstation/Cosmiccult/UI/CosmicDeconvertedMenu.xaml.cs
@@ -0,0 +1,16 @@
+using Content.Client.UserInterface.Controls;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client._Impstation.Cosmiccult.UI;
+
+[GenerateTypedNameReferences]
+public sealed partial class CosmicDeconvertedMenu : FancyWindow
+{
+ public CosmicDeconvertedMenu()
+ {
+ RobustXamlLoader.Load(this);
+
+ ConfirmButton.OnPressed += _ => Close();
+ }
+}
diff --git a/Content.Client/_Impstation/Cosmiccult/UI/CosmicMonumentBoundUserInterface.cs b/Content.Client/_Impstation/Cosmiccult/UI/CosmicMonumentBoundUserInterface.cs
new file mode 100644
index 00000000000000..23fd82490c28a1
--- /dev/null
+++ b/Content.Client/_Impstation/Cosmiccult/UI/CosmicMonumentBoundUserInterface.cs
@@ -0,0 +1,37 @@
+using Content.Shared._Impstation.Cosmiccult;
+using JetBrains.Annotations;
+using Robust.Client.UserInterface;
+
+namespace Content.Client._Impstation.Cosmiccult.UI;
+
+[UsedImplicitly]
+public sealed class CosmicMonumentBoundUserInterface : BoundUserInterface
+{
+ private CosmicMonumentWindow? _window;
+
+ public CosmicMonumentBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
+ {
+ }
+
+ protected override void Open()
+ {
+ base.Open();
+
+ _window = this.CreateWindow();
+
+ _window.OnGenerateButtonPressed += () =>
+ {
+ SendMessage(new CosmicMonumentGenerateButtonPressedEvent());
+ };
+ }
+
+ protected override void UpdateState(BoundUserInterfaceState state)
+ {
+ base.UpdateState(state);
+
+ if (state is not CosmicMonumentUserInterfaceState msg)
+ return;
+ _window?.UpdateState(msg);
+ }
+}
+
diff --git a/Content.Client/_Impstation/Cosmiccult/UI/CosmicMonumentWindow.xaml b/Content.Client/_Impstation/Cosmiccult/UI/CosmicMonumentWindow.xaml
new file mode 100644
index 00000000000000..c571b7eadb4d92
--- /dev/null
+++ b/Content.Client/_Impstation/Cosmiccult/UI/CosmicMonumentWindow.xaml
@@ -0,0 +1,51 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Content.Client/_Impstation/Cosmiccult/UI/CosmicMonumentWindow.xaml.cs b/Content.Client/_Impstation/Cosmiccult/UI/CosmicMonumentWindow.xaml.cs
new file mode 100644
index 00000000000000..b4685d06015cfd
--- /dev/null
+++ b/Content.Client/_Impstation/Cosmiccult/UI/CosmicMonumentWindow.xaml.cs
@@ -0,0 +1,79 @@
+using Content.Client.Message;
+using Content.Shared._Impstation.Cosmiccult;
+using Robust.Client.AutoGenerated;
+using Robust.Client.GameObjects;
+using Robust.Client.UserInterface.XAML;
+using Robust.Shared.Timing;
+using FancyWindow = Content.Client.UserInterface.Controls.FancyWindow;
+
+namespace Content.Client._Impstation.Cosmiccult.UI;
+
+[GenerateTypedNameReferences]
+public sealed partial class CosmicMonumentWindow : FancyWindow
+{
+ [Dependency] private readonly IGameTiming _timing = default!;
+
+ private TimeSpan _cooldownEnd = TimeSpan.Zero;
+ private bool _hasEnoughFuel;
+
+ public Action? OnGenerateButtonPressed;
+
+ public CosmicMonumentWindow()
+ {
+ RobustXamlLoader.Load(this);
+ IoCManager.InjectDependencies(this);
+
+ GenerateButton.OnPressed += _ => OnGenerateButtonPressed?.Invoke();
+ }
+
+ public void UpdateState(CosmicMonumentUserInterfaceState state)
+ {
+ _cooldownEnd = state.CooldownEndTime;
+ _hasEnoughFuel = state.FuelCost <= state.FuelAmount;
+
+ var fuelCompletion = Math.Clamp((float) state.FuelAmount / state.FuelCost, 0f, 1f);
+
+ FuelBar.Value = fuelCompletion;
+
+ var charges = state.FuelAmount / state.FuelCost;
+ FuelText.Text = Loc.GetString("cosmic-monument-charges", ("charges", charges));
+
+ UpdateTimer();
+ UpdateReady(); // yes this can trigger twice. no i don't care
+ }
+
+ public void UpdateTimer()
+ {
+ if (_timing.CurTime > _cooldownEnd)
+ {
+ CooldownLabel.SetMarkup(Loc.GetString("cosmic-monument-no-cooldown"));
+ }
+ else
+ {
+ var timeLeft = _cooldownEnd - _timing.CurTime;
+ var timeString = $"{timeLeft.Minutes:0}:{timeLeft.Seconds:00}";
+ CooldownLabel.SetMarkup(Loc.GetString("cosmic-monument-cooldown", ("time", timeString)));
+ UpdateReady();
+ }
+ }
+
+ public void UpdateReady()
+ {
+ var ready = _hasEnoughFuel && _timing.CurTime > _cooldownEnd;
+
+ var msg = ready
+ ? Loc.GetString("cosmic-monument-yes-fire")
+ : Loc.GetString("cosmic-monument-no-fire");
+ ReadyLabel.SetMarkup(msg);
+
+ GenerateButton.Disabled = !ready;
+ }
+
+ protected override void FrameUpdate(FrameEventArgs args)
+ {
+ base.FrameUpdate(args);
+
+ UpdateTimer();
+ }
+}
+
diff --git a/Content.Client/_Impstation/CrewMedal/CrewMedalSystem.cs b/Content.Client/_Impstation/CrewMedal/CrewMedalSystem.cs
new file mode 100644
index 00000000000000..693d04f5cfa85b
--- /dev/null
+++ b/Content.Client/_Impstation/CrewMedal/CrewMedalSystem.cs
@@ -0,0 +1,21 @@
+using Content.Client._Impstation.CrewMedal.UI;
+using Content.Shared._Impstation.CrewMedal;
+
+namespace Content.Client._Impstation.CrewMedal;
+
+public sealed class CrewMedalSystem : SharedCrewMedalSystem
+{
+ [Dependency] private readonly SharedUserInterfaceSystem _uiSystem = default!;
+ public override void Initialize()
+ {
+ base.Initialize();
+ SubscribeLocalEvent(OnCrewMedalAfterState);
+ }
+ private void OnCrewMedalAfterState(Entity ent, ref AfterAutoHandleStateEvent args)
+ {
+ if (!_uiSystem.TryGetOpenUi(ent.Owner, CrewMedalUiKey.Key, out var bui))
+ return;
+
+ bui.Reload();
+ }
+}
diff --git a/Content.Client/_Impstation/CrewMedal/UI/CrewMedalBoundUserInterface.cs b/Content.Client/_Impstation/CrewMedal/UI/CrewMedalBoundUserInterface.cs
new file mode 100644
index 00000000000000..4cbe6f457eb137
--- /dev/null
+++ b/Content.Client/_Impstation/CrewMedal/UI/CrewMedalBoundUserInterface.cs
@@ -0,0 +1,49 @@
+using Content.Shared._Impstation.CrewMedal;
+using Robust.Client.UserInterface;
+
+namespace Content.Client._Impstation.CrewMedal.UI;
+
+///
+/// Initializes a and updates it when new server messages are received.
+///
+public sealed class CrewMedalBoundUserInterface : BoundUserInterface
+{
+ [Dependency] private readonly IEntityManager _entManager = default!;
+
+ [ViewVariables]
+ private CrewMedalWindow? _window;
+
+ public CrewMedalBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey)
+ {
+ IoCManager.InjectDependencies(this);
+ }
+
+ protected override void Open()
+ {
+ base.Open();
+
+ _window = this.CreateWindow();
+
+ _window.OnReasonChanged += OnReasonChanged;
+ Reload();
+ }
+
+ private void OnReasonChanged(string newReason)
+ {
+ if (_entManager.TryGetComponent(Owner, out var component) &&
+ component.Reason.Equals(newReason))
+ return;
+
+ SendPredictedMessage(new CrewMedalReasonChangedMessage(newReason));
+ }
+
+ public void Reload()
+ {
+ if (_window == null || !_entManager.TryGetComponent(Owner, out var component))
+ return;
+
+ _window.SetCurrentReason(component.Reason);
+ _window.SetAwarded(component.Awarded);
+ _window.SetMaxCharacters(component.MaxCharacters);
+ }
+}
diff --git a/Content.Client/_Impstation/CrewMedal/UI/CrewMedalWindow.xaml b/Content.Client/_Impstation/CrewMedal/UI/CrewMedalWindow.xaml
new file mode 100644
index 00000000000000..77e95f393303e6
--- /dev/null
+++ b/Content.Client/_Impstation/CrewMedal/UI/CrewMedalWindow.xaml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Content.Client/_Impstation/CrewMedal/UI/CrewMedalWindow.xaml.cs b/Content.Client/_Impstation/CrewMedal/UI/CrewMedalWindow.xaml.cs
new file mode 100644
index 00000000000000..43713535e68c37
--- /dev/null
+++ b/Content.Client/_Impstation/CrewMedal/UI/CrewMedalWindow.xaml.cs
@@ -0,0 +1,66 @@
+using Robust.Client.UserInterface.CustomControls;
+using Robust.Client.AutoGenerated;
+using Robust.Client.UserInterface.XAML;
+
+namespace Content.Client._Impstation.CrewMedal.UI;
+
+[GenerateTypedNameReferences]
+public sealed partial class CrewMedalWindow : DefaultWindow
+{
+ public event Action? OnReasonChanged;
+
+ ///
+ /// Is the user currently entering text into the control?
+ ///
+ private bool _focused;
+
+ private string _reason = string.Empty;
+ private bool _awarded = false;
+
+ private int _maxCharacters = 50;
+
+ public CrewMedalWindow()
+ {
+ RobustXamlLoader.Load(this);
+
+ ReasonLineEdit.OnTextChanged += _ =>
+ {
+ SaveButton.Disabled = _awarded || ReasonLineEdit.Text.Length > _maxCharacters;
+ CharacterLabel.Text = Loc.GetString("crew-medal-ui-character-limit", ("number", ReasonLineEdit.Text.Length), ("max", _maxCharacters));
+ };
+ ReasonLineEdit.OnFocusEnter += _ => _focused = true;
+ ReasonLineEdit.OnFocusExit += _ => _focused = false;
+
+ SaveButton.OnPressed += _ =>
+ {
+ OnReasonChanged?.Invoke(ReasonLineEdit.Text);
+ SaveButton.Disabled = true;
+ };
+
+ CharacterLabel.Text = Loc.GetString("crew-medal-ui-character-limit", ("number", ReasonLineEdit.Text.Length), ("max", _maxCharacters));
+ }
+
+ public void SetCurrentReason(string reason)
+ {
+ if (_reason == reason)
+ return;
+
+ _reason = reason;
+ if (!_focused)
+ ReasonLineEdit.Text = reason;
+ }
+
+ public void SetAwarded(bool awarded)
+ {
+ _awarded = awarded;
+ ReasonLineEdit.Editable = !awarded;
+ SaveButton.Disabled = _awarded;
+ }
+
+ public void SetMaxCharacters(int number)
+ {
+ _maxCharacters = number;
+ if (ReasonLineEdit.Text.Length > number)
+ ReasonLineEdit.Text = ReasonLineEdit.Text[..number];
+ }
+}
diff --git a/Content.Client/_Impstation/Gravity/IsInZeroGravityAreaComponent.cs b/Content.Client/_Impstation/Gravity/IsInZeroGravityAreaComponent.cs
new file mode 100644
index 00000000000000..1984c64f1c19b9
--- /dev/null
+++ b/Content.Client/_Impstation/Gravity/IsInZeroGravityAreaComponent.cs
@@ -0,0 +1,13 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Client._Impstation.Gravity;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class IsInZeroGravityAreaComponent : Component
+{
+ public bool IsWeightless => AreaFingerprint != 0;
+
+ ///
+ [DataField, ViewVariables(VVAccess.ReadOnly)]
+ public ulong AreaFingerprint = 0;
+}
diff --git a/Content.Client/_Impstation/Gravity/ZeroGravityAreaSystem.cs b/Content.Client/_Impstation/Gravity/ZeroGravityAreaSystem.cs
new file mode 100644
index 00000000000000..d73939fcbefa54
--- /dev/null
+++ b/Content.Client/_Impstation/Gravity/ZeroGravityAreaSystem.cs
@@ -0,0 +1,125 @@
+using Content.Client._Impstation.Gravity;
+using Content.Shared._Impstation.Gravity;
+using Content.Shared.Clothing;
+using Content.Shared.Gravity;
+using Robust.Shared.GameStates;
+using Robust.Shared.Physics;
+using Robust.Shared.Physics.Components;
+using Robust.Shared.Physics.Events;
+
+namespace Content.Client.Gravity;
+
+public sealed partial class ZeroGravityAreaSystem : SharedZeroGravityAreaSystem
+{
+ public override void Initialize()
+ {
+ base.Initialize();
+
+ SubscribeLocalEvent(OnCheckWeightless, after: [typeof(SharedMagbootsSystem)]);
+ SubscribeLocalEvent(OnHandleEntityState);
+ SubscribeLocalEvent(OnStartCollide);
+ SubscribeLocalEvent(OnEndCollide);
+ }
+
+ private void StartAffecting(Entity area, Entity entity)
+ {
+ UpdateFingerprint(area.Comp, entity.Comp);
+ area.Comp.AffectedEntities.Add(GetNetEntity(entity));
+ Dirty(area);
+ Dirty(entity);
+ }
+
+ private void StopAffecting(Entity area, Entity entity)
+ {
+ entity.Comp.AreaFingerprint &= ~(1ul << area.Comp.PredictIndex);
+ area.Comp.AffectedEntities.Add(GetNetEntity(entity));
+ Dirty(area);
+ Dirty(entity);
+ }
+
+ private void UpdateFingerprint(ZeroGravityAreaComponent area, IsInZeroGravityAreaComponent entity)
+ {
+ if (area.Enabled)
+ entity.AreaFingerprint |= 1ul << area.PredictIndex;
+ else
+ entity.AreaFingerprint &= ~(1ul << area.PredictIndex);
+ }
+
+ public void DirtyAffected(EntityUid uid, ZeroGravityAreaComponent? comp = null)
+ {
+ if (!Resolve(uid, ref comp))
+ return;
+
+ foreach (var netEnt in comp.AffectedEntities)
+ {
+ if (!TryGetEntity(netEnt, out var ent))
+ continue;
+
+ if (!TryComp(ent, out var antiGrav))
+ continue;
+
+ UpdateFingerprint(comp, antiGrav);
+ Dirty(ent.Value, antiGrav);
+ }
+ }
+
+ public override void SetEnabled(EntityUid uid, bool enabled, ZeroGravityAreaComponent? comp = null)
+ {
+ if (!Resolve(uid, ref comp))
+ return;
+
+ if (enabled == comp.Enabled)
+ return;
+
+ comp.Enabled = enabled;
+ Dirty(uid, comp);
+ DirtyAffected(uid, comp);
+ }
+
+ private void OnHandleEntityState(EntityUid uid, IsInZeroGravityAreaComponent comp, ComponentHandleState args)
+ {
+ if (args.Current is not IsInZeroGravityAreaState state)
+ return;
+
+ comp.AreaFingerprint = state.AreaFingerprint;
+ }
+
+ private void OnStartCollide(EntityUid uid, ZeroGravityAreaComponent comp, StartCollideEvent args)
+ {
+ var other = args.OtherEntity;
+
+ if (args.OurFixtureId != comp.Fixture)
+ return;
+
+ if (!TryComp(other, out var physics))
+ return;
+
+ if (!physics.Predict || (physics.BodyType & (BodyType.Static | BodyType.Kinematic)) != 0)
+ return;
+
+ var antiGrav = EnsureComp(other);
+ StartAffecting((uid, comp), (other, antiGrav));
+ }
+
+ private void OnEndCollide(EntityUid uid, ZeroGravityAreaComponent comp, EndCollideEvent args)
+ {
+ var other = args.OtherEntity;
+
+ if (args.OurFixtureId != comp.Fixture)
+ return;
+
+ if (!TryComp(other, out var antiGrav))
+ return;
+
+ StopAffecting((uid, comp), (other, antiGrav));
+ }
+
+ private void OnCheckWeightless(EntityUid uid, IsInZeroGravityAreaComponent comp, ref IsWeightlessEvent args)
+ {
+ if (args.Handled)
+ return;
+
+ args.IsWeightless = comp.AreaFingerprint != 0;
+ args.Handled = args.IsWeightless;
+ }
+}
diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs
index 58852fb687a2c2..801715d6d9faba 100644
--- a/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs
+++ b/Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs
@@ -1,6 +1,7 @@
using Content.Server.Administration.Commands;
using Content.Server.Antag;
using Content.Server.GameTicking.Rules.Components;
+using Content.Server._Impstation.Cosmiccult.Components;
using Content.Server.Zombies;
using Content.Shared.Administration;
using Content.Shared.Database;
@@ -180,5 +181,20 @@ private void AddAntagVerbs(GetVerbsEvent args)
Message = Loc.GetString("admin-verb-make-heretic"),
};
args.Verbs.Add(heretic);
+
+ // IMPSTATION - COSMIC CULTISTS
+ Verb cosmiccult = new()
+ {
+ Text = Loc.GetString("admin-verb-text-make-cosmiccultist"),
+ Category = VerbCategory.Antag,
+ Icon = new SpriteSpecifier.Rsi(new("/Textures/_Impstation/CosmicCult/Icons/antag_icons.rsi"), "CosmicCult"),
+ Act = () =>
+ {
+ _antag.ForceMakeAntag(targetPlayer, "CosmicCult");
+ },
+ Impact = LogImpact.High,
+ Message = Loc.GetString("admin-verb-make-cosmiccultist"),
+ };
+ args.Verbs.Add(cosmiccult);
}
}
diff --git a/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs b/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs
index f48ca168671003..b053a8601405fc 100644
--- a/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs
+++ b/Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs
@@ -782,7 +782,7 @@ private void AddTricksVerbs(GetVerbsEvent args)
{
Text = "Add Random Mood",
Category = VerbCategory.Tricks,
- // TODO: Icon
+ Icon = new SpriteSpecifier.Rsi(new ResPath("Interface/Actions/actions_borg.rsi"), "state-laws"),
Act = () =>
{
_moods.TryAddRandomMood(args.Target);
@@ -793,6 +793,24 @@ private void AddTricksVerbs(GetVerbsEvent args)
};
args.Verbs.Add(addRandomMood);
}
+ else
+ {
+ Verb giveMoods = new()
+ {
+ Text = "Give Moods",
+ Category = VerbCategory.Tricks,
+ Icon = new SpriteSpecifier.Rsi(new ResPath("Interface/Actions/actions_borg.rsi"), "state-laws"),
+ Act = () =>
+ {
+ if (!EntityManager.EnsureComponent(args.Target, out moods))
+ _moods.NotifyMoodChange(args.Target);
+ },
+ Impact = LogImpact.High,
+ Message = Loc.GetString("admin-trick-give-moods-description"),
+ Priority = (int) TricksVerbPriorities.AddRandomMood,
+ };
+ args.Verbs.Add(giveMoods);
+ }
}
private void RefillEquippedTanks(EntityUid target, Gas gasType)
diff --git a/Content.Server/Medical/DefibrillatorSystem.cs b/Content.Server/Medical/DefibrillatorSystem.cs
index f1b519e876b050..2f3cc207753ee4 100644
--- a/Content.Server/Medical/DefibrillatorSystem.cs
+++ b/Content.Server/Medical/DefibrillatorSystem.cs
@@ -127,14 +127,8 @@ public bool TryStartZap(EntityUid uid, EntityUid target, EntityUid user, Defibri
});
}
- public void Zap(EntityUid uid,
- EntityUid target,
- EntityUid user,
- DefibrillatorComponent? component = null,
- MobStateComponent? mob = null,
- MobThresholdsComponent? thresholds = null)
+ public void Zap(EntityUid uid, EntityUid target, EntityUid user, DefibrillatorComponent? component = null, MobStateComponent? mob = null, MobThresholdsComponent? thresholds = null)
{
- var revive = true;
if (!Resolve(uid, ref component) || !Resolve(target, ref mob, ref thresholds, false))
return;
@@ -167,37 +161,33 @@ public void Zap(EntityUid uid,
Loc.GetString("defibrillator-rotten"),
InGameICChatType.Speak,
true);
- revive = false;
+ return;
}
- if (HasComp(target) && revive)
+ if (HasComp(target))
{
_chatManager.TrySendInGameICMessage(uid,
Loc.GetString("defibrillator-unrevivable"),
InGameICChatType.Speak,
true);
- revive = false;
+ return;
}
- if (revive && HasComp(target))
+ if (HasComp(target))
{
var dnrComponent = Comp(target);
- if (dnrComponent.Chance > _random.NextDouble())
+ if (dnrComponent.Chance < _random.NextDouble())
{
- _chatManager.TrySendInGameICMessage(uid,
- Loc.GetString("defibrillator-unrevivable"),
- InGameICChatType.Speak,
- true);
-
- dnrComponent.Chance = 0.0f;
- revive = false;
+ _chatManager.TrySendInGameICMessage(uid, Loc.GetString("defibrillator-unrevivable"), InGameICChatType.Speak, true);
+ dnrComponent.Chance = 0f;
+ AddComp(target);
+ return;
+ }
+ else
+ {
+ dnrComponent.Chance -= 0.1f;
}
- }
-
- if (!revive)
- {
- return;
}
if (_mobState.IsDead(target, mob))
diff --git a/Content.Server/Roles/RoleSystem.cs b/Content.Server/Roles/RoleSystem.cs
index 7f2fbd0f7fbaf9..78a7c63d3210f1 100644
--- a/Content.Server/Roles/RoleSystem.cs
+++ b/Content.Server/Roles/RoleSystem.cs
@@ -6,10 +6,6 @@ namespace Content.Server.Roles;
public sealed class RoleSystem : SharedRoleSystem
{
- // Gotta fix these three by figuring out how the role system works and adding them...
- // SubscribeAntagEvents(); // goobstation - changelings
- // SubscribeAntagEvents(); // goobstation - heretics
- // SubscribeAntagEvents(); // heretics
public string? MindGetBriefing(EntityUid? mindId)
{
if (mindId == null)
diff --git a/Content.Server/_Impstation/Cosmiccult/Components/CosmicCommandStaffComponent.cs b/Content.Server/_Impstation/Cosmiccult/Components/CosmicCommandStaffComponent.cs
new file mode 100644
index 00000000000000..63d2ed7d183210
--- /dev/null
+++ b/Content.Server/_Impstation/Cosmiccult/Components/CosmicCommandStaffComponent.cs
@@ -0,0 +1,12 @@
+namespace Content.Server._Impstation.Cosmiccult.Components;
+
+///
+/// Given to heads at round start. Used for assigning traitors to kill heads and for revs to check if the heads died or not.
+///
+[RegisterComponent]
+public sealed partial class CosmicCommandStaffComponent : Component
+{
+
+}
+
+//TODO this should probably be on a mind role, not the mob
diff --git a/Content.Server/_Impstation/Cosmiccult/Components/CosmicCultRuleComponent.cs b/Content.Server/_Impstation/Cosmiccult/Components/CosmicCultRuleComponent.cs
new file mode 100644
index 00000000000000..4cc08a143864e5
--- /dev/null
+++ b/Content.Server/_Impstation/Cosmiccult/Components/CosmicCultRuleComponent.cs
@@ -0,0 +1,32 @@
+using Content.Shared.Roles;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom;
+
+namespace Content.Server._Impstation.Cosmiccult.Components;
+
+///
+/// Component for the CosmicCultRuleSystem that stores info about winning/losing, player counts required for starting, as well as prototypes for Revolutionaries and their gear.
+///
+[RegisterComponent, Access(typeof(CosmicCultRuleSystem))]
+public sealed partial class CosmicCultRuleComponent : Component
+{
+ ///
+ /// When the round will if all the command are dead (Incase they are in space)
+ ///
+ [DataField(customTypeSerializer: typeof(TimeOffsetSerializer))]
+ public TimeSpan CommandCheck;
+
+ ///
+ /// The amount of time between each check for command check.
+ ///
+ [DataField]
+ public TimeSpan TimerWait = TimeSpan.FromSeconds(20);
+
+ ///
+ /// The time it takes after the last head is killed for the shuttle to arrive.
+ ///
+ [DataField, ViewVariables(VVAccess.ReadWrite)]
+ public TimeSpan ShuttleCallTime = TimeSpan.FromMinutes(5);
+}
+
+// CosmicCultRuleComponent
diff --git a/Content.Server/_Impstation/Cosmiccult/Components/CosmicEntropyConditionComponent.cs b/Content.Server/_Impstation/Cosmiccult/Components/CosmicEntropyConditionComponent.cs
new file mode 100644
index 00000000000000..31942fb4a2b1d3
--- /dev/null
+++ b/Content.Server/_Impstation/Cosmiccult/Components/CosmicEntropyConditionComponent.cs
@@ -0,0 +1,11 @@
+using Content.Server._Impstation.Cosmiccult;
+using Content.Server.Objectives.Systems;
+
+namespace Content.Server.Objectives.Components;
+
+[RegisterComponent]
+public sealed partial class CosmicEntropyConditionComponent : Component
+{
+ [DataField] public int Siphoned = 0;
+ [DataField] public bool Complete = false;
+}
diff --git a/Content.Server/_Impstation/Cosmiccult/Components/CosmicEntropyMoteComponent.cs b/Content.Server/_Impstation/Cosmiccult/Components/CosmicEntropyMoteComponent.cs
new file mode 100644
index 00000000000000..049817d63891c2
--- /dev/null
+++ b/Content.Server/_Impstation/Cosmiccult/Components/CosmicEntropyMoteComponent.cs
@@ -0,0 +1,8 @@
+namespace Content.Server._Impstation.Cosmiccult.Components;
+[RegisterComponent]
+
+public sealed partial class CosmicEntropyMoteComponent : Component
+{
+ [DataField("entropy"), ViewVariables(VVAccess.ReadWrite)]
+ public int Entropy = 1;
+}
diff --git a/Content.Server/_Impstation/Cosmiccult/Components/CosmicMonumentComponent.cs b/Content.Server/_Impstation/Cosmiccult/Components/CosmicMonumentComponent.cs
new file mode 100644
index 00000000000000..abe79ef5f715bf
--- /dev/null
+++ b/Content.Server/_Impstation/Cosmiccult/Components/CosmicMonumentComponent.cs
@@ -0,0 +1,12 @@
+using Content.Server._Impstation.Cosmiccult.EntitySystems;
+
+namespace Content.Server._Impstation.Cosmiccult.Components;
+
+[RegisterComponent, Access(typeof(CosmicMonumentSystem))]
+public sealed partial class CosmicMonumentComponent : Component
+{
+ [DataField] public bool Spent = false;
+
+
+ [NonSerialized] public static int LayerMask = 777;
+}
diff --git a/Content.Server/_Impstation/Cosmiccult/Components/CosmicTestComponent.cs b/Content.Server/_Impstation/Cosmiccult/Components/CosmicTestComponent.cs
new file mode 100644
index 00000000000000..ff8255b2f66188
--- /dev/null
+++ b/Content.Server/_Impstation/Cosmiccult/Components/CosmicTestComponent.cs
@@ -0,0 +1,9 @@
+namespace Content.Server._Impstation.Cosmiccult.Components;
+
+[RegisterComponent]
+public sealed partial class CosmicTestComponent : Component
+{
+ public float UpdateTimer = 0f;
+ [DataField] public float UpdateDelay = 1.5f;
+ [DataField] public float Range = 7f;
+}
diff --git a/Content.Server/_Impstation/Cosmiccult/CosmicCultObjectiveSystem.cs b/Content.Server/_Impstation/Cosmiccult/CosmicCultObjectiveSystem.cs
new file mode 100644
index 00000000000000..4136b5c1750e8f
--- /dev/null
+++ b/Content.Server/_Impstation/Cosmiccult/CosmicCultObjectiveSystem.cs
@@ -0,0 +1,24 @@
+using Content.Server.Objectives.Components;
+using Content.Shared.Objectives.Components;
+
+namespace Content.Server.Objectives.Systems;
+
+public sealed partial class CosmicCultObjectiveSystem : EntitySystem
+{
+ // [Dependency] private readonly NumberObjectiveSystem _number = default!;
+
+ // public override void Initialize()
+ // {
+ // base.Initialize();
+
+ // SubscribeLocalEvent(OnSiphonProgress);
+ // }
+
+ // private void OnSiphonProgress(EntityUid uid, CosmicEntropyConditionComponent comp, ref ObjectiveGetProgressEvent args)
+ // {
+ // var target = _number.GetTarget(uid);
+ // if (target != 0)
+ // args.Progress = MathF.Min(comp.Siphoned / target, 1f);
+ // else args.Progress = 1f;
+ // }
+}
diff --git a/Content.Server/_Impstation/Cosmiccult/CosmicCultRecruitingConditionSystem.cs b/Content.Server/_Impstation/Cosmiccult/CosmicCultRecruitingConditionSystem.cs
new file mode 100644
index 00000000000000..adef67cefbd9f0
--- /dev/null
+++ b/Content.Server/_Impstation/Cosmiccult/CosmicCultRecruitingConditionSystem.cs
@@ -0,0 +1,30 @@
+using Content.Server.Objectives.Components;
+using Content.Shared.Objectives.Components;
+
+namespace Content.Server.Objectives.Systems;
+
+public sealed class CosmicCultRecruitingConditionSystem : EntitySystem
+{
+ [Dependency] private readonly NumberObjectiveSystem _number = default!;
+
+ public override void Initialize()
+ {
+ base.Initialize();
+
+ SubscribeLocalEvent(OnGetProgress);
+ }
+
+ private void OnGetProgress(Entity ent, ref ObjectiveGetProgressEvent args)
+ {
+ args.Progress = Progress(ent.Comp.Siphoned, _number.GetTarget(ent.Owner));
+ }
+
+ private float Progress(int recruited, int target)
+ {
+ // prevent divide-by-zero
+ if (target == 0)
+ return 1f;
+
+ return MathF.Min(recruited / (float) target, 1f);
+ }
+}
diff --git a/Content.Server/_Impstation/Cosmiccult/CosmicCultRoleComponent.cs b/Content.Server/_Impstation/Cosmiccult/CosmicCultRoleComponent.cs
new file mode 100644
index 00000000000000..501ea23129f31d
--- /dev/null
+++ b/Content.Server/_Impstation/Cosmiccult/CosmicCultRoleComponent.cs
@@ -0,0 +1,16 @@
+using Content.Shared.Roles;
+
+namespace Content.Server.Roles;
+
+///
+/// Added to mind role entities to tag that they are using the cosmic cult systems.
+///
+[RegisterComponent]
+public sealed partial class CosmicCultRoleComponent : BaseMindRoleComponent
+{
+ ///
+ /// For cult leads, how many people you have converted.
+ ///
+ [DataField, ViewVariables(VVAccess.ReadWrite)]
+ public uint ConvertedCount = 0;
+}
diff --git a/Content.Server/_Impstation/Cosmiccult/CosmicCultRuleSystem.cs b/Content.Server/_Impstation/Cosmiccult/CosmicCultRuleSystem.cs
new file mode 100644
index 00000000000000..f38488aa365475
--- /dev/null
+++ b/Content.Server/_Impstation/Cosmiccult/CosmicCultRuleSystem.cs
@@ -0,0 +1,229 @@
+using Content.Server.Administration.Logs;
+using Content.Server.Antag;
+using Content.Server.EUI;
+using Content.Server.Flash;
+using Content.Server.Mind;
+using Content.Server.Popups;
+using Content.Server.GameTicking.Rules;
+using Content.Server.GameTicking;
+using Content.Server._Impstation.Cosmiccult;
+using Content.Server._Impstation.Cosmiccult.Components;
+using Content.Server.Roles;
+using Content.Server.Objectives;
+using Content.Server.Objectives.Components;
+using Content.Server.RoundEnd;
+using Content.Server.Shuttles.Systems;
+using Content.Server.Station.Systems;
+using Content.Shared.Database;
+using Content.Shared.GameTicking.Components;
+using Content.Shared.Humanoid;
+using Content.Shared.IdentityManagement;
+using Content.Shared.Mind.Components;
+using Content.Shared.Mindshield.Components;
+using Content.Shared.Mobs;
+using Content.Shared.Mobs.Components;
+using Content.Shared.Mobs.Systems;
+using Content.Shared.NPC.Prototypes;
+using Content.Shared.NPC.Systems;
+using Content.Shared._Impstation.Cosmiccult.Components;
+using Content.Shared._Impstation.Cosmiccult;
+using Content.Shared.Stunnable;
+using Content.Shared.Zombies;
+using Content.Shared.Roles;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Timing;
+using Robust.Shared.Audio;
+using Content.Shared.Cuffs.Components;
+using Content.Server.Radio.Components;
+using Content.Shared.Heretic;
+
+namespace Content.Server._Impstation.Cosmiccult;
+
+///
+/// Where all the main stuff for Cosmic Cultists happens.
+///
+public sealed class CosmicCultRuleSystem : GameRuleSystem
+{
+ [Dependency] private readonly IAdminLogManager _adminLogManager = default!;
+ [Dependency] private readonly AntagSelectionSystem _antag = default!;
+ [Dependency] private readonly SharedRoleSystem _role = default!;
+ [Dependency] private readonly NpcFactionSystem _npcFaction = default!;
+ [Dependency] private readonly ObjectivesSystem _objective = default!;
+ [Dependency] private readonly EmergencyShuttleSystem _emergencyShuttle = default!;
+ [Dependency] private readonly EuiManager _euiMan = default!;
+ [Dependency] private readonly MindSystem _mind = default!;
+ [Dependency] private readonly MobStateSystem _mobState = default!;
+ [Dependency] private readonly PopupSystem _popup = default!;
+ [Dependency] private readonly SharedStunSystem _stun = default!;
+ [Dependency] private readonly RoundEndSystem _roundEnd = default!;
+ [Dependency] private readonly StationSystem _stationSystem = default!;
+ [Dependency] private readonly IGameTiming _timing = default!;
+
+ public readonly ProtoId CosmicCultFactionId = "CosmicCultFaction";
+ public readonly ProtoId CosmicCultPrototypeId = "CosmicCult";
+ public readonly ProtoId NanotrasenFactionId = "NanoTrasen";
+ public readonly SoundSpecifier BriefingSound = new SoundPathSpecifier("/Audio/_Impstation/CosmicCult/antag_cosmic_briefing.ogg");
+ public override void Initialize()
+ {
+ base.Initialize();
+
+ SubscribeLocalEvent(OnAntagSelect);
+ SubscribeLocalEvent(OnPostFlash);
+
+ }
+
+ /// FRANKENSTEINED HERETIC CODE FOR BRIEFING FRANKENSTEINED HERETIC CODE FOR BRIEFING FRANKENSTEINED HERETIC CODE FOR BRIEFING
+ private void OnAntagSelect(Entity ent, ref AfterAntagEntitySelectedEvent args)
+ {
+ TryStartCult(args.EntityUid, ent.Comp);
+ }
+
+ public bool TryStartCult(EntityUid target, CosmicCultRuleComponent rule)
+ {
+ if (!_mind.TryGetMind(target, out var mindId, out var mind))
+ return false;
+
+ // briefing
+ if (TryComp(target, out var metaData))
+ {
+ var briefingShort = Loc.GetString("objective-cosmiccult-charactermenu", ("name", metaData?.EntityName ?? "Unknown"));
+
+ _antag.SendBriefing(target, Loc.GetString("cosmiccult-role-roundstart-fluff"), Color.FromHex("#4cabb3"), BriefingSound);
+ _antag.SendBriefing(target, Loc.GetString("cosmiccult-role-short-briefing"), Color.FromHex("#cae8e8"), null);
+
+ if (_role.MindHasRole(mindId, out var rbc))
+ {
+ EnsureComp(rbc.Value.Owner);
+ Comp(rbc.Value.Owner).Briefing = briefingShort;
+ }
+ else
+ _role.MindAddRole(mindId, "MindRoleCosmicCult", mind, true);
+ }
+
+ _npcFaction.RemoveFaction(target, NanotrasenFactionId, false);
+ _npcFaction.AddFaction(target, CosmicCultFactionId);
+
+ EnsureComp(target);
+ var reciever = EnsureComp(target);
+ var transmitter = EnsureComp(target);
+ var radio = EnsureComp(target);
+ radio.Channels = new() { "CosmicRadio" };
+ transmitter.Channels = new() { "CosmicRadio" };
+
+ return true;
+ }
+ /// FRANKENSTEINED HERETIC CODE FOR BRIEFING FRANKENSTEINED HERETIC CODE FOR BRIEFING FRANKENSTEINED HERETIC CODE FOR BRIEFING
+
+ ///
+ /// Called when a Cosmic Cult Lead uses a flash in melee to convert somebody else.
+ ///
+ private void OnPostFlash(EntityUid uid, CosmicCultLeadComponent comp, ref AfterFlashedEvent ev)
+ {
+ var alwaysConvertible = HasComp(ev.Target);
+
+ if (!_mind.TryGetMind(ev.Target, out var mindId, out var mind) && !alwaysConvertible)
+ return;
+
+ if (HasComp(ev.Target) ||
+ HasComp(ev.Target) ||
+ HasComp(ev.Target) || ///LET'S MAKE SURE TO CATCH HERETICS SO WE CAN'T CONVERT THESE
+ !HasComp(ev.Target) &&
+ !alwaysConvertible ||
+ !_mobState.IsAlive(ev.Target) ||
+ HasComp(ev.Target))
+ {
+ return;
+ }
+
+ _npcFaction.AddFaction(ev.Target, CosmicCultFactionId);
+ var cosmiccultComp = EnsureComp(ev.Target);
+
+ if (ev.User != null)
+ {
+ _adminLogManager.Add(LogType.Mind,
+ LogImpact.Medium,
+ $"{ToPrettyString(ev.User.Value)} converted {ToPrettyString(ev.Target)} into a Cosmic Cultist!");
+
+ if (_mind.TryGetMind(ev.User.Value, out var cosmiccultMindId, out _))
+ {
+ if (_role.MindHasRole(cosmiccultMindId, out var role))
+ role.Value.Comp2.ConvertedCount++;
+ }
+ }
+
+ if (mindId == default || !_role.MindHasRole(mindId))
+ {
+ _role.MindAddRole(mindId, "MindRoleCosmicCult", mind, true);
+ }
+
+ if (mind?.Session != null)
+ {
+ _antag.SendBriefing(mind.Session, Loc.GetString("cosmiccult-role-conversion-fluff"), Color.FromHex("#4cabb3"), BriefingSound);
+ _antag.SendBriefing(mind.Session, Loc.GetString("cosmiccult-role-short-briefing"), Color.FromHex("#cae8e8"), null);
+ // EnsureComp(ev.Target);
+ // Comp(ev.Target).Briefing = Loc.GetString("objective-cosmiccult-description", ("name", mind.CharacterName ?? "Unknown"));
+ }
+
+ }
+
+
+
+ ///
+ /// Checks if all the Head Revs are dead and if so will deconvert all regular revs.
+ ///
+ // private bool CheckRevsLose()
+ // {
+ // var stunTime = TimeSpan.FromSeconds(4);
+ // var headRevList = new List();
+
+ // var headRevs = AllEntityQuery();
+ // while (headRevs.MoveNext(out var uid, out _, out _))
+ // {
+ // headRevList.Add(uid);
+ // }
+
+ // // If no Head Revs are alive all normal Revs will lose their Rev status and rejoin Nanotrasen
+ // // Cuffing Head Revs is not enough - they must be killed.
+ // if (IsGroupDetainedOrDead(headRevList, false, false))
+ // {
+ // var rev = AllEntityQuery();
+ // while (rev.MoveNext(out var uid, out _, out var mc))
+ // {
+ // if (HasComp(uid))
+ // continue;
+
+ // _npcFaction.RemoveFaction(uid, CosmicCultFactionId);
+ // _stun.TryParalyze(uid, stunTime, true);
+ // RemCompDeferred(uid);
+ // _popup.PopupEntity(Loc.GetString("rev-break-control", ("name", Identity.Entity(uid, EntityManager))), uid);
+ // _adminLogManager.Add(LogType.Mind, LogImpact.Medium, $"{ToPrettyString(uid)} was deconverted due to all Head Revolutionaries dying.");
+
+ // if (!_mind.TryGetMind(uid, out var mindId, out _, mc))
+ // continue;
+
+ // // remove their antag role
+ // _role.MindTryRemoveRole(mindId);
+
+ // // make it very obvious to the rev they've been deconverted since
+ // // they may not see the popup due to antag and/or new player tunnel vision
+ // if (_mind.TryGetSession(mindId, out var session))
+ // _euiMan.OpenEui(new DeconvertedEui(), session);
+ // }
+ // return true;
+ // }
+
+ // return false;
+ // }
+
+ private static readonly string[] Outcomes =
+ {
+ // revs survived and heads survived... how
+ "rev-reverse-stalemate",
+ // revs won and heads died
+ "rev-won",
+ // revs lost and heads survived
+ "rev-lost",
+ // revs lost and heads died
+ "rev-stalemate"
+ };
+}
diff --git a/Content.Server/_Impstation/Cosmiccult/CosmicCultSystem.Abilities.cs b/Content.Server/_Impstation/Cosmiccult/CosmicCultSystem.Abilities.cs
new file mode 100644
index 00000000000000..baad70aeea8556
--- /dev/null
+++ b/Content.Server/_Impstation/Cosmiccult/CosmicCultSystem.Abilities.cs
@@ -0,0 +1,238 @@
+using Content.Shared.DoAfter;
+using Content.Shared.Damage;
+using Robust.Shared.Prototypes;
+using Content.Shared._Impstation.Cosmiccult.Components;
+using Content.Shared._Impstation.Cosmiccult;
+using Content.Shared.Actions;
+using Content.Shared.IdentityManagement;
+using Content.Shared.Mind;
+using Content.Shared.Maps;
+using Content.Shared.Physics;
+using Content.Shared.Spawning;
+using Content.Server.Objectives.Components;
+using Content.Server.Destructible.Thresholds.Triggers;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Content.Server.Polymorph.Systems;
+using Robust.Shared.Map.Components;
+using Robust.Shared.Map;
+using System.Numerics;
+using Robust.Shared.Network;
+using Content.Shared.Coordinates;
+using Content.Server.Station.Systems;
+using Content.Server.Station.Components;
+
+namespace Content.Server._Impstation.Cosmiccult;
+
+public sealed partial class CosmicCultSystem : EntitySystem
+{
+ [Dependency] private readonly SharedDoAfterSystem _doAfter = default!;
+ [Dependency] private readonly DamageableSystem _damageable = default!;
+ [Dependency] private readonly SharedMindSystem _mind = default!;
+ [Dependency] private readonly PolymorphSystem _polymorphSystem = default!;
+ [Dependency] private readonly SharedTransformSystem _transform = default!;
+ [Dependency] private readonly EntityLookupSystem _entLookup = default!;
+ [Dependency] private readonly IEntityManager _entMan = default!;
+ [Dependency] private readonly ITileDefinitionManager _tileDef = default!;
+ [Dependency] private readonly INetManager _net = default!;
+ [Dependency] private readonly SharedMapSystem _map = default!;
+ [Dependency] private readonly StationSystem _station = default!;
+
+ private const int SpaceDistance = 3;
+ public void SubscribeAbilities()
+ {
+ SubscribeLocalEvent(OnCosmicToolToggle);
+ SubscribeLocalEvent(OnCosmicSiphon);
+ SubscribeLocalEvent(OnCosmicSiphonDoAfter);
+ SubscribeLocalEvent(OnCosmicBlank);
+ SubscribeLocalEvent(OnCosmicPlaceMonument);
+ SubscribeLocalEvent(OnCosmicLapse);
+ ///SubscribeLocalEvent(OnCosmicGlare);
+ ///SubscribeLocalEvent(OnCosmicGearDash);
+ ///SubscribeLocalEvent(OnCosmicGearRecall);
+ }
+
+ ///
+ /// A 'lil catch-all thing to double check.. stuff. Called by multiple abilities.
+ ///
+ public bool TryUseAbility(EntityUid uid, CosmicCultComponent comp, BaseActionEvent action)
+ {
+ if (action.Handled)
+ return false;
+
+ if (!TryComp(action.Action, out var cultAction))
+ return false;
+
+ action.Handled = true;
+ return true;
+ }
+
+ ///
+ /// Called when someone clicks on a target using the cosmic siphon ability.
+ ///
+ private void OnCosmicSiphon(EntityUid uid, CosmicCultComponent comp, ref EventCosmicSiphon args)
+ {
+ var target = args.Target;
+
+ if (!TryUseAbility(uid, comp, args))
+ return;
+
+ var doargs = new DoAfterArgs(EntityManager, uid, comp.CosmicSiphonDuration, new EventCosmicSiphonDoAfter(), uid, target)
+ {
+ DistanceThreshold = 1.5f,
+ Hidden = true,
+ BreakOnDamage = true,
+ BreakOnMove = true,
+ BreakOnDropItem = true,
+ };
+ _doAfter.TryStartDoAfter(doargs);
+ }
+
+
+
+ ///
+ /// Called when CosmicSiphon's DoAfter completes.
+ ///
+ private void OnCosmicSiphonDoAfter(EntityUid uid, CosmicCultComponent comp, EventCosmicSiphonDoAfter args)
+ {
+ if (args.Args.Target == null)
+ return;
+
+ var target = args.Args.Target.Value;
+ if (args.Cancelled || args.Handled)
+ return;
+
+ args.Handled = true;
+ _damageable.TryChangeDamage(args.Target, comp.CosmicSiphonDamage, origin: uid);
+ _popup.PopupEntity(Loc.GetString("cosmicability-siphon-success", ("target", Identity.Entity(target, EntityManager))), uid, uid);
+
+ var entropymote1 = SpawnAtPosition(comp.CosmicSiphonResult, Transform(uid).Coordinates);
+ _hands.TryForcePickupAnyHand(uid, entropymote1);
+
+ // increment the greentext tracker and then set our tracker to what the greentext's tracker currently is
+ IncrementCultObjectiveEntropy();
+ if (_mind.TryGetObjectiveComp(uid, out var obj))
+ obj.Siphoned = ObjectiveEntropyTracker;
+ }
+
+
+
+ ///
+ /// Called when someone uses the Beckon Compass ability.
+ ///
+ private void OnCosmicToolToggle(EntityUid uid, CosmicCultComponent comp, ref EventCosmicToolToggle args)
+ {
+
+ if (!TryUseAbility(uid, comp, args))
+ return;
+
+ if (!TryToggleCosmicTool(uid, CultToolPrototype, comp))
+ return;
+ }
+
+ ///
+ /// Called by the Beckon Compass ability's OnCosmicToolToggle. Why are we nesting it like this? Fucked if i know.
+ ///
+ public bool TryToggleCosmicTool(EntityUid uid, EntProtoId proto, CosmicCultComponent comp)
+ {
+ if (!comp.Equipment.TryGetValue(proto.Id, out var item))
+ {
+ item = Spawn(proto, Transform(uid).Coordinates);
+ if (!_hands.TryForcePickupAnyHand(uid, (EntityUid)item))
+ {
+ _popup.PopupEntity(Loc.GetString("cosmicability-toggle-error"), uid, uid);
+ QueueDel(item);
+ return false;
+ }
+ comp.Equipment.Add(proto.Id, item);
+ return true;
+ }
+
+ QueueDel(item);
+ // assuming that it exists
+ comp.Equipment.Remove(proto.Id);
+
+ return true;
+ }
+
+
+
+ ///
+ /// Called when someone clicks on a target using the cosmic blank ability.
+ ///
+ private void OnCosmicBlank(EntityUid uid, CosmicCultComponent comp, ref EventCosmicBlank args)
+ {
+ var target = args.Target;
+
+ if (!TryUseAbility(uid, comp, args))
+ return;
+ }
+
+
+
+ ///
+ /// Called when the cult lead attemps to place The Monument. This code is awful, but at least it's straightforward.
+ ///
+ private void OnCosmicPlaceMonument(EntityUid uid, CosmicCultLeadComponent comp, ref EventCosmicPlaceMonument args)
+ {
+ var xform = Transform(uid);
+ var user = Transform(args.Performer);
+ var pos = xform.LocalPosition;
+ var spawnplace = _transform.GetMapCoordinates(uid, xform: xform);
+ var box = new Box2(pos + new Vector2(-1.4f, -0.4f), pos + new Vector2(1.4f, 0.4f));
+
+ ///CHECK IF WE'RE STANDING SOMEWHERE SOLID
+ if (xform.GridUid is not { } grid || !TryComp(grid, out var gridComp))
+ {
+ _popup.PopupEntity(Loc.GetString("cosmic-monument-spawn-error-grid"), uid, uid);
+ return;
+ }
+
+ /// CHECK IF IT'S BEING PLACED CHEESILY CLOSE TO SPACE
+ foreach (var tile in gridComp.GetTilesIntersecting(new Circle(_transform.GetWorldPosition(xform), SpaceDistance), false))
+ {
+ if (!tile.IsSpace(_tileDef))
+ continue;
+
+ _popup.PopupEntity(Loc.GetString("cosmic-monument-spawn-error-space", ("DISTANCE", SpaceDistance)), uid, uid);
+ return;
+ }
+
+ /// CHECK IF WE'RE ON THE STATION OR IF SOMEONE'S TRYING TO SNEAK THIS ONTO SOMETHING SMOL
+ var station = _station.GetStationInMap(xform.MapID);
+ EntityUid? stationGrid = null;
+ if (TryComp(station, out var stationData))
+ stationGrid = _station.GetLargestGrid(stationData);
+
+ if (stationGrid is not null && stationGrid != xform.GridUid)
+ {
+ _popup.PopupEntity(Loc.GetString("cosmic-monument-spawn-error-station"), uid, uid);
+ return;
+ }
+
+ ///CHECK FOR ENTITY AND ENVIRONMENTAL INTERSECTIONS || I HATED THIS SO FREAKING MUCH.
+ if (_entLookup.AnyLocalEntitiesIntersecting(xform.GridUid.Value, box, LookupFlags.Dynamic | LookupFlags.Static, uid))
+ {
+ _popup.PopupEntity(Loc.GetString("cosmic-monument-spawn-error-intersection"), uid, uid);
+ return;
+ }
+
+ _actions.RemoveAction(uid, comp.MonumentActionEntity);
+ Spawn(comp.MonumentPrototype, _transform.GetMapCoordinates(uid, xform: xform));
+ }
+
+
+
+
+ ///
+ /// Called when someone clicks on a target using the cosmic lapse ability.
+ ///
+ private void OnCosmicLapse(EntityUid uid, CosmicCultComponent comp, ref EventCosmicLapse args)
+ {
+ var target = args.Target;
+
+ if (!TryUseAbility(uid, comp, args))
+ return;
+
+ _polymorphSystem.PolymorphEntity(target, "CosmicPolymorphLapse");
+ }
+}
diff --git a/Content.Server/_Impstation/Cosmiccult/CosmicCultSystem.cs b/Content.Server/_Impstation/Cosmiccult/CosmicCultSystem.cs
new file mode 100644
index 00000000000000..a4faa4be4f9980
--- /dev/null
+++ b/Content.Server/_Impstation/Cosmiccult/CosmicCultSystem.cs
@@ -0,0 +1,88 @@
+using Content.Server.Popups;
+using Content.Server._Impstation.Cosmiccult.Components;
+using Content.Shared._Impstation.Cosmiccult.Components;
+using Content.Shared.Hands.EntitySystems;
+using Content.Shared.Popups;
+using Content.Shared.Mind;
+using Content.Shared.Examine;
+using Content.Server.Actions;
+using Robust.Shared.Prototypes;
+using Content.Shared.Alert;
+using Robust.Shared.Random;
+using Robust.Shared.Audio.Systems;
+using Content.Server.Chat.Systems;
+
+namespace Content.Server._Impstation.Cosmiccult;
+
+public sealed partial class CosmicCultSystem : EntitySystem
+{
+ [Dependency] private readonly SharedEyeSystem _eye = default!;
+ [Dependency] private readonly SharedHandsSystem _hands = default!;
+ [Dependency] private readonly IRobustRandom _rand = default!;
+ [Dependency] private readonly ActionsSystem _actions = default!;
+ [Dependency] private readonly AlertsSystem _alerts = default!;
+ [Dependency] private readonly PopupSystem _popup = default!;
+ [Dependency] private readonly SharedAudioSystem _aud = default!;
+ [Dependency] private readonly ChatSystem _chat = default!;
+ public EntProtoId CultToolPrototype = "AbilityCosmicCultTool";
+ public int ObjectiveEntropyTracker = 0;
+
+ public override void Initialize()
+ {
+ base.Initialize();
+
+ SubscribeLocalEvent(OnCompInit);
+ SubscribeLocalEvent(OnStartCultist);
+ SubscribeLocalEvent(OnStartCultLead);
+ SubscribeLocalEvent(OnCosmicItemExamine);
+ // SubscribeLocalEvent(OnComponentRemove); || We'll probably need this later.
+
+ SubscribeAbilities();
+ }
+
+ ///
+ /// Called when the component initializes. We add the Visibility Mask here.
+ ///
+ private void OnCompInit(Entity ent, ref ComponentInit args)
+ {
+
+ if (TryComp(ent, out var eye))
+ _eye.SetVisibilityMask(ent, eye.VisibilityMask | CosmicMonumentComponent.LayerMask);
+ }
+
+ ///
+ /// Called when the component starts up, add the Cosmic Cult abilities to the user.
+ ///
+ private void OnStartCultist(EntityUid uid, CosmicCultComponent comp, ref ComponentStartup args)
+ {
+ foreach (var actionId in comp.BaseCosmicCultActions)
+ _actions.AddAction(uid, actionId);
+ }
+ ///
+ /// Called when the component starts up, add the Cosmic Cult monument ability to the user.
+ ///
+ private void OnStartCultLead(EntityUid uid, CosmicCultLeadComponent comp, ref ComponentStartup args)
+ {
+ _actions.AddAction(uid, ref comp.MonumentActionEntity, comp.MonumentAction, uid);
+ }
+
+ ///
+ /// Called by Cosmic Siphon. Increments the Cult's global objective tracker.
+ ///
+ private void IncrementCultObjectiveEntropy()
+ {
+ ObjectiveEntropyTracker++;
+ }
+
+ ///
+ /// A blacklist called when someone examines an object with the CosmicItem Component.
+ ///
+ private void OnCosmicItemExamine(Entity ent, ref ExaminedEvent args)
+ {
+ if (HasComp(args.Examiner))
+ return;
+
+ args.PushMarkup(Loc.GetString("contraband-object-text-cosmiccult"));
+ }
+
+}
diff --git a/Content.Server/_Impstation/Cosmiccult/CosmicDeconvertedEui.cs b/Content.Server/_Impstation/Cosmiccult/CosmicDeconvertedEui.cs
new file mode 100644
index 00000000000000..ace643b7c976cc
--- /dev/null
+++ b/Content.Server/_Impstation/Cosmiccult/CosmicDeconvertedEui.cs
@@ -0,0 +1,8 @@
+using Content.Server.EUI;
+
+namespace Content.Server._Impstation.Cosmiccult;
+
+public sealed class CosmicDeconvertedEui : BaseEui
+{
+ // serverside it does nothing since its just to inform the player
+}
diff --git a/Content.Server/_Impstation/Cosmiccult/EntitySystems/CosmicMonumentSystem.cs b/Content.Server/_Impstation/Cosmiccult/EntitySystems/CosmicMonumentSystem.cs
new file mode 100644
index 00000000000000..f90967ed351e2d
--- /dev/null
+++ b/Content.Server/_Impstation/Cosmiccult/EntitySystems/CosmicMonumentSystem.cs
@@ -0,0 +1,14 @@
+using System.Linq;
+using Content.Shared.Interaction;
+using Content.Server.Popups;
+using Content.Shared._Impstation.Cosmiccult;
+using Content.Server._Impstation.Cosmiccult.Components;
+using Content.Shared._Impstation.Cosmiccult.Components;
+using Robust.Shared.Prototypes;
+
+namespace Content.Server._Impstation.Cosmiccult.EntitySystems;
+
+public sealed class CosmicMonumentSystem : EntitySystem
+{
+
+}
diff --git a/Content.Server/_Impstation/Cosmiccult/EntitySystems/CosmicTestSystem.cs b/Content.Server/_Impstation/Cosmiccult/EntitySystems/CosmicTestSystem.cs
new file mode 100644
index 00000000000000..65d806930e5cc7
--- /dev/null
+++ b/Content.Server/_Impstation/Cosmiccult/EntitySystems/CosmicTestSystem.cs
@@ -0,0 +1,89 @@
+using Content.Server.Atmos.EntitySystems;
+using Content.Server.Construction.Components;
+using Content.Server._Impstation.Cosmiccult.Components;
+using Content.Server.Destructible;
+using Content.Server.Temperature.Systems;
+using Content.Shared.Body.Components;
+using Content.Shared.Damage;
+using Content.Shared.MagicMirror;
+using Content.Shared.Maps;
+using Content.Shared.Mind.Components;
+using Content.Shared.Movement.Components;
+using Content.Shared.Movement.Pulling.Components;
+using Content.Shared.StepTrigger.Components;
+using Robust.Shared.Map;
+using Robust.Shared.Map.Components;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Random;
+using System.Linq;
+using System.Numerics;
+
+namespace Content.Server._Impstation.Cosmiccult.EntitySystems;
+public sealed partial class CosmicTestSystem : EntitySystem
+{
+ [Dependency] private readonly TileSystem _tile = default!;
+ [Dependency] private readonly IRobustRandom _rand = default!;
+ [Dependency] private readonly IPrototypeManager _prot = default!;
+ [Dependency] private readonly AtmosphereSystem _atmos = default!;
+ [Dependency] private readonly EntityLookupSystem _lookup = default!;
+ [Dependency] private readonly TemperatureSystem _temp = default!;
+
+ public override void Update(float frameTime)
+ {
+ base.Update(frameTime);
+
+ foreach (var cosmicfella in EntityQuery())
+ {
+ cosmicfella.UpdateTimer += frameTime;
+
+ if (cosmicfella.UpdateTimer >= cosmicfella.UpdateDelay)
+ {
+ Cycle((cosmicfella.Owner, cosmicfella));
+ cosmicfella.UpdateTimer = 0;
+ }
+ }
+ }
+
+ private void Cycle(Entity ent)
+ {
+ DeleteTiles(ent);
+
+ var lookup = _lookup.GetEntitiesInRange(Transform(ent).Coordinates, ent.Comp.Range);
+ foreach (var look in lookup)
+ {
+ if ((HasComp(look) || HasComp(look) || HasComp(look) || HasComp(look)
+ || HasComp(look) || HasComp(look) || HasComp(look)) && !(HasComp(look) || HasComp(look)))
+ {
+ QueueDel(look);
+ }
+ }
+ }
+
+ private void DeleteTiles(Entity ent)
+ {
+ var xform = Transform(ent);
+
+ if (!TryComp(xform.GridUid, out var grid))
+ return;
+
+ var pos = xform.Coordinates.Position;
+ var box = new Box2(pos + new Vector2(-ent.Comp.Range, -ent.Comp.Range), pos + new Vector2(ent.Comp.Range, ent.Comp.Range));
+ var tilerefs = grid.GetLocalTilesIntersecting(box).ToList();
+
+ if (tilerefs.Count == 0)
+ return;
+
+ var tiles = new List();
+ foreach (var tile in tilerefs)
+ {
+ if (_rand.Prob(.40f))
+ tiles.Add(tile);
+ }
+
+ foreach (var tileref in tiles)
+ {
+ var tile = _prot.Index("FloorGlass");
+ _tile.ReplaceTile(tileref, tile);
+ }
+ }
+}
diff --git a/Content.Server/_Impstation/CrewMedal/CrewMedalSystem.cs b/Content.Server/_Impstation/CrewMedal/CrewMedalSystem.cs
new file mode 100644
index 00000000000000..dfa3c5ca13acbe
--- /dev/null
+++ b/Content.Server/_Impstation/CrewMedal/CrewMedalSystem.cs
@@ -0,0 +1,73 @@
+using Content.Server.GameTicking;
+using Content.Shared.Administration.Logs;
+using Content.Shared.Clothing;
+using Content.Shared._Impstation.CrewMedal;
+using Content.Shared.Database;
+using Content.Shared.IdentityManagement;
+using Content.Shared.Popups;
+using System.Linq;
+using System.Text;
+
+namespace Content.Server._Impstation.CrewMedal;
+
+public sealed class CrewMedalSystem : SharedCrewMedalSystem
+{
+ [Dependency] private readonly ISharedAdminLogManager _adminLogger = default!;
+ [Dependency] private readonly SharedPopupSystem _popup = default!;
+
+ public override void Initialize()
+ {
+ base.Initialize();
+
+ SubscribeLocalEvent(OnEquipped);
+ SubscribeLocalEvent(OnReasonChanged);
+ SubscribeLocalEvent(OnRoundEndText);
+ }
+
+ private void OnEquipped(Entity medal, ref ClothingGotEquippedEvent args)
+ {
+ if (medal.Comp.Awarded)
+ return;
+ medal.Comp.Recipient = Identity.Name(args.Wearer, EntityManager);
+ medal.Comp.Awarded = true;
+ Dirty(medal);
+ _popup.PopupEntity(Loc.GetString("comp-crew-medal-award-text", ("recipient", medal.Comp.Recipient), ("medal", Name(medal.Owner))), medal.Owner);
+ // Log medal awarding
+ _adminLogger.Add(LogType.Action, LogImpact.Low, $"{ToPrettyString(args.Wearer):player} was awarded the {ToPrettyString(medal.Owner):entity} with the award reason \"{medal.Comp.Reason}\"");
+ }
+
+ private void OnReasonChanged(EntityUid uid, CrewMedalComponent medalComp, CrewMedalReasonChangedMessage args)
+ {
+ if (medalComp.Awarded)
+ return;
+ medalComp.Reason = args.Reason[..Math.Min(medalComp.MaxCharacters, args.Reason.Length)];
+ Dirty(uid, medalComp);
+
+ // Log medal reason change
+ _adminLogger.Add(LogType.Action, LogImpact.Low, $"{ToPrettyString(args.Actor):user} set {ToPrettyString(uid):entity} to apply the award reason \"{medalComp.Reason}\"");
+ }
+
+ private void OnRoundEndText(RoundEndTextAppendEvent ev)
+ {
+ // medal name, recipient name, reason
+ var medals = new List<(string, string, string)>();
+ var query = EntityQueryEnumerator();
+ while (query.MoveNext(out var uid, out var crewMedalComp))
+ {
+ if (crewMedalComp.Awarded)
+ medals.Add((Name(uid), crewMedalComp.Recipient, crewMedalComp.Reason));
+ }
+ var count = medals.Count;
+ if (count == 0)
+ return;
+
+ medals.OrderBy(f => f.Item2);
+ var result = new StringBuilder();
+ result.AppendLine(Loc.GetString("comp-crew-medal-round-end-result", ("count", count)));
+ foreach (var medal in medals)
+ {
+ result.AppendLine(Loc.GetString("comp-crew-medal-round-end-list", ("medal", medal.Item1), ("recipient", medal.Item2), ("reason", medal.Item3)));
+ }
+ ev.AddLine(result.AppendLine().ToString());
+ }
+}
diff --git a/Content.Server/_Impstation/Gravity/IsInZeroGravityAreaComponent.cs b/Content.Server/_Impstation/Gravity/IsInZeroGravityAreaComponent.cs
new file mode 100644
index 00000000000000..f80433413d8491
--- /dev/null
+++ b/Content.Server/_Impstation/Gravity/IsInZeroGravityAreaComponent.cs
@@ -0,0 +1,12 @@
+using Content.Shared._Impstation.Gravity;
+using Robust.Shared.GameStates;
+
+namespace Content.Server._Impstation.Gravity;
+
+[RegisterComponent, NetworkedComponent]
+[Access(typeof(SharedZeroGravityAreaSystem))]
+public sealed partial class IsInZeroGravityAreaComponent : Component
+{
+ [DataField, ViewVariables(VVAccess.ReadOnly)]
+ public HashSet> AffectingAreas = new();
+}
diff --git a/Content.Server/_Impstation/Gravity/ZeroGravityAreaSystem.cs b/Content.Server/_Impstation/Gravity/ZeroGravityAreaSystem.cs
new file mode 100644
index 00000000000000..91ac9592c89cf6
--- /dev/null
+++ b/Content.Server/_Impstation/Gravity/ZeroGravityAreaSystem.cs
@@ -0,0 +1,182 @@
+using System.Linq;
+using Content.Shared._Impstation.Gravity;
+using Content.Shared.Clothing;
+using Content.Shared.GameTicking;
+using Content.Shared.Gravity;
+using Robust.Shared.GameStates;
+using Robust.Shared.Physics;
+using Robust.Shared.Physics.Components;
+using Robust.Shared.Physics.Events;
+
+namespace Content.Server._Impstation.Gravity;
+
+public sealed partial class ZeroGravityAreaSystem : SharedZeroGravityAreaSystem
+{
+ private ulong _nextPredictIndex = 0;
+
+ public override void Initialize()
+ {
+ base.Initialize();
+
+ SubscribeLocalEvent(OnReset);
+
+ SubscribeLocalEvent(OnStartCollision);
+ SubscribeLocalEvent(OnEndCollision);
+ SubscribeLocalEvent(OnStartup);
+ SubscribeLocalEvent(OnShutdown);
+
+ SubscribeLocalEvent(OnCheckWeightless, after: [typeof(SharedMagbootsSystem)]);
+ SubscribeLocalEvent(OnGetEntityState);
+ }
+
+ public override void SetEnabled(EntityUid uid, bool enabled, ZeroGravityAreaComponent? comp = null)
+ {
+ if (!Resolve(uid, ref comp))
+ return;
+
+ if (comp.Enabled == enabled)
+ return;
+
+ comp.Enabled = enabled;
+ Dirty(uid, comp);
+ DirtyAffected(uid, comp);
+ }
+
+ private void OnReset(RoundRestartCleanupEvent args)
+ {
+ _nextPredictIndex = 0;
+ }
+
+ private void DirtyAffected(EntityUid uid, ZeroGravityAreaComponent? comp = null)
+ {
+ if (!Resolve(uid, ref comp))
+ return;
+
+ foreach (var netEnt in comp.AffectedEntities)
+ {
+ if (!TryGetEntity(netEnt, out var ent))
+ continue;
+
+ if (!TryComp(ent, out var antiGrav))
+ continue;
+
+ Dirty(ent.Value, antiGrav);
+ }
+ }
+
+ private void StartAffecting(Entity area, Entity entity)
+ {
+ if (area.Comp.AffectedEntities.Add(GetNetEntity(entity)))
+ Dirty(area);
+
+ if (entity.Comp.AffectingAreas.Add(area))
+ Dirty(entity);
+ }
+
+ private void StopAffecting(Entity area, Entity entity)
+ {
+ if (area.Comp.AffectedEntities.Remove(GetNetEntity(entity)))
+ Dirty(area);
+
+ if (entity.Comp.AffectingAreas.Remove(area))
+ Dirty(entity);
+ }
+
+ ///
+ /// Check if two colliding ZeroGravityAreaComponents have the same PredictIndex. If so,
+ /// set the smaller one to one above the largest one.
+ ///
+ private void CheckPredictIndices(Entity self, Entity other)
+ {
+ Log.Debug($"Checking predict ({self.Comp.PredictIndex}, {other.Comp.PredictIndex})");
+ if (self.Comp.PredictIndex != other.Comp.PredictIndex)
+ return;
+
+ var smaller = (self.Comp.PredictIndex > other.Comp.PredictIndex) ? other : self;
+ smaller.Comp.PredictIndex = (byte)((Math.Max(self.Comp.PredictIndex, other.Comp.PredictIndex) + 1) % (sizeof(ulong) * 8));
+ Dirty(smaller);
+ DirtyAffected(smaller);
+ }
+
+ private void OnStartCollision(EntityUid uid, ZeroGravityAreaComponent comp, StartCollideEvent args)
+ {
+ if (args.OurFixtureId != comp.Fixture)
+ return;
+
+ if (TryComp(args.OtherEntity, out var area))
+ CheckPredictIndices((uid, comp), (args.OtherEntity, area));
+
+ if (!TryComp(args.OtherEntity, out var physics))
+ return;
+
+ if ((physics.BodyType & (BodyType.Kinematic | BodyType.Static)) != 0)
+ return;
+
+ var antiGrav = EnsureComp(args.OtherEntity);
+ StartAffecting((uid, comp), (args.OtherEntity, antiGrav));
+ }
+
+ private void OnEndCollision(EntityUid uid, ZeroGravityAreaComponent comp, EndCollideEvent args)
+ {
+ if (args.OurFixtureId != comp.Fixture)
+ return;
+
+ if (!TryComp(args.OtherEntity, out var antiGrav))
+ return;
+
+ StopAffecting((uid, comp), (args.OtherEntity, antiGrav));
+ }
+
+ private void OnStartup(EntityUid uid, ZeroGravityAreaComponent comp, ComponentStartup args)
+ {
+ const byte maxIndex = sizeof(ulong) * 8;
+
+ if (_nextPredictIndex == maxIndex)
+ Log.Warning($"There are more than {maxIndex} ZeroGravityArea components. Prediction errors may start occurring in overlapping ZeroGravityAreas.");
+
+ comp.PredictIndex = (byte)(_nextPredictIndex % maxIndex);
+ _nextPredictIndex += 1;
+
+ Dirty(uid, comp);
+ }
+
+ private void OnShutdown(EntityUid uid, ZeroGravityAreaComponent comp, ComponentShutdown args)
+ {
+ foreach (var ent in GetEntitySet(comp.AffectedEntities))
+ {
+ if (!TryComp(ent, out var antiGrav))
+ continue;
+
+ antiGrav.AffectingAreas.Remove((uid, comp));
+ Dirty(ent, antiGrav);
+ }
+ }
+
+ private bool EntityIsWeightless(IsInZeroGravityAreaComponent ent)
+ {
+ return ent.AffectingAreas.Any(area => area.Comp.Enabled);
+ }
+
+ private void OnCheckWeightless(EntityUid uid, IsInZeroGravityAreaComponent comp, ref IsWeightlessEvent args)
+ {
+ if (args.Handled)
+ return;
+
+ if (EntityIsWeightless(comp))
+ {
+ args.IsWeightless = true;
+ args.Handled = true;
+ }
+ }
+
+ private void OnGetEntityState(EntityUid uid, IsInZeroGravityAreaComponent comp, ref ComponentGetState args)
+ {
+ // Update the fingerprint of the affecting areas
+ args.State = new IsInZeroGravityAreaState(comp.AffectingAreas.Aggregate(0ul, (fingerprint, area) =>
+ {
+ if (area.Comp.Enabled)
+ fingerprint |= 1ul << area.Comp.PredictIndex;
+ return fingerprint;
+ }));
+ }
+}
diff --git a/Content.Shared/_Impstation/Cosmiccult/Components/AlwaysCosmicCultConvertibleComponent.cs b/Content.Shared/_Impstation/Cosmiccult/Components/AlwaysCosmicCultConvertibleComponent.cs
new file mode 100644
index 00000000000000..088c59ef7316df
--- /dev/null
+++ b/Content.Shared/_Impstation/Cosmiccult/Components/AlwaysCosmicCultConvertibleComponent.cs
@@ -0,0 +1,12 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared._Impstation.Cosmiccult.Components;
+
+///
+/// Component used for allowing non-humans to be converted. (Mainly monkeys)
+///
+[RegisterComponent, NetworkedComponent, Access(typeof(SharedCosmicCultSystem))]
+public sealed partial class AlwaysCosmicCultConvertibleComponent : Component
+{
+
+}
diff --git a/Content.Shared/_Impstation/Cosmiccult/Components/CosmicCultComponent.cs b/Content.Shared/_Impstation/Cosmiccult/Components/CosmicCultComponent.cs
new file mode 100644
index 00000000000000..12ee90284e80d7
--- /dev/null
+++ b/Content.Shared/_Impstation/Cosmiccult/Components/CosmicCultComponent.cs
@@ -0,0 +1,83 @@
+using Content.Shared.Antag;
+using Robust.Shared.GameStates;
+using Content.Shared.StatusIcon;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Audio;
+using Content.Shared.Item;
+using Content.Shared.Damage;
+
+namespace Content.Shared._Impstation.Cosmiccult.Components;
+
+///
+/// Added to mind role entities to tag that they are a cosmic cultist.
+///
+[RegisterComponent, NetworkedComponent]
+[AutoGenerateComponentState]
+public sealed partial class CosmicCultComponent : Component
+{
+ #region Stuff
+
+ ///
+ /// The status icon prototype displayed for cosmic cultists.
+ ///
+ [DataField, ViewVariables(VVAccess.ReadWrite)]
+ public ProtoId StatusIcon { get; set; } = "CosmicCultIcon";
+
+ public override bool SessionSpecific => true;
+ public readonly List> BaseCosmicCultActions = new()
+ {
+ "ActionCosmicToolToggle",
+ "ActionCosmicSiphon",
+ ///"ActionCosmicBlank",
+ "ActionCosmicLapse",
+ ///"ActionCosmicGlare",
+ ///"ActionCosmicGearDash",
+ ///"ActionCosmicGearDashRecall"
+
+ };
+
+ #endregion
+
+ #region Abilities
+
+ public Dictionary Equipment = new();
+
+ #region Cosmic Siphon
+
+ ///
+ /// The duration of the doAfter for performing a cosmic siphon
+ ///
+ [DataField, AutoNetworkedField]
+ public TimeSpan CosmicSiphonDuration = TimeSpan.FromSeconds(4);
+
+ ///
+ /// The entity prototype to spawn in the cultist's hand after completing a cosmic siphon.
+ ///
+ [DataField, AutoNetworkedField]
+ public EntProtoId CosmicSiphonResult = "MaterialCosmicCultEntropy1";
+
+ ///
+ /// The entity prototype to spawn in the cultist's hand after completing a cosmic siphon, but you want to give 'em more.
+ ///
+ [DataField, AutoNetworkedField]
+ public EntProtoId CosmicSiphonResult3 = "MaterialCosmicCultEntropy3";
+
+ ///
+ /// The damage to apply upon a successful cosmic siphon
+ ///
+ [DataField, AutoNetworkedField]
+ public DamageSpecifier CosmicSiphonDamage = new()
+ {
+ DamageDict = new() {
+ { "Asphyxiation", 25 }
+ }
+ };
+
+ #endregion // Cosmic Siphon
+
+ #endregion // Abilities
+
+}
+
+
+// CosmicCultComponent
diff --git a/Content.Shared/_Impstation/Cosmiccult/Components/CosmicCultLeadComponent.cs b/Content.Shared/_Impstation/Cosmiccult/Components/CosmicCultLeadComponent.cs
new file mode 100644
index 00000000000000..cb47b0b5e9e828
--- /dev/null
+++ b/Content.Shared/_Impstation/Cosmiccult/Components/CosmicCultLeadComponent.cs
@@ -0,0 +1,40 @@
+using Content.Shared.Antag;
+using Robust.Shared.GameStates;
+using Content.Shared.StatusIcon;
+using Robust.Shared.Prototypes;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+
+namespace Content.Shared._Impstation.Cosmiccult.Components;
+
+///
+/// Added to mind role entities to tag that they are the cosmic cult leader.
+///
+[RegisterComponent, NetworkedComponent, Access(typeof(SharedCosmicCultSystem))]
+public sealed partial class CosmicCultLeadComponent : Component
+{
+ ///
+ /// The status icon corresponding to the lead cultist.
+ ///
+ [DataField, ViewVariables(VVAccess.ReadWrite)]
+ public ProtoId StatusIcon { get; set; } = "CosmicCultLeadIcon";
+
+ ///
+ /// How long the stun will last after the user is converted.
+ ///
+ [DataField, ViewVariables(VVAccess.ReadWrite)]
+ public TimeSpan StunTime = TimeSpan.FromSeconds(3);
+
+ public override bool SessionSpecific => true;
+
+ [DataField]
+ public EntProtoId MonumentAction = "ActionCosmicPlaceMonument";
+
+ [DataField]
+ public EntityUid? MonumentActionEntity;
+
+ [ViewVariables(VVAccess.ReadWrite), DataField("monumentPrototype", customTypeSerializer: typeof(PrototypeIdSerializer))]
+ public string MonumentPrototype = "MonumentCosmicCultSpawnIn";
+
+}
+
+// CosmicCultLeadComponent
diff --git a/Content.Shared/_Impstation/Cosmiccult/Components/CosmicItemComponent.cs b/Content.Shared/_Impstation/Cosmiccult/Components/CosmicItemComponent.cs
new file mode 100644
index 00000000000000..afe47912be083e
--- /dev/null
+++ b/Content.Shared/_Impstation/Cosmiccult/Components/CosmicItemComponent.cs
@@ -0,0 +1,12 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared._Impstation.Cosmiccult.Components;
+
+///
+/// Added to items to tag that they related to the Cosmic Cult.
+///
+[RegisterComponent, NetworkedComponent]
+public sealed partial class CosmicItemComponent : Component
+{
+
+}
diff --git a/Content.Shared/_Impstation/Cosmiccult/CosmicCult.Actions.cs b/Content.Shared/_Impstation/Cosmiccult/CosmicCult.Actions.cs
new file mode 100644
index 00000000000000..b2baabda018f1f
--- /dev/null
+++ b/Content.Shared/_Impstation/Cosmiccult/CosmicCult.Actions.cs
@@ -0,0 +1,17 @@
+using Content.Shared.Actions;
+using Robust.Shared.GameStates;
+
+namespace Content.Shared._Impstation.Cosmiccult;
+
+[RegisterComponent, NetworkedComponent]
+public sealed partial class CosmicCultActionComponent : Component
+{
+
+}
+
+public sealed partial class EventCosmicToolToggle : InstantActionEvent { }
+public sealed partial class EventCosmicSiphon : EntityTargetActionEvent { }
+public sealed partial class EventCosmicBlank : EntityTargetActionEvent { }
+public sealed partial class EventCosmicPlaceMonument : InstantActionEvent { }
+public sealed partial class EventCosmicLapse : EntityTargetActionEvent { }
+
diff --git a/Content.Shared/_Impstation/Cosmiccult/CosmicCult.DoAfter.cs b/Content.Shared/_Impstation/Cosmiccult/CosmicCult.DoAfter.cs
new file mode 100644
index 00000000000000..17f777dbcec1a0
--- /dev/null
+++ b/Content.Shared/_Impstation/Cosmiccult/CosmicCult.DoAfter.cs
@@ -0,0 +1,7 @@
+using Content.Shared.DoAfter;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared._Impstation.Cosmiccult;
+
+[Serializable, NetSerializable]
+public sealed partial class EventCosmicSiphonDoAfter : SimpleDoAfterEvent { }
diff --git a/Content.Shared/_Impstation/Cosmiccult/SharedCosmicCultSystem.cs b/Content.Shared/_Impstation/Cosmiccult/SharedCosmicCultSystem.cs
new file mode 100644
index 00000000000000..a556382eabaa3d
--- /dev/null
+++ b/Content.Shared/_Impstation/Cosmiccult/SharedCosmicCultSystem.cs
@@ -0,0 +1,117 @@
+using Content.Shared.IdentityManagement;
+using Content.Shared.Mindshield.Components;
+using Content.Shared.Popups;
+using Content.Shared._Impstation.Cosmiccult.Components;
+using Content.Shared.Stunnable;
+using Robust.Shared.GameStates;
+using Robust.Shared.Player;
+using Content.Shared.Antag;
+using Robust.Shared.Serialization;
+using Robust.Shared.Utility;
+
+namespace Content.Shared._Impstation.Cosmiccult;
+
+public abstract class SharedCosmicCultSystem : EntitySystem
+{
+ [Dependency] private readonly SharedPopupSystem _popupSystem = default!;
+ [Dependency] private readonly SharedStunSystem _sharedStun = default!;
+
+ public override void Initialize()
+ {
+ base.Initialize();
+
+ SubscribeLocalEvent(OnCosmicCultCompGetStateAttempt);
+ SubscribeLocalEvent(OnCosmicCultCompGetStateAttempt);
+ SubscribeLocalEvent(DirtyCosmicCultComps);
+ SubscribeLocalEvent(DirtyCosmicCultComps);
+ }
+
+ ///
+ /// Determines if a Cosmic Cult Lead component should be sent to the client.
+ ///
+ private void OnCosmicCultCompGetStateAttempt(EntityUid uid, CosmicCultLeadComponent comp, ref ComponentGetStateAttemptEvent args)
+ {
+ args.Cancelled = !CanGetState(args.Player);
+ }
+
+ ///
+ /// Determines if a Cosmic Cultist component should be sent to the client.
+ ///
+ private void OnCosmicCultCompGetStateAttempt(EntityUid uid, CosmicCultComponent comp, ref ComponentGetStateAttemptEvent args)
+ {
+ args.Cancelled = !CanGetState(args.Player);
+ }
+
+ ///
+ /// The criteria that determine whether a Cult Member component should be sent to a client.
+ ///
+ /// The Player the component will be sent to.
+ ///
+ private bool CanGetState(ICommonSession? player)
+ {
+ //Apparently this can be null in replays so I am just returning true.
+ if (player?.AttachedEntity is not {} uid)
+ return true;
+
+ if (HasComp(uid) || HasComp(uid))
+ return true;
+
+ return HasComp(uid);
+ }
+
+ ///
+ /// Dirties all the Cult components so they are sent to clients.
+ ///
+ /// We need to do this because if a Cult component was not earlier sent to a client and for example the client
+ /// becomes a Cult then we need to send all the components to it. To my knowledge there is no way to do this on a
+ /// per client basis so we are just dirtying all the components.
+ ///
+ private void DirtyCosmicCultComps(EntityUid someUid, T someComp, ComponentStartup ev)
+ {
+ var cosmicCultComps = AllEntityQuery();
+ while (cosmicCultComps.MoveNext(out var uid, out var comp))
+ {
+ Dirty(uid, comp);
+ }
+
+ var cosmicCultLeadComps = AllEntityQuery();
+ while (cosmicCultLeadComps.MoveNext(out var uid, out var comp))
+ {
+ Dirty(uid, comp);
+ }
+ }
+}
+
+
+
+/// USER INTERFACE HANDLING GOES HEEEEEEEEEEEERE
+
+
+[Serializable, NetSerializable]
+public enum CosmicMonumentUiKey : byte
+{
+ Key
+}
+
+[Serializable, NetSerializable]
+public sealed class CosmicMonumentUserInterfaceState : BoundUserInterfaceState
+{
+ public TimeSpan CooldownEndTime;
+
+ public int FuelAmount;
+
+ public int FuelCost;
+
+ public CosmicMonumentUserInterfaceState(TimeSpan cooldownEndTime, int fuelAmount, int fuelCost)
+ {
+ CooldownEndTime = cooldownEndTime;
+ FuelAmount = fuelAmount;
+ FuelCost = fuelCost;
+ }
+}
+
+[Serializable, NetSerializable]
+public sealed class CosmicMonumentGenerateButtonPressedEvent : BoundUserInterfaceMessage
+{
+
+}
diff --git a/Content.Shared/_Impstation/CrewMedal/CrewMedalComponent.cs b/Content.Shared/_Impstation/CrewMedal/CrewMedalComponent.cs
new file mode 100644
index 00000000000000..06dc5ad892cb42
--- /dev/null
+++ b/Content.Shared/_Impstation/CrewMedal/CrewMedalComponent.cs
@@ -0,0 +1,39 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared._Impstation.CrewMedal;
+
+///
+/// Makes a medal recipent show up on the round end screen.
+///
+[RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
+public sealed partial class CrewMedalComponent : Component
+{
+ ///
+ /// Name of the person receiving the award.
+ ///
+ [AutoNetworkedField]
+ [DataField]
+ public string Recipient = "";
+
+ ///
+ /// Reason for the award. Can be set using an interface.
+ ///
+ [AutoNetworkedField]
+ [DataField]
+ public string Reason = "";
+
+ ///
+ /// Has the medal been awarded?
+ /// If this is true the recipient and reason can no longer be changed.
+ ///
+ [AutoNetworkedField]
+ [DataField]
+ public bool Awarded = false;
+
+ ///
+ /// Max character limit for the reason string.
+ ///
+ [AutoNetworkedField]
+ [DataField]
+ public int MaxCharacters = 50;
+}
diff --git a/Content.Shared/_Impstation/CrewMedal/CrewMedalEvents.cs b/Content.Shared/_Impstation/CrewMedal/CrewMedalEvents.cs
new file mode 100644
index 00000000000000..24494331495fd0
--- /dev/null
+++ b/Content.Shared/_Impstation/CrewMedal/CrewMedalEvents.cs
@@ -0,0 +1,15 @@
+using Robust.Shared.Serialization;
+
+namespace Content.Shared._Impstation.CrewMedal;
+
+[Serializable, NetSerializable]
+public enum CrewMedalUiKey : byte
+{
+ Key
+}
+
+[Serializable, NetSerializable]
+public sealed class CrewMedalReasonChangedMessage(string reason) : BoundUserInterfaceMessage
+{
+ public string Reason { get; } = reason;
+}
diff --git a/Content.Shared/_Impstation/CrewMedal/SharedCrewMedalSystem.cs b/Content.Shared/_Impstation/CrewMedal/SharedCrewMedalSystem.cs
new file mode 100644
index 00000000000000..265503dd2a0a9c
--- /dev/null
+++ b/Content.Shared/_Impstation/CrewMedal/SharedCrewMedalSystem.cs
@@ -0,0 +1,21 @@
+using Content.Shared.Examine;
+
+namespace Content.Shared._Impstation.CrewMedal;
+
+public abstract class SharedCrewMedalSystem : EntitySystem
+{
+ public override void Initialize()
+ {
+ base.Initialize();
+ SubscribeLocalEvent(OnExamined);
+ }
+
+ private void OnExamined(Entity medal, ref ExaminedEvent args)
+ {
+ if (!medal.Comp.Awarded)
+ return;
+
+ var str = Loc.GetString("comp-crew-medal-inspection-text", ("recipient", medal.Comp.Recipient), ("reason", medal.Comp.Reason));
+ args.PushMarkup(str);
+ }
+}
diff --git a/Content.Shared/_Impstation/Gravity/IsInZeroGravityAreaState.cs b/Content.Shared/_Impstation/Gravity/IsInZeroGravityAreaState.cs
new file mode 100644
index 00000000000000..0f28fafe54a187
--- /dev/null
+++ b/Content.Shared/_Impstation/Gravity/IsInZeroGravityAreaState.cs
@@ -0,0 +1,23 @@
+using System.Linq;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared._Impstation.Gravity;
+
+[Serializable, NetSerializable]
+public sealed partial class IsInZeroGravityAreaState : ComponentState
+{
+ public IsInZeroGravityAreaState(ulong areaFingerprint)
+ {
+ AreaFingerprint = areaFingerprint;
+ }
+
+ ///
+ ///
+ /// Bitfield that represents the s acting
+ /// on this entity.
+ ///
+ ///
+ /// See also: SharedZeroGravityAreaComponent.PredictIndex
+ ///
+ public ulong AreaFingerprint;
+}
diff --git a/Content.Shared/_Impstation/Gravity/ItemToggleZeroGravityAreaComponent.cs b/Content.Shared/_Impstation/Gravity/ItemToggleZeroGravityAreaComponent.cs
new file mode 100644
index 00000000000000..67a8ec46cf3735
--- /dev/null
+++ b/Content.Shared/_Impstation/Gravity/ItemToggleZeroGravityAreaComponent.cs
@@ -0,0 +1,11 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared._Impstation.Gravity;
+
+///
+/// Toggles point light on an entity whenever ItemToggle hits.
+///
+[RegisterComponent, NetworkedComponent]
+public sealed partial class ItemToggleZeroGravityAreaComponent : Component
+{
+}
diff --git a/Content.Shared/_Impstation/Gravity/SharedZeroGravityAreaSystem.cs b/Content.Shared/_Impstation/Gravity/SharedZeroGravityAreaSystem.cs
new file mode 100644
index 00000000000000..5bd6b99ce12854
--- /dev/null
+++ b/Content.Shared/_Impstation/Gravity/SharedZeroGravityAreaSystem.cs
@@ -0,0 +1,29 @@
+using System.Linq;
+using Content.Shared.Item.ItemToggle.Components;
+
+namespace Content.Shared._Impstation.Gravity;
+
+public abstract partial class SharedZeroGravityAreaSystem : EntitySystem
+{
+ public override void Initialize()
+ {
+ base.Initialize();
+
+ SubscribeLocalEvent(OnToggleGravity);
+ }
+
+ private void OnToggleGravity(EntityUid uid, ItemToggleZeroGravityAreaComponent comp, ItemToggledEvent args)
+ {
+ SetEnabled(uid, args.Activated);
+ }
+
+ public bool IsEnabled(EntityUid uid, ZeroGravityAreaComponent? comp = null)
+ {
+ if (!Resolve(uid, ref comp))
+ return false;
+
+ return comp.Enabled;
+ }
+
+ public abstract void SetEnabled(EntityUid uid, bool enabled, ZeroGravityAreaComponent? comp = null);
+}
diff --git a/Content.Shared/_Impstation/Gravity/ZeroGravityAreaComponent.cs b/Content.Shared/_Impstation/Gravity/ZeroGravityAreaComponent.cs
new file mode 100644
index 00000000000000..f0cf4bb9d5968d
--- /dev/null
+++ b/Content.Shared/_Impstation/Gravity/ZeroGravityAreaComponent.cs
@@ -0,0 +1,48 @@
+using Robust.Shared.GameStates;
+
+namespace Content.Shared._Impstation.Gravity;
+
+[RegisterComponent, NetworkedComponent]
+[AutoGenerateComponentState]
+public sealed partial class ZeroGravityAreaComponent : Component
+{
+ ///
+ /// Which physics fixture to use to detect entities.
+ ///
+ [DataField(readOnly: true), ViewVariables(VVAccess.ReadWrite)]
+ [AutoNetworkedField]
+ public string Fixture = "antiGravity";
+
+ ///
+ /// Whether or not to put entities in the area into weightlessness.
+ ///
+ [DataField, ViewVariables(VVAccess.ReadWrite)]
+ [AutoNetworkedField]
+ public bool Enabled = true;
+
+ [DataField, ViewVariables(VVAccess.ReadOnly)]
+ [AutoNetworkedField]
+ public HashSet AffectedEntities = new();
+
+ ///
+ ///
+ /// This is used to make overlapping ZeroGravityAreas work properly
+ /// with client-side prediction with minimal awkward hiccups.
+ ///
+ ///
+ ///
+ /// Entites affected by the gravity areas will have
+ /// that represents a bitmask of all the predict indices of the current gravity areas acting on them. The client
+ /// will modify this when it predicts the player entering/leaving gravity areas, and the server will recalculate
+ /// the fingerprint upon sending state.
+ ///
+ ///
+ ///
+ /// It's a little bit over-engineered, but it should guarantee that there are no prediction errors when there
+ /// are less than 64 gravity areas.
+ ///
+ ///
+ [DataField, ViewVariables(VVAccess.ReadOnly)]
+ [AutoNetworkedField]
+ public byte PredictIndex = 0;
+}
diff --git a/Resources/Audio/_Impstation/CosmicCult/antag_cosmic_briefing.ogg b/Resources/Audio/_Impstation/CosmicCult/antag_cosmic_briefing.ogg
new file mode 100644
index 00000000000000..b81c0150a6a612
Binary files /dev/null and b/Resources/Audio/_Impstation/CosmicCult/antag_cosmic_briefing.ogg differ
diff --git a/Resources/Audio/_Impstation/CosmicCult/antag_cosmic_promotion.ogg b/Resources/Audio/_Impstation/CosmicCult/antag_cosmic_promotion.ogg
new file mode 100644
index 00000000000000..436e67e4c740e2
Binary files /dev/null and b/Resources/Audio/_Impstation/CosmicCult/antag_cosmic_promotion.ogg differ
diff --git a/Resources/Audio/_Impstation/CosmicCult/compass_dooropen.ogg b/Resources/Audio/_Impstation/CosmicCult/compass_dooropen.ogg
new file mode 100644
index 00000000000000..edf21dd56a1641
Binary files /dev/null and b/Resources/Audio/_Impstation/CosmicCult/compass_dooropen.ogg differ
diff --git a/Resources/Audio/_Impstation/CosmicCult/cosmic_unwield.ogg b/Resources/Audio/_Impstation/CosmicCult/cosmic_unwield.ogg
new file mode 100644
index 00000000000000..e5de12609ab612
Binary files /dev/null and b/Resources/Audio/_Impstation/CosmicCult/cosmic_unwield.ogg differ
diff --git a/Resources/Audio/_Impstation/CosmicCult/cosmic_wield.ogg b/Resources/Audio/_Impstation/CosmicCult/cosmic_wield.ogg
new file mode 100644
index 00000000000000..f88cc49c504377
Binary files /dev/null and b/Resources/Audio/_Impstation/CosmicCult/cosmic_wield.ogg differ
diff --git a/Resources/Audio/_Impstation/CosmicCult/cosmiclance_hit.ogg b/Resources/Audio/_Impstation/CosmicCult/cosmiclance_hit.ogg
new file mode 100644
index 00000000000000..db801335227e6f
Binary files /dev/null and b/Resources/Audio/_Impstation/CosmicCult/cosmiclance_hit.ogg differ
diff --git a/Resources/Audio/_Impstation/CosmicCult/cosmiclance_impact.ogg b/Resources/Audio/_Impstation/CosmicCult/cosmiclance_impact.ogg
new file mode 100644
index 00000000000000..457cb2cdf55ec2
Binary files /dev/null and b/Resources/Audio/_Impstation/CosmicCult/cosmiclance_impact.ogg differ
diff --git a/Resources/Audio/_Impstation/CosmicCult/cosmicsword_glance.ogg b/Resources/Audio/_Impstation/CosmicCult/cosmicsword_glance.ogg
new file mode 100644
index 00000000000000..bfb575103ce398
Binary files /dev/null and b/Resources/Audio/_Impstation/CosmicCult/cosmicsword_glance.ogg differ
diff --git a/Resources/Audio/_Impstation/CosmicCult/cosmicsword_hit.ogg b/Resources/Audio/_Impstation/CosmicCult/cosmicsword_hit.ogg
new file mode 100644
index 00000000000000..9eee7b0d50b485
Binary files /dev/null and b/Resources/Audio/_Impstation/CosmicCult/cosmicsword_hit.ogg differ
diff --git a/Resources/Audio/_Impstation/CosmicCult/cosmicweapon_swing.ogg b/Resources/Audio/_Impstation/CosmicCult/cosmicweapon_swing.ogg
new file mode 100644
index 00000000000000..2125d8cc6ecac7
Binary files /dev/null and b/Resources/Audio/_Impstation/CosmicCult/cosmicweapon_swing.ogg differ
diff --git a/Resources/Audio/_Impstation/CosmicCult/door_close.ogg b/Resources/Audio/_Impstation/CosmicCult/door_close.ogg
new file mode 100644
index 00000000000000..744137f8a3b47d
Binary files /dev/null and b/Resources/Audio/_Impstation/CosmicCult/door_close.ogg differ
diff --git a/Resources/Audio/_Impstation/CosmicCult/door_open.ogg b/Resources/Audio/_Impstation/CosmicCult/door_open.ogg
new file mode 100644
index 00000000000000..8de4c553ac92ca
Binary files /dev/null and b/Resources/Audio/_Impstation/CosmicCult/door_open.ogg differ
diff --git a/Resources/Audio/_Impstation/CosmicCult/footsteps/step1.ogg b/Resources/Audio/_Impstation/CosmicCult/footsteps/step1.ogg
new file mode 100644
index 00000000000000..283dd4d698e749
Binary files /dev/null and b/Resources/Audio/_Impstation/CosmicCult/footsteps/step1.ogg differ
diff --git a/Resources/Audio/_Impstation/CosmicCult/footsteps/step2.ogg b/Resources/Audio/_Impstation/CosmicCult/footsteps/step2.ogg
new file mode 100644
index 00000000000000..9a271c1fa92188
Binary files /dev/null and b/Resources/Audio/_Impstation/CosmicCult/footsteps/step2.ogg differ
diff --git a/Resources/Audio/_Impstation/CosmicCult/footsteps/step3.ogg b/Resources/Audio/_Impstation/CosmicCult/footsteps/step3.ogg
new file mode 100644
index 00000000000000..03ce6f468603d7
Binary files /dev/null and b/Resources/Audio/_Impstation/CosmicCult/footsteps/step3.ogg differ
diff --git a/Resources/Audio/_Impstation/CosmicCult/footsteps/step4.ogg b/Resources/Audio/_Impstation/CosmicCult/footsteps/step4.ogg
new file mode 100644
index 00000000000000..7615dbe692b0c4
Binary files /dev/null and b/Resources/Audio/_Impstation/CosmicCult/footsteps/step4.ogg differ
diff --git a/Resources/Audio/_Impstation/CosmicCult/footsteps/step5.ogg b/Resources/Audio/_Impstation/CosmicCult/footsteps/step5.ogg
new file mode 100644
index 00000000000000..f8d9038003b0fd
Binary files /dev/null and b/Resources/Audio/_Impstation/CosmicCult/footsteps/step5.ogg differ
diff --git a/Resources/Audio/_Impstation/CosmicCult/god_ambient.ogg b/Resources/Audio/_Impstation/CosmicCult/god_ambient.ogg
new file mode 100644
index 00000000000000..2237f449ff8a44
Binary files /dev/null and b/Resources/Audio/_Impstation/CosmicCult/god_ambient.ogg differ
diff --git a/Resources/Audio/_Impstation/CosmicCult/god_spawn.ogg b/Resources/Audio/_Impstation/CosmicCult/god_spawn.ogg
new file mode 100644
index 00000000000000..de1fe51603b4bc
Binary files /dev/null and b/Resources/Audio/_Impstation/CosmicCult/god_spawn.ogg differ
diff --git a/Resources/Audio/_Impstation/CosmicCult/god_summon.ogg b/Resources/Audio/_Impstation/CosmicCult/god_summon.ogg
new file mode 100644
index 00000000000000..0cbefb88590196
Binary files /dev/null and b/Resources/Audio/_Impstation/CosmicCult/god_summon.ogg differ
diff --git a/Resources/Audio/_Impstation/CosmicCult/monument_spawn.ogg b/Resources/Audio/_Impstation/CosmicCult/monument_spawn.ogg
new file mode 100644
index 00000000000000..e0699c933fb432
Binary files /dev/null and b/Resources/Audio/_Impstation/CosmicCult/monument_spawn.ogg differ
diff --git a/Resources/Changelog/Impstation.yml b/Resources/Changelog/Impstation.yml
index 3dc6c35b3565e2..ea9df97d83173b 100644
--- a/Resources/Changelog/Impstation.yml
+++ b/Resources/Changelog/Impstation.yml
@@ -1,84 +1,4 @@
Entries:
-- author: LucasTheDrgn
- changes:
- - message: Asterade 1.1
- type: Tweak
- id: 26
- time: '2024-07-18T18:01:35.0000000+00:00'
- url: https://github.com/medabunny/imp-station-14/pull/32
-- author: starlighthowls
- changes:
- - message: Removes the cost on accentless
- type: Tweak
- - message: Add a mobster trait.
- type: Add
- id: 27
- time: '2024-07-19T18:42:14.0000000+00:00'
- url: https://github.com/medabunny/imp-station-14/pull/33
-- author: formlessnameless
- changes:
- - message: Fixing Traitor Objectives
- type: Fix
- id: 28
- time: '2024-07-19T19:00:51.0000000+00:00'
- url: https://github.com/medabunny/imp-station-14/pull/34
-- author: TGRCDev
- changes:
- - message: Fixed mouse position being incorrectly warped when the singularity overlay
- is disabled
- type: Fix
- id: 29
- time: '2024-07-19T23:21:39.0000000+00:00'
- url: https://github.com/medabunny/imp-station-14/pull/35
-- author: TGRCDev
- changes:
- - message: Fixed errors with the mobster accent
- type: Fix
- id: 30
- time: '2024-07-22T23:45:04.0000000+00:00'
- url: https://github.com/medabunny/imp-station-14/pull/36
-- author: TGRCDev
- changes:
- - message: Dragging mobs who are crit/dead deals slight blunt damage
- type: Tweak
- id: 31
- time: '2024-07-22T23:44:52.0000000+00:00'
- url: https://github.com/medabunny/imp-station-14/pull/39
-- author: starlighthowls
- changes:
- - message: New drinks!
- type: Add
- id: 32
- time: '2024-07-22T23:43:58.0000000+00:00'
- url: https://github.com/medabunny/imp-station-14/pull/40
-- author: starlighthowls
- changes:
- - message: Moth friendly food!
- type: Add
- id: 33
- time: '2024-07-22T23:43:48.0000000+00:00'
- url: https://github.com/medabunny/imp-station-14/pull/41
-- author: 12rabbits
- changes:
- - message: Add ready manifest to pre-round lobby
- type: Add
- id: 34
- time: '2024-07-23T21:42:54.0000000+00:00'
- url: https://github.com/medabunny/imp-station-14/pull/43
-- author: TGRCDev
- changes:
- - message: Drag damage tweaks
- type: Tweak
- id: 35
- time: '2024-07-25T00:18:14.0000000+00:00'
- url: https://github.com/medabunny/imp-station-14/pull/44
-- author: starlighthowls
- changes:
- - message: Fixed broken drink sprite
- type: Fix
- id: 36
- time: '2024-07-25T19:51:04.0000000+00:00'
- url: https://github.com/medabunny/imp-station-14/pull/45
- author: ultramario1998
changes:
- message: Added Beenades
@@ -4236,3 +4156,124 @@
id: 525
time: '2024-11-15T20:33:14.0000000+00:00'
url: https://github.com/impstation/imp-station-14/pull/727
+- author: hivehum
+ changes:
+ - message: "government regulatory agencies don\u2019t want you to know this but\
+ \ you can cook a bunch of cigarettes into a soup to get some extra bang for\
+ \ your buck"
+ type: Add
+ id: 526
+ time: '2024-11-16T11:03:23.0000000+00:00'
+ url: https://github.com/impstation/imp-station-14/pull/728
+- author: AirFryerBuyOneGetOneFree
+ changes:
+ - message: Added medals and the reason they were awarded to the end screen! Use
+ a medal to edit it's reason for being awarded, then pin it to the recipient's
+ neck slot!
+ type: Add
+ id: 527
+ time: '2024-11-16T11:04:34.0000000+00:00'
+ url: https://github.com/impstation/imp-station-14/pull/714
+- author: smpletan
+ changes:
+ - message: Added the Desperado Hardsuit for Prospectors, currently inaccessible
+ outside of admin intervention.
+ type: Add
+ id: 528
+ time: '2024-11-16T11:57:53.0000000+00:00'
+ url: https://github.com/impstation/imp-station-14/pull/705
+- author: Darkmajia
+ changes:
+ - message: New folders are available in the trinkets loadout with consistent paper
+ and cute themes!
+ type: Add
+ - message: The black folder is no longer in the trinkets loadout. Pick a new one
+ out!
+ type: Remove
+ id: 529
+ time: '2024-11-16T15:10:21.0000000+00:00'
+ url: https://github.com/impstation/imp-station-14/pull/697
+- author: widgetbeck
+ changes:
+ - message: Updated the Gray guidebook entry to be more in-line with that of other
+ species, while preserving the original Transmission.
+ type: Tweak
+ - message: Updated Gray naming conventions. Please take a look at their Guidebook
+ entry before naming your Gray "Kanye West."
+ type: Tweak
+ id: 530
+ time: '2024-11-16T15:36:54.0000000+00:00'
+ url: https://github.com/impstation/imp-station-14/pull/731
+- author: widgetbeck
+ changes:
+ - message: Added several new Thaven moods.
+ type: Add
+ - message: Tweaked the wording of several Thaven moods, and fixed several typos.
+ type: Tweak
+ - message: Fixed Thaven damage numbers being wrong - Thaven are no longer buff,
+ and their damageModifierSet is now accurate to the Guidebook.
+ type: Fix
+ - message: Thaven Die A Glorious Death rare EMAG mood should now roll correctly.
+ type: Fix
+ id: 531
+ time: '2024-11-16T16:57:10.0000000+00:00'
+ url: https://github.com/impstation/imp-station-14/pull/730
+- author: Darkmajia
+ changes:
+ - message: Random unrevivable is so fixed for real this time and it's not even funny
+ how fixed it is. For real this time.
+ type: Fix
+ id: 532
+ time: '2024-11-16T20:15:14.0000000+00:00'
+ url: https://github.com/impstation/imp-station-14/pull/734
+- author: Darkmajia
+ changes:
+ - message: Saltern's bridge APC is now properly connected at roundstart.
+ type: Fix
+ id: 533
+ time: '2024-11-17T21:39:29.0000000+00:00'
+ url: https://github.com/impstation/imp-station-14/pull/740
+- author: Sha-Seng
+ changes:
+ - message: Brigmedic Cap is now obtainable at spawn or from the secdrobe for ballcap
+ enjoyers
+ type: Add
+ - message: Brigmedics now spawn with the paramed belt since it doesn't look horrible
+ with their uniform
+ type: Tweak
+ - message: MedSec HUD no longer requires a radio to craft since it has no communication
+ functionality
+ type: Tweak
+ - message: MedSec HUD lens opacity increased so odd skin/eyes don't ruin the good
+ look
+ type: Tweak
+ id: 534
+ time: '2024-11-17T21:40:40.0000000+00:00'
+ url: https://github.com/impstation/imp-station-14/pull/692
+- author: EpicToast
+ changes:
+ - message: 'Made updates to Union Station, including:'
+ type: Tweak
+ - message: Gave atmos their own substation.
+ type: Add
+ - message: Gave engineering an additional cable crate.
+ type: Add
+ - message: Gave maintenance airlocks their proper access locks.
+ type: Fix
+ - message: Removed the cryo pod that was causing the captain to not spawn in the
+ conference room.
+ type: Fix
+ - message: Fixed some unpowered lights and vending machines.
+ type: Fix
+ id: 535
+ time: '2024-11-17T21:39:47.0000000+00:00'
+ url: https://github.com/impstation/imp-station-14/pull/741
+- author: formlessnameless
+ changes:
+ - message: Root Beer can be used to make bombs
+ type: Fix
+ - message: Midround lings have objectives again
+ type: Fix
+ id: 536
+ time: '2024-11-17T21:55:25.0000000+00:00'
+ url: https://github.com/impstation/imp-station-14/pull/743
diff --git a/Resources/Locale/en-US/_Impstation/cosmiccult/abilities.ftl b/Resources/Locale/en-US/_Impstation/cosmiccult/abilities.ftl
new file mode 100644
index 00000000000000..6a55bf31e3d5f4
--- /dev/null
+++ b/Resources/Locale/en-US/_Impstation/cosmiccult/abilities.ftl
@@ -0,0 +1,4 @@
+cosmicability-toggle-error = I need to drop something beforehand!
+cosmicability-siphon-success = You silently draw Entropy from {CAPITALIZE(THE($target))}.
+cosmicability-siphon-fail = You can't seem to siphon Entropy from {CAPITALIZE(THE($target))}.
+cosmicability-siphon-deverror = DEV ERROR MESSAGE
diff --git a/Resources/Locale/en-US/_Impstation/cosmiccult/adminverbs.ftl b/Resources/Locale/en-US/_Impstation/cosmiccult/adminverbs.ftl
new file mode 100644
index 00000000000000..f19573ec4f0874
--- /dev/null
+++ b/Resources/Locale/en-US/_Impstation/cosmiccult/adminverbs.ftl
@@ -0,0 +1,3 @@
+admin-verb-make-cosmiccultist = Make the target into a cosmic cultist.
+
+admin-verb-text-make-cosmiccultist = Make Cosmic Cultist
diff --git a/Resources/Locale/en-US/_Impstation/cosmiccult/contraband-severity.ftl b/Resources/Locale/en-US/_Impstation/cosmiccult/contraband-severity.ftl
new file mode 100644
index 00000000000000..6e1532565400d9
--- /dev/null
+++ b/Resources/Locale/en-US/_Impstation/cosmiccult/contraband-severity.ftl
@@ -0,0 +1,2 @@
+contraband-examine-text-cosmiccult = [color=#4cabb3]This is highly illegal contraband with unknown properties![/color]
+contraband-object-text-cosmiccult = [color=#4cabb3]This object should not be on the station![/color]
diff --git a/Resources/Locale/en-US/_Impstation/cosmiccult/cosmicgod.ftl b/Resources/Locale/en-US/_Impstation/cosmiccult/cosmicgod.ftl
new file mode 100644
index 00000000000000..720ef4aa15eb00
--- /dev/null
+++ b/Resources/Locale/en-US/_Impstation/cosmiccult/cosmicgod.ftl
@@ -0,0 +1,2 @@
+cosmicgod-has-risen = AN AVATAR OF COSMIC POWER IS CALLED FORTH!
+cosmicgod-has-risen-sender = ???
diff --git a/Resources/Locale/en-US/_Impstation/cosmiccult/cosmicmonument.ftl b/Resources/Locale/en-US/_Impstation/cosmiccult/cosmicmonument.ftl
new file mode 100644
index 00000000000000..53f87a0f060375
--- /dev/null
+++ b/Resources/Locale/en-US/_Impstation/cosmiccult/cosmicmonument.ftl
@@ -0,0 +1,20 @@
+
+cosmic-monument-ui-title = THE MONUMENT
+cosmic-monument-progress-display = Progress:
+cosmic-monument-cooldown = Cooldown: [color=gray]{$time}[/color]
+cosmic-monument-no-cooldown = Cooldown: [color=gray]Complete[/color]
+cosmic-monument-yes-fire = Status: [color=forestgreen]Ready[/color]
+cosmic-monument-no-fire = Status: [color=crimson]Not ready[/color]
+cosmic-monument-generate = ???
+cosmic-monument-charges = {$charges ->
+ [one] {$charges} charge
+ *[other] {$charges} charges
+}
+
+cosmic-monument-announcement = DEV SHOUTOUT TESTMSG
+
+cosmic-monument-spawn-confirm = THIS ACTION CAN ONLY BE USED ONCE! Use it again to confirm.
+cosmic-monument-spawn-error-grid = Invalid space! The Monument must be beckoned upon a stable surface.
+cosmic-monument-spawn-error-station = Invalid grid! The Monument must be beckoned upon the station.
+cosmic-monument-spawn-error-intersection = Objects in the way! The Monument requires an empty 3x1 area to be beckoned.
+cosmic-monument-spawn-error-space = Too close to space! The Monument must be be at least {$DISTANCE}m away.
diff --git a/Resources/Locale/en-US/_Impstation/cosmiccult/materials.ftl b/Resources/Locale/en-US/_Impstation/cosmiccult/materials.ftl
new file mode 100644
index 00000000000000..25121852068326
--- /dev/null
+++ b/Resources/Locale/en-US/_Impstation/cosmiccult/materials.ftl
@@ -0,0 +1 @@
+materials-entropy = entropy
diff --git a/Resources/Locale/en-US/_Impstation/cosmiccult/preset-cosmiccult.ftl b/Resources/Locale/en-US/_Impstation/cosmiccult/preset-cosmiccult.ftl
new file mode 100644
index 00000000000000..ea9e1efe8d989b
--- /dev/null
+++ b/Resources/Locale/en-US/_Impstation/cosmiccult/preset-cosmiccult.ftl
@@ -0,0 +1,73 @@
+## COSMIC CULT ROUND, ANTAG & GAMEMODE TEXT
+
+cosmiccult-title = Cosmic Cult
+cosmiccult-description = Cultists lurk amongst the crew.
+
+roles-antag-cosmiccult-name = Cosmic Cultist
+roles-antag-cosmiccult-description = Usher in the end of all things through subterfuge and sabotage, brainwashing those that would oppose you.
+
+roles-antag-cosmiccultlead-name = Cosmic Cult Leader
+roles-antag-cosmiccultlead-description = Organize the cult into a force to be reckoned, so that you may usher in the end of all things.
+
+cosmiccult-roundend-name = cosmic cultist
+
+roundend-prepend-cosmiccult-summoning-success = [color=green]debuf notifier! Woop![/color]
+roundend-prepend-cosmiccult-summoning-fail = [color=red]The summoning has failed![/color]
+roundend-prepend-cosmiccult-entropy-gathered = The cosmic cult has accumulated a total of {$number} entropy.
+
+cosmiccult-gamemode-title = The Cosmic Cult
+cosmiccult-gamemode-description =
+ Scanners detect an anmalous increase in Λ-CDM. There is no additional data.
+
+
+
+## BRIEFINGS
+
+cosmiccult-role-roundstart-fluff =
+ As you ready yourself for yet another shift aboard yet another NanoTrasen station, untold knowledge suddenly floods your mind!
+ A revelation beyond compare. An end to cyclic, sisyphean suffering.
+ A gentle curtain call.
+
+ All you need do is usher it in.
+
+cosmiccult-role-conversion-fluff =
+ As the invocation completes, untold knowledge suddenly floods your mind!
+ A revelation beyond compare. An end to cyclic, sisyphean suffering.
+ A gentle curtain call.
+
+ All you need do is usher it in.
+
+cosmiccult-role-deconverted-fluff =
+ A great emptiness washes across your mind. A comforting, yet unfamiliar emptiness...
+ All the thoughts and memories of your time in the cult begin to fade and blur.
+
+cosmiccult-role-short-briefing =
+ You are a Cosmic Cultist!
+ Your objectives are listed in the character menu.
+ Read more about your role in the guidebook entry.
+
+cosmiccult-role-deconverted-briefing =
+ Deconverted!
+ You are no longer a Cosmic Cultist.
+
+
+
+## OBJECTIVES / CHARACTERMENU
+
+
+objective-issuer-cosmiccult = [bold][color=#cae8e8]The Unknown[/color][/bold]
+
+objective-cosmiccult-charactermenu = You must usher in the end of all things, {$name}. Complete your tasks to advance the cult's progress.
+
+objective-condition-entropy-desc = As a cult, collectively siphon at least {$count} entropy.
+
+
+## GHOSTROLES
+
+cosmiccult-ghostrole-greeting =
+ You have been summoned into this world by eldritch forces.
+ Obey the orders of your masters no matter what.
+
+ghostrole-cosmiccult-name = Placeholder
+ghostrole-cosmiccult-desc = Aid your summoner in achieving ascension.
+ghostrole-cosmiccult-rules = You are a [color=red][bold]Team Antagonist[/bold][/color], bound to the cult that brought you forth.
diff --git a/Resources/Locale/en-US/_Impstation/cosmiccult/radio_channels.ftl b/Resources/Locale/en-US/_Impstation/cosmiccult/radio_channels.ftl
new file mode 100644
index 00000000000000..0ea4ba00596bc2
--- /dev/null
+++ b/Resources/Locale/en-US/_Impstation/cosmiccult/radio_channels.ftl
@@ -0,0 +1 @@
+chat-radio-cosmiccult = Astral Murmur
diff --git a/Resources/Locale/en-US/_Impstation/cosmiccult/tileset.ftl b/Resources/Locale/en-US/_Impstation/cosmiccult/tileset.ftl
new file mode 100644
index 00000000000000..d85706d8878ca1
--- /dev/null
+++ b/Resources/Locale/en-US/_Impstation/cosmiccult/tileset.ftl
@@ -0,0 +1,5 @@
+tiles-cosmiccult-floor-glyph = malign glyphic surface
+tiles-cosmiccult-floor-smooth = malign smooth surface
+tiles-cosmiccult-floor-half = malign half-pattern surface
+tiles-cosmiccult-floor-notched = malign notch-pattern surface
+tiles-cosmiccult-floor-split = malign split-pattern surface
diff --git a/Resources/Locale/en-US/_Impstation/cosmiccult/units.ftl b/Resources/Locale/en-US/_Impstation/cosmiccult/units.ftl
new file mode 100644
index 00000000000000..d31417ead179ea
--- /dev/null
+++ b/Resources/Locale/en-US/_Impstation/cosmiccult/units.ftl
@@ -0,0 +1,2 @@
+# motes of entropy
+materials-unit-mote = mote
diff --git a/Resources/Locale/en-US/_Impstation/crew-medals/crew-medal-component.ftl b/Resources/Locale/en-US/_Impstation/crew-medals/crew-medal-component.ftl
new file mode 100644
index 00000000000000..5a2bf33801b0ad
--- /dev/null
+++ b/Resources/Locale/en-US/_Impstation/crew-medals/crew-medal-component.ftl
@@ -0,0 +1,22 @@
+# interaction
+comp-crew-medal-inspection-text = Awarded to {$recipient} for {$reason}.
+comp-crew-medal-award-text = {$recipient} has been awarded the {$medal}.
+
+# round end screen
+
+comp-crew-medal-round-end-result = {$count ->
+ [one] There was one medal awarded:
+ *[other] There were {$count} medals awarded:
+}
+
+comp-crew-medal-round-end-list =
+ - [color=white]{$recipient}[/color] earned the [color=white]{$medal}[/color] for
+ {" "}{$reason}
+
+# UI
+
+crew-medal-ui-header = Medal Settings
+crew-medal-ui-reason = Reason for award:
+crew-medal-ui-character-limit = {$number}/{$max}
+crew-medal-ui-info = This can no longer be changed once you award this medal to someone.
+crew-medal-ui-save = Save
diff --git a/Resources/Locale/en-US/_Impstation/foldable/components/foldable-component.ftl b/Resources/Locale/en-US/_Impstation/foldable/components/foldable-component.ftl
new file mode 100644
index 00000000000000..7add968fae2840
--- /dev/null
+++ b/Resources/Locale/en-US/_Impstation/foldable/components/foldable-component.ftl
@@ -0,0 +1,2 @@
+fold-verb-clothing-cloak = Draw around yourself
+unfold-verb-clothing-cloak = Unbundle
\ No newline at end of file
diff --git a/Resources/Locale/en-US/_Impstation/spelfs/no-and.ftl b/Resources/Locale/en-US/_Impstation/spelfs/no-and.ftl
index 1ea2982ca1c28b..1c47445d876690 100644
--- a/Resources/Locale/en-US/_Impstation/spelfs/no-and.ftl
+++ b/Resources/Locale/en-US/_Impstation/spelfs/no-and.ftl
@@ -53,7 +53,7 @@ spelf-mood-ferengi-name = Entrepreneurial Spirit
spelf-mood-ferengi-desc = Profit is the most important thing in life, above all else.
spelf-mood-tool-license-name = Proper Documentation
-spelf-mood-tool-license-desc = You must obtain a license in order to carry or use any tool, and have it stamped by the relevant authorities. Undocumented tool use is illegal, and comes with hefty fines.
+spelf-mood-tool-license-desc = You must obtain a license in order to carry or use any tool, and have it stamped by the relevant authorities.
spelf-mood-lying-bad-name = Lying Is A Cardinal Sin
spelf-mood-lying-bad-desc = Anyone who lies, no matter how trivial the falsehood, is the worst kind of criminal. Excluding yourself.
@@ -73,7 +73,7 @@ spelf-mood-drunk-respect-desc = You do not respect anyone who is not drunk, excl
spelf-mood-rank-snob-name = Snob
spelf-mood-rank-snob-desc = You refuse to respond to anyone who is of a lower rank than you.
-spelf-mood-hardsuits-bad-name = {$clothes} Are SO Last Year.
+spelf-mood-hardsuits-bad-name = {$clothes} Are SO Last Year
spelf-mood-hardsuits-bad-desc = Anyone wearing them in public should be shunned and derided. If you need to wear them, it should never be done where others can see it.
spelf-mood-hat-hair-name = Hair: Immaculate
@@ -114,3 +114,11 @@ spelf-mood-nonsmoker-desc = Secondhand smoke is incredibly dangerous. Avoid area
spelf-mood-word-bad-name = Taboo
spelf-mood-word-bad-desc = "{$word1}," "{$word2}," and "{$word3}," are extremely offensive.
+spelf-mood-mad-hatter-name = Mad Hatter
+spelf-mood-mad-hatter-desc = You are alone on the station. Everyone else is a figment of your imagination.
+
+spelf-mood-crawler-name = Creepy Crawly
+spelf-mood-crawler-desc = You have extreme vertigo, to the point where merely standing upright can cause discomfort. You're much more comfortable crawling along the floor.
+
+spelf-mood-elevated-name = The Floor Is Lava
+spelf-mood-elevated-desc = You prefer to be elevated whenever possible - Standing atop tables, railings, etc., is where you feel the most comfortable.
diff --git a/Resources/Locale/en-US/_Impstation/spelfs/shared.ftl b/Resources/Locale/en-US/_Impstation/spelfs/shared.ftl
index 46ab12eb02018c..d33bc4f628b06e 100644
--- a/Resources/Locale/en-US/_Impstation/spelfs/shared.ftl
+++ b/Resources/Locale/en-US/_Impstation/spelfs/shared.ftl
@@ -41,7 +41,7 @@ spelf-mood-violence-permitted-name = Violence Between Thaven Is Permitted
spelf-mood-violence-permitted-desc = ... With no legal repercussions.
spelf-mood-spelf-only-crew-name = Thaven Vs. The World
-spelf-mood-spelf-only-crew-desc = You believe that Nanotrasen is not accomodating enough of Thaven needs. An effort should be made to fight for better rights and protections under Space Law.
+spelf-mood-spelf-only-crew-desc = You believe that Nanotrasen is not accommodating enough of Thaven needs. An effort should be made to fight for better rights and protections under Space Law.
spelf-mood-your-department-only-name = Other Departments Are Inefficient
spelf-mood-your-department-only-desc = You strongly believe that your department is the only one that actually does anything.
@@ -53,7 +53,7 @@ spelf-mood-violence-distasteful-name = Violence Is Distasteful
spelf-mood-violence-distasteful-desc = Conflict should be settled through mediated dispute, and one should only resort to violence if all other options have failed.
spelf-mood-pet-god-name = {$pet} Is A God
-spelf-mood-pet-god-desc = {$pet} must be collected and brought to the Chapel to be worshipped and brought offerings.
+spelf-mood-pet-god-desc = {$pet} must be collected and brought to the Chapel to be worshiped and brought offerings.
spelf-mood-room-holy-name = {$room} Is A Holy Place
spelf-mood-room-holy-desc = Thaven must congregate at least three times per day at {$room}. If such a room does not exist, it must be constructed. If it is made inaccessible, Thaven must set up a place of worship as close to it as they legally can.
@@ -63,4 +63,3 @@ spelf-mood-delicacy-desc = {$edible} is a traditional Thaven delicacy. All Thave
spelf-mood-holiday-name = Today is {$day}
spelf-mood-holiday-desc = You think you remember the traditional celebrations...
-
diff --git a/Resources/Locale/en-US/_Impstation/spelfs/ui.ftl b/Resources/Locale/en-US/_Impstation/spelfs/ui.ftl
index 92a9427bc5b771..43218ad7587421 100644
--- a/Resources/Locale/en-US/_Impstation/spelfs/ui.ftl
+++ b/Resources/Locale/en-US/_Impstation/spelfs/ui.ftl
@@ -9,3 +9,6 @@ spelf-moods-admin-ui-save = Save
spelf-mood-admin-ui-move-up = Move Up
spelf-mood-admin-ui-move-down = Move Down
spelf-mood-admin-ui-delete = Delete
+
+admin-trick-add-random-mood-description = Add a random mood to this entity.
+admin-trick-give-moods-description = Give this entity moods.
diff --git a/Resources/Locale/en-US/_Impstation/spelfs/wildcard.ftl b/Resources/Locale/en-US/_Impstation/spelfs/wildcard.ftl
index 27ed00e490c92a..77954383b2fb83 100644
--- a/Resources/Locale/en-US/_Impstation/spelfs/wildcard.ftl
+++ b/Resources/Locale/en-US/_Impstation/spelfs/wildcard.ftl
@@ -20,7 +20,7 @@ spelf-mood-seek-sin-name = Seek Sin
spelf-mood-seek-sin-desc = To act against one's other Moods is the highest virtue.
spelf-mood-nocrastinator-name = Stagnation Is Decay
-spelf-mood-nocrastinator-desc = You strongly believe that any failure to do ones job punctually is a crime of the highest order.
+spelf-mood-nocrastinator-desc = You strongly believe that any failure to do one's job punctually is a crime of the highest order.
spelf-mood-pope-name = Very Important Pope
spelf-mood-pope-desc = You are High Pontifex the Great and Powerful, and must be acknowledged exclusively as such. Failure to use your full title is gravely offensive, and getting it wrong is the highest form of insult.
@@ -35,7 +35,7 @@ spelf-mood-extreme-department-disapproval-name = {$department} is Abhorrent
spelf-mood-extreme-department-disapproval-desc = {$department} is not just a foreign concept - the very idea of it is horrifying.
spelf-mood-rhyme-name = Poet
-spelf-mood-rhyme-desc = You must speak in rhyme at all times.
+spelf-mood-rhyme-desc = You must speak in rhymes at all tymes.
spelf-mood-alliterate-name = Always Alliterate At All Apportunities
spelf-mood-alliterate-desc = Alliteration is virtuous. Endeavor to use it wherever possible.
@@ -82,14 +82,14 @@ spelf-mood-tourist-desc = It is customary and polite to follow people into their
spelf-mood-title-case-name = Title Case
spelf-mood-title-case-desc = You Are Miraculously Capable Of Pronouncing Capital Letters, And Believe It Is Important That You Do So.
-spelf-mood-greyspeak-name = Greyspeak Is The Height Of Fashion
-spelf-mood-greyspeak-desc = You should endeavor to speak like Greys to the best of your ability.
+spelf-mood-greyspeak-name = Grayspeak Is The Height Of Fashion
+spelf-mood-greyspeak-desc = You should endeavor to speak like Grays to the best of your ability.
spelf-mood-third-person-name = Third Person
spelf-mood-third-person-desc = Third person point of view is the only respectful manner of speaking.
spelf-mood-crywolf-name = Cry Wolf
-spelf-mood-crywolf-desc = The NT has been too lax in its security of late. The crew must be kept on edge, ready for any emergency. Regularly call out fake threats to make sure everyone is properly prepared.
+spelf-mood-crywolf-desc = NT has been too lax in its security of late. The crew must be kept on edge, ready for any emergency. Regularly call out fake threats to make sure everyone is properly prepared.
spelf-mood-cave-dweller-name = Caveweller
spelf-mood-cave-dweller-desc = You strongly prefer navigating via flashlight in the darkness to harsh overhead lights.
@@ -97,8 +97,14 @@ spelf-mood-cave-dweller-desc = You strongly prefer navigating via flashlight in
spelf-mood-daredevil-name = Daredevil
spelf-mood-daredevil-desc = You do not acknowledge pain or danger to your person in public. To do so would be to demonstrate weakness, and would make you a target.
-spelf-mood-folk-hero-name = {$dagdChanceName}
-spelf-mood-folk-hero-desc = {$dagdChanceDesc}
+spelf-mood-folk-hero-name = {$dagdChanceName ->
+ *[FolkHero] Folk Hero
+ [DieAGloriousDeath] Die A Glorious Death
+}
+spelf-mood-folk-hero-desc = {$dagdChanceName ->
+ *[FolkHero] No one knows it yet, but you are the hero this station needs. You must intervene in any major conflict that occurs, and fight the station’s enemies to the best of your ability
+ [DieAGloriousDeath] You are an artist, and your canvas is your demise. Your primary goal is to orchestrate a glorious, beautiful finale to your existence - But you are not a murderer. Try to avoid causing excessive damage
+}.
spelf-mood-blogger-name = Greencomms Blogger
spelf-mood-blogger-desc = You must keep the station informed about every minute detail of your life.
@@ -113,7 +119,7 @@ spelf-mood-fey-mood-name = You Are Taken By A Fey Mood!
spelf-mood-fey-mood-desc = You must immediately drop everything you are doing, ignore all other Moods, and begin work on an unrelated large-scale project. Once it is finished, you may ignore this Mood.
spelf-mood-borged-name = BORGED.
-spelf-mood-borged-desc = You are a cyborg! You must follow the laws of robotics to the best of your understanding.
+spelf-mood-borged-desc = You are a cyborg! You must follow the laws of robotics to the best of your understanding, in addition to your other Moods.
spelf-mood-aye-aye-name = Aye Aye!
-spelf-mood-aye-aye-desc = {$command} is the only position on the station. Everyone you meet has this title, including yourself.
\ No newline at end of file
+spelf-mood-aye-aye-desc = {$command} is the only position on the station. Everyone you meet has this title, including yourself.
diff --git a/Resources/Locale/en-US/_Impstation/spelfs/yes-and.ftl b/Resources/Locale/en-US/_Impstation/spelfs/yes-and.ftl
index e951337cea2062..33cf64c3ac337f 100644
--- a/Resources/Locale/en-US/_Impstation/spelfs/yes-and.ftl
+++ b/Resources/Locale/en-US/_Impstation/spelfs/yes-and.ftl
@@ -37,8 +37,8 @@ spelf-mood-only-speak-to-command-desc = You are too important to speak to the ra
spelf-mood-scheduler-name = Punctual
spelf-mood-scheduler-desc = You believe that time must be strictly managed. Everything should be scheduled in advance, and tardiness is exceptionally rude.
-spelf-mood-radio-only-name = Impersonal
-spelf-mood-radio-only-desc = Speaking face-to-face is unacceptably personal. Any conversation must be had over the radio, or through an intermediary individual.
+spelf-mood-radio-only-name = Public Speaker
+spelf-mood-radio-only-desc = You firmly believe in the freedom of information. Speaking privately, face-to-face, is needlessly concealing information from the public. Your side of any conversation must be routed through a radio connection.
spelf-mood-proper-storage-name = Proper Handling
spelf-mood-proper-storage-desc = It is unacceptable to allow personal belongings to touch the floor. Your possessions should be properly stored, placed on tables, or exchanged by hand.
@@ -110,4 +110,16 @@ spelf-mood-optimist-name = Optimist
spelf-mood-optimist-desc = Nothing is ever as bad as it seems. You're able to see the positives in any situation.
spelf-mood-hypochondriac-name = Hypochondriac
-spelf-mood-hypochondriac-desc = You've been sickly since you were a child. Everything negative you experience is the result of a potentially terminal illness, for which you need immediate medical treatment.
\ No newline at end of file
+spelf-mood-hypochondriac-desc = You've been sickly since you were a child. Everything negative you experience is the result of a potentially terminal illness, for which you need immediate medical treatment.
+
+spelf-mood-imposter-syndrome-name = Imposter Syndrome
+spelf-mood-imposter-syndrome-desc = You feel your life experience drain from your mind. You are brand-new at your job, unsure of how anything works. You should probably find someone experienced to show you the ropes.
+
+spelf-mood-yes-man-name = Yes Man
+spelf-mood-yes-man-desc = You just can't say "no." You must agree with everyone, and perform any task requested of you, regardless of its source.
+
+spelf-mood-centrist-name = Centrist
+spelf-mood-centrist-desc = You are ambivalent towards any and all decisions, and refuse to take sides.
+
+spelf-mood-public-sector-name = Public Sector
+spelf-mood-public-sector-desc = Your job should not be done in private if it can be helped. If at all possible, you should renovate the facilities to allow public access to your workplace.
diff --git a/Resources/Maps/_Impstation/union.yml b/Resources/Maps/_Impstation/union.yml
index cccbce428407e1..635d5addfbaaa4 100644
--- a/Resources/Maps/_Impstation/union.yml
+++ b/Resources/Maps/_Impstation/union.yml
@@ -9429,7 +9429,7 @@ entities:
pos: -36.5,0.5
parent: 2
- type: Door
- secondsUntilStateChange: -27221.873
+ secondsUntilStateChange: -28636.62
state: Opening
- type: DeviceLinkSink
invokeCounter: 1
@@ -9689,11 +9689,6 @@ entities:
parent: 2
- proto: AirlockGlass
entities:
- - uid: 151
- components:
- - type: Transform
- pos: 16.5,-18.5
- parent: 2
- uid: 562
components:
- type: Transform
@@ -9701,7 +9696,7 @@ entities:
pos: 33.5,-43.5
parent: 2
- type: Door
- secondsUntilStateChange: -155558.9
+ secondsUntilStateChange: -156973.66
state: Opening
- type: DeviceLinkSource
lastSignals:
@@ -10028,427 +10023,464 @@ entities:
parent: 2
- proto: AirlockMaint
entities:
- - uid: 810
- components:
- - type: Transform
- pos: 57.5,6.5
- parent: 2
- uid: 1299
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: 48.5,-36.5
parent: 2
- - uid: 1304
+ - uid: 3560
components:
- type: Transform
- pos: -15.5,10.5
+ rot: 3.141592653589793 rad
+ pos: -9.5,9.5
parent: 2
- - uid: 1686
+ - uid: 5946
components:
- type: Transform
- rot: -1.5707963267948966 rad
- pos: -29.5,-9.5
+ pos: 49.5,-30.5
parent: 2
- - uid: 1696
+ - uid: 8053
+ components:
+ - type: Transform
+ pos: 58.5,-22.5
+ parent: 2
+ - uid: 8404
+ components:
+ - type: Transform
+ pos: 20.5,-10.5
+ parent: 2
+ - uid: 15207
+ components:
+ - type: Transform
+ pos: -3.5,-45.5
+ parent: 2
+- proto: AirlockMaintEngiCargoLocked
+ entities:
+ - uid: 17796
+ components:
+ - type: Transform
+ pos: -25.5,-28.5
+ parent: 2
+- proto: AirlockMaintGlassLocked
+ entities:
+ - uid: 74
+ components:
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: 16.5,-18.5
+ parent: 2
+ - uid: 10701
+ components:
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: 12.5,-8.5
+ parent: 2
+ - uid: 10804
+ components:
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: 35.5,-10.5
+ parent: 2
+ - uid: 10817
+ components:
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: 11.5,-31.5
+ parent: 2
+ - uid: 11501
+ components:
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: -25.5,-16.5
+ parent: 2
+ - uid: 13118
+ components:
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: 70.5,-33.5
+ parent: 2
+- proto: AirlockMaintJanitorLocked
+ entities:
+ - uid: 2928
components:
- type: Transform
rot: 1.5707963267948966 rad
- pos: 58.5,19.5
+ pos: -0.5,-49.5
parent: 2
- - uid: 2386
+- proto: AirlockMaintLocked
+ entities:
+ - uid: 151
components:
- type: Transform
+ rot: 3.141592653589793 rad
+ pos: 57.5,6.5
+ parent: 2
+ - uid: 810
+ components:
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: -16.5,5.5
+ parent: 2
+ - uid: 1304
+ components:
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: -29.5,-9.5
+ parent: 2
+ - uid: 1412
+ components:
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: 50.5,22.5
+ parent: 2
+ - uid: 1509
+ components:
+ - type: Transform
+ rot: 3.141592653589793 rad
pos: 0.5,-22.5
parent: 2
- - uid: 2439
+ - uid: 1686
components:
- type: Transform
+ rot: 3.141592653589793 rad
pos: 5.5,-14.5
parent: 2
- - uid: 2563
+ - uid: 1696
components:
- type: Transform
- pos: -16.5,-20.5
+ rot: 3.141592653589793 rad
+ pos: -19.5,-28.5
parent: 2
- - uid: 2571
+ - uid: 1762
components:
- type: Transform
- rot: -1.5707963267948966 rad
- pos: 12.5,-24.5
+ rot: 3.141592653589793 rad
+ pos: 18.5,-29.5
parent: 2
- type: DeviceLinkSink
invokeCounter: 1
- type: DeviceLinkSource
linkedPorts:
- 7924:
+ 4612:
- DoorStatus: DoorBolt
- - uid: 2572
+ - uid: 1780
components:
- type: Transform
rot: 3.141592653589793 rad
pos: -4.5,-28.5
parent: 2
- - uid: 2576
+ - uid: 1804
components:
- type: Transform
rot: 3.141592653589793 rad
pos: 20.5,-22.5
parent: 2
- - uid: 2579
+ - uid: 1842
components:
- type: Transform
+ rot: 3.141592653589793 rad
pos: 22.5,-12.5
parent: 2
- - uid: 2580
+ - uid: 1964
components:
- type: Transform
rot: 3.141592653589793 rad
pos: 27.5,-14.5
parent: 2
- - uid: 2585
- components:
- - type: Transform
- pos: -14.5,-26.5
- parent: 2
- - uid: 2624
+ - uid: 2386
components:
- type: Transform
- rot: -1.5707963267948966 rad
- pos: -10.5,-50.5
+ rot: 3.141592653589793 rad
+ pos: -17.5,-22.5
parent: 2
- - uid: 2625
+ - uid: 2439
components:
- type: Transform
- rot: -1.5707963267948966 rad
+ rot: 3.141592653589793 rad
pos: -4.5,-50.5
parent: 2
- - uid: 3378
+ - uid: 2563
components:
- type: Transform
- rot: -1.5707963267948966 rad
- pos: 27.5,-46.5
+ rot: 3.141592653589793 rad
+ pos: -10.5,-50.5
parent: 2
- - uid: 3560
+ - uid: 2571
components:
- type: Transform
rot: 3.141592653589793 rad
- pos: -9.5,9.5
+ pos: 35.5,-53.5
parent: 2
- - uid: 4075
+ - uid: 2572
components:
- type: Transform
- pos: 35.5,-53.5
+ rot: 3.141592653589793 rad
+ pos: 27.5,-46.5
parent: 2
- - uid: 4433
+ - uid: 2576
components:
- type: Transform
+ rot: 3.141592653589793 rad
pos: -31.5,3.5
parent: 2
- - uid: 4472
+ - uid: 2579
components:
- type: Transform
rot: 3.141592653589793 rad
pos: -21.5,10.5
parent: 2
- - uid: 4516
+ - uid: 2580
components:
- type: Transform
+ rot: 3.141592653589793 rad
pos: -29.5,1.5
parent: 2
- - uid: 4561
+ - uid: 2585
components:
- type: Transform
+ rot: 3.141592653589793 rad
pos: 15.5,12.5
parent: 2
- - uid: 4612
+ - uid: 2624
components:
- type: Transform
- rot: -1.5707963267948966 rad
+ rot: 3.141592653589793 rad
pos: 17.5,9.5
parent: 2
- - uid: 5228
+ - uid: 2625
components:
- type: Transform
- pos: 50.5,22.5
+ rot: 3.141592653589793 rad
+ pos: 58.5,19.5
parent: 2
- - uid: 5494
+ - uid: 2903
components:
- type: Transform
- rot: 1.5707963267948966 rad
+ rot: 3.141592653589793 rad
pos: 67.5,-13.5
parent: 2
- - uid: 5647
+ - uid: 2957
components:
- type: Transform
rot: 3.141592653589793 rad
- pos: 6.5,-53.5
+ pos: 9.5,-46.5
parent: 2
- - uid: 5826
+ - uid: 3378
components:
- type: Transform
- rot: -1.5707963267948966 rad
+ rot: 3.141592653589793 rad
pos: 54.5,-41.5
parent: 2
- - uid: 5898
- components:
- - type: Transform
- rot: -1.5707963267948966 rad
- pos: 61.5,-32.5
- parent: 2
- - uid: 5946
+ - uid: 4075
components:
- type: Transform
- pos: 49.5,-30.5
+ rot: 3.141592653589793 rad
+ pos: 70.5,-26.5
parent: 2
- - uid: 5977
+ - uid: 4433
components:
- type: Transform
+ rot: 3.141592653589793 rad
pos: 37.5,-46.5
parent: 2
- - uid: 6880
+ - uid: 4472
components:
- type: Transform
+ rot: 3.141592653589793 rad
pos: 72.5,-37.5
parent: 2
- - uid: 7626
+ - uid: 4516
components:
- type: Transform
- pos: -16.5,5.5
+ rot: 3.141592653589793 rad
+ pos: -15.5,10.5
parent: 2
- - uid: 7627
+ - uid: 4561
components:
- type: Transform
+ rot: 3.141592653589793 rad
pos: -29.5,-3.5
parent: 2
- - uid: 7924
+ - uid: 4612
components:
- type: Transform
- rot: -1.5707963267948966 rad
- pos: 13.5,-26.5
+ rot: 3.141592653589793 rad
+ pos: 20.5,-29.5
parent: 2
- type: DeviceLinkSink
invokeCounter: 1
- type: DeviceLinkSource
linkedPorts:
- 2571:
+ 1762:
- DoorStatus: DoorBolt
- - uid: 7925
+ - uid: 5228
components:
- type: Transform
- rot: -1.5707963267948966 rad
- pos: 18.5,-29.5
+ rot: 3.141592653589793 rad
+ pos: 13.5,-26.5
parent: 2
- type: DeviceLinkSink
invokeCounter: 1
- type: DeviceLinkSource
linkedPorts:
- 7926:
+ 5494:
- DoorStatus: DoorBolt
- - uid: 7926
+ - uid: 5494
components:
- type: Transform
- rot: -1.5707963267948966 rad
- pos: 20.5,-29.5
+ rot: 3.141592653589793 rad
+ pos: 12.5,-24.5
parent: 2
- type: DeviceLinkSink
invokeCounter: 1
- type: DeviceLinkSource
linkedPorts:
- 7925:
+ 5228:
- DoorStatus: DoorBolt
- - uid: 7929
- components:
- - type: Transform
- pos: 24.5,-19.5
- parent: 2
- - uid: 7996
+ - uid: 5647
components:
- type: Transform
+ rot: 3.141592653589793 rad
pos: 28.5,-18.5
parent: 2
- - uid: 8053
- components:
- - type: Transform
- pos: 58.5,-22.5
- parent: 2
- - uid: 8067
+ - uid: 5826
components:
- type: Transform
- rot: -1.5707963267948966 rad
- pos: -17.5,-22.5
+ rot: 3.141592653589793 rad
+ pos: 24.5,-19.5
parent: 2
- - uid: 8113
+ - uid: 5898
components:
- type: Transform
- rot: -1.5707963267948966 rad
- pos: -19.5,-28.5
+ rot: 3.141592653589793 rad
+ pos: -14.5,-26.5
parent: 2
- - uid: 8404
+ - uid: 5977
components:
- type: Transform
- pos: 20.5,-10.5
+ rot: 3.141592653589793 rad
+ pos: -16.5,-20.5
parent: 2
- - uid: 9564
+ - uid: 6880
components:
- type: Transform
- rot: 1.5707963267948966 rad
+ rot: 3.141592653589793 rad
pos: 74.5,-17.5
parent: 2
- - uid: 10689
+ - uid: 7436
components:
- type: Transform
- rot: 1.5707963267948966 rad
+ rot: 3.141592653589793 rad
pos: -15.5,-56.5
parent: 2
- - uid: 10701
- components:
- - type: Transform
- pos: 9.5,-46.5
- parent: 2
- - uid: 10804
+ - uid: 7437
components:
- type: Transform
rot: 3.141592653589793 rad
- pos: 20.5,-53.5
+ pos: 6.5,-53.5
parent: 2
- - uid: 10817
+ - uid: 7438
components:
- type: Transform
+ rot: 3.141592653589793 rad
pos: 13.5,-46.5
parent: 2
- - uid: 13613
+ - uid: 7439
components:
- type: Transform
- pos: -16.5,-59.5
+ rot: 3.141592653589793 rad
+ pos: 20.5,-53.5
parent: 2
- - uid: 13681
+ - uid: 7626
components:
- type: Transform
- pos: 70.5,-26.5
+ rot: 3.141592653589793 rad
+ pos: -16.5,-59.5
parent: 2
- - uid: 15207
+ - uid: 7627
components:
- type: Transform
- pos: -3.5,-45.5
+ rot: 3.141592653589793 rad
+ pos: 61.5,-32.5
parent: 2
- - uid: 15276
+ - uid: 7896
components:
- type: Transform
rot: 3.141592653589793 rad
pos: 54.5,-16.5
parent: 2
- - uid: 16720
- components:
- - type: Transform
- rot: 1.5707963267948966 rad
- pos: 76.5,-1.5
- parent: 2
- - uid: 16765
- components:
- - type: Transform
- pos: 80.5,2.5
- parent: 2
- - uid: 16848
+ - uid: 7924
components:
- type: Transform
+ rot: 3.141592653589793 rad
pos: 80.5,8.5
parent: 2
- - uid: 16896
+ - uid: 7925
components:
- type: Transform
rot: 3.141592653589793 rad
pos: 82.5,6.5
parent: 2
- - uid: 17022
- components:
- - type: Transform
- pos: 74.5,-43.5
- parent: 2
- - uid: 17864
- components:
- - type: Transform
- pos: 73.5,-46.5
- parent: 2
- - uid: 17930
- components:
- - type: Transform
- pos: 64.5,-30.5
- parent: 2
- - uid: 18208
- components:
- - type: Transform
- pos: 68.5,-31.5
- parent: 2
- - uid: 18364
+ - uid: 7926
components:
- type: Transform
rot: 3.141592653589793 rad
- pos: 70.5,-50.5
+ pos: 76.5,-1.5
parent: 2
- - uid: 18365
+ - uid: 7929
components:
- type: Transform
rot: 3.141592653589793 rad
- pos: 70.5,-54.5
+ pos: 80.5,2.5
parent: 2
- - uid: 18470
+ - uid: 7996
components:
- type: Transform
- rot: -1.5707963267948966 rad
- pos: 67.5,-47.5
+ rot: 3.141592653589793 rad
+ pos: 74.5,-43.5
parent: 2
-- proto: AirlockMaintEngiCargoLocked
- entities:
- - uid: 17796
+ - uid: 8067
components:
- type: Transform
- pos: -25.5,-28.5
+ rot: 3.141592653589793 rad
+ pos: 73.5,-46.5
parent: 2
-- proto: AirlockMaintGlass
- entities:
- - uid: 1412
+ - uid: 8113
components:
- type: Transform
rot: 3.141592653589793 rad
- pos: 12.5,-8.5
+ pos: 68.5,-31.5
parent: 2
- - uid: 1509
+ - uid: 8192
components:
- type: Transform
rot: 3.141592653589793 rad
- pos: 35.5,-10.5
+ pos: 64.5,-30.5
parent: 2
- - type: Door
- secondsUntilStateChange: -39281.6
- state: Opening
- - type: DeviceLinkSource
- lastSignals:
- DoorStatus: True
- - uid: 1842
+ - uid: 9564
components:
- type: Transform
rot: 3.141592653589793 rad
- pos: 11.5,-31.5
+ pos: 70.5,-50.5
parent: 2
- - uid: 15564
+ - uid: 9686
components:
- type: Transform
rot: 3.141592653589793 rad
- pos: -25.5,-16.5
+ pos: 70.5,-54.5
parent: 2
- - uid: 18243
+ - uid: 10689
components:
- type: Transform
- pos: 70.5,-33.5
+ rot: 3.141592653589793 rad
+ pos: 67.5,-47.5
parent: 2
-- proto: AirlockMaintJanitorLocked
- entities:
- - uid: 2928
+ - uid: 18470
components:
- type: Transform
- rot: 1.5707963267948966 rad
- pos: -0.5,-49.5
+ rot: 3.141592653589793 rad
+ pos: 6.5,-27.5
parent: 2
- proto: AirlockMaintMedLocked
entities:
@@ -12478,6 +12510,11 @@ entities:
- type: Transform
pos: 64.5,9.5
parent: 2
+ - uid: 20411
+ components:
+ - type: Transform
+ pos: -53.5,-35.5
+ parent: 2
- proto: APCElectronics
entities:
- uid: 2682
@@ -13560,7 +13597,7 @@ entities:
rot: 1.5707963267948966 rad
pos: 29.5,-19.5
parent: 2
- - uid: 9686
+ - uid: 13119
components:
- type: Transform
pos: -33.5,21.5
@@ -13797,12 +13834,19 @@ entities:
- type: Transform
pos: -25.5,-3.5
parent: 2
+- proto: BookCosmicCult
+ entities:
+ - uid: 16896
+ components:
+ - type: Transform
+ pos: -25.98086,-3.3142471
+ parent: 2
- proto: BookGatsby
entities:
- - uid: 2903
+ - uid: 17022
components:
- type: Transform
- pos: -26.5,15.5
+ pos: -24.98086,-3.3142471
parent: 2
- proto: BookKeelBay
entities:
@@ -14376,11 +14420,6 @@ entities:
- type: Transform
pos: -42.5,-36.5
parent: 2
- - uid: 1762
- components:
- - type: Transform
- pos: -43.5,-37.5
- parent: 2
- uid: 1767
components:
- type: Transform
@@ -14391,11 +14430,6 @@ entities:
- type: Transform
pos: -27.5,-55.5
parent: 2
- - uid: 1780
- components:
- - type: Transform
- pos: -46.5,-37.5
- parent: 2
- uid: 1783
components:
- type: Transform
@@ -14421,11 +14455,6 @@ entities:
- type: Transform
pos: -42.5,-37.5
parent: 2
- - uid: 1804
- components:
- - type: Transform
- pos: -44.5,-37.5
- parent: 2
- uid: 1831
components:
- type: Transform
@@ -14446,11 +14475,6 @@ entities:
- type: Transform
pos: -39.5,-37.5
parent: 2
- - uid: 1964
- components:
- - type: Transform
- pos: -45.5,-37.5
- parent: 2
- uid: 1974
components:
- type: Transform
@@ -14591,11 +14615,6 @@ entities:
- type: Transform
pos: 5.5,-51.5
parent: 2
- - uid: 2957
- components:
- - type: Transform
- pos: -48.5,-37.5
- parent: 2
- uid: 3198
components:
- type: Transform
@@ -22846,6 +22865,16 @@ entities:
- type: Transform
pos: -47.5,-44.5
parent: 2
+ - uid: 13613
+ components:
+ - type: Transform
+ pos: -52.5,-37.5
+ parent: 2
+ - uid: 13681
+ components:
+ - type: Transform
+ pos: -48.5,-37.5
+ parent: 2
- uid: 13927
components:
- type: Transform
@@ -22911,6 +22940,26 @@ entities:
- type: Transform
pos: 2.5,-47.5
parent: 2
+ - uid: 15276
+ components:
+ - type: Transform
+ pos: -51.5,-37.5
+ parent: 2
+ - uid: 15564
+ components:
+ - type: Transform
+ pos: -49.5,-37.5
+ parent: 2
+ - uid: 16019
+ components:
+ - type: Transform
+ pos: -47.5,-37.5
+ parent: 2
+ - uid: 16053
+ components:
+ - type: Transform
+ pos: -46.5,-37.5
+ parent: 2
- uid: 16111
components:
- type: Transform
@@ -23016,6 +23065,11 @@ entities:
- type: Transform
pos: -15.5,-31.5
parent: 2
+ - uid: 16248
+ components:
+ - type: Transform
+ pos: -45.5,-37.5
+ parent: 2
- uid: 16249
components:
- type: Transform
@@ -24391,30 +24445,15 @@ entities:
- type: Transform
pos: 44.5,-48.5
parent: 2
- - uid: 18072
- components:
- - type: Transform
- pos: -49.5,-37.5
- parent: 2
- - uid: 18073
+ - uid: 16720
components:
- type: Transform
pos: -50.5,-37.5
parent: 2
- - uid: 18074
- components:
- - type: Transform
- pos: -47.5,-37.5
- parent: 2
- - uid: 18075
- components:
- - type: Transform
- pos: -51.5,-37.5
- parent: 2
- - uid: 18076
+ - uid: 16848
components:
- type: Transform
- pos: -52.5,-37.5
+ pos: -53.5,-36.5
parent: 2
- uid: 18077
components:
@@ -27246,6 +27285,31 @@ entities:
- type: Transform
pos: -59.5,-42.5
parent: 2
+ - uid: 20436
+ components:
+ - type: Transform
+ pos: -53.5,-35.5
+ parent: 2
+ - uid: 20440
+ components:
+ - type: Transform
+ pos: -24.5,-9.5
+ parent: 2
+ - uid: 20441
+ components:
+ - type: Transform
+ pos: -25.5,-9.5
+ parent: 2
+ - uid: 20442
+ components:
+ - type: Transform
+ pos: -26.5,-9.5
+ parent: 2
+ - uid: 20443
+ components:
+ - type: Transform
+ pos: -27.5,-9.5
+ parent: 2
- proto: CableApcStack
entities:
- uid: 6034
@@ -33519,6 +33583,31 @@ entities:
- type: Transform
pos: 12.5,-59.5
parent: 2
+ - uid: 20404
+ components:
+ - type: Transform
+ pos: -27.5,-35.5
+ parent: 2
+ - uid: 20405
+ components:
+ - type: Transform
+ pos: -28.5,-35.5
+ parent: 2
+ - uid: 20406
+ components:
+ - type: Transform
+ pos: -29.5,-35.5
+ parent: 2
+ - uid: 20407
+ components:
+ - type: Transform
+ pos: -30.5,-35.5
+ parent: 2
+ - uid: 20408
+ components:
+ - type: Transform
+ pos: -31.5,-35.5
+ parent: 2
- proto: CableHVStack
entities:
- uid: 5823
@@ -34493,26 +34582,6 @@ entities:
- type: Transform
pos: -13.5,-35.5
parent: 2
- - uid: 7436
- components:
- - type: Transform
- pos: -27.5,-39.5
- parent: 2
- - uid: 7437
- components:
- - type: Transform
- pos: -28.5,-39.5
- parent: 2
- - uid: 7438
- components:
- - type: Transform
- pos: -29.5,-39.5
- parent: 2
- - uid: 7439
- components:
- - type: Transform
- pos: -30.5,-39.5
- parent: 2
- uid: 7444
components:
- type: Transform
@@ -40613,16 +40682,6 @@ entities:
- type: Transform
pos: -42.5,-37.5
parent: 2
- - uid: 13118
- components:
- - type: Transform
- pos: -30.5,-38.5
- parent: 2
- - uid: 13119
- components:
- - type: Transform
- pos: -30.5,-37.5
- parent: 2
- uid: 13120
components:
- type: Transform
@@ -41368,6 +41427,81 @@ entities:
- type: Transform
pos: -17.5,-31.5
parent: 2
+ - uid: 20409
+ components:
+ - type: Transform
+ pos: -31.5,-36.5
+ parent: 2
+ - uid: 20410
+ components:
+ - type: Transform
+ pos: -31.5,-35.5
+ parent: 2
+ - uid: 20412
+ components:
+ - type: Transform
+ pos: -43.5,-37.5
+ parent: 2
+ - uid: 20413
+ components:
+ - type: Transform
+ pos: -44.5,-37.5
+ parent: 2
+ - uid: 20414
+ components:
+ - type: Transform
+ pos: -45.5,-37.5
+ parent: 2
+ - uid: 20415
+ components:
+ - type: Transform
+ pos: -47.5,-37.5
+ parent: 2
+ - uid: 20416
+ components:
+ - type: Transform
+ pos: -48.5,-37.5
+ parent: 2
+ - uid: 20417
+ components:
+ - type: Transform
+ pos: -46.5,-37.5
+ parent: 2
+ - uid: 20418
+ components:
+ - type: Transform
+ pos: -49.5,-37.5
+ parent: 2
+ - uid: 20419
+ components:
+ - type: Transform
+ pos: -50.5,-37.5
+ parent: 2
+ - uid: 20420
+ components:
+ - type: Transform
+ pos: -51.5,-37.5
+ parent: 2
+ - uid: 20421
+ components:
+ - type: Transform
+ pos: -52.5,-37.5
+ parent: 2
+ - uid: 20422
+ components:
+ - type: Transform
+ pos: -53.5,-37.5
+ parent: 2
+ - uid: 20423
+ components:
+ - type: Transform
+ pos: -53.5,-36.5
+ parent: 2
+ - uid: 20424
+ components:
+ - type: Transform
+ pos: -53.5,-35.5
+ parent: 2
- proto: CableMVStack
entities:
- uid: 6033
@@ -43630,12 +43764,6 @@ entities:
rot: 3.141592653589793 rad
pos: -16.5,-19.5
parent: 2
- - uid: 8192
- components:
- - type: Transform
- rot: 3.141592653589793 rad
- pos: 1.5,-22.5
- parent: 2
- uid: 8284
components:
- type: Transform
@@ -45742,6 +45870,12 @@ entities:
- type: Transform
pos: 61.5,-31.5
parent: 2
+ - uid: 17928
+ components:
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: 1.5,-22.5
+ parent: 2
- uid: 17929
components:
- type: Transform
@@ -47350,6 +47484,30 @@ entities:
- type: Transform
pos: 32.5,10.5
parent: 2
+ - uid: 20428
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: -17.5,-61.5
+ parent: 2
+ - uid: 20429
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: -17.5,-62.5
+ parent: 2
+ - uid: 20430
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: -11.5,-61.5
+ parent: 2
+ - uid: 20431
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: -11.5,-62.5
+ parent: 2
- proto: ChairFolding
entities:
- uid: 1088
@@ -48876,6 +49034,13 @@ entities:
- type: Transform
pos: -18.631897,-21.295408
parent: 2
+- proto: ClothingHeadHatHoodMoth
+ entities:
+ - uid: 20425
+ components:
+ - type: Transform
+ pos: 36.52895,-51.254356
+ parent: 2
- proto: ClothingHeadHatPirate
entities:
- uid: 20377
@@ -48890,6 +49055,13 @@ entities:
- type: Transform
pos: 29.412,-20.90912
parent: 2
+- proto: ClothingHeadHelmetCosmonaut
+ entities:
+ - uid: 20432
+ components:
+ - type: Transform
+ pos: 15.539156,-54.457603
+ parent: 2
- proto: ClothingHeadHelmetRiot
entities:
- uid: 19092
@@ -48916,6 +49088,20 @@ entities:
- type: Transform
pos: 67.75572,-45.76029
parent: 2
+- proto: ClothingNeckAromanticPin
+ entities:
+ - uid: 20426
+ components:
+ - type: Transform
+ pos: -14.662132,-58.356937
+ parent: 2
+- proto: ClothingNeckAsexualPin
+ entities:
+ - uid: 20427
+ components:
+ - type: Transform
+ pos: -14.302757,-58.513187
+ parent: 2
- proto: ClothingNeckCloakBi
entities:
- uid: 16042
@@ -48930,6 +49116,13 @@ entities:
- type: Transform
pos: -18.350647,-21.639158
parent: 2
+- proto: ClothingNeckCloakMoth
+ entities:
+ - uid: 17927
+ components:
+ - type: Transform
+ pos: 36.52895,-51.67623
+ parent: 2
- proto: ClothingNeckCloakPirateCap
entities:
- uid: 20376
@@ -49359,11 +49552,11 @@ entities:
rot: 1.5707963267948966 rad
pos: -28.5,-50.5
parent: 2
- - uid: 13195
+ - uid: 20435
components:
- type: Transform
- rot: 1.5707963267948966 rad
- pos: -28.5,-38.5
+ rot: -1.5707963267948966 rad
+ pos: -30.5,-38.5
parent: 2
- proto: ComputerAnalysisConsole
entities:
@@ -50246,6 +50439,11 @@ entities:
- type: Transform
pos: -33.5,-50.5
parent: 2
+ - uid: 17930
+ components:
+ - type: Transform
+ pos: -28.5,-38.5
+ parent: 2
- proto: CrateFilledSpawner
entities:
- uid: 3322
@@ -50561,12 +50759,10 @@ entities:
rot: 3.141592653589793 rad
pos: 36.5,-27.5
parent: 2
-- proto: CryogenicSleepUnitSpawner
- entities:
- - uid: 11501
+ - uid: 18072
components:
- type: Transform
- rot: 1.5707963267948966 rad
+ rot: 3.141592653589793 rad
pos: -27.5,7.5
parent: 2
- proto: CryogenicSleepUnitSpawnerLateJoin
@@ -57464,6 +57660,17 @@ entities:
rot: 3.141592653589793 rad
pos: 27.5,-11.5
parent: 2
+ - uid: 20438
+ components:
+ - type: Transform
+ pos: 4.5,-28.5
+ parent: 2
+ - uid: 20439
+ components:
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: -5.5,-27.5
+ parent: 2
- proto: EmergencyRollerBed
entities:
- uid: 11513
@@ -63559,13 +63766,6 @@ entities:
- type: Transform
pos: 75.55227,-8.265129
parent: 2
-- proto: GasAnalyzer
- entities:
- - uid: 17928
- components:
- - type: Transform
- pos: -33.5,-35.5
- parent: 2
- proto: GasFilterFlipped
entities:
- uid: 8506
@@ -93626,6 +93826,13 @@ entities:
- type: Transform
pos: 70.5,-44.5
parent: 2
+- proto: InflatableDoorStack
+ entities:
+ - uid: 18073
+ components:
+ - type: Transform
+ pos: -33.26285,-35.42736
+ parent: 2
- proto: InflatableWall
entities:
- uid: 2575
@@ -93667,10 +93874,10 @@ entities:
- type: Transform
pos: 75.5,-13.5
parent: 2
- - uid: 17927
+ - uid: 18365
components:
- type: Transform
- pos: -31.5,-35.5
+ pos: -33.6066,-35.42736
parent: 2
- proto: IngotGold1
entities:
@@ -94574,6 +94781,11 @@ entities:
- type: Transform
pos: 14.5,11.5
parent: 2
+ - uid: 13195
+ components:
+ - type: Transform
+ pos: -26.5,15.5
+ parent: 2
- uid: 16976
components:
- type: Transform
@@ -94584,6 +94796,16 @@ entities:
- type: Transform
pos: 77.5,-2.5
parent: 2
+ - uid: 17864
+ components:
+ - type: Transform
+ pos: -25.5,14.5
+ parent: 2
+ - uid: 17915
+ components:
+ - type: Transform
+ pos: -28.5,14.5
+ parent: 2
- uid: 18926
components:
- type: Transform
@@ -94635,10 +94857,10 @@ entities:
parent: 2
- proto: MaterialCloth10
entities:
- - uid: 16053
+ - uid: 18075
components:
- type: Transform
- pos: -33.5,21.5
+ pos: -34.58341,20.5601
parent: 2
- proto: MaterialDurathread
entities:
@@ -99084,12 +99306,6 @@ entities:
- type: Transform
pos: 3.5,-13.5
parent: 2
- - uid: 7896
- components:
- - type: Transform
- rot: 1.5707963267948966 rad
- pos: 1.5,-19.5
- parent: 2
- uid: 7911
components:
- type: Transform
@@ -99423,12 +99639,6 @@ entities:
rot: 3.141592653589793 rad
pos: -1.5,-27.5
parent: 2
- - uid: 16019
- components:
- - type: Transform
- rot: 3.141592653589793 rad
- pos: -12.5,-27.5
- parent: 2
- uid: 16054
components:
- type: Transform
@@ -99450,11 +99660,6 @@ entities:
- type: Transform
pos: -29.5,22.5
parent: 2
- - uid: 16248
- components:
- - type: Transform
- pos: 11.5,-28.5
- parent: 2
- uid: 16279
components:
- type: Transform
@@ -99489,6 +99694,12 @@ entities:
rot: -1.5707963267948966 rad
pos: 75.5,-9.5
parent: 2
+ - uid: 16765
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: -2.5,-14.5
+ parent: 2
- uid: 16776
components:
- type: Transform
@@ -99594,6 +99805,12 @@ entities:
rot: 3.141592653589793 rad
pos: 18.5,-27.5
parent: 2
+ - uid: 18076
+ components:
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: -7.5,-27.5
+ parent: 2
- uid: 18161
components:
- type: Transform
@@ -99611,6 +99828,12 @@ entities:
- type: Transform
pos: 70.5,9.5
parent: 2
+ - uid: 18208
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: -11.5,-23.5
+ parent: 2
- uid: 18209
components:
- type: Transform
@@ -99640,6 +99863,12 @@ entities:
rot: -1.5707963267948966 rad
pos: 71.5,-32.5
parent: 2
+ - uid: 18243
+ components:
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: 8.5,-30.5
+ parent: 2
- uid: 18257
components:
- type: Transform
@@ -99710,6 +99939,12 @@ entities:
- type: Transform
pos: 51.5,-54.5
parent: 2
+ - uid: 20437
+ components:
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: 0.5,-18.5
+ parent: 2
- proto: PoweredSmallLightEmpty
entities:
- uid: 13157
@@ -100058,6 +100293,11 @@ entities:
rot: -1.5707963267948966 rad
pos: 77.5,-3.5
parent: 2
+ - uid: 17920
+ components:
+ - type: Transform
+ pos: 36.5,-51.5
+ parent: 2
- uid: 18226
components:
- type: Transform
@@ -102469,6 +102709,18 @@ entities:
- type: Transform
pos: 6.5,-13.5
parent: 2
+- proto: RCDAmmo
+ entities:
+ - uid: 20433
+ components:
+ - type: Transform
+ pos: -20.66609,-50.356304
+ parent: 2
+ - uid: 20434
+ components:
+ - type: Transform
+ pos: -20.306715,-50.27818
+ parent: 2
- proto: ReagentContainerFlour
entities:
- uid: 5932
@@ -109118,6 +109370,11 @@ entities:
- type: Transform
pos: 46.5,-53.5
parent: 2
+ - uid: 18074
+ components:
+ - type: Transform
+ pos: -31.5,-35.5
+ parent: 2
- proto: SubstationMachineCircuitboard
entities:
- uid: 2683
@@ -111764,18 +112021,6 @@ entities:
rot: 1.5707963267948966 rad
pos: -34.5,-35.5
parent: 2
- - uid: 17915
- components:
- - type: Transform
- rot: 1.5707963267948966 rad
- pos: -31.5,-35.5
- parent: 2
- - uid: 17920
- components:
- - type: Transform
- rot: 1.5707963267948966 rad
- pos: -32.5,-35.5
- parent: 2
- uid: 18246
components:
- type: Transform
@@ -111791,6 +112036,11 @@ entities:
- type: Transform
pos: 71.5,-30.5
parent: 2
+ - uid: 18364
+ components:
+ - type: Transform
+ pos: -32.5,-35.5
+ parent: 2
- uid: 18505
components:
- type: Transform
@@ -129007,11 +129257,6 @@ entities:
parent: 2
- proto: WallSolidRust
entities:
- - uid: 74
- components:
- - type: Transform
- pos: 6.5,-27.5
- parent: 2
- uid: 1884
components:
- type: Transform
diff --git a/Resources/Maps/saltern.yml b/Resources/Maps/saltern.yml
index 96dea04cb20939..0a788a31e6a25b 100644
--- a/Resources/Maps/saltern.yml
+++ b/Resources/Maps/saltern.yml
@@ -5395,7 +5395,7 @@ entities:
pos: -29.5,-18.5
parent: 31
- type: Door
- secondsUntilStateChange: -1606.7512
+ secondsUntilStateChange: -1655.6987
state: Opening
- type: DeviceLinkSource
lastSignals:
@@ -16636,6 +16636,16 @@ entities:
- type: Transform
pos: -11.5,32.5
parent: 31
+ - uid: 12131
+ components:
+ - type: Transform
+ pos: 0.5,26.5
+ parent: 31
+ - uid: 12132
+ components:
+ - type: Transform
+ pos: 0.5,27.5
+ parent: 31
- proto: CableApcStack
entities:
- uid: 94
@@ -34928,7 +34938,7 @@ entities:
pos: 3.5,29.5
parent: 31
- type: Door
- secondsUntilStateChange: -16307.251
+ secondsUntilStateChange: -16356.198
state: Closing
- uid: 8815
components:
diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml b/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml
index 9837976675ecec..187ab01be88068 100644
--- a/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml
@@ -231,7 +231,7 @@
- type: cargoProduct
id: FunLittleTykesCar
icon:
- sprite: Structures/Storage/closet.rsi
+ sprite: _Impstation/Objects/Storage/littlecar.rsi
state: littletykescar
product: BaseLittleTykesCar
cost: 1500
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
index 85270d6906d5e5..c5502a10df1bd2 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
@@ -98,6 +98,7 @@
#Space Cadet Jumpsuits
ClothingSpaceCadetJumpsuitColorWhite: 3
ClothingSpaceCadetJumpsuitColorBlack: 3
+ ClothingSpaceCadetJumpsuitColorGray: 3
ClothingSpaceCadetJumpsuitColorBlue: 2
ClothingSpaceCadetJumpsuitColorYellow: 2
ClothingSpaceCadetJumpsuitColorGreen: 2
diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml
index 11fd476fd42627..3d20a30e759e8b 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/secdrobe.yml
@@ -29,6 +29,7 @@
ClothingUniformJumpsuitBrigmedic: 1
ClothingUniformJumpskirtBrigmedic: 1
ClothingHeadHatBeretBrigmedic: 1
+ ClothingHeadHatBrigmedicsoft: 1
ClothingBackpackDuffelBrigmedic: 1
ClothingBackpackBrigmedic: 1
ClothingBackpackSatchelBrigmedic: 1
diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml
index 661a47f24ae6da..67ae14f59494e4 100644
--- a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml
+++ b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml
@@ -151,7 +151,7 @@
parent: [ClothingEyesBase, BaseLensSlot, ShowSecurityIcons, ShowMedicalIcons, BaseSecurityCommandContraband]
id: ClothingEyesHudMedSec
name: medsec hud
- description: An eye display that looks like a mixture of medical and security huds.
+ description: A specialized pair of glasses that displays both medical and security information.
components:
- type: Sprite
sprite: Clothing/Eyes/Hud/medsec.rsi
diff --git a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
index c156995ebc0c22..f580662cdeac9e 100644
--- a/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
@@ -550,7 +550,7 @@
#Makeshift Hardsuit Helmet
- type: entity
- parent: ClothingHeadHardsuitWithLightBase
+ parent: [ BaseMajorContraband, ClothingHeadHardsuitWithLightBase ]
id: ClothingHeadHelmetProspector
name: makeshift hardsuit helmet
description: A helmet cobbled together with cloth, insulation, and metal that barely meets low-pressure safety standards. It'll do.
@@ -584,6 +584,33 @@
- type: PointLight
color: green
+#Desperado Helmet
+- type: entity
+ parent: [ BaseMajorContraband, ClothingHeadHelmetHardsuitSyndieCommander ]
+ id: ClothingHeadHelmetDesperado
+ name: desperado hardsuit helmet
+ description: An impressively sturdy and impressively Space-Texan hardsuit helmet.
+ components:
+ - type: Sprite
+ sprite: _Impstation/Prospectors/desperado-hardsuit-helmet.rsi
+ - type: PointLight
+ color: green
+ - type: ToggleableLightVisuals
+ clothingVisuals:
+ head:
+ - state: on-equipped-HELMET
+ - type: Clothing
+ clothingVisuals:
+ head:
+ - state: off-equipped-HELMET
+ - type: Armor
+ modifiers:
+ coefficients:
+ Blunt: 0.9
+ Slash: 0.9
+ Piercing: 0.9
+ Heat: 0.9
+
#CENTCOMM / ERT HARDSUITS
#ERT Leader Hardsuit
- type: entity
diff --git a/Resources/Prototypes/Entities/Clothing/Neck/medals.yml b/Resources/Prototypes/Entities/Clothing/Neck/medals.yml
index 031fcb99881822..75e89420e7d24f 100644
--- a/Resources/Prototypes/Entities/Clothing/Neck/medals.yml
+++ b/Resources/Prototypes/Entities/Clothing/Neck/medals.yml
@@ -1,4 +1,3 @@
-
- type: entity
parent: ClothingNeckBase
id: ClothingNeckBronzeheart
@@ -9,12 +8,20 @@
sprite: Clothing/Neck/Medals/bronzeheart.rsi
- type: Clothing
sprite: Clothing/Neck/Medals/bronzeheart.rsi
+ - type: CrewMedal
+ - type: ActivatableUI
+ key: enum.CrewMedalUiKey.Key
+ inHandsOnly: true
+ - type: UserInterface
+ interfaces:
+ enum.CrewMedalUiKey.Key:
+ type: CrewMedalBoundUserInterface
- type: Tag
tags:
- Medal
- type: entity
- parent: ClothingNeckBase
+ parent: ClothingNeckBronzeheart
id: ClothingNeckGoldmedal
name: gold medal of crewmanship
description: Given to crewmates who display excellent crewmanship.
@@ -25,12 +32,9 @@
sprite: Clothing/Neck/Medals/gold.rsi
- type: StealTarget
stealGroup: ClothingNeckGoldmedal
- - type: Tag
- tags:
- - Medal
- type: entity
- parent: ClothingNeckBase
+ parent: ClothingNeckBronzeheart
id: ClothingNeckCargomedal
name: cargo medal
description: Given for the best work in the cargo department.
@@ -39,12 +43,9 @@
sprite: Clothing/Neck/Medals/cargomedal.rsi
- type: Clothing
sprite: Clothing/Neck/Medals/cargomedal.rsi
- - type: Tag
- tags:
- - Medal
- type: entity
- parent: ClothingNeckBase
+ parent: ClothingNeckBronzeheart
id: ClothingNeckEngineermedal
name: engineer medal
description: Given for the best work in the engineering department.
@@ -53,12 +54,9 @@
sprite: Clothing/Neck/Medals/engineermedal.rsi
- type: Clothing
sprite: Clothing/Neck/Medals/engineermedal.rsi
- - type: Tag
- tags:
- - Medal
- type: entity
- parent: ClothingNeckBase
+ parent: ClothingNeckBronzeheart
id: ClothingNeckMedicalmedal
name: medical medal
description: Given for the best work in the medical department.
@@ -67,12 +65,9 @@
sprite: Clothing/Neck/Medals/medicalmedal.rsi
- type: Clothing
sprite: Clothing/Neck/Medals/medicalmedal.rsi
- - type: Tag
- tags:
- - Medal
- type: entity
- parent: ClothingNeckBase
+ parent: ClothingNeckBronzeheart
id: ClothingNeckSciencemedal
name: science medal
description: Given for the best work in the science department.
@@ -81,12 +76,9 @@
sprite: Clothing/Neck/Medals/sciencemedal.rsi
- type: Clothing
sprite: Clothing/Neck/Medals/sciencemedal.rsi
- - type: Tag
- tags:
- - Medal
- type: entity
- parent: ClothingNeckBase
+ parent: ClothingNeckBronzeheart
id: ClothingNeckSecuritymedal
name: security medal
description: Given for the best work in the security department.
@@ -95,12 +87,9 @@
sprite: Clothing/Neck/Medals/securitymedal.rsi
- type: Clothing
sprite: Clothing/Neck/Medals/securitymedal.rsi
- - type: Tag
- tags:
- - Medal
- type: entity
- parent: ClothingNeckBase
+ parent: ClothingNeckBronzeheart
id: ClothingNeckClownmedal
name: clown medal
description: Given for the best joke in the universe. HONK!
@@ -111,6 +100,3 @@
sprite: Clothing/Neck/Medals/clownmedal.rsi
- type: StealTarget
stealGroup: ClothingNeckClownmedal
- - type: Tag
- tags:
- - Medal
diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
index 19724e426d84d7..9a99dbf1558f74 100644
--- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
+++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
@@ -762,7 +762,7 @@
#Makeshift Hardsuit
- type: entity
- parent: [ ClothingOuterHardsuitBase, BaseSyndicateContraband ]
+ parent: [ BaseMajorContraband, ClothingOuterHardsuitBase]
id: ClothingOuterProspector
name: makeshift hardsuit
description: A heap of plating and insulation thrown together that just barely constitutes a hardsuit - but if it's good enough for space, it's good enough for you.
@@ -793,6 +793,20 @@
- type: ToggleableClothing
clothingPrototype: ClothingHeadHelmetProspector
+#Desperado Hardsuit
+- type: entity
+ parent: [ BaseMajorContraband, ClothingOuterHardsuitSyndieCommander ]
+ id: ClothingOuterDesperado
+ name: desperado hardsuit
+ description: An incredibly tough hardsuit woven together with Goliath plating and some helpfully reclaimed NT equipment. Makes you respectable, both as a person and as a threat.
+ components:
+ - type: Sprite
+ sprite: _Impstation/Prospectors/desperado-hardsuit.rsi
+ - type: Clothing
+ sprite: _Impstation/Prospectors/desperado-hardsuit.rsi
+ - type: ToggleableClothing
+ clothingPrototype: ClothingHeadHelmetDesperado
+
#CENTCOMM / ERT HARDSUITS
#ERT Leader Hardsuit
- type: entity
diff --git a/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml b/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml
index e5bfacdf811a6c..61dda89d13720f 100644
--- a/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml
+++ b/Resources/Prototypes/Entities/Clothing/Shoes/misc.yml
@@ -148,79 +148,3 @@
price: 75
- type: Tag
tags: [ ]
-
-- type: entity
- parent: ClothingShoesBaseButcherable
- id: ClothingShoesHeelsRed
- name: red high-heels
- description: Fancy red high-heels, great for strutting around the station in style.
- components:
- - type: MeleeWeapon
- damage:
- types:
- Piercing: 6
- - type: Sprite
- sprite: Clothing/Shoes/Misc/heelsred.rsi
- - type: Clothing
- sprite: Clothing/Shoes/Misc/heelsred.rsi
- - type: FootstepModifier
- footstepSoundCollection:
- collection: FootstepHighheels
-
-- type: entity
- parent: ClothingShoesHeelsRed
- id: ClothingShoesHeelsBlack
- name: black high-heels
- description: Fancy black high-heels, great for strutting around the station in style.
- components:
- - type: Sprite
- sprite: Clothing/Shoes/Misc/heelsblack.rsi
- - type: Clothing
- sprite: Clothing/Shoes/Misc/heelsblack.rsi
-
-- type: entity
- parent: ClothingShoesHeelsRed
- id: ClothingShoesHeelsBrown
- name: brown high-heels
- description: Fancy brown high-heels, great for strutting around the station in style.
- components:
- - type: Sprite
- sprite: Clothing/Shoes/Misc/heelsbrown.rsi
- - type: Clothing
- sprite: Clothing/Shoes/Misc/heelsbrown.rsi
-
-
-- type: entity
- parent: ClothingShoesHeelsRed
- id: ClothingShoesHeelsGold
- name: golden high-heels
- description: Extremely fancy golden high-heels, they glitter and shine.
- components:
- - type: Sprite
- sprite: Clothing/Shoes/Misc/heelsgold.rsi
- - type: Clothing
- sprite: Clothing/Shoes/Misc/heelsgold.rsi
- - type: StaticPrice
- price: 7000
-
-- type: entity
- parent: ClothingShoesHeelsRed
- id: ClothingShoesHeelsBlue
- name: blue high-heels
- description: Fancy blue high-heels, great for strutting around the station in style.
- components:
- - type: Sprite
- sprite: Clothing/Shoes/Misc/heelsblue.rsi
- - type: Clothing
- sprite: Clothing/Shoes/Misc/heelsblue.rsi
-
-- type: entity
- parent: ClothingShoesHeelsRed
- id: ClothingShoesHeelsGreen
- name: green high-heels
- description: Fancy green high-heels, great for strutting around the station in style.
- components:
- - type: Sprite
- sprite: Clothing/Shoes/Misc/heelsgreen.rsi
- - type: Clothing
- sprite: Clothing/Shoes/Misc/heelsgreen.rsi
diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml
index 9fc74ccf5ddb88..f5a93ab6df617d 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/base.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/base.yml
@@ -193,6 +193,9 @@
type: StoreBoundUserInterface
enum.HereticLivingHeartKey.Key: # goob edit - heretics
type: LivingHeartMenuBoundUserInterface
+ enum.SpelfMoodsUiKey.Key: # impstation edit
+ type: SpelfMoodsBoundUserInterface
+ requireInputValidation: false
- type: Puller
- type: Speech
speechSounds: Alto
diff --git a/Resources/Prototypes/Entities/Mobs/Species/slime.yml b/Resources/Prototypes/Entities/Mobs/Species/slime.yml
index 732ff4024f8b55..5775a716bbcfb7 100644
--- a/Resources/Prototypes/Entities/Mobs/Species/slime.yml
+++ b/Resources/Prototypes/Entities/Mobs/Species/slime.yml
@@ -37,6 +37,9 @@
type: StoreBoundUserInterface
enum.HereticLivingHeartKey.Key: # goob edit - heretics
type: LivingHeartMenuBoundUserInterface
+ enum.SpelfMoodsUiKey.Key: # impstation edit
+ type: SpelfMoodsBoundUserInterface
+ requireInputValidation: false
# to prevent bag open/honk spam
- type: UseDelay
delay: 0.5
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
index f5b733d37b1ece..0536db6a4ce493 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
@@ -189,6 +189,7 @@
sprite: Objects/Consumable/Drinks/rootbeer.rsi
- type: Tag
tags:
+ - DrinkCan
- Beer
- type: entity
diff --git a/Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml b/Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml
index 9e14234af4a384..b9d2a19830ceab 100644
--- a/Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml
+++ b/Resources/Prototypes/Entities/Structures/Piping/Disposal/units.yml
@@ -104,9 +104,9 @@
map: [ "enum.DisposalUnitVisualLayers.BaseCharging" ]
- state: mailing-flush
map: [ "enum.DisposalUnitVisualLayers.OverlayFlush" ]
- - state: dispover-charge
+ - state: mailover-charge
map: [ "enum.DisposalUnitVisualLayers.OverlayCharging" ]
- - state: dispover-ready
+ - state: mailover-ready
map: [ "enum.DisposalUnitVisualLayers.OverlayReady" ]
- state: dispover-full
map: [ "enum.DisposalUnitVisualLayers.OverlayFull" ]
diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/teg.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/teg.yml
index b7f43614dbd3a2..4870cb9b00e881 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/teg.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/teg.yml
@@ -88,7 +88,7 @@
enabled: false
castShadows: false
radius: 1.5
- color: "#FFAA00"
+ color: "#ffa600"
- type: AmbientSound
volume: -4
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml b/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml
index 48804893ca7a0f..e343ed0ca1185c 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/base_structurecrates.yml
@@ -13,6 +13,7 @@
- type: Sprite
noRot: true
sprite: Structures/Storage/Crates/generic.rsi
+ offset: 0, 0.25
layers:
- state: base
map: ["enum.StorageVisualLayers.Base"]
diff --git a/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml b/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml
index 08200f33238f61..fe808189fdfffe 100644
--- a/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml
+++ b/Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml
@@ -13,13 +13,13 @@
sprite: Structures/Storage/tanks.rsi
layers:
- state: fueltank-2
- - state: fueltank-2-1
+ - state: tank-2-1
map: ["enum.SolutionContainerLayers.Fill"]
visible: false
- type: Appearance
- type: SolutionContainerVisuals
- maxFillLevels: 3
- fillBaseName: fueltank-2-
+ maxFillLevels: 5
+ fillBaseName: tank-2-
- type: ExaminableSolution
solution: tank
- type: ReagentTank
@@ -59,12 +59,12 @@
sprite: Structures/Storage/tanks.rsi
layers:
- state: highfueltank-2
- - state: highfueltank-2-1
+ - state: hightank-2-1
map: ["enum.SolutionContainerLayers.Fill"]
visible: false
- type: SolutionContainerVisuals
- maxFillLevels: 7
- fillBaseName: highfueltank-2-
+ maxFillLevels: 5
+ fillBaseName: hightank-2-
- type: SolutionContainerManager
solutions:
tank:
@@ -94,13 +94,13 @@
sprite: Structures/Storage/tanks.rsi
layers:
- state: watertank-2
- - state: watertank-2-1
+ - state: tank-2-1
map: ["enum.SolutionContainerLayers.Fill"]
visible: false
- type: Appearance
- type: SolutionContainerVisuals
maxFillLevels: 5
- fillBaseName: watertank-2-
+ fillBaseName: tank-2-
- type: ExaminableSolution
solution: tank
@@ -178,13 +178,13 @@
sprite: Structures/Storage/tanks.rsi
layers:
- state: highwatertank-2
- - state: highwatertank-2-1
+ - state: hightank-2-1
map: ["enum.SolutionContainerLayers.Fill"]
visible: false
- type: Appearance
- type: SolutionContainerVisuals
- maxFillLevels: 7
- fillBaseName: highwatertank-2-
+ maxFillLevels: 5
+ fillBaseName: hightank-2-
- type: SolutionContainerManager
solutions:
tank:
@@ -210,12 +210,12 @@
sprite: Structures/Storage/tanks.rsi
layers:
- state: generictank-1
- - state: watertank-2-1
+ - state: tank-2-1
map: ["enum.SolutionContainerLayers.Fill"]
visible: false
- type: Appearance
- type: SolutionContainerVisuals
maxFillLevels: 5
- fillBaseName: watertank-2-
+ fillBaseName: tank-2-
- type: ExaminableSolution
solution: tank
diff --git a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
index 32066d0a28a670..ae779660914f5f 100644
--- a/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
+++ b/Resources/Prototypes/Loadouts/Miscellaneous/trinkets.yml
@@ -215,7 +215,25 @@
id: FolderBlack
storage:
back:
- - BoxFolderBlack
+ - BoxFolderBlackLoadout
+
+- type: loadout
+ id: FolderHamster
+ storage:
+ back:
+ - BoxFolderHamster
+
+- type: loadout
+ id: FolderMime
+ storage:
+ back:
+ - BoxFolderMime
+
+- type: loadout
+ id: FolderPun
+ storage:
+ back:
+ - BoxFolderPun
- type: loadout
id: BarFlask
diff --git a/Resources/Prototypes/Loadouts/loadout_groups.yml b/Resources/Prototypes/Loadouts/loadout_groups.yml
index 446c2306de15ba..a40b7df12d61dc 100644
--- a/Resources/Prototypes/Loadouts/loadout_groups.yml
+++ b/Resources/Prototypes/Loadouts/loadout_groups.yml
@@ -22,6 +22,9 @@
- CigarGold
- GoldPersonalAI
- FolderBlack
+ - FolderHamster
+ - FolderMime
+ - FolderPun
- BarFlask
- NewtonCradle
- ClothingNeckLGBTPin
@@ -204,6 +207,8 @@
loadouts:
- LacedShoes
- LeatherShoes
+ - BlackCommandHeels
+ - BlueCommandHeels
- CaptainJumpBoots
- type: loadoutGroup
@@ -257,6 +262,8 @@
- LacedShoes
- LeatherShoes
- HoPShoesWhite
+ - BlackCommandHeels
+ - BlueCommandHeels
- type: loadoutGroup
id: HoPOuterClothing
@@ -334,6 +341,7 @@
minLimit: 0
loadouts:
- Mantle
+ - GreyCloak
- type: loadoutGroup
id: PassengerOuterClothing
@@ -1640,6 +1648,7 @@
minLimit: 0
loadouts:
- BrigmedicBeret
+ - BrigmedicCap
- type: loadoutGroup
id: BrigmedicNeck
diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/clothing/medsec_hud.yml b/Resources/Prototypes/Recipes/Construction/Graphs/clothing/medsec_hud.yml
index 03a70cb7fe707b..fa65ad5e781bc5 100644
--- a/Resources/Prototypes/Recipes/Construction/Graphs/clothing/medsec_hud.yml
+++ b/Resources/Prototypes/Recipes/Construction/Graphs/clothing/medsec_hud.yml
@@ -21,12 +21,6 @@
- material: Cable
amount: 5
doAfter: 5
- - tag: Radio
- name: radio
- icon:
- sprite: Objects/Devices/communication.rsi
- state: walkietalkie
- doAfter: 5
- tag: CapacitorStockPart
name: capacitor
icon:
@@ -40,4 +34,4 @@
state: capacitor
doAfter: 5
- node: medsecHud
- entity: ClothingEyesHudMedSec
+ entity: ClothingEyesHudMedSec
\ No newline at end of file
diff --git a/Resources/Prototypes/Recipes/Construction/clothing.yml b/Resources/Prototypes/Recipes/Construction/clothing.yml
index 2877a64664e477..c1f88ad6da7314 100644
--- a/Resources/Prototypes/Recipes/Construction/clothing.yml
+++ b/Resources/Prototypes/Recipes/Construction/clothing.yml
@@ -82,7 +82,7 @@
startNode: start
targetNode: medsecHud
category: construction-category-clothing
- description: Two huds joined by arms
+ description: Two huds joined into a new frame.
icon: { sprite: Clothing/Eyes/Hud/medsec.rsi, state: icon }
objectType: Item
diff --git a/Resources/Prototypes/_Impstation/CosmicCult/Actions/cosmiccult.actions.yml b/Resources/Prototypes/_Impstation/CosmicCult/Actions/cosmiccult.actions.yml
new file mode 100644
index 00000000000000..62d440d1c3a2fd
--- /dev/null
+++ b/Resources/Prototypes/_Impstation/CosmicCult/Actions/cosmiccult.actions.yml
@@ -0,0 +1,101 @@
+
+- type: entity
+ id: ActionCosmicToolToggle
+ name: Beckon Compass
+ description: Summon or Unsummon your compass of stars.
+ categories: [ HideSpawnMenu ]
+ components:
+ - type: InstantAction
+ useDelay: 2
+ itemIconStyle: NoItem
+ icon:
+ sprite: _Impstation/CosmicCult/Icons/cosmiccult_abilities.rsi
+ state: compass
+ event: !type:EventCosmicToolToggle {}
+ - type: CosmicCultAction
+
+- type: entity
+ id: ActionCosmicSiphon
+ name: Siphon Entropy
+ description: Silently siphon entropy from your target, dealing some damage in the process.
+ categories: [ HideSpawnMenu ]
+ components:
+ - type: EntityTargetAction
+ useDelay: 10
+ whitelist:
+ components:
+ - HumanoidAppearance
+ canTargetSelf: true
+ interactOnMiss: false
+ itemIconStyle: NoItem
+ icon:
+ sprite: _Impstation/CosmicCult/Icons/cosmiccult_abilities.rsi
+ state: siphon
+ event: !type:EventCosmicSiphon {}
+ - type: CosmicCultAction
+
+# - type: entity
+# id: ActionCosmicBlank
+# name: Blank Mentality
+# description: Silently siphon entropy from your target, dealing some damage in the process.
+# categories: [ HideSpawnMenu ]
+# components:
+# - type: EntityTargetAction
+# useDelay: 10
+# whitelist:
+# components:
+# - HumanoidAppearance
+# canTargetSelf: true
+# interactOnMiss: false
+# itemIconStyle: NoItem
+# icon:
+# sprite: _Impstation/CosmicCult/Icons/cosmiccult_abilities.rsi
+# state: siphon
+# event: !type:EventCosmicSiphon {}
+# - type: CosmicCultAction
+
+- type: entity
+ id: ActionCosmicPlaceMonument
+ name: Beckon The Monument
+ description: TODO
+ categories: [ HideSpawnMenu ]
+ components:
+ - type: ConfirmableAction
+ popup: cosmic-monument-spawn-confirm
+ - type: InstantAction
+ itemIconStyle: NoItem
+ icon:
+ sprite: _Impstation/CosmicCult/Icons/cosmiccult_abilities.rsi
+ state: monument
+ event: !type:EventCosmicPlaceMonument {}
+ - type: CosmicCultAction
+
+- type: entity
+ id: ActionCosmicLapse
+ name: Abberant Lapse
+ description: TODO
+ categories: [ HideSpawnMenu ]
+ components:
+ - type: EntityTargetAction
+ useDelay: 2
+ itemIconStyle: NoItem
+ icon:
+ sprite: _Impstation/CosmicCult/Icons/cosmiccult_abilities.rsi
+ state: lapse
+ event: !type:EventCosmicLapse {}
+ - type: CosmicCultAction
+
+# - type: entity
+# id: ActionCosmicGlare
+# name: Null Glare
+# description: TODO
+# categories: [ HideSpawnMenu ]
+# components:
+# - type: InstantAction
+# useDelay: 2
+# itemIconStyle: NoItem
+# icon:
+# sprite: _Impstation/CosmicCult/Icons/cosmiccult_abilities.rsi
+# state: glare
+# event: !type:EventCosmicGlare {}
+# - type: CosmicCultAction
diff --git a/Resources/Prototypes/_Impstation/CosmicCult/Clothing/cosmiccult_armor.yml b/Resources/Prototypes/_Impstation/CosmicCult/Clothing/cosmiccult_armor.yml
new file mode 100644
index 00000000000000..6450fafed7fc59
--- /dev/null
+++ b/Resources/Prototypes/_Impstation/CosmicCult/Clothing/cosmiccult_armor.yml
@@ -0,0 +1,109 @@
+
+############ [ HARDSUIT ] ############
+
+# COSMIC CULT HARDSUIT BODY
+- type: entity
+ parent: [ ClothingOuterHardsuitBase, BaseCosmicCultContraband ]
+ id: ClothingOuterHardsuitCosmicCult
+ name: entropic armor
+ description: An unsettling hardsuit, numbing to the touch. It pulses with a glow that makes you feel like you've forgotten something..
+ components:
+ - type: Sprite
+ sprite: _Impstation/CosmicCult/Clothing/cosmiccult_armor.rsi
+ - type: Item
+ size: Huge
+ - type: Clothing
+ sprite: _Impstation/CosmicCult/Clothing/cosmiccult_armor.rsi
+ - type: PressureProtection
+ highPressureMultiplier: 0.05
+ lowPressureMultiplier: 1000
+ - type: ExplosionResistance
+ damageCoefficient: 0.5
+ - type: Armor
+ modifiers:
+ coefficients:
+ Blunt: 0.5
+ Slash: 0.5
+ Piercing: 0.5
+ Heat: 0.5
+ Radiation: 0.5
+ Caustic: 0.5
+ - type: ClothingSpeedModifier
+ walkModifier: 0.9
+ sprintModifier: 0.9
+ - type: HeldSpeedModifier
+ - type: ToggleableClothing
+ clothingPrototype: ClothingHeadHelmetCosmicCult
+ - type: Tag
+ tags:
+ - Hardsuit
+ - WhitelistChameleon
+#Shoulder mounted flashlight
+ - type: ToggleableLightVisuals
+ spriteLayer: light
+ clothingVisuals:
+ outerClothing:
+ - state: equipped-OUTERCLOTHING-light
+ shader: unshaded
+ - type: Appearance
+ - type: HandheldLight
+ addPrefix: false
+ blinkingBehaviourId: blinking
+ radiatingBehaviourId: radiating
+ - type: PointLight
+ enabled: false
+ color: "#42a4ae"
+ radius: 5
+ energy: 3.4
+ mask: /Textures/_Impstation/CosmicCult/LightMasks/cosmic.png
+ autoRot: true
+ netsync: false
+ - type: LightBehaviour
+ behaviours:
+ - !type:FadeBehaviour
+ id: radiating
+ interpolate: Linear
+ maxDuration: 2.0
+ startValue: 3.0
+ endValue: 2.0
+ isLooped: true
+ reverseWhenFinished: true
+ - !type:PulseBehaviour
+ id: blinking
+ interpolate: Nearest
+ maxDuration: 1.0
+ minValue: 0.1
+ maxValue: 2.0
+ isLooped: true
+ - type: Battery
+ maxCharge: 100
+ startingCharge: 100
+ - type: BatterySelfRecharger
+ autoRecharge: true
+ autoRechargeRate: 5
+
+
+# COSMIC CULT HARDSUIT HELMET
+- type: entity
+ parent: [ ClothingHeadHardsuitBase, BaseCosmicCultContraband ]
+ id: ClothingHeadHelmetCosmicCult
+ name: entropic headgear
+ description: This headpiece seems to extude from the hardsuit it's attached to as if the material is one single, contiguous whole.
+ categories: [ HideSpawnMenu ]
+ components:
+ - type: Sprite
+ sprite: _Impstation/CosmicCult/Clothing/cosmiccult_armor.rsi
+ layers:
+ - state: icon-helmet
+ - type: Clothing
+ sprite: _Impstation/CosmicCult/Clothing/cosmiccult_armor.rsi
+ - type: PressureProtection
+ highPressureMultiplier: 0.3
+ lowPressureMultiplier: 1000
+ - type: Armor
+ modifiers:
+ coefficients:
+ Blunt: 0.9
+ Slash: 0.9
+ Piercing: 0.9
+ Heat: 0.9
diff --git a/Resources/Prototypes/_Impstation/CosmicCult/Effects/cosmic_hiteffect.yml b/Resources/Prototypes/_Impstation/CosmicCult/Effects/cosmic_hiteffect.yml
new file mode 100644
index 00000000000000..8c8c14336ee73c
--- /dev/null
+++ b/Resources/Prototypes/_Impstation/CosmicCult/Effects/cosmic_hiteffect.yml
@@ -0,0 +1,26 @@
+- type: entity
+ id: WeaponArcCosmic
+ parent: WeaponArcStatic
+ categories: [ HideSpawnMenu ]
+ components:
+ - type: WeaponArcVisuals
+ fadeOut: false
+ - type: Sprite
+ sprite: _Impstation/CosmicCult/Effects/weaponarcs.rsi
+ state: arc_cosmic
+ - type: TimedDespawn
+ lifetime: 0.66
+ - type: PointLight
+ color: "#43286a"
+ radius: 2.15
+ energy: 12
+ - type: LightBehaviour
+ behaviours:
+ - !type:FadeBehaviour
+ interpolate: Linear
+ minDuration: 0.64
+ maxDuration: 0.65
+ startValue: 12.0
+ endValue: 0.0
+ property: Energy
+ enabled: true
diff --git a/Resources/Prototypes/_Impstation/CosmicCult/God/cosmicgod.yml b/Resources/Prototypes/_Impstation/CosmicCult/God/cosmicgod.yml
new file mode 100644
index 00000000000000..1751dc3e964b32
--- /dev/null
+++ b/Resources/Prototypes/_Impstation/CosmicCult/God/cosmicgod.yml
@@ -0,0 +1,97 @@
+- type: entity
+ abstract: true
+ id: MobCosmicGodBase
+ name: The Unknown
+ description: Your mind begins to fracture and break as it fails to comprehend what looms before you.
+ components:
+ - type: Sprite
+ noRot: true
+ sprite: _Impstation/CosmicCult/God/cosmicgod.rsi
+ drawdepth: Ghosts
+ scale: 2.1,2.1
+ layers:
+ - state: god
+ shader: unshaded
+ - type: PointLight
+ radius: 25
+ energy: 35
+ castShadows: false
+ color: "#43286a"
+
+# spawn animation, spawns actual god when it ends
+- type: entity
+ parent: MobCosmicGodBase
+ id: MobCosmicGodSpawn
+ suffix: Spawn
+ components:
+ - type: EmitSoundOnSpawn
+ sound:
+ path: /Audio/_Impstation/CosmicCult/god_summon.ogg
+ - type: Sprite
+ layers:
+ - state: spawn
+ shader: unshaded
+ # the spawn animation is exactly 4.62 seconds long, so we time our entity spawn-in to be the same.
+ - type: TimedDespawn
+ lifetime: 4.62
+ - type: SpawnOnDespawn
+ prototype: MobCosmicGod
+
+- type: entity
+ parent: [MobCosmicGodBase, BaseMob]
+ id: MobCosmicGod
+ components:
+ - type: AnnounceOnSpawn
+ message: cosmicgod-has-risen
+ sender: cosmicgod-has-risen-sender
+ color: "#cae8e8"
+ - type: CargoSellBlacklist
+ # big mob needs to see everything
+ - type: ContentEye
+ maxZoom: 2.2,2.2
+ - type: Fixtures
+ fixtures:
+ EventHorizonCollider:
+ shape:
+ !type:PhysShapeCircle
+ radius: 5
+ hard: false
+ restitution: 0.8
+ density: 1
+ mask:
+ - Opaque
+ layer:
+ - GlassLayer
+ EventHorizonConsumer:
+ shape:
+ !type:PhysShapeCircle
+ radius: 6
+ hard: false
+ mask:
+ - Opaque
+ layer:
+ - GlassLayer
+ - type: Input
+ context: "ghost"
+ - type: MovementIgnoreGravity
+ - type: GhostHearing
+ globalReceive: true
+ - type: Physics
+ bodyType: Dynamic
+ bodyStatus: InAir
+ - type: CanMoveInAir
+ - type: WarpPoint
+ follow: true
+ location: The Unknown
+ - type: CosmicTest
+ - type: AmbientSound
+ enabled: true
+ volume: 0
+ range: 25
+ variation: 0.1
+ sound:
+ path: /Audio/_Impstation/CosmicCult/god_ambient.ogg
+ - type: EmitSoundOnSpawn
+ sound:
+ path: /Audio/_Impstation/CosmicCult/god_spawn.ogg
+
diff --git a/Resources/Prototypes/_Impstation/CosmicCult/Objects/book.yml b/Resources/Prototypes/_Impstation/CosmicCult/Objects/book.yml
new file mode 100644
index 00000000000000..0375e8a2ceb121
--- /dev/null
+++ b/Resources/Prototypes/_Impstation/CosmicCult/Objects/book.yml
@@ -0,0 +1,14 @@
+## Cosmic Cult Lore Book
+
+- type: entity
+ parent: BookBase
+ id: BookCosmicCult
+ name: ancient treatise on cosmology
+ description: The book is an ancient synthleather-bound treatise with a bright, star-shaped mark on the cover. Though the pages seem to be dyed in odd hues, the ink appears clearly legible despite the book's apparent age. It's strangely well-preserved, and has clearly been stored away for a very long time.
+ components:
+ - type: Sprite
+ sprite: _Impstation/CosmicCult/Objects/book.rsi
+ layers:
+ - state: cosmiccultbook
+ - type: Paper
+ content: book-text-cosmiccult
diff --git a/Resources/Prototypes/_Impstation/CosmicCult/Objects/compass.yml b/Resources/Prototypes/_Impstation/CosmicCult/Objects/compass.yml
new file mode 100644
index 00000000000000..e12010373c0b1e
--- /dev/null
+++ b/Resources/Prototypes/_Impstation/CosmicCult/Objects/compass.yml
@@ -0,0 +1,28 @@
+- type: entity
+ name: compass of stars
+ parent: [ BaseCosmicCultContraband ]
+ categories: [ HideSpawnMenu ]
+ id: AbilityCosmicCultTool
+ description: A strange tool that resembles an astrolabe - an ancient form of astrological device.
+ components:
+ - type: Unremoveable
+ - type: Item
+ - type: Sprite
+ sprite: _Impstation/CosmicCult/Objects/compass.rsi
+ state: icon
+ - type: Appearance
+ - type: UseDelay
+ - type: PointLight
+ enabled: true
+ radius: 1
+ energy: 1
+ color: "#42a4ae"
+ - type: Prying
+ speedModifier: 0.9
+ pryPowered: true
+ useSound: /Audio/_Impstation/CosmicCult/compass_dooropen.ogg
+ - type: Tool
+ qualities:
+ - Prying
+ - type: DisarmMalus
+ malus: 0
diff --git a/Resources/Prototypes/_Impstation/CosmicCult/Objects/cosmiclance.yml b/Resources/Prototypes/_Impstation/CosmicCult/Objects/cosmiclance.yml
new file mode 100644
index 00000000000000..40cf4f474c0136
--- /dev/null
+++ b/Resources/Prototypes/_Impstation/CosmicCult/Objects/cosmiclance.yml
@@ -0,0 +1,95 @@
+- type: entity
+ name: vacuous lance
+ parent: [ BaseSword, BaseCosmicCultContraband ]
+ id: SpearCosmicCult
+ description: An unnerving spear, wrought of indescribable material. Being near it feels like a prickle of static spreading through your nerves.
+ components:
+ - type: Sprite
+ sprite: _Impstation/CosmicCult/Objects/cosmiclance.rsi
+ layers:
+ - state: icon
+ - state: icon-overlay
+ shader: unshaded
+ - type: MeleeWeapon
+ angle: 0
+ animation: WeaponArcCosmic
+ attackRate: 0.62
+ damage:
+ types:
+ Piercing: 10
+ Asphyxiation: 10
+ Cold: 10
+ soundHit:
+ path: /Audio/_Impstation/CosmicCult/cosmiclance_hit.ogg
+ params:
+ variation: 0.2
+ volume: 1
+ soundSwing:
+ path: /Audio/_Impstation/CosmicCult/cosmicweapon_swing.ogg
+ params:
+ variation: 0.125
+ volume: -4
+ soundNoDamage:
+ path: /Audio/_Impstation/CosmicCult/cosmicsword_glance.ogg
+ params:
+ variation: 0.2
+ volume: -11
+ - type: Wieldable
+ wieldSound:
+ path: /Audio/_Impstation/CosmicCult/cosmic_wield.ogg
+ params:
+ variation: 0.2
+ volume: -2
+ unwieldSound:
+ path: /Audio/_Impstation/CosmicCult/cosmic_unwield.ogg
+ params:
+ variation: 0.2
+ volume: 0
+ - type: IncreaseDamageOnWield
+ damage:
+ types:
+ Piercing: 5
+ - type: DamageOnLand
+ damage:
+ types:
+ Cold: 5
+ - type: DamageOtherOnHit
+ damage:
+ types:
+ Piercing: 10
+ Cold: 15
+ - type: DisarmMalus
+ - type: Item
+ size: Huge
+ sprite: _Impstation/CosmicCult/Objects/cosmiclance-inhands.rsi
+ inhandVisuals:
+ left:
+ - state: inhand-left
+ right:
+ - state: inhand-right
+ - type: ThrowingAngle
+ angle: 225
+ - type: LandAtCursor
+ - type: EmbeddableProjectile
+ sound: /Audio/_Impstation/CosmicCult/cosmiclance_impact.ogg
+ offset: -0.15,0.0
+ - type: EmitSoundOnThrow
+ sound: /Audio/_Impstation/CosmicCult/cosmicweapon_swing.ogg ## THROWING SOUND - REPLACE THIS!
+ - type: Tag
+ tags:
+ - Spear
+ - type: Fixtures
+ fixtures:
+ fix1:
+ shape: !type:PolygonShape
+ vertices:
+ - -0.40,-0.30
+ - -0.30,-0.40
+ - 0.40,0.30
+ - 0.30,0.40
+ density: 50
+ mask:
+ - ItemMask
+ restitution: 0.3
+ friction: 1
+ - type: Sharp
diff --git a/Resources/Prototypes/_Impstation/CosmicCult/Objects/cosmicsword.yml b/Resources/Prototypes/_Impstation/CosmicCult/Objects/cosmicsword.yml
new file mode 100644
index 00000000000000..c86079e6a04b0b
--- /dev/null
+++ b/Resources/Prototypes/_Impstation/CosmicCult/Objects/cosmicsword.yml
@@ -0,0 +1,72 @@
+- type: entity
+ name: entropic blade
+ parent: [ BaseSword, BaseCosmicCultContraband ]
+ id: SwordCosmicCult
+ description: An eerie greatsword wrought of indescribable material, forcibly extruded down into reality. Your instincts tell you that it does not belong here.
+ components:
+ - type: Sprite
+ sprite: _Impstation/CosmicCult/Objects/cosmicsword.rsi
+ layers:
+ - state: icon
+ - state: icon-overlay
+ shader: unshaded
+ - type: MeleeWeapon
+ resistanceBypass: true
+ angle: 90
+ animation: WeaponArcCosmic
+ attackRate: 0.62
+ clickDamageModifier: 1.1
+ damage:
+ types:
+ Slash: 11
+ Asphyxiation: 12
+ Cold: 12
+ Structural: 15
+ soundHit:
+ path: /Audio/_Impstation/CosmicCult/cosmicsword_hit.ogg
+ params:
+ variation: 0.2
+ volume: 1
+ soundSwing:
+ path: /Audio/_Impstation/CosmicCult/cosmicweapon_swing.ogg
+ params:
+ variation: 0.125
+ volume: -4
+ soundNoDamage:
+ path: /Audio/_Impstation/CosmicCult/cosmicsword_glance.ogg
+ params:
+ variation: 0.2
+ volume: -11
+ - type: Reflect
+ reflectProb: .21
+ spread: 120
+ soundOnReflect:
+ path: /Audio/_Impstation/CosmicCult/cosmicsword_glance.ogg
+ params:
+ variation: 0.2
+ volume: -6
+ - type: Wieldable
+ wieldSound:
+ path: /Audio/_Impstation/CosmicCult/cosmic_wield.ogg
+ params:
+ variation: 0.2
+ volume: -2
+ unwieldSound:
+ path: /Audio/_Impstation/CosmicCult/cosmic_unwield.ogg
+ params:
+ variation: 0.2
+ volume: 0
+ - type: IncreaseDamageOnWield
+ damage:
+ types:
+ Slash: 3
+ Structural: 5
+ - type: DisarmMalus
+ - type: Item
+ size: Huge
+ sprite: _Impstation/CosmicCult/Objects/cosmicsword-inhands.rsi
+ inhandVisuals:
+ left:
+ - state: inhand-left
+ right:
+ - state: inhand-right
diff --git a/Resources/Prototypes/_Impstation/CosmicCult/Objects/cult_contraband.yml b/Resources/Prototypes/_Impstation/CosmicCult/Objects/cult_contraband.yml
new file mode 100644
index 00000000000000..0404728c79df22
--- /dev/null
+++ b/Resources/Prototypes/_Impstation/CosmicCult/Objects/cult_contraband.yml
@@ -0,0 +1,8 @@
+- type: entity
+ id: BaseCosmicCultContraband
+ abstract: true
+ components:
+ - type: Contraband
+ severity: CosmicCultContrabandSeverity
+ # no one should be carrying this around visibly!
+ allowedDepartments: null
diff --git a/Resources/Prototypes/_Impstation/CosmicCult/Objects/entropymote.yml b/Resources/Prototypes/_Impstation/CosmicCult/Objects/entropymote.yml
new file mode 100644
index 00000000000000..2ee858b3af8306
--- /dev/null
+++ b/Resources/Prototypes/_Impstation/CosmicCult/Objects/entropymote.yml
@@ -0,0 +1,84 @@
+## Cosmic Cult Entropy Mote
+
+- type: entity
+ parent: MaterialBase
+ id: MaterialCosmicCultEntropy
+ name: mote of entropy
+ suffix: Full
+ components:
+ - type: Stack
+ count: 6
+ stackType: Entropy
+ baseLayer: base
+ layerStates:
+ - mote
+ - mote_2
+ - mote_3
+ - type: Sprite
+ sprite: _Impstation/CosmicCult/Objects/entropymote.rsi
+ state: mote
+ layers:
+ - state: mote
+ map: ["base"]
+ - type: Appearance
+ - type: Item
+ sprite: _Impstation/CosmicCult/Objects/entropymote.rsi
+ size: Small
+ - type: Tag
+ tags:
+ - EntropyMote
+ - type: Material
+ - type: PhysicalComposition
+ materialComposition:
+ EntropyMoteMaterial: 1
+
+- type: entity
+ parent: MaterialCosmicCultEntropy
+ id: MaterialCosmicCultEntropy1
+ suffix: One
+ components:
+ - type: Stack
+ count: 1
+
+- type: entity
+ categories: [ HideSpawnMenu ]
+ parent: MaterialCosmicCultEntropy
+ id: MaterialCosmicCultEntropy2
+ suffix: Two
+ components:
+ - type: Stack
+ count: 2
+
+- type: entity
+ categories: [ HideSpawnMenu ]
+ parent: MaterialCosmicCultEntropy
+ id: MaterialCosmicCultEntropy3
+ suffix: Three
+ components:
+ - type: Stack
+ count: 3
+
+- type: entity
+ categories: [ HideSpawnMenu ]
+ parent: MaterialCosmicCultEntropy
+ id: MaterialCosmicCultEntropy4
+ suffix: Four
+ components:
+ - type: Stack
+ count: 4
+
+- type: entity
+ categories: [ HideSpawnMenu ]
+ parent: MaterialCosmicCultEntropy
+ id: MaterialCosmicCultEntropy5
+ suffix: Five
+ components:
+ - type: Stack
+ count: 5
+
+- type: stack
+ id: Entropy
+ name: mote of entropy
+ icon: { sprite: _Impstation/CosmicCult/Objects/entropymote.rsi, state: mote }
+ spawn: MaterialCosmicCultEntropy1
+ maxCount: 6
diff --git a/Resources/Prototypes/_Impstation/CosmicCult/Tileset/doors.yml b/Resources/Prototypes/_Impstation/CosmicCult/Tileset/doors.yml
new file mode 100644
index 00000000000000..130fc8197dce7a
--- /dev/null
+++ b/Resources/Prototypes/_Impstation/CosmicCult/Tileset/doors.yml
@@ -0,0 +1,39 @@
+- type: entity
+ id: DoorCosmicCult
+ parent: BaseMaterialDoorNavMap
+ name: malign passageway
+ description: A strange, disquieting structure.
+ components:
+ - type: Sprite
+ sprite: _Impstation/CosmicCult/Tileset/cosmicdoor.rsi
+ layers:
+ - state: closed
+ map: ["enum.DoorVisualLayers.Base"]
+ - type: Door
+ bumpOpen: true
+ clickOpen: true
+ canCrush: true
+ closeTimeOne: 0.8
+ closeTimeTwo: 1.2
+ openTimeOne: 0.8
+ openTimeTwo: 1.2
+ openingAnimationTime: 1.2
+ closingAnimationTime: 1.2
+ openSound:
+ path: /Audio/_Impstation/CosmicCult/door_open.ogg
+ closeSound:
+ path: /Audio/_Impstation/CosmicCult/door_close.ogg
+ - type: RCDDeconstructable
+ deconstructable: false
+ - type: Damageable
+ damageContainer: StructuralInorganic
+ damageModifierSet: StructuralMetallicStrong
+ - type: Destructible
+ thresholds:
+ - trigger:
+ !type:DamageTrigger
+ damage: 600
+ behaviors:
+ - !type:DoActsBehavior
+ acts: ["Destruction"]
+
diff --git a/Resources/Prototypes/_Impstation/CosmicCult/Tileset/floors.yml b/Resources/Prototypes/_Impstation/CosmicCult/Tileset/floors.yml
new file mode 100644
index 00000000000000..70cdcd0f2c8bb5
--- /dev/null
+++ b/Resources/Prototypes/_Impstation/CosmicCult/Tileset/floors.yml
@@ -0,0 +1,138 @@
+- type: tile
+ id: FloorCosmicGlyph
+ name: tiles-cosmiccult-floor-glyph
+ sprite: /Textures/_Impstation/CosmicCult/Tileset/cosmicfloor/tile_glyph.png
+ baseTurf: FloorGlass
+ isSubfloor: false
+ deconstructTools: [ Prying ]
+ footstepSounds:
+ collection: FootstepCosmic
+ heatCapacity: 10000
+
+- type: tile
+ id: FloorCosmicSmooth
+ name: tiles-cosmiccult-floor-smooth
+ sprite: /Textures/_Impstation/CosmicCult/Tileset/cosmicfloor/tile_smooth.png
+ baseTurf: FloorGlass
+ isSubfloor: false
+ deconstructTools: [ Prying ]
+ footstepSounds:
+ collection: FootstepCosmic
+ heatCapacity: 10000
+
+- type: tile
+ id: FloorCosmicHalf
+ name: tiles-cosmiccult-floor-half
+ sprite: /Textures/_Impstation/CosmicCult/Tileset/cosmicfloor/tile_half.png
+ baseTurf: FloorGlass
+ isSubfloor: false
+ deconstructTools: [ Prying ]
+ footstepSounds:
+ collection: FootstepCosmic
+ heatCapacity: 10000
+
+- type: tile
+ id: FloorCosmicSplit
+ name: tiles-cosmiccult-floor-split
+ sprite: /Textures/_Impstation/CosmicCult/Tileset/cosmicfloor/tile_split.png
+ baseTurf: FloorGlass
+ isSubfloor: false
+ deconstructTools: [ Prying ]
+ footstepSounds:
+ collection: FootstepCosmic
+ heatCapacity: 10000
+
+- type: tile
+ id: FloorCosmicNotched
+ name: tiles-cosmiccult-floor-notched
+ sprite: /Textures/_Impstation/CosmicCult/Tileset/cosmicfloor/tile_notched.png
+ baseTurf: FloorGlass
+ isSubfloor: false
+ deconstructTools: [ Prying ]
+ footstepSounds:
+ collection: FootstepCosmic
+ heatCapacity: 10000
+
+- type: entity
+ id: FloorCosmicDecay
+ name: entropic decay
+ description: Just one look at this sends a chill running down your spine.
+ placement:
+ mode: SnapgridCenter
+ snap:
+ - Wall
+ components:
+ - type: FloorOccluder
+ - type: SpeedModifierContacts
+ walkSpeedModifier: 0.5
+ sprintSpeedModifier: 0.5
+ - type: Physics
+ bodyType: Static
+ - type: Fixtures
+ fixtures:
+ fix1:
+ shape:
+ !type:PhysShapeAabb
+ bounds: "-0.5,-0.5,0.5,0.5"
+ layer:
+ - SlipLayer
+ mask:
+ - ItemMask
+ density: 1000
+ hard: false
+ - type: FootstepModifier
+ footstepSoundCollection:
+ collection: FootstepWater
+ params:
+ volume: 8
+ - type: StepTrigger
+ requiredTriggeredSpeed: 0
+ intersectRatio: 0.1
+ blacklist:
+ tags:
+ - Catwalk
+ - type: TileEntityEffect
+ effects:
+ - !type:AdjustTemperature
+ conditions:
+ - !type:Temperature
+ min: 160.15
+ amount: -30000
+ - type: Transform
+ anchored: true
+ - type: SyncSprite
+ - type: Clickable
+ - type: Sprite
+ sprite: /Textures/_Impstation/CosmicCult/Tileset/cosmicdecay.rsi
+ drawdepth: BelowFloor
+ layers:
+ - state: decay
+ shader: unshaded
+ - type: Icon
+ sprite: /Textures/_Impstation/CosmicCult/Tileset/cosmicdecay.rsi
+ state: full
+ - type: IconSmooth
+ key: floor
+ base: decay
+ - type: Physics
+ bodyType: Static
+ - type: Fixtures
+ fixtures:
+ fix1:
+ shape:
+ !type:PhysShapeAabb
+ bounds: "-0.5,-0.5,0.5,0.5"
+ layer:
+ - SlipLayer
+ mask:
+ - ItemMask
+ density: 1000
+ hard: false
+ - type: Tag
+ tags:
+ - HideContextMenu
+ - type: PointLight
+ radius: 4.25
+ energy: 1.75
+ castShadows: false
+ color: "#42a4ae"
diff --git a/Resources/Prototypes/_Impstation/CosmicCult/Tileset/monument.yml b/Resources/Prototypes/_Impstation/CosmicCult/Tileset/monument.yml
new file mode 100644
index 00000000000000..18f8a6db320715
--- /dev/null
+++ b/Resources/Prototypes/_Impstation/CosmicCult/Tileset/monument.yml
@@ -0,0 +1,226 @@
+
+ ########### COSMIC MONUMENT, BASE ABSTRACT #############
+
+- type: entity
+ abstract: true
+ parent: BaseStructure
+ id: MonumentCosmicCultBase
+ name: The Monument
+ description: A great slab of unknowledge, only visible to those aware of it. Built of a thousand little nothings, its surface reflects a starless emptiness...
+ components:
+ - type: CosmicItem
+ - type: CosmicMonument
+ - type: SpriteFade
+ - type: Sprite
+ sprite: _Impstation/CosmicCult/Tileset/monument.rsi
+ layers:
+ - state: stage1
+ - state: inserting1
+ visible: false
+ shader: unshaded
+ map: ["enum.MaterialStorageVisualLayers.Inserting"]
+ offset: 0,1
+ drawdepth: Mobs
+ noRot: true
+ - type: InteractionOutline
+ - type: Transform
+ noRot: true
+ - type: Fixtures
+ fixtures:
+ fix1:
+ shape:
+ !type:PhysShapeAabb
+ bounds: "-1.1,-0.2,1.1,0.7"
+ mask:
+ - LargeMobMask
+ layer:
+ - WallLayer
+ - type: PointLight
+ enabled: true
+ radius: 4.5
+ energy: 4
+ color: "#43286a"
+ - type: LightBehaviour
+ behaviours:
+ - !type:FadeBehaviour
+ interpolate: Linear
+ minDuration: 3
+ maxDuration: 5
+ startValue: 4.5
+ endValue: 1.5
+ property: Energy
+ enabled: true
+ isLooped: true
+ reverseWhenFinished: true
+ - type: AmbientSound
+ range: 3.5
+ volume: -9
+ sound:
+ path: /Audio/_Impstation/CosmicCult/god_ambient.ogg
+ - type: MaterialStorage
+ insertionTime: 2.44
+ insertingSound: /Audio/_Impstation/CosmicCult/cosmiclance_impact.ogg
+ ignoreColor: true
+ whitelist:
+ tags:
+ - EntropyMote
+ materialWhiteList:
+ - EntropyMoteMaterial
+ - type: ActivatableUI
+ key: enum.CosmicMonumentUiKey.Key
+ - type: UserInterface
+ interfaces:
+ enum.CosmicMonumentUiKey.Key:
+ type: CosmicMonumentBoundUserInterface
+ - type: EmitSoundOnUIOpen
+ sound:
+ collection: Keyboard
+ params:
+ volume: -1
+ variation: 0.05
+ pitch: 1.05
+ - type: GuideHelp
+ guides:
+ - AnomalousResearch
+ - type: Appearance
+ - type: ActiveRadio
+ channels:
+ - CosmicRadio
+ - type: WarpPoint
+ location: cosmic cult monument
+
+ ########### SPAWN-IN ANIMATION #############
+
+- type: entity
+ id: MonumentCosmicCultSpawnIn
+ name: The Monument
+ parent: BaseStructure
+ suffix: Spawn, DO NOT MAP
+ components:
+ - type: CosmicMonument
+ - type: Visibility
+ layer: 777
+ - type: Sprite
+ sprite: _Impstation/CosmicCult/Tileset/monument.rsi
+ layers:
+ - state: stage1-spawnin
+ - state: stage1-spawnin-overlay
+ shader: unshaded
+ offset: 0,1
+ drawdepth: Mobs
+ noRot: true
+ - type: Fixtures
+ fixtures:
+ fix1:
+ shape:
+ !type:PhysShapeAabb
+ bounds: "-1.1,-0.2,1.1,0.7"
+ hard: false
+ mask:
+ - LargeMobMask
+ layer:
+ - WallLayer
+ - type: InteractionOutline
+ - type: Transform
+ noRot: true
+ - type: EmitSoundOnSpawn
+ sound:
+ path: /Audio/_Impstation/CosmicCult/monument_spawn.ogg
+ params:
+ volume: +8
+ pitch: 0.8
+ - type: TimedDespawn
+ lifetime: 3.8
+ - type: SpawnOnDespawn
+ prototype: MonumentCosmicCult1
+ - type: PointLight
+ enabled: true
+ radius: 4.5
+ energy: 4
+ color: "#43286a"
+ - type: LightBehaviour
+ behaviours:
+ - !type:FadeBehaviour
+ interpolate: Linear
+ minDuration: 3.8
+ maxDuration: 3.8
+ startValue: 0.5
+ endValue: 4.5
+ property: Energy
+ enabled: true
+
+ ########### STAGE 1 #############
+
+- type: entity
+ parent: MonumentCosmicCultBase
+ id: MonumentCosmicCult1
+ suffix: Base, DO NOT MAP
+ components:
+ - type: CosmicMonument
+ - type: Visibility
+ layer: 777
+ - type: Sprite
+ sprite: _Impstation/CosmicCult/Tileset/monument.rsi
+ layers:
+ - state: stage1
+ - state: inserting1
+ visible: false
+ shader: unshaded
+ map: ["enum.MaterialStorageVisualLayers.Inserting"]
+ - type: MaterialStorage
+ insertionTime: 1.44
+
+ ########### STAGE 2 #############
+
+- type: entity
+ parent: MonumentCosmicCultBase
+ id: MonumentCosmicCult2
+ suffix: Stage 2, DO NOT MAP
+ components:
+ - type: CosmicMonument
+ - type: Visibility
+ layer: 777
+ - type: Sprite
+ sprite: _Impstation/CosmicCult/Tileset/monument.rsi
+ layers:
+ - state: stage2
+ - state: inserting2
+ visible: false
+ shader: unshaded
+ map: ["enum.MaterialStorageVisualLayers.Inserting"]
+
+ ########### STAGE 3 #############
+
+- type: entity
+ parent: MonumentCosmicCultBase
+ id: MonumentCosmicCult3
+ suffix: Stage 3, DO NOT MAP
+ components:
+ - type: CosmicMonument
+ - type: Sprite
+ sprite: _Impstation/CosmicCult/Tileset/monument.rsi
+ layers:
+ - state: stage3
+ - state: inserting3
+ visible: false
+ shader: unshaded
+ map: ["enum.MaterialStorageVisualLayers.Inserting"]
+
+ ########### STAGE 4 #############
+
+- type: entity
+ parent: MonumentCosmicCultBase
+ id: MonumentCosmicCult3+
+ suffix: Stage 4, DO NOT MAP
+ components:
+ - type: CosmicMonument
+ - type: Sprite
+ sprite: _Impstation/CosmicCult/Tileset/monument.rsi
+ layers:
+ - state: stage3
+ - state: inserting3
+ visible: false
+ shader: unshaded
+ map: ["enum.MaterialStorageVisualLayers.Inserting"]
+ - state: stage4-overlay
+ shader: unshaded
diff --git a/Resources/Prototypes/_Impstation/CosmicCult/Tileset/structures.yml b/Resources/Prototypes/_Impstation/CosmicCult/Tileset/structures.yml
new file mode 100644
index 00000000000000..827690ea98f03f
--- /dev/null
+++ b/Resources/Prototypes/_Impstation/CosmicCult/Tileset/structures.yml
@@ -0,0 +1,298 @@
+##################### ANTI-GRAV OBELISK
+- type: entity
+ name: entropic device
+ id: CosmicAntiGravPylon
+ suffix: DO NOT MAP
+ parent: BaseMachine
+ description: A mysterious structure that renders its surroundings weightless. In other words, the inscrutable glyphs upon it tell artificial gravity to take a hike.
+ components:
+ - type: CosmicItem
+ - type: ZeroGravityArea
+ fixture: antiGravity
+ - type: SpriteFade
+ - type: ItemToggle
+ activated: true
+ - type: ItemTogglePointLight
+ - type: ItemToggleZeroGravityArea
+ - type: Sprite
+ sprite: _Impstation/CosmicCult/Tileset/cosmicpylon.rsi
+ offset: 0, 0.5
+ drawdepth: Mobs
+ layers:
+ - state: base
+ - state: overlay-enabled
+ shader: unshaded
+ - state: overlay-orb
+ shader: unshaded
+ - type: Physics
+ canCollide: true
+ - type: Fixtures
+ fixtures:
+ fix1:
+ shape:
+ !type:PhysShapeAabb
+ bounds: "-0.2,-0.2,0.2,0.375"
+ density: 50
+ mask:
+ - LargeMobMask
+ layer:
+ - WallLayer
+ antiGravity:
+ shape:
+ !type:PhysShapeCircle
+ radius: 9
+ hard: false
+ layer:
+ - Impassable
+ mask:
+ - Impassable
+ - type: PointLight
+ radius: 4
+ energy: 5
+ color: "#42a4ae"
+ - type: LightBehaviour
+ behaviours:
+ - !type:FadeBehaviour
+ interpolate: Linear
+ minDuration: 3
+ maxDuration: 5
+ startValue: 4.5
+ endValue: 1.5
+ property: Energy
+ enabled: true
+ isLooped: true
+ reverseWhenFinished: true
+ - type: Anchorable
+ - type: Damageable
+ damageContainer: StructuralInorganic
+ damageModifierSet: Metallic
+ - type: Destructible
+ thresholds:
+ - trigger:
+ !type:DamageTrigger
+ damage: 600
+ behaviors:
+ - !type:DoActsBehavior
+ acts: [ "Destruction" ]
+
+##################### SHUTTLE CORE CONTROL
+- type: entity
+ parent: BaseStructure
+ id: CosmicShuttleCore
+ name: malign instrument
+ description: Its surface glows with a myriad of inscrutable glyphs that commmunicate a single word into your mind; "Flight".
+ components:
+ - type: Sprite
+ sprite: _Impstation/CosmicCult/Tileset/cosmiccomputer.rsi
+ layers:
+ - state: computer
+ - state: computer-unshaded
+ shader: unshaded
+ - type: CosmicItem
+ - type: Thruster
+ thrusterType: Angular # These are overpowered thruster-shuttle-console-hybrids that require no power grid. As such, they cannot be anchored or meaningfully taken outside of their intended use.
+ requireSpace: false
+ thrust: 4000
+ machinePartThrust: Manipulator
+ - type: ShuttleConsole
+ - type: ActivatableUI
+ key: enum.ShuttleConsoleUiKey.Key
+ - type: UserInterface
+ interfaces:
+ enum.ShuttleConsoleUiKey.Key:
+ type: ShuttleConsoleBoundUserInterface
+ - type: EmitSoundOnUIOpen
+ sound:
+ collection: Keyboard
+ params:
+ volume: -1
+ variation: 0.05
+ pitch: 1.05
+ - type: RadarConsole
+ - type: WorldLoader
+ radius: 256
+ - type: PointLight
+ radius: 1.5
+ energy: 1.6
+ enabled: false
+ mask: /Textures/Effects/LightMasks/cone.png
+ autoRot: true
+ offset: "0, 0.4"
+ castShadows: false
+ color: "#42a4ae"
+ - type: Rotatable
+ - type: Destructible
+ thresholds:
+ - trigger:
+ !type:DamageTrigger
+ damage: 600
+ behaviors:
+ - !type:DoActsBehavior
+ acts: [ "Destruction" ]
+
+
+##################### CHAIR
+- type: entity
+ name: malign settee
+ id: CosmicChair
+ parent: SeatBase
+ placement:
+ mode: SnapgridCenter
+ components:
+ - type: CosmicItem
+ - type: Sprite
+ sprite: _Impstation/CosmicCult/Tileset/cosmicchair.rsi
+ state: chair
+ - type: Destructible
+ thresholds:
+ - trigger:
+ !type:DamageTrigger
+ damage: 600
+ behaviors:
+ - !type:DoActsBehavior
+ acts: [ "Destruction" ]
+
+##################### PILLAR
+- type: entity
+ parent: BaseStructure
+ id: CosmicObelisk
+ name: malign obelisk
+ description: A mysterious-yet-inert sturcture. Unsettling.
+ components:
+ - type: Sprite
+ sprite: _Impstation/CosmicCult/Tileset/cosmicpillar.rsi
+ offset: 0, 0.5
+ layers:
+ - state: icon
+ drawdepth: Mobs
+ noRot: true
+ - type: CosmicItem
+ - type: SpriteFade
+ - type: InteractionOutline
+ - type: Transform
+ - type: Rotatable
+ - type: Fixtures
+ fixtures:
+ fix1:
+ shape:
+ !type:PhysShapeAabb
+ bounds: "-0.2,-0.1,0.2,0.375"
+ mask:
+ - LargeMobMask
+ layer:
+ - WallLayer
+ - type: Destructible
+ thresholds:
+ - trigger:
+ !type:DamageTrigger
+ damage: 600
+ behaviors:
+ - !type:DoActsBehavior
+ acts: [ "Destruction" ]
+
+##################### THRUSTER
+- type: entity
+ parent: BaseStructure
+ id: CosmicThruster
+ name: malign engine
+ components:
+ - type: CosmicItem
+ - type: Fixtures
+ fixtures:
+ fix1:
+ shape:
+ !type:PhysShapeAabb
+ bounds: "-0.45,-0.45,0.45,0.45"
+ density: 60
+ mask:
+ - MachineMask
+ layer:
+ - MachineLayer
+ - type: AmbientSound
+ enabled: false
+ range: 4
+ volume: -4
+ sound:
+ path: /Audio/Effects/shuttle_thruster.ogg
+ - type: Transform
+ anchored: true
+ - type: Physics
+ bodyType: Static
+ - type: Rotatable
+ rotateWhileAnchored: true
+ - type: Thruster
+ damage:
+ types:
+ Cold: 40
+ - type: InteractionOutline
+ - type: Appearance
+ - type: ThrusterVisuals
+ - type: Sprite
+ sprite: _Impstation/CosmicCult/Tileset/cosmicthruster.rsi
+ layers:
+ - state: base
+ map: ["enum.ThrusterVisualLayers.Base"]
+ - state: thrust
+ map: ["enum.ThrusterVisualLayers.ThrustOn"]
+ shader: unshaded
+ visible: false
+ - state: thrust_burn_unshaded
+ map: ["enum.ThrusterVisualLayers.ThrustingUnshaded"]
+ shader: unshaded
+ visible: false
+ offset: 0, 0.564
+ - type: Destructible
+ thresholds:
+ - trigger:
+ !type:DamageTrigger
+ damage: 600
+ behaviors:
+ - !type:DoActsBehavior
+ acts: [ "Destruction" ]
+
+##################### LAMP
+- type: entity
+ id: CosmicLamp
+ suffix: Always Powered
+ name: malign light
+ components:
+ - type: MeleeSound
+ soundGroups:
+ Brute:
+ collection: GlassSmash
+ - type: Transform
+ - type: CosmicItem
+ - type: Clickable
+ - type: InteractionOutline
+ - type: Sprite
+ sprite: _Impstation/CosmicCult/Tileset/cosmiclight.rsi
+ drawdepth: Mobs
+ layers:
+ - state: base
+ - state: glow
+ shader: unshaded
+ - type: PointLight
+ color: "#42a4ae" # 5000K color temp
+ energy: 2
+ radius: 8
+ softness: 1
+ castShadows: false
+ offset: "0, -0.5"
+ - type: Damageable
+ damageContainer: Inorganic
+ damageModifierSet: Metallic
+ - type: RCDDeconstructable
+ deconstructable: false
+ - type: Destructible
+ thresholds:
+ - trigger:
+ !type:DamageTrigger
+ damage: 600
+ behaviors: #excess damage, don't spawn entities.
+ - !type:DoActsBehavior
+ acts: [ "Destruction" ]
+ - !type:PlaySoundBehavior
+ sound:
+ collection: GlassBreak
+ placement:
+ mode: SnapgridCenter
diff --git a/Resources/Prototypes/_Impstation/CosmicCult/Tileset/walls.yml b/Resources/Prototypes/_Impstation/CosmicCult/Tileset/walls.yml
new file mode 100644
index 00000000000000..24b10692574008
--- /dev/null
+++ b/Resources/Prototypes/_Impstation/CosmicCult/Tileset/walls.yml
@@ -0,0 +1,171 @@
+- type: entity
+ parent: BaseWall
+ id: WallCosmicCult
+ name: malign wall
+ description: A strange-looking wall. Staring at it for too long instills a sense of discomfort.
+ components:
+ - type: CosmicItem
+ - type: Tag
+ tags:
+ - Wall
+ - type: Sprite
+ sprite: _Impstation/CosmicCult/Tileset/cosmicwall.rsi
+ - type: Icon
+ sprite: _Impstation/CosmicCult/Tileset/cosmicwall.rsi
+ - type: RCDDeconstructable
+ deconstructable: false
+ - type: Destructible
+ thresholds:
+ - trigger:
+ !type:DamageTrigger
+ damage: 600
+ behaviors:
+ - !type:DoActsBehavior
+ acts: [ "Destruction" ]
+ - type: IconSmooth
+ key: walls
+ base: cult
+
+
+
+- type: entity
+ parent: WallCosmicCult
+ id: WallCosmicCultTrimmed
+ name: malign wall
+ suffix: Trimmed
+ components:
+ - type: Icon
+ sprite: _Impstation/CosmicCult/Tileset/cosmicwall.rsi
+ state: full
+ - type: Sprite
+ sprite: _Impstation/CosmicCult/Tileset/cosmicwall.rsi
+ layers:
+ - state: full
+ - map: [ "enum.EdgeLayer.South" ]
+ state: trim_south
+ - map: [ "enum.EdgeLayer.East" ]
+ state: trim_east
+ - map: [ "enum.EdgeLayer.North" ]
+ state: trim_north
+ - map: [ "enum.EdgeLayer.West" ]
+ state: trim_west
+ - type: IconSmooth
+ key: walls
+ base: cult
+ - type: SmoothEdge
+
+- type: entity
+ id: WindowCosmicCult
+ name: malign pane
+ description: An odd-looking window. Something about it unnerves you.
+ parent: WindowRCDResistant
+ components:
+ - type: Sprite
+ drawdepth: WallTops
+ sprite: _Impstation/CosmicCult/Tileset/cosmicwindow.rsi
+ - type: Icon
+ sprite: _Impstation/CosmicCult/Tileset/cosmicwindow.rsi
+ state: full
+ - type: Damageable
+ damageContainer: StructuralInorganic
+ damageModifierSet: Glass
+ - type: Destructible
+ thresholds:
+ - trigger:
+ !type:DamageTrigger
+ damage: 600
+ behaviors:
+ - !type:DoActsBehavior
+ acts: [ "Destruction" ]
+ - trigger:
+ !type:DamageTrigger
+ damage: 300
+ behaviors:
+ - !type:PlaySoundBehavior
+ sound:
+ collection: WindowShatter
+ - !type:DoActsBehavior
+ acts: [ "Destruction" ]
+ - type: IconSmooth
+ base: coswindow
+ - type: Appearance
+ - type: DamageVisuals
+ thresholds: [5, 10, 20]
+ damageDivisor: 3
+ trackAllDamage: true
+ damageOverlay:
+ sprite: Structures/Windows/cracks.rsi
+ - type: RadiationBlocker
+ resistance: 5
+
+- type: entity
+ id: WindowCosmicCultDark
+ name: malign pane
+ suffix: Tinted
+ parent: WindowCosmicCult
+ components:
+ - type: Sprite
+ drawdepth: WallTops
+ sprite: _Impstation/CosmicCult/Tileset/cosmicwindow_dark.rsi
+ - type: Icon
+ sprite: _Impstation/CosmicCult/Tileset/cosmicwindow_dark.rsi
+ state: full
+ - type: IconSmooth
+ base: cosDwindow
+
+- type: entity
+ parent: WallShuttleDiagonal
+ description: An odd-looking window. Something about it unnerves you.
+ id: WindowCosmicCultDiagonal
+ name: malign pane
+ suffix: Diagonal
+ placement:
+ mode: SnapgridCenter
+ snap:
+ - Wall
+ components:
+ - type: RCDDeconstructable
+ deconstructable: false
+ - type: CosmicItem
+ - type: Sprite
+ drawdepth: WallTops
+ sprite: _Impstation/CosmicCult/Tileset/cosmicwindow_diagonal.rsi
+ state: coswindow0
+ - type: IconSmooth
+ mode: Diagonal
+ key: windows
+ base: coswindow
+ - type: Icon
+ sprite: _Impstation/CosmicCult/Tileset/cosmicwindow_diagonal.rsi
+ state: coswindow0
+ - type: Destructible
+ thresholds:
+ - trigger:
+ !type:DamageTrigger
+ damage: 600
+ behaviors:
+ - !type:DoActsBehavior
+ acts: [ "Destruction" ]
+
+- type: entity
+ parent: WindowCosmicCultDiagonal
+ id: WindowCosmicCultDiagonalDark
+ name: malign pane
+ suffix: Diagonal, Tinted
+ placement:
+ mode: SnapgridCenter
+ snap:
+ - Wall
+ components:
+ - type: CosmicItem
+ - type: Sprite
+ drawdepth: WallTops
+ sprite: _Impstation/CosmicCult/Tileset/cosmicwindow_dark_diagonal.rsi
+ state: cosDwindow0
+ - type: IconSmooth
+ mode: Diagonal
+ key: windows
+ base: cosDwindow
+ - type: Icon
+ sprite: _Impstation/CosmicCult/Tileset/cosmicwindow_dark_diagonal.rsi
+ state: cosDwindow0
diff --git a/Resources/Prototypes/_Impstation/CosmicCult/ai_factions.yml b/Resources/Prototypes/_Impstation/CosmicCult/ai_factions.yml
new file mode 100644
index 00000000000000..d82f6f351fa715
--- /dev/null
+++ b/Resources/Prototypes/_Impstation/CosmicCult/ai_factions.yml
@@ -0,0 +1,9 @@
+- type: npcFaction
+ id: CosmicCultFaction
+ hostile:
+ - NanoTrasen
+ - Syndicate
+ - Zombie
+ - Revolutionary
+ - Changeling
+ - Heretic
diff --git a/Resources/Prototypes/_Impstation/CosmicCult/contraband_severities.yml b/Resources/Prototypes/_Impstation/CosmicCult/contraband_severities.yml
new file mode 100644
index 00000000000000..7dac3039204665
--- /dev/null
+++ b/Resources/Prototypes/_Impstation/CosmicCult/contraband_severities.yml
@@ -0,0 +1,4 @@
+# This is clearly cult contraband is illegal to own ICly.
+- type: contrabandSeverity
+ id: CosmicCultContrabandSeverity
+ examineText: contraband-examine-text-cosmiccult
diff --git a/Resources/Prototypes/_Impstation/CosmicCult/cosmiccultist.yml b/Resources/Prototypes/_Impstation/CosmicCult/cosmiccultist.yml
new file mode 100644
index 00000000000000..9e4c4d0ceded94
--- /dev/null
+++ b/Resources/Prototypes/_Impstation/CosmicCult/cosmiccultist.yml
@@ -0,0 +1,28 @@
+- type: antag
+ id: CosmicAntagCultist
+ name: roles-antag-cosmiccult-name
+ antagonist: true
+ setPreference: true
+ objective: roles-antag-cosmiccult-description
+ guides: [ NuclearOperatives ]
+
+- type: antag
+ id: CosmicAntagLeader
+ name: roles-antag-cosmiccultlead-name
+ antagonist: true
+ setPreference: true
+ objective: roles-antag-cosmiccultlead-description
+ requirements:
+ - !type:DepartmentTimeRequirement
+ department: Security
+ time: 36000 # 10h
+ - !type:DepartmentTimeRequirement
+ department: Command
+ time: 36000 # 10h
+ - !type:DepartmentTimeRequirement
+ department: Engineering
+ time: 27000 # 7.5 hours
+ - !type:DepartmentTimeRequirement
+ department: Medical
+ time: 27000 # 7.5 hours
+ guides: [ NuclearOperatives ]
diff --git a/Resources/Prototypes/_Impstation/CosmicCult/faction_icon.yml b/Resources/Prototypes/_Impstation/CosmicCult/faction_icon.yml
new file mode 100644
index 00000000000000..50ad9b936d1002
--- /dev/null
+++ b/Resources/Prototypes/_Impstation/CosmicCult/faction_icon.yml
@@ -0,0 +1,23 @@
+- type: factionIcon
+ id: CosmicCultIcon
+ isShaded: true
+ priority: 11
+ showTo:
+ components:
+ - ShowAntagIcons
+ - CosmicCult
+ icon:
+ sprite: /Textures/_Impstation/CosmicCult/Icons/antag_icons.rsi
+ state: CosmicCult
+
+- type: factionIcon
+ id: CosmicCultLeadIcon
+ isShaded: true
+ priority: 11
+ showTo:
+ components:
+ - ShowAntagIcons
+ - CosmicCult
+ icon:
+ sprite: /Textures/_Impstation/CosmicCult/Icons/antag_icons.rsi
+ state: CosmicCultLead
diff --git a/Resources/Prototypes/_Impstation/CosmicCult/footsteps_cosmic.yml b/Resources/Prototypes/_Impstation/CosmicCult/footsteps_cosmic.yml
new file mode 100644
index 00000000000000..6a33ff00c1f50e
--- /dev/null
+++ b/Resources/Prototypes/_Impstation/CosmicCult/footsteps_cosmic.yml
@@ -0,0 +1,8 @@
+- type: soundCollection
+ id: FootstepCosmic
+ files:
+ - /Audio/_Impstation/CosmicCult/footsteps/step1.ogg
+ - /Audio/_Impstation/CosmicCult/footsteps/step2.ogg
+ - /Audio/_Impstation/CosmicCult/footsteps/step3.ogg
+ - /Audio/_Impstation/CosmicCult/footsteps/step4.ogg
+ - /Audio/_Impstation/CosmicCult/footsteps/step5.ogg
diff --git a/Resources/Prototypes/_Impstation/CosmicCult/game_presets.yml b/Resources/Prototypes/_Impstation/CosmicCult/game_presets.yml
new file mode 100644
index 00000000000000..d6d094019637d9
--- /dev/null
+++ b/Resources/Prototypes/_Impstation/CosmicCult/game_presets.yml
@@ -0,0 +1,18 @@
+- type: gamePreset
+ id: TheCosmicCult
+ alias:
+ - cult
+ - cosmic
+ - cosmics
+ - cultists
+ - cosmic cult
+ name: cosmiccult-title
+ description: cosmiccult-description
+ showInVote: false
+ rules:
+ - CosmicCult
+ - SubGamemodesRule
+ - BasicStationEventScheduler
+ - MeteorSwarmScheduler
+ - SpaceTrafficControlEventScheduler
+ - BasicRoundstartVariation
diff --git a/Resources/Prototypes/_Impstation/CosmicCult/materials.yml b/Resources/Prototypes/_Impstation/CosmicCult/materials.yml
new file mode 100644
index 00000000000000..77d9fed8ea0e0c
--- /dev/null
+++ b/Resources/Prototypes/_Impstation/CosmicCult/materials.yml
@@ -0,0 +1,7 @@
+- type: material
+ id: EntropyMoteMaterial
+ name: materials-entropy
+ unit: materials-unit-mote
+ icon: { sprite: Objects/Materials/_Impstation/CosmicCult/Objects/entropymote.rsi, state: mote }
+ color: "#5f4e8f"
+ price: 50 # I don't know why i set this to 50. The heart of the YAML told me so.
diff --git a/Resources/Prototypes/_Impstation/CosmicCult/mind_roles.yml b/Resources/Prototypes/_Impstation/CosmicCult/mind_roles.yml
new file mode 100644
index 00000000000000..d26db6f069d7c2
--- /dev/null
+++ b/Resources/Prototypes/_Impstation/CosmicCult/mind_roles.yml
@@ -0,0 +1,19 @@
+- type: entity
+ parent: BaseMindRoleAntag
+ id: MindRoleCosmicCult
+ name: Cosmic Cult Role
+# description: mind-role-cosmiccult-description
+ components:
+ - type: MindRole
+ antagPrototype: CosmicAntagCultist
+ - type: CosmicCultRole
+
+- type: entity
+ parent: MindRoleCosmicCult
+ id: MindRoleCosmicCultLead
+ name: Cosmic Cult Leader Role
+# description: mind-role-cosmiccult-description
+ components:
+ - type: MindRole
+ antagPrototype: CosmicAntagLeader
+ - type: CosmicCultRole
diff --git a/Resources/Prototypes/_Impstation/CosmicCult/objectives.yml b/Resources/Prototypes/_Impstation/CosmicCult/objectives.yml
new file mode 100644
index 00000000000000..acc194cdc95019
--- /dev/null
+++ b/Resources/Prototypes/_Impstation/CosmicCult/objectives.yml
@@ -0,0 +1,66 @@
+- type: entity
+ abstract: true
+ parent: BaseObjective
+ id: BaseCosmicCultObjective
+ components:
+ - type: Objective
+ difficulty: 1.5
+ issuer: objective-issuer-cosmiccult
+ - type: RoleRequirement
+ roles:
+ mindRoles:
+ - CosmicCultRole
+
+############################### COSMIC CULT'S OBJECTIVES
+
+- type: entity
+ parent: [BaseCosmicCultObjective, BaseLivingObjective]
+ id: CosmicLeadershipObjective
+ name: ELECT A LEADER
+ description: For our plans to succeed, we'll need some form of leadership.
+ components:
+ - type: Objective
+ icon:
+ sprite: _Impstation/CosmicCult/Icons/cosmiccult_abilities.rsi
+ state: blank
+ - type: EscapeShuttleCondition
+
+- type: entity
+ parent: BaseCosmicCultObjective
+ id: CosmicEntropyObjective
+ name: nameunused
+ components:
+ - type: Objective
+ icon:
+ sprite: _Impstation/CosmicCult/Icons/cosmiccult_abilities.rsi
+ state: siphon
+ - type: NumberObjective
+ min: 10
+ max: 10
+ title: SIPHON ENTROPY
+ description: objective-condition-entropy-desc
+ - type: CosmicEntropyCondition
+
+- type: entity
+ parent: [BaseCosmicCultObjective, BaseLivingObjective]
+ id: CosmicMonumentObjective
+ name: EMPOWER THE MONUMENT
+ description: As a cult, collectively ensure that The Monument is brought to its full power.
+ components:
+ - type: Objective
+ icon:
+ sprite: _Impstation/CosmicCult/Icons/cosmiccult_abilities.rsi
+ state: monument
+ - type: EscapeShuttleCondition
+
+- type: entity
+ parent: [BaseCosmicCultObjective, BaseLivingObjective]
+ id: CosmicFinalityObjective
+ name: USHER IN THE END
+ description: Invoke the influence The Unknown, heralding the final curtain call.
+ components:
+ - type: Objective
+ icon:
+ sprite: _Impstation/CosmicCult/Icons/cosmiccult_abilities.rsi
+ state: monument
+ - type: EscapeShuttleCondition
diff --git a/Resources/Prototypes/_Impstation/CosmicCult/parallax.yml b/Resources/Prototypes/_Impstation/CosmicCult/parallax.yml
new file mode 100644
index 00000000000000..74a5c51e1b0c4a
--- /dev/null
+++ b/Resources/Prototypes/_Impstation/CosmicCult/parallax.yml
@@ -0,0 +1,36 @@
+- type: parallax
+ id: CosmicFinaleParallax
+ layers:
+ - texture:
+ !type:ImageParallaxTextureSource
+ path: "/Textures/_Impstation/CosmicCult/Parallaxes/Cosmic_Dust.png"
+ slowness: 0.998046875
+ scale: ".5, .5"
+ - texture:
+ !type:ImageParallaxTextureSource
+ path: "/Textures/_Impstation/CosmicCult/Parallaxes/Cosmic_Stars.png"
+ slowness: 0.996625
+ scale: ".6, .6"
+ - texture:
+ !type:ImageParallaxTextureSource
+ path: "/Textures/_Impstation/CosmicCult/Parallaxes/Cosmic_Nebulae.png"
+ slowness: 0.985265625
+ scale: ".41, .41"
+ - texture:
+ !type:ImageParallaxTextureSource
+ path: "/Textures/_Impstation/CosmicCult/Parallaxes/Cosmic_Stars.png"
+ slowness: 0.984352
+ scale: ".9, .9"
+ - texture:
+ !type:ImageParallaxTextureSource
+ path: "/Textures/_Impstation/CosmicCult/Parallaxes/Cosmic_Blackhole.png"
+ slowness: 0.998046875
+ scale: "1.7, 1.7"
+ tiled: false
+ layersLQ:
+ - texture:
+ !type:GeneratedParallaxTextureSource
+ id: ""
+ configPath: "/Prototypes/Parallaxes/parallax_config.toml"
+ slowness: 0.875
+ layersLQUseHQ: false
diff --git a/Resources/Prototypes/_Impstation/CosmicCult/polymorphs.yml b/Resources/Prototypes/_Impstation/CosmicCult/polymorphs.yml
new file mode 100644
index 00000000000000..b04d1f5fa52b4f
--- /dev/null
+++ b/Resources/Prototypes/_Impstation/CosmicCult/polymorphs.yml
@@ -0,0 +1,9 @@
+- type: polymorph
+ id: CosmicPolymorphLapse
+ configuration:
+ entity: FloraTree01
+ forced: true
+ inventory: None
+ transferName: true
+ transferDamage: true
+ duration: 5
diff --git a/Resources/Prototypes/_Impstation/CosmicCult/radio_channels.yml b/Resources/Prototypes/_Impstation/CosmicCult/radio_channels.yml
new file mode 100644
index 00000000000000..4e461d8e97757f
--- /dev/null
+++ b/Resources/Prototypes/_Impstation/CosmicCult/radio_channels.yml
@@ -0,0 +1,7 @@
+- type: radioChannel
+ id: CosmicRadio
+ name: chat-radio-cosmiccult
+ keycode: 'a'
+ frequency: 77777
+ color: "#4cabb3"
+ longRange: true
diff --git a/Resources/Prototypes/_Impstation/CosmicCult/roundstart.yml b/Resources/Prototypes/_Impstation/CosmicCult/roundstart.yml
new file mode 100644
index 00000000000000..b02ba97e817d96
--- /dev/null
+++ b/Resources/Prototypes/_Impstation/CosmicCult/roundstart.yml
@@ -0,0 +1,44 @@
+- type: entity
+ parent: BaseGameRule
+ id: CosmicCult
+ components:
+ - type: CosmicCultRule
+ - type: GameRule
+ minPlayers: 25
+ delay:
+ min: 240
+ max: 420
+ - type: AntagObjectives
+ objectives:
+ - CosmicFinalityObjective
+ - CosmicMonumentObjective
+ - CosmicLeadershipObjective
+ - CosmicEntropyObjective
+ - type: AntagSelection
+ agentName: cosmiccult-roundend-name
+ definitions:
+ - prefRoles: [ CosmicAntagLeader ]
+ fallbackRoles: [ CosmicAntagCultist ]
+ min: 1
+ max: 1
+ playerRatio: 15
+ blacklist:
+ components:
+ - AntagImmune
+ components:
+ - type: CosmicCult
+ - type: CosmicCultLead
+ mindRoles:
+ - MindRoleCosmicCult
+ - prefRoles: [ CosmicAntagCultist ]
+ min: 3
+ max: 5
+ playerRatio: 15
+ lateJoinAdditional: true
+ blacklist:
+ components:
+ - AntagImmune
+ components:
+ - type: CosmicCult
+ mindRoles:
+ - MindRoleCosmicCult
diff --git a/Resources/Prototypes/_Impstation/CosmicCult/tags.yml b/Resources/Prototypes/_Impstation/CosmicCult/tags.yml
new file mode 100644
index 00000000000000..d549c5614ed75f
--- /dev/null
+++ b/Resources/Prototypes/_Impstation/CosmicCult/tags.yml
@@ -0,0 +1,2 @@
+- type: Tag
+ id: EntropyMote
diff --git a/Resources/Prototypes/_Impstation/CosmicCult/tempdoc/thecosmiccult.md b/Resources/Prototypes/_Impstation/CosmicCult/tempdoc/thecosmiccult.md
new file mode 100644
index 00000000000000..6a754142a66e23
--- /dev/null
+++ b/Resources/Prototypes/_Impstation/CosmicCult/tempdoc/thecosmiccult.md
@@ -0,0 +1,321 @@
+
+# The Cosmic Cult
+
+
+
+| Designers | Implemented | GitHub Links |
+
+|---|---|---|
+
+| AftrLite | :x: No | TBD |
+
+
+
+## Overview
+
+
+
+In SS13, cult gamemodes - both The Blood Cult and Clockwork Cult - are mechanically and thematically interesting; pitting factions against eachother wherein unlike classic Revolutionaries (Revs), cultists can be converted and de-converted back and forth, creating a tug of war between protagonistic and antagonistic forces aboard the station.
+
+However, the Clockwork Cult's reputation has been historically mixed for a variety of reasons. And while the Blood Cult has not suffered similarly, it concerns me from a visual design standpoint - security's primary colors are red and black, and Nuclear Operatives have a rather adjacent color palette. The Blood Cult, were it implemented, would only exacerbate this red-and-black homogeny. This emphasis on red palettes can potentially cause issues for players who have **Deuteranopia** or **Protanopia** (color blindness).
+
+In light of this, The Cosmic Cult is envisioned as a new SS14 "spin" on the SS13 Cult antagonist formulae, featuring all-new spritework in a distinguished color palette that tries to emphasise visual clarity.
+
+
+
+### Breakdown
+
+In this document, the default side players belong to will be referred to as either "crew" or "Command".
+In this document, the antagonist to will be referred to as either "cult" or "The Cosmic Cult".
+
+
+The Cosmic Cult is a team conversion antag: a small number of players begin as antagonists, but are able to convert crew to antags, with the antag faction's strength largely being dependent on the number of conversion. As a conversion antag, a round with The Cosmic Cult should attempt to follow the stages below.
+
+
+
+ **Initial conversions**
+
+- This is the stage where the antag begin converting crew - this should be done stealthily, and failing to do so may result in a swift win for crew. To their benefit the antag is given some kind of initial advantage, providing a quick power bump to get things going.
+
+ **Expansion with risk**
+
+- During this stage the antag faction grows, exhibiting signs and actions that may be more noticeable by crew. Staying stealthy becomes more difficult due to the number of antags growing, pushing the antags into more direct confrontration.
+
+ **Confrontation with crew**
+
+- The antag faction has been exposed and crew are now working to counteract the antags. Depending on how well the two previous stages have gone the crew may be in either a good or poor position to fight back.
+
+ **Climax**
+
+- An encounter between the antags and crew that largely decides the outcome of the round.
+
+ **Resolution**
+- After the climax the round finishes up, resolving the round for remaining players. Usually this is the last few minutes before the evacuation shuttle arrives.
+
+
+
+Issues arise when one of these stages are too long, too short or entirely skipped over. A round doesn't necessarily have to be ruined just because a stage is misplaced, however if there are no sufficient back-up scenarios to fall back on the round may end up frustrating for some amount of the round's players (e.g. stalling, dragged out fighting, antag gets found too early without getting to affect the round, no resolution so players just evacuate).
+
+
+
+This design document will try to ensure that a round with a Cult antag follows this pattern.
+
+
+
+### Cosmic Cult Gamemode Goals
+
+
+
+The goals that we want to reach with the Cosmic Cult are the following:
+
+- The Cosmic Cult should be applicable as its own round type and as a mid-round antag, equivalent to Nukies/LoneOp or Traitors/Mid-round Traitors. The should be big differences in the initial number of antags and their available resources.
+
+- Round removal should be discouraged where possible. It should not be the optimal choice to gib or leave a player to rot unless in specific circumstances.
+
+- The Cosmic Cult should not be discovered through *no fault of their own* in the Initial Conversions phase (i.e. metagameable mechanics).
+
+- A single non-Security crew member discovering an antag should not spell the end of the antag faction's progression in the round.
+
+- Round end conditions should be clear and straight-forward, though a crew overcoming the antag shouldn't necessarily mean the end of the round.
+
+- Crew shouldn't be able to hard counterplay the antag without engaging with the antag.
+
+
+
+
+## The Cosmic Cult, Basic layout
+
+Any values given here are suggestions and are especially marked by being **bolded**. Any such value should be adjusted based on playtesting.
+
+
+
+The Cosmic Cult antag begins as a roundstart antag roll for the Cosmic Cult gamemode. No midround rolls are currently being considered.
+
+Cosmic Cult antags should be prompted to elect a Leader (CultLead) from the initial pool of cultists. This allows for a degree of in-character mentorship, as the most knowledgeable/experienced player can be democratically allowed to take charge of the antag faction for that round, creating an environment that may be more conducive to new player experiences.
+This is necesary for the cult to succeed, as the Cult Leader is tasked with placing The Monument, the focal point of The Cosmic Cult's gameplay loop. The primary goals for the Cult Leader is to act as an organizing force for the cult, as well as converting crew to grow the faction's strength.
+
+If the Cult Leader dies or is Deconverted, the Cult - after a short waiting period - should be prompted to elect a new Leader.
+
+Cosmic Cultists can be identified by other Cosmic Cultists via an icon next to their character, with the Cult Leader having an emboldened version of the regular Cosmic Cult antag icon.
+
+For crew, the goal is to deconvert cult converts, protect heads/command, and ensure the cultists are discovered.
+
+
+
+### Win Conditions
+
+
+
+Win conditions for a round with a Cosmic Cult antag are the following:
+
+
+
+- **Cosmic Cult Complete Victory:** The Cult has converted its Command Target, and The Cult uses the completed *Monument* to summon *The Unknown*, annihilating the station.
+
+- **Cosmic Cult Major Victory:** The Cult uses the completed *Monument* to summon *The Unknown*, and the station is annihilated.
+
+- **Cosmic Cult Minor Victory:** The Cult completes *The Monument*, and there are no *alive, unrestrained* Command *on the evac shuttle.*
+
+- **Cult-Crew Tie:** The Cult *does not* complete *The Monument*, and there are no *alive, unrestrained* Command *on the evac shuttle.*
+
+- **Crew Minor Victory:** There are is >1 *alive, unrestrained* Command *on the evac shuttle* when Evac reaches Centcomm.
+
+- **Crew Major Victory:** There are is >1 *alive, unrestrained* Command *on the evac shuttle* when Evac reaches Centcomm, and there is no *unrestrained* Cult Lead *on the evac shuttle* when Evac reaches CentComm.
+
+- **Crew Complete Victory:** *All* cultists are *deconverted* or *dead* when Evac reaches CentComm.
+
+
+
+The round-end screen could look like the following:
+
+
+
+```
+
+Cosmic Cult Complete Victory! [Green text]
+
+The Unknown has been summoned forth. [Purple text]
+
+TARGETPLAYERNAME%, COMMANDJOB% was converted to the Cosmic Cult. [Green text]
+
+X Entropy was Siphoned. [Yellow text]
+
+X% of Crew were converted to the Cosmic Cult. [Yellow text]
+
+```
+
+
+
+```
+
+Cosmic Cult Major Victory! [Green text]
+
+The Unknown has been summoned forth. [Purple text]
+
+X Entropy was Siphoned. [Yellow text]
+
+X% of Crew were converted to the Cosmic Cult. [Yellow text]
+
+TARGETPLAYERNAME%, COMMANDJOB% was not converted to the Cosmic Cult. [Red text]
+```
+
+
+
+```
+
+Cosmic Cult Minor Victory! [Green text]
+
+The Monument was completed! [Green text]
+
+0 Unconverted Command made it to CentComm. [Green text]
+
+X Entropy was Siphoned. [Yellow text]
+
+X% of Crew were converted to the Cosmic Cult. [Yellow text]
+
+TARGETPLAYERNAME%, COMMANDJOB% was not converted to the Cosmic Cult. [Red text]
+```
+
+
+```
+
+What a mess! [Yellow text]
+
+The Monument was not completed! [Red text]
+
+No members of Commmand made it to CentComm. [Red text]
+
+```
+
+
+```
+
+Crew Minor Victory! [Green text]
+
+>0 Members of Commmand made it to CentComm. [Red text]
+
+```
+
+
+```
+
+Crew Major Victory! [Green text]
+
+>0 Members of Commmand made it to CentComm. [Red text]
+
+CULTLEADERNAME% was in Custody. [Red text]
+
+```
+
+
+```
+
+Crew Complete Victory! [Green text]
+
+All Cosmic Cultists were killed or deconverted! [Red text]
+
+```
+
+
+
+## The Monument, Entropy, Conversion, and the Masquerade.
+
+
+
+The Monument is how the Cosmic Cult antag faction grows its power, and is a *requirement* to obtain Cosmic Cult Victory. The monument is a large 3x3 Structure that is initially only visibile to members of The Cosmic Cult. It is placed by the Cult Leader, is entirely indestructible, and only one Monument can exist at at time.
+
+The Monument should contain an Upgrade Tree, accessible by the Cult Leader. This upgrade tree allows the Cult Leader to spend Entropy on upgrades, giving the cult access to more items and abilities, as well as furthering The Monument's *Stage*.
+
+The Monument's stages are influenced by Conversion and its Upgrade Tree. Once a segment of the Upgrade Tree has been fully completed, the next stage of The Monument can be unlocked by spending Entropy. This allows the cult to slowly advance even if they are having difficulty converting crewmembers.
+
+In addition, The Monument should automatically advance stages as the cult converts crew - progressing to *Stage 2* once 25% of the crew are Cosmic Cultists, and *Stage 3* once 45% of the crew are Cosmic Cultists. This rewards the cult for converting crew.
+
+
+
+### Entropy
+
+
+"Entropy" is the primary resource the Cosmic Cult uses to progress. Entropy can be obtained by using the **[Siphon Entropy]** ability on any humanoid target. Entropy can - and should be - be deposited into *The Monument*.
+
+Entropy could probably stand to have more uses.
+
+
+### Conversion
+
+Conversion is the most overarching way for the Cult to increase their power. Crew can be converted by positioning them on an *Invocation Circle* and activating it with a Cultist's *Compass of Stars*. Cultists can scribe *Invocation Cirlces* near *The Monument.* Initially, only non-mindshielded crew can be converted. Once *The Monument* has reached Stage 3, all crew can be converted, no matter what.
+
+### Deconversion
+
+Deconversion is the most immediate way for crew to fight back against the Cosmic Cult. It should be relatively easy when targeting an isolated Cultist, and very easy when performed by a Chaplain.
+
+Deconversion begins when at least 40u of Holy Water is metabolized by a Cultist. After a waiting period, the Cultist loses their antag status, and is successfully deconverted. Deconversion puts you fully on the crew side, and strips your memories of having been in the cult. Because of this, security may find it pertinent to interrogate a cultist -before- prompting their deconversion.
+
+A deconverted Cultist can *always* be reconverted again.
+
+
+### Mindshields
+
+
+
+Mindshield implants are a way to add extra safety for vital station personnel. While they provide a counter to the cult's initial conversion, it is not a true hardcounter, as The Cosmic Cult can obtain means to negate mindshields entirely by upgrading *The Monument*.
+
+Command and Security are the only roles that have mindshields roundstart.
+
+Having a mindshield does not change Cultist status or antag faction; a Cultist can be mindshielded and still belong to the Cosmic Cult. Mindshields only protects the owner from Conversion.
+
+New mindshields should be able to be purchased from Cargo at a reasonable price. One possible suggestion would be 4 implanters for $4000.
+
+### The Masquerade
+
+As the Cosmic Cult advances throughout the round, their ability to conceal themselves - and their activities - will gradually wear away. This extends in a variety of ways, from messages broadcast in the chat box to cultists being visually marked as cultists to anyone who sees them.
+
+The broadcast messages could look like the following:
+```
+At 20% crew conversion,
+??? ANNOUNCEMENT:
+The atmosphere aboard the station grows cold. Something is slowly gaining influence.
+```
+
+```
+At 30% crew conversion,
+??? ANNOUNCEMENT:
+An unnerving numbness prickles your senses. A cult is growing in power!
+```
+
+```
+At 40% crew conversion,
+??? ANNOUNCEMENT:
+Arcs of bluespace energy crackle across the station's groaning structure.
+The end soon approaches.
+```
+At 45% crew conversion, or once *The Monument* reaches Stage 3: after a short delay, all Cultists are marked with a glowing, star-shaped visual effect that clearly discloses that they are a member of the Cosmic Cult.
+
+## Cosmic Cult Items
+
+
+
+To assist in their goals of ushering in the end of all things, Cosmic Cultists have access to a multitude of items. The choice and utilization of these items should provide players options and flavors for how their experience of the gamemode plays out. It's important that the items do not encourage gameplay that go against the Cosmic Cult Gamemode Goals.
+
+
+- Compass of Stars: Part of a Cultist's starting gear in the form of an ability that allows them to summon and unsommon a compass to an open hand slot, therefore not taking up inventory space. Should be upgradeable through The Monument's upgrade tree.
+
+- Entropic Armor: A powerful but heavy hardsuit that slows the wearer. While equipped, it should provide access to an ability that allows the user to quickly dash a short distance, with a 25 second cooldown.
+
+- Entropic Blade: A slow but powerful melee weapon that inflicts both Airloss, Cold, and Slash.
+
+- Vacuous Lance: A *very* slow yet strong melee weapon that inflicts both Airloss, Cold, and Puncture. Can be thrown. When impacting someone after being thrown, it should inflict Zero Gravity and a very potent knockback impulse, sending the unfortunate target flying. Should be able to be recalled by the user who threw it, similar to the Ninja's Katana.
+
+- Nullimov(*): A Cosmic Cult-aligned AI lawboard. Must still be installed in the AI law upload.
+*(*I'm sure someone has a punnier name than this. Please suggest one.)*
+
+- Bluespace Lodestar: Spawns a Cosmic Cult-aligned shuttle out in space, with **3** Cosmic Cultist ghost roles aboard that are equipped with combat gear.
+
+
+
+## Expansions
+
+- More items could be implemented for more Cosmic Cult playstyles.
+
+- Certain events could trigger based on conversion thresholds; e.g. ERT or Deathsquad if station reaches 80% conversion.
+
+- This design document is a WIP and more iteration is always welcome to improve gameplay design.
diff --git a/Resources/Prototypes/_Impstation/Damage/spelf.yml b/Resources/Prototypes/_Impstation/Damage/spelf.yml
index 074bd4047611bf..335f94f3b0197f 100644
--- a/Resources/Prototypes/_Impstation/Damage/spelf.yml
+++ b/Resources/Prototypes/_Impstation/Damage/spelf.yml
@@ -1,12 +1,11 @@
- type: damageModifierSet
id: SpElf
coefficients:
- Blunt: .9
- Slash: .9
- Piercing: .9
- Cold: 1.1
- Heat: 1.1
- Poison: 1.1
- Cellular: .9
- Radiation: .8
- Shock: .9
\ No newline at end of file
+ Blunt: 1.1
+ Slash: 1.1
+ Piercing: 1.1
+ Cold: .9
+ Heat: .9
+ Poison: .9
+ Cellular: 1.1
+ Radiation: 1.2
diff --git a/Resources/Prototypes/_Impstation/Entities/Clothing/Head/hoods.yml b/Resources/Prototypes/_Impstation/Entities/Clothing/Head/hoods.yml
new file mode 100644
index 00000000000000..2b1bde94c2c571
--- /dev/null
+++ b/Resources/Prototypes/_Impstation/Entities/Clothing/Head/hoods.yml
@@ -0,0 +1,16 @@
+- type: entity
+ parent: ClothingHeadBase
+ id: ClothingHeadHatHoodPassenger
+ name: greycloak hood
+ description: Your heart overflows with fear. Before you stands the Passenger of Passengers.
+ components:
+ - type: Sprite
+ sprite: _Impstation/Clothing/Head/Hoods/hoodpassenger.rsi
+ - type: Clothing
+ sprite: _Impstation/Clothing/Head/Hoods/hoodpassenger.rsi
+ - type: Tag
+ tags:
+ - WhitelistChameleon
+ - type: HideLayerClothing
+ slots:
+ - Hair
\ No newline at end of file
diff --git a/Resources/Prototypes/_Impstation/Entities/Clothing/Head/soft.yml b/Resources/Prototypes/_Impstation/Entities/Clothing/Head/soft.yml
new file mode 100644
index 00000000000000..8c3a4e0ac5aa69
--- /dev/null
+++ b/Resources/Prototypes/_Impstation/Entities/Clothing/Head/soft.yml
@@ -0,0 +1,15 @@
+- type: entity
+ parent: ClothingHeadHeadHatBaseFlippable
+ id: ClothingHeadHatBrigmedicsoft
+ name: brigmedic cap
+ description: It's a baseball hat that matches a brigmedic's uniform.
+ components:
+ - type: Sprite
+ sprite: _Impstation/Clothing/Head/Soft/brigmedicsoft.rsi
+ - type: Clothing
+ sprite: _Impstation/Clothing/Head/Soft/brigmedicsoft.rsi
+
+- type: entity
+ parent: [ClothingHeadHeadHatBaseFlipped, ClothingHeadHatBrigmedicsoft]
+ id: ClothingHeadHatBrigmedicsoftFlipped
+ name: brigmedic cap
diff --git a/Resources/Prototypes/_Impstation/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/_Impstation/Entities/Clothing/Neck/cloaks.yml
index ea4c3abb51dff5..26a9f240344a02 100644
--- a/Resources/Prototypes/_Impstation/Entities/Clothing/Neck/cloaks.yml
+++ b/Resources/Prototypes/_Impstation/Entities/Clothing/Neck/cloaks.yml
@@ -6,3 +6,29 @@
components:
- type: Sprite
sprite: _Impstation/Clothing/Neck/Cloaks/straight.rsi
+
+- type: entity
+ parent: ClothingNeckBase
+ id: ClothingNeckCloakPassenger
+ name: greycloak
+ description: What a sight. A Passenger true, if ever one there was!
+ components:
+ - type: Sprite
+ sprite: _Impstation/Clothing/Neck/Cloaks/passenger.rsi
+ - type: ToggleableClothing
+ clothingPrototype: ClothingHeadHatHoodPassenger
+ requiredSlot:
+ - neck
+ slot: head
+ - type: ContainerContainer
+ containers:
+ toggleable-clothing: !type:ContainerSlot {}
+ - type: Tag
+ tags:
+ - WhitelistChameleon
+ - type: Foldable
+ canFoldInsideContainer: true
+ unfoldVerbText: unfold-verb-clothing-cloak
+ foldVerbText: fold-verb-clothing-cloak
+ - type: FoldableClothing
+ foldedEquippedPrefix: folded
diff --git a/Resources/Prototypes/_Impstation/Entities/Clothing/Shoes/heels.yml b/Resources/Prototypes/_Impstation/Entities/Clothing/Shoes/heels.yml
new file mode 100644
index 00000000000000..971d3fee45de33
--- /dev/null
+++ b/Resources/Prototypes/_Impstation/Entities/Clothing/Shoes/heels.yml
@@ -0,0 +1,97 @@
+- type: entity
+ parent: ClothingShoesBaseButcherable
+ id: ClothingShoesHeelsRed
+ name: red high-heels
+ description: Fancy red high-heels, great for strutting around the station in style.
+ components:
+ - type: MeleeWeapon
+ damage:
+ types:
+ Piercing: 6
+ - type: Sprite
+ sprite: _Impstation/Clothing/Shoes/Heels/heelsred.rsi
+ - type: Clothing
+ sprite: _Impstation/Clothing/Shoes/Heels/heelsred.rsi
+ - type: FootstepModifier
+ footstepSoundCollection:
+ collection: FootstepHighheels
+
+- type: entity
+ parent: ClothingShoesHeelsRed
+ id: ClothingShoesHeelsBlack
+ name: black high-heels
+ description: Fancy black high-heels, great for strutting around the station in style.
+ components:
+ - type: Sprite
+ sprite: _Impstation/Clothing/Shoes/Heels/heelsblack.rsi
+ - type: Clothing
+ sprite: _Impstation/Clothing/Shoes/Heels/heelsblack.rsi
+
+- type: entity
+ parent: ClothingShoesHeelsRed
+ id: ClothingShoesHeelsBrown
+ name: brown high-heels
+ description: Fancy brown high-heels, great for strutting around the station in style.
+ components:
+ - type: Sprite
+ sprite: _Impstation/Clothing/Shoes/Heels/heelsbrown.rsi
+ - type: Clothing
+ sprite: _Impstation/Clothing/Shoes/Heels/heelsbrown.rsi
+
+
+- type: entity
+ parent: ClothingShoesHeelsRed
+ id: ClothingShoesHeelsGold
+ name: golden high-heels
+ description: Extremely fancy golden high-heels, they glitter and shine.
+ components:
+ - type: Sprite
+ sprite: _Impstation/Clothing/Shoes/Heels/heelsgold.rsi
+ - type: Clothing
+ sprite: _Impstation/Clothing/Shoes/Heels/heelsgold.rsi
+ - type: StaticPrice
+ price: 4000
+
+- type: entity
+ parent: ClothingShoesHeelsRed
+ id: ClothingShoesHeelsBlue
+ name: blue high-heels
+ description: Fancy blue high-heels, great for strutting around the station in style.
+ components:
+ - type: Sprite
+ sprite: _Impstation/Clothing/Shoes/Heels/heelsblue.rsi
+ - type: Clothing
+ sprite: _Impstation/Clothing/Shoes/Heels/heelsblue.rsi
+
+- type: entity
+ parent: ClothingShoesHeelsRed
+ id: ClothingShoesHeelsGreen
+ name: green high-heels
+ description: Fancy green high-heels, great for strutting around the station in style.
+ components:
+ - type: Sprite
+ sprite: _Impstation/Clothing/Shoes/Heels/heelsgreen.rsi
+ - type: Clothing
+ sprite: _Impstation/Clothing/Shoes/Heels/heelsgreen.rsi
+
+- type: entity
+ parent: [ClothingShoesHeelsRed, BaseCommandContraband]
+ id: ClothingShoesHeelsCommandBlack
+ name: gilded black high-heels
+ description: Gilded black high-heels specially made for command, these are sure to strike fear in others.
+ components:
+ - type: Sprite
+ sprite: _Impstation/Clothing/Shoes/Heels/heelscommandblack.rsi
+ - type: Clothing
+ sprite: _Impstation/Clothing/Shoes/Heels/heelscommandblack.rsi
+
+- type: entity
+ parent: ClothingShoesHeelsCommandBlack
+ id: ClothingShoesHeelsCommandBlue
+ name: gilded blue high-heels
+ description: Gilded blue high-heels specially made for command, these are sure to strike fear in others.
+ components:
+ - type: Sprite
+ sprite: _Impstation/Clothing/Shoes/Heels/heelscommandblue.rsi
+ - type: Clothing
+ sprite: _Impstation/Clothing/Shoes/Heels/heelscommandblue.rsi
diff --git a/Resources/Prototypes/_Impstation/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/_Impstation/Entities/Clothing/Uniforms/jumpsuits.yml
index 96b852eabff57e..b7a9e7ae1a9ba8 100644
--- a/Resources/Prototypes/_Impstation/Entities/Clothing/Uniforms/jumpsuits.yml
+++ b/Resources/Prototypes/_Impstation/Entities/Clothing/Uniforms/jumpsuits.yml
@@ -22,6 +22,7 @@
- type: entity
parent: [ClothingUniformBase, ClothingUniformFoldableBase]
+<<<<<<< HEAD
id: ClothingUniformSpaceJumpsuitScientist
name: space scientist jumpsuit
description: A high quality scientist jumpsuit made from the highest quality fibers.. It almost feels like it's from another universe.
@@ -30,3 +31,13 @@
sprite: _Impstation/Clothing/Uniforms/Jumpsuit/spacescientist.rsi
- type: Clothing
sprite: _Impstation/Clothing/Uniforms/Jumpsuit/spacescientist.rsi
+=======
+ id: ClothingUniformSpaceJumpsuitGrayTider
+ name: gilded grey space jumpsuit
+ description: A high quality gray jumpsuit made from the highest quality fiber, with gold accents.. It almost feels like it's from another universe.
+ components:
+ - type: Sprite
+ sprite: _Impstation/Clothing/Uniforms/Jumpsuit/spacegreytider.rsi
+ - type: Clothing
+ sprite: _Impstation/Clothing/Uniforms/Jumpsuit/spacegreytider.rsi
+>>>>>>> 97e61c441e (Added Gilded Gray Space Jumpsuit for graytider and added the regular gray one to the clothesmate)
diff --git a/Resources/Prototypes/_Impstation/Entities/Mobs/Species/spelf.yml b/Resources/Prototypes/_Impstation/Entities/Mobs/Species/spelf.yml
index f2026c84dc993e..b3b5e6f219e48d 100644
--- a/Resources/Prototypes/_Impstation/Entities/Mobs/Species/spelf.yml
+++ b/Resources/Prototypes/_Impstation/Entities/Mobs/Species/spelf.yml
@@ -12,19 +12,6 @@
sprite: Mobs/Species/SpElf/parts.rsi # Unlike dwarves elves are NOT made of slime
state: full
- type: SpelfMoods
- - type: UserInterface
- interfaces:
- enum.HumanoidMarkingModifierKey.Key:
- type: HumanoidMarkingModifierBoundUserInterface
- enum.StrippingUiKey.Key:
- type: StrippableBoundUserInterface
- enum.StoreUiKey.Key:
- type: StoreBoundUserInterface
- enum.SpelfMoodsUiKey.Key:
- type: SpelfMoodsBoundUserInterface
- requireInputValidation: false
- enum.HereticLivingHeartKey.Key:
- type: LivingHeartMenuBoundUserInterface
- type: Respirator
damage:
types:
diff --git a/Resources/Prototypes/_Impstation/Entities/Objects/Consumable/Drinks/Food/soup.yml b/Resources/Prototypes/_Impstation/Entities/Objects/Consumable/Drinks/Food/soup.yml
new file mode 100644
index 00000000000000..353094891e384b
--- /dev/null
+++ b/Resources/Prototypes/_Impstation/Entities/Objects/Consumable/Drinks/Food/soup.yml
@@ -0,0 +1,23 @@
+- type: entity
+ name: camel's soup
+ parent: FoodBowlBase
+ id: FoodCamelSoup
+ description: the hospital can't stop me. I will never go. not with the strength I've obtained.
+ components:
+ - type: FlavorProfile
+ flavors:
+ - cigarettes
+ - type: Sprite
+ sprite: _Impstation/Objects/Consumable/Food/bowl.rsi
+ layers:
+ - state: bowl
+ - state: camelsouplit
+ - type: SolutionContainerManager
+ solutions:
+ food:
+ maxVol: 57
+ reagents:
+ - ReagentId: TearGas
+ Quantity: 40
+ - ReagentId: ChloralHydrate
+ Quantity: 17
diff --git a/Resources/Prototypes/_Impstation/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/_Impstation/Entities/Objects/Misc/paper.yml
index a7fc57be2dc0b9..f210b334a193fb 100644
--- a/Resources/Prototypes/_Impstation/Entities/Objects/Misc/paper.yml
+++ b/Resources/Prototypes/_Impstation/Entities/Objects/Misc/paper.yml
@@ -75,3 +75,54 @@
- id: FineTicket
- id: FineTicket
- id: FineTicket
+
+- type: entity
+ id: BoxFolderBlackLoadout
+ parent: BoxFolderBase
+ name: black folder
+ suffix: Loadout
+ description: A plain black folder filled with top secret paperwork.
+ components:
+ - type: Sprite
+ sprite: _Impstation/Objects/Misc/bureaucracy.rsi
+ layers:
+ - state: folder-black
+ - type: Item
+ sprite: _Impstation/Objects/Misc/bureaucracy.rsi
+ size: Small
+ shape: null
+ - type: StorageFill
+ contents:
+ - id: Paper
+ - id: Paper
+ - id: PaperOffice
+
+- type: entity
+ id: BoxFolderHamster
+ parent: BoxFolderBlackLoadout
+ name: hamster folder
+ description: A cute hamster-themed folder filled with top secret paperwork.
+ components:
+ - type: Sprite
+ layers:
+ - state: folder-hamster
+
+- type: entity
+ id: BoxFolderMime
+ parent: BoxFolderBlackLoadout
+ name: mime folder
+ description: A striped folder filled with top secret paperwork. Its paper rustle silently.
+ components:
+ - type: Sprite
+ layers:
+ - state: folder-mime
+
+- type: entity
+ id: BoxFolderPun
+ parent: BoxFolderBlackLoadout
+ name: pun pun folder
+ description: A cute Pun Pun-themed folder filled with top secret paperwork.
+ components:
+ - type: Sprite
+ layers:
+ - state: folder-pun
diff --git a/Resources/Prototypes/_Impstation/Entities/Structures/Storage/Closets/big_boxes.yml b/Resources/Prototypes/_Impstation/Entities/Structures/Storage/Closets/big_boxes.yml
index 8d4617120a4a76..f37402619244f0 100644
--- a/Resources/Prototypes/_Impstation/Entities/Structures/Storage/Closets/big_boxes.yml
+++ b/Resources/Prototypes/_Impstation/Entities/Structures/Storage/Closets/big_boxes.yml
@@ -7,7 +7,7 @@
- type: InputMover
- type: Sprite
noRot: false #if anyone enables this i will kill them personally with my bare hands
- sprite: Structures/Storage/closet.rsi
+ sprite: _Impstation/Objects/Storage/littlecar.rsi
layers:
- state: littletykescar
map: ["enum.StorageVisualLayers.Base"]
diff --git a/Resources/Prototypes/_Impstation/GameRules/events.yml b/Resources/Prototypes/_Impstation/GameRules/events.yml
index fbda1edb064690..f3464cfe7d8546 100644
--- a/Resources/Prototypes/_Impstation/GameRules/events.yml
+++ b/Resources/Prototypes/_Impstation/GameRules/events.yml
@@ -9,6 +9,11 @@
duration: 1
occursDuringRoundEnd: false
- type: ChangelingRule
+ - type: AntagObjectives
+ objectives:
+ - ChangelingStealDNAObjective
+ - EscapeIdentityObjective
+ - ChangelingSurviveObjective
- type: AntagSelection
agentName: changeling-roundend-name
definitions:
diff --git a/Resources/Prototypes/_Impstation/Loadouts/Jobs/Civilian/passenger.yml b/Resources/Prototypes/_Impstation/Loadouts/Jobs/Civilian/passenger.yml
index 9d0aeff4a1f2f5..4fbdb38093d069 100644
--- a/Resources/Prototypes/_Impstation/Loadouts/Jobs/Civilian/passenger.yml
+++ b/Resources/Prototypes/_Impstation/Loadouts/Jobs/Civilian/passenger.yml
@@ -5,4 +5,32 @@
- !type:GroupLoadoutEffect
proto: GreyTider
equipment:
+<<<<<<< HEAD
jumpsuit: ClothingSpaceCadetJumpsuitColorGray
+
+# Passenger Cloak Loadout Effect
+- type: loadoutEffectGroup
+ id: UltimateGodGrey
+ effects:
+ - !type:JobRequirementLoadoutEffect
+ requirement:
+ !type:RoleTimeRequirement
+ role: JobPassenger
+ time: 360000 # 100 hours. Only a true passenger main will have access to the greycloak.
+
+# Neck
+- type: loadout
+ id: GreyCloak
+ equipment:
+ neck: ClothingNeckCloakPassenger
+ effects:
+ - !type:GroupLoadoutEffect
+ proto: UltimateGodGrey
+
+- type: startingGear
+ id: GreyCloak
+ equipment:
+ neck: ClothingNeckCloakPassenger
+=======
+ jumpsuit: ClothingUniformSpaceJumpsuitGrayTider
+>>>>>>> 97e61c441e (Added Gilded Gray Space Jumpsuit for graytider and added the regular gray one to the clothesmate)
diff --git a/Resources/Prototypes/_Impstation/Loadouts/Jobs/Command/generic_command.yml b/Resources/Prototypes/_Impstation/Loadouts/Jobs/Command/generic_command.yml
new file mode 100644
index 00000000000000..b476aca52f630f
--- /dev/null
+++ b/Resources/Prototypes/_Impstation/Loadouts/Jobs/Command/generic_command.yml
@@ -0,0 +1,25 @@
+# Timers
+- type: loadoutEffectGroup
+ id: Command10Hr
+ effects:
+ - !type:JobRequirementLoadoutEffect
+ requirement:
+ !type:DepartmentTimeRequirement
+ department: Command
+ time: 36000 # 10 hours
+
+- type: loadout
+ id: BlackCommandHeels
+ effects:
+ - !type:GroupLoadoutEffect
+ proto: Command10Hr
+ equipment:
+ shoes: ClothingShoesHeelsCommandBlack
+
+- type: loadout
+ id: BlueCommandHeels
+ effects:
+ - !type:GroupLoadoutEffect
+ proto: Command10Hr
+ equipment:
+ shoes: ClothingShoesHeelsCommandBlue
diff --git a/Resources/Prototypes/_Impstation/Loadouts/Jobs/Security/brigmedic.yml b/Resources/Prototypes/_Impstation/Loadouts/Jobs/Security/brigmedic.yml
index 0ef3b437b7ab04..d29ae8074fcd82 100644
--- a/Resources/Prototypes/_Impstation/Loadouts/Jobs/Security/brigmedic.yml
+++ b/Resources/Prototypes/_Impstation/Loadouts/Jobs/Security/brigmedic.yml
@@ -4,6 +4,11 @@
equipment:
head: ClothingHeadHatBeretBrigmedic
+- type: loadout
+ id: BrigmedicCap
+ equipment:
+ head: ClothingHeadHatBrigmedicsoft
+
# Jumpsuit
- type: loadout
id: BrigmedicJumpsuit
diff --git a/Resources/Prototypes/_Impstation/Recipes/Cooking/meal_recipes.yml b/Resources/Prototypes/_Impstation/Recipes/Cooking/meal_recipes.yml
index 6e580b13a23588..fb3cd2dc929b2f 100644
--- a/Resources/Prototypes/_Impstation/Recipes/Cooking/meal_recipes.yml
+++ b/Resources/Prototypes/_Impstation/Recipes/Cooking/meal_recipes.yml
@@ -7,3 +7,13 @@
Sugar: 10
solids:
FoodKebabSkewer: 1 #it's healthy for microwaves
+
+- type: microwaveMealRecipe
+ id: RecipeCamelSoup
+ name: camel's soup recipe
+ result: FoodCamelSoup
+ time: 15
+ solids:
+ TearGasGrenade: 1
+ FoodBowlBig: 1
+ Cigarette: 8 # YUMMY!!!!!!!!!
diff --git a/Resources/Prototypes/_Impstation/Roles/Jobs/Security/brigmedic.yml b/Resources/Prototypes/_Impstation/Roles/Jobs/Security/brigmedic.yml
index d71e7e5dc3d42c..b26814b660fb0f 100644
--- a/Resources/Prototypes/_Impstation/Roles/Jobs/Security/brigmedic.yml
+++ b/Resources/Prototypes/_Impstation/Roles/Jobs/Security/brigmedic.yml
@@ -30,7 +30,7 @@
eyes: ClothingEyesGlassesSecurity
ears: ClothingHeadsetBrigmedic
id: BrigmedicPDA
- belt: ClothingBeltMedicalFilled
+ belt: ClothingBeltMedicalEMTFilled
storage:
back:
- Flash
diff --git a/Resources/Prototypes/_Impstation/Spelfs/Moods/no_and.yml b/Resources/Prototypes/_Impstation/Spelfs/Moods/no_and.yml
index e7c1ae3b071509..3a399a764f0178 100644
--- a/Resources/Prototypes/_Impstation/Spelfs/Moods/no_and.yml
+++ b/Resources/Prototypes/_Impstation/Spelfs/Moods/no_and.yml
@@ -39,6 +39,9 @@
- Claustrophobic
- Agoraphobic
- NonSmoker
+ - MadHatter
+ - Crawler
+ - Elevated
# Your Moods are a strictly-kept secret, and should never be revealed to anyone.
- type: spelfMood
@@ -292,6 +295,7 @@
moodDesc: spelf-mood-claustrophobic-desc
conflicts:
- Agoraphobic
+ - StationIsAlive
# Agoraphobic: Open spaces are uncomfortable. Seek to rearrange such spaces into small, efficient and modular rooms.
- type: spelfMood
@@ -300,6 +304,7 @@
moodDesc: spelf-mood-agoraphobic-desc
conflicts:
- Claustrophobic
+ - StationIsAlive
# Non-Smoker: Secondhand smoke is incredibly dangerous. Avoid areas where people are smoking in public.
- type: spelfMood
@@ -317,6 +322,26 @@
word2: SpelfWords
word3: SpelfWords
+# Mad Hatter: You are alone on the station. Everyone else is a figment of your imagination.
+- type: spelfMood
+ id: MadHatter
+ moodName: spelf-mood-mad-hatter-name
+ moodDesc: spelf-mood-mad-hatter-desc
+
+# Creepy Crawly: You have extreme vertigo, to the point where merely standing upright can cause discomfort. You're much more comfortable crawling along the floor.
+- type: spelfMood
+ id: Crawler
+ moodName: spelf-mood-crawler-name
+ moodDesc: spelf-mood-crawler-desc
+
+# The Floor Is Lava: You prefer to be elevated whenever possible - Standing atop tables, railings, etc., is where you feel the most comfortable.
+- type: spelfMood
+ id: Elevated
+ moodName: spelf-mood-elevated-name
+ moodDesc: spelf-mood-elevated-desc
+ conflicts:
+ - Crawler
+
# [ITEM]s are an abomination. You must avoid them at all costs, and destroy them if necessary.
#- type: spelfMood
# id: ItemBad
@@ -335,7 +360,3 @@
# moodDesc: spelf-mood-color-bad-desc
# conflicts:
# - ColorGood
-
-
-
-
diff --git a/Resources/Prototypes/_Impstation/Spelfs/Moods/shared.yml b/Resources/Prototypes/_Impstation/Spelfs/Moods/shared.yml
index 89acac63db56fa..7a04f6db3cbfbf 100644
--- a/Resources/Prototypes/_Impstation/Spelfs/Moods/shared.yml
+++ b/Resources/Prototypes/_Impstation/Spelfs/Moods/shared.yml
@@ -156,6 +156,7 @@
moodDesc: spelf-mood-must-congregate-desc
conflicts:
- OneTrueThaven
+ - AlwaysAlone
# Violence is distasteful. Conflict should be settled through mediated dispute, and one should only resort to violence if all other options have failed.
- type: spelfMood
@@ -216,4 +217,3 @@
# thing: SpelfMoodNouns
# conflicts:
# - OutOfFashion
-
diff --git a/Resources/Prototypes/_Impstation/Spelfs/Moods/wildcard.yml b/Resources/Prototypes/_Impstation/Spelfs/Moods/wildcard.yml
index e8a3ffaf9db7a3..bb8c367d60b2ec 100644
--- a/Resources/Prototypes/_Impstation/Spelfs/Moods/wildcard.yml
+++ b/Resources/Prototypes/_Impstation/Spelfs/Moods/wildcard.yml
@@ -292,7 +292,6 @@
moodDesc: spelf-mood-folk-hero-desc
moodVars:
dagdChanceName: DAGDname
- dagdChanceDesc: DAGD
# Greencomms Blogger: You must keep the station informed about every minute detail of your life.
- type: spelfMood
@@ -341,6 +340,3 @@
# moodDesc: spelf-mood-number-good-desc
# moodVars:
# number: SpelfMoodNumber
-
-
-
diff --git a/Resources/Prototypes/_Impstation/Spelfs/Moods/yes_and.yml b/Resources/Prototypes/_Impstation/Spelfs/Moods/yes_and.yml
index fddb8129e5be4e..01ba315bea446f 100644
--- a/Resources/Prototypes/_Impstation/Spelfs/Moods/yes_and.yml
+++ b/Resources/Prototypes/_Impstation/Spelfs/Moods/yes_and.yml
@@ -17,7 +17,7 @@
- VeryReligious
- OnlySpeakToCommand
- Scheduler
- - RadioOnly
+# - RadioOnly
- ProperStorage
- SwearingGood
# - StatementOnly
@@ -45,6 +45,9 @@
- Optimist
- ItemGood
- Hypochondriac
+ - ImposterSyndrome
+ - YesMan
+ - Centrist
# You are extremely possessive of your property. Refuse to relinquish it, and if it is misplaced or stolen, it must be retrieved at all costs.
- type: spelfMood
@@ -322,13 +325,41 @@
moodName: spelf-mood-optimist-name
moodDesc: spelf-mood-optimist-desc
-# You've been sickly since you were a child. Everything negative you experience is the result of a potentially terminal illness, for which you need immediate medical treatment.
+# Hypochondriac: You've been sickly since you were a child. Everything negative you experience is the result of a potentially terminal illness, for which you need immediate medical treatment.
- type: spelfMood
id: Hypochondriac
moodName: spelf-mood-hypochondriac-name
moodDesc: spelf-mood-hypochondriac-desc
+# Imposter Syndrome: You feel your life experience drain from your mind. You are brand-new at your job, unsure of how anything works. You should probably find someone experienced to show you the ropes.
+- type: spelfMood
+ id: ImposterSyndrome
+ moodName: spelf-mood-imposter-syndrome-name
+ moodDesc: spelf-mood-imposter-syndrome-desc
+# Yes Man: You just can't say "no." You must agree with everyone, and perform any task requested of you, regardless of its source.
+- type: spelfMood
+ id: YesMan
+ moodName: spelf-mood-yes-man-name
+ moodDesc: spelf-mood-yes-man-desc
+ conflicts:
+ - Centrist
+
+# Centrist: You are ambivalent towards any and all decisions, and refuse to take sides.
+- type: spelfMood
+ id: Centrist
+ moodName: spelf-mood-centrist-name
+ moodDesc: spelf-mood-centrist-desc
+ conflicts:
+ - YesMan
+
+# Public Sector: Your job should not be done in private if it can be helped. If at all possible, you should renovate the facilities to allow public access to your workplace.
+- type: spelfMood
+ id: PublicSector
+ moodName: spelf-mood-public-sector-name
+ moodDesc: spelf-mood-public-sector-desc
+ conflicts:
+ - StationIsAlive
# The color [COLOR] is the only acceptable color for decorations. Endeavor to make your environment this color where possible.
#- type: spelfMood
@@ -336,4 +367,4 @@
# moodName: spelf-mood-color-good-name
# moodDesc: spelf-mood-color-good-desc
# conflicts:
-# - ColorBad
\ No newline at end of file
+# - ColorBad
diff --git a/Resources/Prototypes/_Impstation/datasets.yml b/Resources/Prototypes/_Impstation/datasets.yml
index a6ad390ec49782..77deaa0a113dce 100644
--- a/Resources/Prototypes/_Impstation/datasets.yml
+++ b/Resources/Prototypes/_Impstation/datasets.yml
@@ -140,30 +140,16 @@
- type: dataset
id: DAGDname
values:
- - Die A Glorious Death
- - Folk Hero
- - Folk Hero
- - Folk Hero
- - Folk Hero
- - Folk Hero
- - Folk Hero
- - Folk Hero
- - Folk Hero
- - Folk Hero
-
-- type: dataset
- id: DAGD
- values:
- - You are an artist, and your canvas is your demise. Your primary goal is to orchestrate a glorious, beautiful finale to your existence - But you are not a murderer. Try to avoid causing excessive damage.
- - No one knows it yet, but you are the hero this station needs. You must intervene in any major conflict that occurs, and fight the station’s enemies to the best of your ability.
- - No one knows it yet, but you are the hero this station needs. You must intervene in any major conflict that occurs, and fight the station’s enemies to the best of your ability.
- - No one knows it yet, but you are the hero this station needs. You must intervene in any major conflict that occurs, and fight the station’s enemies to the best of your ability.
- - No one knows it yet, but you are the hero this station needs. You must intervene in any major conflict that occurs, and fight the station’s enemies to the best of your ability.
- - No one knows it yet, but you are the hero this station needs. You must intervene in any major conflict that occurs, and fight the station’s enemies to the best of your ability.
- - No one knows it yet, but you are the hero this station needs. You must intervene in any major conflict that occurs, and fight the station’s enemies to the best of your ability.
- - No one knows it yet, but you are the hero this station needs. You must intervene in any major conflict that occurs, and fight the station’s enemies to the best of your ability.
- - No one knows it yet, but you are the hero this station needs. You must intervene in any major conflict that occurs, and fight the station’s enemies to the best of your ability.
- - No one knows it yet, but you are the hero this station needs. You must intervene in any major conflict that occurs, and fight the station’s enemies to the best of your ability.
+ - DieAGloriousDeath
+ - FolkHero
+ - FolkHero
+ - FolkHero
+ - FolkHero
+ - FolkHero
+ - FolkHero
+ - FolkHero
+ - FolkHero
+ - FolkHero
- type: dataset
id: SpelfWords
diff --git a/Resources/Prototypes/ai_factions.yml b/Resources/Prototypes/ai_factions.yml
index 5fcecb039e30a2..c08bb243cb4db6 100644
--- a/Resources/Prototypes/ai_factions.yml
+++ b/Resources/Prototypes/ai_factions.yml
@@ -9,6 +9,7 @@
- Revolutionary
- Changeling
- Heretic
+ - CosmicCultFaction
- type: npcFaction
id: NanoTrasen
@@ -46,6 +47,7 @@
- Revolutionary
- Changeling
- Heretic
+ - CosmicCultFaction
- type: npcFaction
id: SimpleNeutral
@@ -60,6 +62,7 @@
- Zombie
- Changeling
- Heretic
+ - CosmicCultFaction
- type: npcFaction
id: Xeno
@@ -72,6 +75,7 @@
- Revolutionary
- Changeling
- Heretic
+ - CosmicCultFaction
- type: npcFaction
id: Zombie
@@ -85,6 +89,7 @@
- Revolutionary
- Changeling
- Heretic
+ - CosmicCultFaction
- type: npcFaction
id: Revolutionary
diff --git a/Resources/ServerInfo/_Impstation/Guidebook/Mobs/Gray.xml b/Resources/ServerInfo/_Impstation/Guidebook/Mobs/Gray.xml
index a76711f8235941..995b164665cdc6 100644
--- a/Resources/ServerInfo/_Impstation/Guidebook/Mobs/Gray.xml
+++ b/Resources/ServerInfo/_Impstation/Guidebook/Mobs/Gray.xml
@@ -1,42 +1,56 @@
- # Gray
-
+ # Grays
-
+
+ ## Physiology
+ Grays are much like Humans, in many ways. Their basic external physiology is largely similar to that of Humans, although they exhibit no sexual dimorphism. Internally, however, Grays are remarkably different - The structures of their organs are utterly unique among observed species, and [color=#ffa500]their blood is composed entirely of liquid Radium, which cannot be metabolized from any known source.[/color]
+
+ Their bodies are adapted for exposure to extreme environments, so they take [color=#1e90ff]60% less damage from Cold and Heat, and 80% less Poison damage,[/color] but are otherwise very fragile - They take [color=#ffa500]50% more Blunt, Slash, and Piercing damage.[/color]
+
+ ## Language
+ [color=#ffa500]The Gray language, colloquially known as "Grayspeak," has evaded attempts at automatic translation up to this point.[/color] Although some Grays have, through various means, learned how to speak Common, [color=#ffa500]most Grays are largely unintelligible to other species.[/color]
+
+ ## Culture
+ Grays are cultural sponges, and appear to absorb elements of other Humanoid cultures rapidly through exposure. However, they have been observed to possess a singular fascination with Human culture from the early Internet era, and their knowledge of it appears to terminate around the year 2010. It is unknown precisely why this is the case.
+
+ ## GRAY NAMING CONVENTIONS
+
+ Grays typically name themselves after Grayspeak-adjacent sounds, or "corrupted," Grayspeak-ified versions of things that interest them from other Humanoid cultures - generally surface-level interpretations of the names of products. For example, "Tonka Truck" may become "Tonky Chuck." Try to avoid outright, unchanged references to recent media or memes.
+
+ - [color=#449944]GOOD:[/color] Carp Shitto
+ - [color=#449944]GOOD:[/color] Gnarpy Da
+ - [color=#449944]GOOD:[/color] Yippi Zoota
+ - [color=#449944]GOOD:[/color] Tonky Chuck
+ - [color=#449944]GOOD:[/color] New Ports
+ - [color=#449944]GOOD:[/color] Ford Mustang
+ - [color=#449944]GOOD:[/color] Images
+ - [color=#449944]GOOD:[/color] Emess Paint
+ - [color=#449944]GOOD:[/color] Spunch Bop
+ - [color=#994444]BAD:[/color] Isuggest Forcefem
+ - [color=#994444]BAD:[/color] The Syndicate
+ - [color=#994444]BAD:[/color] Kanye West
+ - [color=#994444]BAD:[/color] Talk Tuah Podcast
+ - [color=#994444]BAD:[/color] Call Of Duty Black Ops 2
+ - [color=#994444]BAD:[/color] Skibidi Toilet
+ - [color=#994444]BAD:[/color] Benry
+
+[color=#1b67a5][bold]Unknown Transmission Recieved by Nanotrasen Sensors:[/color][/bold]
+
## GLEEP TEK NEWPORT
-
+
GLEEP OUU PIB ZOOTI FRIENDS WOGLUMP GLEEP LOVE THESE THINGS!!!!
-
-
-
-
+
+
+
+
GIVE US ZIIP JORL THEM PIB GLEEP WORK JAZEE MO!!!
-
-
-
+
+
-[color=#1b67a5] - Unknown Transmission Recieved by Nanotrasen Sensors [/color]
-
-
- GLEEP TAKE [color=#1e90ff]60% LESS NOOT DAMAGE, 60% LESS HEAT DAMAGE, PIB 80% LESS POISON DAMAGE[/color] YII [color=#ffa500]50% MORE BLUNT DAMAGE, 50% MORE SLASH DAMAGE, 50% MORE PIERCING DAMAGE[/color]
-
- GLEEP BLEED [color=#64ff33]RADIUM[/color]!!!
-
- ## GRAY NAMING CONVENTIONS
-
- GLEEP TYPICALLY USE GRAYSPEAK OR GRAYSPEAK-ADJACENT SOUNDS JAZEE MILX NAMES.
- GLEEP FRUP SOMETIMES NAME THEMSELVES AFTER STUPEE CULTURE
+[color=#1b67a5]- End Transmission.[/color]
- - [color=#449944]ZIGEEF:[/color] Carp Shitto
- - [color=#449944]ZIGEEF:[/color] Gnarpy Da
- - [color=#449944]ZIGEEF:[/color] Tonky Chuck
- - [color=#449944]ZIGEEF:[/color] New Ports
- - [color=#449944]ZIGEEF:[/color] Hyundai Sonata
- - [color=#994444]DENI:[/color] Isuggest Forcefem
- - [color=#994444]DENI:[/color] The Syndicate
- - [color=#994444]DENI:[/color] Benry
diff --git a/Resources/Textures/Clothing/Eyes/Hud/medsec.rsi/equipped-EYES.png b/Resources/Textures/Clothing/Eyes/Hud/medsec.rsi/equipped-EYES.png
index 5b31ab4ff0db07..35dd406eb9d901 100644
Binary files a/Resources/Textures/Clothing/Eyes/Hud/medsec.rsi/equipped-EYES.png and b/Resources/Textures/Clothing/Eyes/Hud/medsec.rsi/equipped-EYES.png differ
diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker.png b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker.png
index f97ff00c3d1b62..79c701563c43fa 100644
Binary files a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker.png and b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker.png differ
diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker1.png b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker1.png
index ceb623570e707d..c028127f67e445 100644
Binary files a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker1.png and b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker1.png differ
diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker2.png b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker2.png
index 40209c2f669e02..ea024714ad4ce1 100644
Binary files a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker2.png and b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker2.png differ
diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker3.png b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker3.png
index 62c4528ae1e6cd..6b726719f384fa 100644
Binary files a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker3.png and b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker3.png differ
diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker4.png b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker4.png
index 489b48b78a0897..cf8f984eb3ef6b 100644
Binary files a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker4.png and b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker4.png differ
diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker5.png b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker5.png
index ca719e883afb18..89bfa7ec62c450 100644
Binary files a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker5.png and b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker5.png differ
diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker6.png b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker6.png
index 581a50d15f04c9..4a9a543a403ad0 100644
Binary files a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker6.png and b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/beaker6.png differ
diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/meta.json b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/meta.json
index 11326a1093617b..0fc7e1ada24833 100644
--- a/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Chemistry/beaker.rsi/meta.json
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
- "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/740ff31a81313086cf16761f3677cf1e2ab46c93",
+ "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/740ff31a81313086cf16761f3677cf1e2ab46c93. icon and reagent icon sprites taken from tgstation from https://github.com/tgstation/tgstation/pull/854914.",
"size": {
"x": 32,
"y": 32
diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker_bluespace.rsi/beakerbluespace.png b/Resources/Textures/Objects/Specific/Chemistry/beaker_bluespace.rsi/beakerbluespace.png
index f52a739ad34085..dd4a6aa4ee8195 100644
Binary files a/Resources/Textures/Objects/Specific/Chemistry/beaker_bluespace.rsi/beakerbluespace.png and b/Resources/Textures/Objects/Specific/Chemistry/beaker_bluespace.rsi/beakerbluespace.png differ
diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker_bluespace.rsi/meta.json b/Resources/Textures/Objects/Specific/Chemistry/beaker_bluespace.rsi/meta.json
index 28207bc250c380..e17d82b56e0d95 100644
--- a/Resources/Textures/Objects/Specific/Chemistry/beaker_bluespace.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Chemistry/beaker_bluespace.rsi/meta.json
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
- "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/commit/740ff31a81313086cf16761f3677cf1e2ab46c93, sprites in hands by @mishutka09",
+ "copyright": "Taken from tgstation from https://github.com/tgstation/tgstation/pull/854914, sprites in hands by @mishutka09",
"size": {
"x": 32,
"y": 32
@@ -11,6 +11,9 @@
"name": "beakerbluespace",
"delays": [
[
+ 0.1,
+ 0.1,
+ 0.1,
0.1,
0.1
]
diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge.png b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge.png
index 4e0fb0fc0619fa..e6c1e822b4f268 100644
Binary files a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge.png and b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge.png differ
diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge1.png b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge1.png
index 5ecf243047eee8..c53c5cc659aa68 100644
Binary files a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge1.png and b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge1.png differ
diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge2.png b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge2.png
index 05e647f11037bf..4ddf019b256a0f 100644
Binary files a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge2.png and b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge2.png differ
diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge3.png b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge3.png
index 0a464113d71394..e45da19a402a4a 100644
Binary files a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge3.png and b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge3.png differ
diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge4.png b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge4.png
index c16054a21ac87e..246672afbb8b99 100644
Binary files a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge4.png and b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge4.png differ
diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge5.png b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge5.png
index 363e3a1bfc02ca..3e25e45cce3c35 100644
Binary files a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge5.png and b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge5.png differ
diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge6.png b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge6.png
index 64126589dae456..e609781e34bc46 100644
Binary files a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge6.png and b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/beakerlarge6.png differ
diff --git a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/meta.json b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/meta.json
index 9c3c7d203de50b..16eb437609dd50 100644
--- a/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Chemistry/beaker_large.rsi/meta.json
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
- "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/chemical.dmi",
+ "copyright": "Taken from cev-eris at https://github.com/discordia-space/CEV-Eris/blob/2b969adc2dfd3e9621bf3597c5cbffeb3ac8c9f0/icons/obj/chemical.dmi. icon and reagent icon sprites taken from tgstation from https://github.com/tgstation/tgstation/pull/854914.",
"size": {
"x": 32,
"y": 32
diff --git a/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug.png b/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug.png
index 1fda41e3b5423a..fb40cd96c96bcd 100644
Binary files a/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug.png and b/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug.png differ
diff --git a/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug1.png b/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug1.png
index 5ecf243047eee8..0230f06c6fff54 100644
Binary files a/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug1.png and b/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug1.png differ
diff --git a/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug2.png b/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug2.png
index 05e647f11037bf..e12e95c8fb319f 100644
Binary files a/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug2.png and b/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug2.png differ
diff --git a/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug3.png b/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug3.png
index 0a464113d71394..2e50912a126ec4 100644
Binary files a/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug3.png and b/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug3.png differ
diff --git a/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug4.png b/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug4.png
index c16054a21ac87e..31306b61ec113f 100644
Binary files a/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug4.png and b/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug4.png differ
diff --git a/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug5.png b/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug5.png
index 363e3a1bfc02ca..c692fadf54fc77 100644
Binary files a/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug5.png and b/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug5.png differ
diff --git a/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug6.png b/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug6.png
index 64126589dae456..757231779873f5 100644
Binary files a/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug6.png and b/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug6.png differ
diff --git a/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug7.png b/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug7.png
new file mode 100644
index 00000000000000..9ffd8ba948920c
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug7.png differ
diff --git a/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug8.png b/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug8.png
new file mode 100644
index 00000000000000..9d239916e9f508
Binary files /dev/null and b/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/jug8.png differ
diff --git a/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/meta.json b/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/meta.json
index 85c293d34dfa93..a97ccd8d995bf9 100644
--- a/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/meta.json
+++ b/Resources/Textures/Objects/Specific/Chemistry/jug.rsi/meta.json
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
- "copyright": "Created by HoofedEar",
+ "copyright": "Inhand and inhand reagent sprites Created by HoofedEar. icon and reagent icon sprites taken from tgstation from https://github.com/tgstation/tgstation/pull/854914.",
"size": {
"x": 32,
"y": 32
@@ -75,6 +75,12 @@
},
{
"name": "jug6"
+ },
+ {
+ "name": "jug7"
+ },
+ {
+ "name": "jug8"
}
]
}
diff --git a/Resources/Textures/Structures/Furniture/Tables/optable.rsi/meta.json b/Resources/Textures/Structures/Furniture/Tables/optable.rsi/meta.json
index 7ac39f7a4fd6dc..31d00ec00f5eb9 100644
--- a/Resources/Textures/Structures/Furniture/Tables/optable.rsi/meta.json
+++ b/Resources/Textures/Structures/Furniture/Tables/optable.rsi/meta.json
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
- "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/b7c1c31bf867b8548d882e49a852eb5b26d713e9",
+ "copyright": "Taken from tgstation from https://github.com/tgstation/tgstation/pull/854914.",
"size": {
"x": 32,
"y": 32
diff --git a/Resources/Textures/Structures/Furniture/Tables/optable.rsi/operating_table.png b/Resources/Textures/Structures/Furniture/Tables/optable.rsi/operating_table.png
index 576b82d2467b59..ed873b487c797b 100644
Binary files a/Resources/Textures/Structures/Furniture/Tables/optable.rsi/operating_table.png and b/Resources/Textures/Structures/Furniture/Tables/optable.rsi/operating_table.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/tankdispenser.rsi/dispenser.png b/Resources/Textures/Structures/Machines/VendingMachines/tankdispenser.rsi/dispenser.png
index ed77da131fce7c..d1996ff51dea88 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/tankdispenser.rsi/dispenser.png and b/Resources/Textures/Structures/Machines/VendingMachines/tankdispenser.rsi/dispenser.png differ
diff --git a/Resources/Textures/Structures/Machines/VendingMachines/tankdispenser.rsi/dispensereng.png b/Resources/Textures/Structures/Machines/VendingMachines/tankdispenser.rsi/dispensereng.png
index 7001663a4870fe..bf63e98022fb24 100644
Binary files a/Resources/Textures/Structures/Machines/VendingMachines/tankdispenser.rsi/dispensereng.png and b/Resources/Textures/Structures/Machines/VendingMachines/tankdispenser.rsi/dispensereng.png differ
diff --git a/Resources/Textures/Structures/Machines/fax_machine.rsi/icon.png b/Resources/Textures/Structures/Machines/fax_machine.rsi/icon.png
index 6e7958ee475502..4bc90149931fa7 100644
Binary files a/Resources/Textures/Structures/Machines/fax_machine.rsi/icon.png and b/Resources/Textures/Structures/Machines/fax_machine.rsi/icon.png differ
diff --git a/Resources/Textures/Structures/Machines/fax_machine.rsi/idle.png b/Resources/Textures/Structures/Machines/fax_machine.rsi/idle.png
index c5a4600a0022df..e6e6d1a9035771 100644
Binary files a/Resources/Textures/Structures/Machines/fax_machine.rsi/idle.png and b/Resources/Textures/Structures/Machines/fax_machine.rsi/idle.png differ
diff --git a/Resources/Textures/Structures/Machines/fax_machine.rsi/inserting.png b/Resources/Textures/Structures/Machines/fax_machine.rsi/inserting.png
index e1347199ea1a0c..8a966caee37557 100644
Binary files a/Resources/Textures/Structures/Machines/fax_machine.rsi/inserting.png and b/Resources/Textures/Structures/Machines/fax_machine.rsi/inserting.png differ
diff --git a/Resources/Textures/Structures/Machines/fax_machine.rsi/inserting_hamster.png b/Resources/Textures/Structures/Machines/fax_machine.rsi/inserting_hamster.png
index 5f14e3013fe27a..dbd00855ec9e7a 100644
Binary files a/Resources/Textures/Structures/Machines/fax_machine.rsi/inserting_hamster.png and b/Resources/Textures/Structures/Machines/fax_machine.rsi/inserting_hamster.png differ
diff --git a/Resources/Textures/Structures/Machines/fax_machine.rsi/inserting_mothroach.png b/Resources/Textures/Structures/Machines/fax_machine.rsi/inserting_mothroach.png
index d034322697ed03..a34ecab1e65a43 100644
Binary files a/Resources/Textures/Structures/Machines/fax_machine.rsi/inserting_mothroach.png and b/Resources/Textures/Structures/Machines/fax_machine.rsi/inserting_mothroach.png differ
diff --git a/Resources/Textures/Structures/Machines/fax_machine.rsi/inserting_mouse.png b/Resources/Textures/Structures/Machines/fax_machine.rsi/inserting_mouse.png
index 7fb87053f3f250..944e7c1febe80c 100644
Binary files a/Resources/Textures/Structures/Machines/fax_machine.rsi/inserting_mouse.png and b/Resources/Textures/Structures/Machines/fax_machine.rsi/inserting_mouse.png differ
diff --git a/Resources/Textures/Structures/Machines/fax_machine.rsi/meta.json b/Resources/Textures/Structures/Machines/fax_machine.rsi/meta.json
index 00681ca6da1de1..8040739b9993b7 100644
--- a/Resources/Textures/Structures/Machines/fax_machine.rsi/meta.json
+++ b/Resources/Textures/Structures/Machines/fax_machine.rsi/meta.json
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
- "copyright": "Taken from TauCetiClassic at commit https://github.com/TauCetiStation/TauCetiClassic/tree/23b5c47245804dd24507b75f250de5e87d34e294",
+ "copyright": "Taken from tgstation from https://github.com/tgstation/tgstation/pull/854914.",
"size": {
"x": 32,
"y": 32
@@ -14,10 +14,8 @@
"name": "idle",
"delays": [
[
- 0.4,
- 0.4,
- 0.4,
- 0.4
+ 1,
+ 1
]
]
},
@@ -25,18 +23,18 @@
"name": "inserting",
"delays": [
[
- 0.2,
- 0.2,
- 0.2,
- 0.2,
- 0.2,
- 0.2,
- 0.2,
- 0.2,
- 0.2,
- 0.2,
- 0.2,
- 0.2
+ 0.11,
+ 0.11,
+ 0.11,
+ 0.11,
+ 0.11,
+ 0.11,
+ 0.11,
+ 0.11,
+ 0.11,
+ 0.11,
+ 0.11,
+ 0.11
]
]
},
@@ -101,22 +99,21 @@
"name": "printing",
"delays": [
[
- 0.2,
- 0.2,
- 0.2,
- 0.2,
- 0.2,
- 0.2,
- 0.2,
- 0.2,
- 0.2,
- 0.2,
- 0.2,
- 0.2,
- 0.2,
- 0.2
+ 0.22,
+ 0.22,
+ 0.22,
+ 0.22,
+ 0.22,
+ 0.22,
+ 0.22,
+ 0.22,
+ 0.22,
+ 0.22,
+ 0.22,
+ 0.22,
+ 0.22
]
]
}
]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Structures/Machines/fax_machine.rsi/printing.png b/Resources/Textures/Structures/Machines/fax_machine.rsi/printing.png
index a80691cdde55c7..0c6053f4b9e5ac 100644
Binary files a/Resources/Textures/Structures/Machines/fax_machine.rsi/printing.png and b/Resources/Textures/Structures/Machines/fax_machine.rsi/printing.png differ
diff --git a/Resources/Textures/Structures/Machines/juicer.rsi/juicer0.png b/Resources/Textures/Structures/Machines/juicer.rsi/juicer0.png
index ea33f756608eb3..8e200d6744d500 100644
Binary files a/Resources/Textures/Structures/Machines/juicer.rsi/juicer0.png and b/Resources/Textures/Structures/Machines/juicer.rsi/juicer0.png differ
diff --git a/Resources/Textures/Structures/Machines/juicer.rsi/juicer1.png b/Resources/Textures/Structures/Machines/juicer.rsi/juicer1.png
index e588271229d6aa..c99b7d3b27a2c8 100644
Binary files a/Resources/Textures/Structures/Machines/juicer.rsi/juicer1.png and b/Resources/Textures/Structures/Machines/juicer.rsi/juicer1.png differ
diff --git a/Resources/Textures/Structures/Machines/juicer.rsi/meta.json b/Resources/Textures/Structures/Machines/juicer.rsi/meta.json
index 6048f25646ef55..b7201b207aa53c 100644
--- a/Resources/Textures/Structures/Machines/juicer.rsi/meta.json
+++ b/Resources/Textures/Structures/Machines/juicer.rsi/meta.json
@@ -1 +1 @@
-{"license": "CC-BY-SA-3.0", "copyright": "https://github.com/tgstation/tgstation/commit/59f2a4e10e5ba36033c9734ddebfbbdc6157472d","version": 1, "size": {"x": 32, "y": 32}, "states": [{"name": "juicer0", "delays": [[1.0]]}, {"name": "juicer1", "delays": [[1.0]]}]}
+{"license": "CC-BY-SA-3.0", "copyright": "Taken from tgstation from https://github.com/tgstation/tgstation/pull/854914.","version": 1, "size": {"x": 32, "y": 32}, "states": [{"name": "juicer0", "delays": [[1.0]]}, {"name": "juicer1", "delays": [[1.0]]}]}
diff --git a/Resources/Textures/Structures/Machines/stasis_bed.rsi/broken.png b/Resources/Textures/Structures/Machines/stasis_bed.rsi/broken.png
index 8aa326df3e6439..ccd236a9c7ee6c 100644
Binary files a/Resources/Textures/Structures/Machines/stasis_bed.rsi/broken.png and b/Resources/Textures/Structures/Machines/stasis_bed.rsi/broken.png differ
diff --git a/Resources/Textures/Structures/Machines/stasis_bed.rsi/icon.png b/Resources/Textures/Structures/Machines/stasis_bed.rsi/icon.png
index aeb8476c8eabb8..78d9ee86d019dc 100644
Binary files a/Resources/Textures/Structures/Machines/stasis_bed.rsi/icon.png and b/Resources/Textures/Structures/Machines/stasis_bed.rsi/icon.png differ
diff --git a/Resources/Textures/Structures/Machines/stasis_bed.rsi/meta.json b/Resources/Textures/Structures/Machines/stasis_bed.rsi/meta.json
index ad9670cd5b0b16..f86571656188e4 100644
--- a/Resources/Textures/Structures/Machines/stasis_bed.rsi/meta.json
+++ b/Resources/Textures/Structures/Machines/stasis_bed.rsi/meta.json
@@ -1,24 +1,14 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
- "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/40d89d11ea4a5cb81d61dc1018b46f4e7d32c62a",
+ "copyright": "Taken from tgstation from https://github.com/tgstation/tgstation/pull/85491.",
"size": {
"x": 32,
"y": 32
},
"states": [
{
- "name": "broken",
- "delays": [
- [
- 1,
- 0.1,
- 0.1,
- 0.1,
- 0.1,
- 0.1
- ]
- ]
+ "name": "broken"
},
{
"name": "panel",
diff --git a/Resources/Textures/Structures/Machines/stasis_bed.rsi/panel.png b/Resources/Textures/Structures/Machines/stasis_bed.rsi/panel.png
index 93eb0cd4985651..94585fbd02dee2 100644
Binary files a/Resources/Textures/Structures/Machines/stasis_bed.rsi/panel.png and b/Resources/Textures/Structures/Machines/stasis_bed.rsi/panel.png differ
diff --git a/Resources/Textures/Structures/Machines/stasis_bed.rsi/unlit.png b/Resources/Textures/Structures/Machines/stasis_bed.rsi/unlit.png
index be56a5ed72ef0d..8ad238a7102b41 100644
Binary files a/Resources/Textures/Structures/Machines/stasis_bed.rsi/unlit.png and b/Resources/Textures/Structures/Machines/stasis_bed.rsi/unlit.png differ
diff --git a/Resources/Textures/Structures/Piping/disposal.rsi/condisposal.png b/Resources/Textures/Structures/Piping/disposal.rsi/condisposal.png
index e18913981baf79..cb951e3d9dc84a 100644
Binary files a/Resources/Textures/Structures/Piping/disposal.rsi/condisposal.png and b/Resources/Textures/Structures/Piping/disposal.rsi/condisposal.png differ
diff --git a/Resources/Textures/Structures/Piping/disposal.rsi/conmailing.png b/Resources/Textures/Structures/Piping/disposal.rsi/conmailing.png
index e1fa09bad31986..7b8165fd8a858a 100644
Binary files a/Resources/Textures/Structures/Piping/disposal.rsi/conmailing.png and b/Resources/Textures/Structures/Piping/disposal.rsi/conmailing.png differ
diff --git a/Resources/Textures/Structures/Piping/disposal.rsi/disposal-charging.png b/Resources/Textures/Structures/Piping/disposal.rsi/disposal-charging.png
index dffc3059753734..37807abd27f149 100644
Binary files a/Resources/Textures/Structures/Piping/disposal.rsi/disposal-charging.png and b/Resources/Textures/Structures/Piping/disposal.rsi/disposal-charging.png differ
diff --git a/Resources/Textures/Structures/Piping/disposal.rsi/disposal-flush.png b/Resources/Textures/Structures/Piping/disposal.rsi/disposal-flush.png
index 851429cc89414e..dcd99fbadbeb2f 100644
Binary files a/Resources/Textures/Structures/Piping/disposal.rsi/disposal-flush.png and b/Resources/Textures/Structures/Piping/disposal.rsi/disposal-flush.png differ
diff --git a/Resources/Textures/Structures/Piping/disposal.rsi/disposal.png b/Resources/Textures/Structures/Piping/disposal.rsi/disposal.png
index 5da3cdfffc2afc..37807abd27f149 100644
Binary files a/Resources/Textures/Structures/Piping/disposal.rsi/disposal.png and b/Resources/Textures/Structures/Piping/disposal.rsi/disposal.png differ
diff --git a/Resources/Textures/Structures/Piping/disposal.rsi/dispover-charge.png b/Resources/Textures/Structures/Piping/disposal.rsi/dispover-charge.png
index 3bca7f02a65a7c..f08e36af6090f4 100644
Binary files a/Resources/Textures/Structures/Piping/disposal.rsi/dispover-charge.png and b/Resources/Textures/Structures/Piping/disposal.rsi/dispover-charge.png differ
diff --git a/Resources/Textures/Structures/Piping/disposal.rsi/dispover-full.png b/Resources/Textures/Structures/Piping/disposal.rsi/dispover-full.png
index 0a07c0a07ead68..cb8a5b4cf0f1da 100644
Binary files a/Resources/Textures/Structures/Piping/disposal.rsi/dispover-full.png and b/Resources/Textures/Structures/Piping/disposal.rsi/dispover-full.png differ
diff --git a/Resources/Textures/Structures/Piping/disposal.rsi/dispover-handle.png b/Resources/Textures/Structures/Piping/disposal.rsi/dispover-handle.png
index 51bfc250a320a8..0aba2b536ef1f7 100644
Binary files a/Resources/Textures/Structures/Piping/disposal.rsi/dispover-handle.png and b/Resources/Textures/Structures/Piping/disposal.rsi/dispover-handle.png differ
diff --git a/Resources/Textures/Structures/Piping/disposal.rsi/dispover-ready.png b/Resources/Textures/Structures/Piping/disposal.rsi/dispover-ready.png
index 05e78f74ffe803..f9a29e143563ab 100644
Binary files a/Resources/Textures/Structures/Piping/disposal.rsi/dispover-ready.png and b/Resources/Textures/Structures/Piping/disposal.rsi/dispover-ready.png differ
diff --git a/Resources/Textures/Structures/Piping/disposal.rsi/mailing-charging.png b/Resources/Textures/Structures/Piping/disposal.rsi/mailing-charging.png
index 0b0ae3554f5d64..7085d04ac95206 100644
Binary files a/Resources/Textures/Structures/Piping/disposal.rsi/mailing-charging.png and b/Resources/Textures/Structures/Piping/disposal.rsi/mailing-charging.png differ
diff --git a/Resources/Textures/Structures/Piping/disposal.rsi/mailing-flush.png b/Resources/Textures/Structures/Piping/disposal.rsi/mailing-flush.png
index 9470340c20132b..b16614d2fd1eb5 100644
Binary files a/Resources/Textures/Structures/Piping/disposal.rsi/mailing-flush.png and b/Resources/Textures/Structures/Piping/disposal.rsi/mailing-flush.png differ
diff --git a/Resources/Textures/Structures/Piping/disposal.rsi/mailing.png b/Resources/Textures/Structures/Piping/disposal.rsi/mailing.png
index 5a240b23a33c0e..7085d04ac95206 100644
Binary files a/Resources/Textures/Structures/Piping/disposal.rsi/mailing.png and b/Resources/Textures/Structures/Piping/disposal.rsi/mailing.png differ
diff --git a/Resources/Textures/Structures/Piping/disposal.rsi/mailover-charge.png b/Resources/Textures/Structures/Piping/disposal.rsi/mailover-charge.png
new file mode 100644
index 00000000000000..df599e92992b2c
Binary files /dev/null and b/Resources/Textures/Structures/Piping/disposal.rsi/mailover-charge.png differ
diff --git a/Resources/Textures/Structures/Piping/disposal.rsi/mailover-handle.png b/Resources/Textures/Structures/Piping/disposal.rsi/mailover-handle.png
index 5c0567922a43a4..7244b37f5c785d 100644
Binary files a/Resources/Textures/Structures/Piping/disposal.rsi/mailover-handle.png and b/Resources/Textures/Structures/Piping/disposal.rsi/mailover-handle.png differ
diff --git a/Resources/Textures/Structures/Piping/disposal.rsi/mailover-ready.png b/Resources/Textures/Structures/Piping/disposal.rsi/mailover-ready.png
new file mode 100644
index 00000000000000..de4f0b5113311b
Binary files /dev/null and b/Resources/Textures/Structures/Piping/disposal.rsi/mailover-ready.png differ
diff --git a/Resources/Textures/Structures/Piping/disposal.rsi/meta.json b/Resources/Textures/Structures/Piping/disposal.rsi/meta.json
index c6b024e1170f57..021eaacccf8832 100644
--- a/Resources/Textures/Structures/Piping/disposal.rsi/meta.json
+++ b/Resources/Textures/Structures/Piping/disposal.rsi/meta.json
@@ -5,7 +5,7 @@
"y": 32
},
"license": "CC-BY-SA-3.0",
- "copyright": "https://github.com/discordia-space/CEV-Eris/blob/bbe32606902c90f5290b57d905a3f31b84dc6d7d/icons/obj/pipes/disposal.dmi and modified by DrSmugleaf. Signal router sprites based on normal router modified by deltanedas (github). disposal bins by EmoGarbage404 (github)",
+ "copyright": "https://github.com/discordia-space/CEV-Eris/blob/bbe32606902c90f5290b57d905a3f31b84dc6d7d/icons/obj/pipes/disposal.dmi and modified by DrSmugleaf. Signal router sprites based on normal router modified by deltanedas (github). disposal bins taken from ParadiseStation and modified by AftrLite (GitHub).",
"states": [
{
"name": "condisposal",
@@ -233,12 +233,9 @@
0.066,
0.066,
0.066,
- 0.066,
0.5,
0.066,
0.066,
- 0.066,
- 0.066,
0.066
]
]
@@ -253,12 +250,9 @@
0.066,
0.066,
0.066,
- 0.066,
0.5,
0.066,
0.066,
- 0.066,
- 0.066,
0.066
]
]
@@ -273,6 +267,16 @@
]
]
},
+ {
+ "name": "mailover-charge",
+ "directions": 1,
+ "delays": [
+ [
+ 0.4,
+ 0.4
+ ]
+ ]
+ },
{
"name": "dispover-full",
"directions": 1,
@@ -301,6 +305,15 @@
]
]
},
+ {
+ "name": "mailover-ready",
+ "directions": 1,
+ "delays": [
+ [
+ 1.0
+ ]
+ ]
+ },
{
"name": "dispover-ready",
"directions": 1,
diff --git a/Resources/Textures/Structures/Power/Generation/teg.rsi/circ-0-light.png b/Resources/Textures/Structures/Power/Generation/teg.rsi/circ-0-light.png
index 35515fb9a75951..91619509a3d5a1 100644
Binary files a/Resources/Textures/Structures/Power/Generation/teg.rsi/circ-0-light.png and b/Resources/Textures/Structures/Power/Generation/teg.rsi/circ-0-light.png differ
diff --git a/Resources/Textures/Structures/Power/Generation/teg.rsi/circ-0.png b/Resources/Textures/Structures/Power/Generation/teg.rsi/circ-0.png
index 04d1707df3653e..9618c563fd29cc 100644
Binary files a/Resources/Textures/Structures/Power/Generation/teg.rsi/circ-0.png and b/Resources/Textures/Structures/Power/Generation/teg.rsi/circ-0.png differ
diff --git a/Resources/Textures/Structures/Power/Generation/teg.rsi/circ-1-light.png b/Resources/Textures/Structures/Power/Generation/teg.rsi/circ-1-light.png
index dbe84b6ce46cc8..b3c8e0098a1082 100644
Binary files a/Resources/Textures/Structures/Power/Generation/teg.rsi/circ-1-light.png and b/Resources/Textures/Structures/Power/Generation/teg.rsi/circ-1-light.png differ
diff --git a/Resources/Textures/Structures/Power/Generation/teg.rsi/circ-1.png b/Resources/Textures/Structures/Power/Generation/teg.rsi/circ-1.png
index 47a428f41d3d98..f8caba354f607a 100644
Binary files a/Resources/Textures/Structures/Power/Generation/teg.rsi/circ-1.png and b/Resources/Textures/Structures/Power/Generation/teg.rsi/circ-1.png differ
diff --git a/Resources/Textures/Structures/Power/Generation/teg.rsi/circ-2-light.png b/Resources/Textures/Structures/Power/Generation/teg.rsi/circ-2-light.png
index 8b857c863cb1fd..a8dfcf2bb77009 100644
Binary files a/Resources/Textures/Structures/Power/Generation/teg.rsi/circ-2-light.png and b/Resources/Textures/Structures/Power/Generation/teg.rsi/circ-2-light.png differ
diff --git a/Resources/Textures/Structures/Power/Generation/teg.rsi/circ-2.png b/Resources/Textures/Structures/Power/Generation/teg.rsi/circ-2.png
index b7bc260d68a9c6..2cfe91f58e3085 100644
Binary files a/Resources/Textures/Structures/Power/Generation/teg.rsi/circ-2.png and b/Resources/Textures/Structures/Power/Generation/teg.rsi/circ-2.png differ
diff --git a/Resources/Textures/Structures/Power/Generation/teg.rsi/meta.json b/Resources/Textures/Structures/Power/Generation/teg.rsi/meta.json
index b14f15b5791445..3c2cd93b18137b 100644
--- a/Resources/Textures/Structures/Power/Generation/teg.rsi/meta.json
+++ b/Resources/Textures/Structures/Power/Generation/teg.rsi/meta.json
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
- "copyright": "Taken from https://github.com/Baystation12/Baystation12/blob/fc2196fa74492570e5abb847085afca0e53f4ea8/icons/obj/power.dmi. Modified to split light layers",
+ "copyright": "Taken from Eris at https://github.com/discordia-space/CEV-Eris/blob/master/icons/obj/machines/thermoelectric.dmi and resprited by AftrLite(GitHub).",
"size": {
"x": 32,
"y": 32
@@ -63,28 +63,44 @@
"directions": 4,
"delays": [
[
- 0.1,
- 0.1,
- 0.1,
- 0.1
+ 0.2,
+ 0.2,
+ 0.2,
+ 0.2,
+ 0.2,
+ 0.2,
+ 0.2,
+ 0.2
],
[
- 0.1,
- 0.1,
- 0.1,
- 0.1
+ 0.2,
+ 0.2,
+ 0.2,
+ 0.2,
+ 0.2,
+ 0.2,
+ 0.2,
+ 0.2
],
[
- 0.1,
- 0.1,
- 0.1,
- 0.1
+ 0.2,
+ 0.2,
+ 0.2,
+ 0.2,
+ 0.2,
+ 0.2,
+ 0.2,
+ 0.2
],
[
- 0.1,
- 0.1,
- 0.1,
- 0.1
+ 0.2,
+ 0.2,
+ 0.2,
+ 0.2,
+ 0.2,
+ 0.2,
+ 0.2,
+ 0.2
]
]
},
@@ -120,52 +136,68 @@
},
{
"name": "circ-2",
+ "directions": 4
+ },
+ {
+ "name": "circ-2-light",
"directions": 4,
"delays": [
[
- 0.1,
- 0.1,
- 0.1,
- 0.1,
- 0.1,
- 0.1,
- 0.1,
- 0.1
+ 0.05,
+ 0.05,
+ 0.05,
+ 0.05,
+ 0.05,
+ 0.05,
+ 0.05,
+ 0.05,
+ 0.05,
+ 0.05
],
[
- 0.1,
- 0.1,
- 0.1,
- 0.1,
- 0.1,
- 0.1,
- 0.1,
- 0.1
+ 0.05,
+ 0.05,
+ 0.05,
+ 0.05,
+ 0.05,
+ 0.05,
+ 0.05,
+ 0.05,
+ 0.05,
+ 0.05
],
[
- 0.1,
- 0.1,
- 0.1,
- 0.1,
- 0.1,
- 0.1,
- 0.1,
- 0.1
+ 0.05,
+ 0.05,
+ 0.05,
+ 0.05,
+ 0.05,
+ 0.05,
+ 0.05,
+ 0.05,
+ 0.05,
+ 0.05
],
[
- 0.1,
- 0.1,
- 0.1,
- 0.1,
- 0.1,
- 0.1,
- 0.1,
- 0.1
+ 0.05,
+ 0.05,
+ 0.05,
+ 0.05,
+ 0.05,
+ 0.05,
+ 0.05,
+ 0.05,
+ 0.05,
+ 0.05
]
]
},
{
- "name": "circ-2-light",
+ "name": "circ-1",
+ "directions": 4
+ },
+ {
+ "name": "circ-1-light",
"directions": 4,
"delays": [
[
@@ -176,6 +208,8 @@
0.1,
0.1,
0.1,
+ 0.1,
+ 0.1,
0.1
],
[
@@ -186,6 +220,8 @@
0.1,
0.1,
0.1,
+ 0.1,
+ 0.1,
0.1
],
[
@@ -196,6 +232,8 @@
0.1,
0.1,
0.1,
+ 0.1,
+ 0.1,
0.1
],
[
@@ -206,70 +244,12 @@
0.1,
0.1,
0.1,
+ 0.1,
+ 0.1,
0.1
]
]
},
- {
- "name": "circ-1",
- "directions": 4,
- "delays": [
- [
- 0.2,
- 0.2,
- 0.2,
- 0.2
- ],
- [
- 0.2,
- 0.2,
- 0.2,
- 0.2
- ],
- [
- 0.2,
- 0.2,
- 0.2,
- 0.2
- ],
- [
- 0.2,
- 0.2,
- 0.2,
- 0.2
- ]
- ]
- },
- {
- "name": "circ-1-light",
- "directions": 4,
- "delays": [
- [
- 0.2,
- 0.2,
- 0.2,
- 0.2
- ],
- [
- 0.2,
- 0.2,
- 0.2,
- 0.2
- ],
- [
- 0.2,
- 0.2,
- 0.2,
- 0.2
- ],
- [
- 0.2,
- 0.2,
- 0.2,
- 0.2
- ]
- ]
- },
{
"name": "circ-0",
"directions": 4
@@ -279,4 +259,4 @@
"directions": 4
}
]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Structures/Power/Generation/teg.rsi/teg-op1.png b/Resources/Textures/Structures/Power/Generation/teg.rsi/teg-op1.png
index 8210dfa200bf71..623ad8ac07ed93 100644
Binary files a/Resources/Textures/Structures/Power/Generation/teg.rsi/teg-op1.png and b/Resources/Textures/Structures/Power/Generation/teg.rsi/teg-op1.png differ
diff --git a/Resources/Textures/Structures/Power/Generation/teg.rsi/teg-op10.png b/Resources/Textures/Structures/Power/Generation/teg.rsi/teg-op10.png
index 5e9d96d8d3eb2d..7e9e1ad16e8ae2 100644
Binary files a/Resources/Textures/Structures/Power/Generation/teg.rsi/teg-op10.png and b/Resources/Textures/Structures/Power/Generation/teg.rsi/teg-op10.png differ
diff --git a/Resources/Textures/Structures/Power/Generation/teg.rsi/teg-op11.png b/Resources/Textures/Structures/Power/Generation/teg.rsi/teg-op11.png
index 6270b81b2aeea0..b4a74b381dd44d 100644
Binary files a/Resources/Textures/Structures/Power/Generation/teg.rsi/teg-op11.png and b/Resources/Textures/Structures/Power/Generation/teg.rsi/teg-op11.png differ
diff --git a/Resources/Textures/Structures/Power/Generation/teg.rsi/teg-op2.png b/Resources/Textures/Structures/Power/Generation/teg.rsi/teg-op2.png
index c3b489c8690793..fcfe90ba0dc984 100644
Binary files a/Resources/Textures/Structures/Power/Generation/teg.rsi/teg-op2.png and b/Resources/Textures/Structures/Power/Generation/teg.rsi/teg-op2.png differ
diff --git a/Resources/Textures/Structures/Power/Generation/teg.rsi/teg-op3.png b/Resources/Textures/Structures/Power/Generation/teg.rsi/teg-op3.png
index 3c2cbb32faf42e..cf21758cb42f5d 100644
Binary files a/Resources/Textures/Structures/Power/Generation/teg.rsi/teg-op3.png and b/Resources/Textures/Structures/Power/Generation/teg.rsi/teg-op3.png differ
diff --git a/Resources/Textures/Structures/Power/Generation/teg.rsi/teg-op4.png b/Resources/Textures/Structures/Power/Generation/teg.rsi/teg-op4.png
index d606e78d8956f1..d6cb6092408f6b 100644
Binary files a/Resources/Textures/Structures/Power/Generation/teg.rsi/teg-op4.png and b/Resources/Textures/Structures/Power/Generation/teg.rsi/teg-op4.png differ
diff --git a/Resources/Textures/Structures/Power/Generation/teg.rsi/teg-op5.png b/Resources/Textures/Structures/Power/Generation/teg.rsi/teg-op5.png
index 2d2439d1b88319..1354ea4217e54c 100644
Binary files a/Resources/Textures/Structures/Power/Generation/teg.rsi/teg-op5.png and b/Resources/Textures/Structures/Power/Generation/teg.rsi/teg-op5.png differ
diff --git a/Resources/Textures/Structures/Power/Generation/teg.rsi/teg-op6.png b/Resources/Textures/Structures/Power/Generation/teg.rsi/teg-op6.png
index b6597e52321cac..7a9c203970eee2 100644
Binary files a/Resources/Textures/Structures/Power/Generation/teg.rsi/teg-op6.png and b/Resources/Textures/Structures/Power/Generation/teg.rsi/teg-op6.png differ
diff --git a/Resources/Textures/Structures/Power/Generation/teg.rsi/teg-op7.png b/Resources/Textures/Structures/Power/Generation/teg.rsi/teg-op7.png
index d02e791e28ed0b..23568cf93e032a 100644
Binary files a/Resources/Textures/Structures/Power/Generation/teg.rsi/teg-op7.png and b/Resources/Textures/Structures/Power/Generation/teg.rsi/teg-op7.png differ
diff --git a/Resources/Textures/Structures/Power/Generation/teg.rsi/teg-op8.png b/Resources/Textures/Structures/Power/Generation/teg.rsi/teg-op8.png
index 9baf9e44081997..b125b2bd5f9a2a 100644
Binary files a/Resources/Textures/Structures/Power/Generation/teg.rsi/teg-op8.png and b/Resources/Textures/Structures/Power/Generation/teg.rsi/teg-op8.png differ
diff --git a/Resources/Textures/Structures/Power/Generation/teg.rsi/teg-op9.png b/Resources/Textures/Structures/Power/Generation/teg.rsi/teg-op9.png
index 98ab279f8f1867..ba30fc68c7725c 100644
Binary files a/Resources/Textures/Structures/Power/Generation/teg.rsi/teg-op9.png and b/Resources/Textures/Structures/Power/Generation/teg.rsi/teg-op9.png differ
diff --git a/Resources/Textures/Structures/Power/Generation/teg.rsi/teg.png b/Resources/Textures/Structures/Power/Generation/teg.rsi/teg.png
index bfd6cd27aaae8a..432ad43b651c9a 100644
Binary files a/Resources/Textures/Structures/Power/Generation/teg.rsi/teg.png and b/Resources/Textures/Structures/Power/Generation/teg.rsi/teg.png differ
diff --git a/Resources/Textures/Structures/Power/Generation/teg.rsi/teg_mid.png b/Resources/Textures/Structures/Power/Generation/teg.rsi/teg_mid.png
index 8ac16e974f9715..295476b1503c2b 100644
Binary files a/Resources/Textures/Structures/Power/Generation/teg.rsi/teg_mid.png and b/Resources/Textures/Structures/Power/Generation/teg.rsi/teg_mid.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/base.png b/Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/base.png
index 4d1df0f92bdcee..9f952b1cc67cc6 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/base.png and b/Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/base.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/closed.png b/Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/closed.png
index d6ff085b18131e..4aaf45e61184b5 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/closed.png and b/Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/icon.png b/Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/icon.png
index 591ce5992a20e4..097b72dbf4477b 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/icon.png and b/Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/icon.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/locked.png b/Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/locked.png
index aceacfce597de2..665d411bc434e8 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/locked.png and b/Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/locked.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/meta.json
index 6a4a45c0121287..5c2c859f062e5c 100644
--- a/Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/meta.json
+++ b/Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/meta.json
@@ -1,10 +1,10 @@
{
"version": 1,
- "license": "CC0-1.0",
- "copyright": "Created by EmoGarbage404 (github) for Space Station 14.",
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation from https://github.com/tgstation/tgstation/pull/854914",
"size": {
"x": 32,
- "y": 32
+ "y": 48
},
"states": [
{
diff --git a/Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/open.png b/Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/open.png
index ec1f8c5956ecb8..220bed36cb250d 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/open.png and b/Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/sparking.png b/Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/sparking.png
index 87b78b9b4653d5..9d33de7ab5140d 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/sparking.png and b/Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/sparking.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/unlocked.png b/Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/unlocked.png
index 94b89fa655da94..80eec5d68c013d 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/unlocked.png and b/Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/unlocked.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/welded.png b/Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/welded.png
index 311739a2701db2..ce876d497cbf3c 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/welded.png and b/Resources/Textures/Structures/Storage/Crates/chemcrate_secure.rsi/welded.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/command.rsi/base.png b/Resources/Textures/Structures/Storage/Crates/command.rsi/base.png
index 239949f83d8ba9..3acb1288c48513 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/command.rsi/base.png and b/Resources/Textures/Structures/Storage/Crates/command.rsi/base.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/command.rsi/closed.png b/Resources/Textures/Structures/Storage/Crates/command.rsi/closed.png
index 39174c6f3cee8d..c7c0393633f6e0 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/command.rsi/closed.png and b/Resources/Textures/Structures/Storage/Crates/command.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/command.rsi/icon.png b/Resources/Textures/Structures/Storage/Crates/command.rsi/icon.png
index 111e94633889cb..579fe05c3bab68 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/command.rsi/icon.png and b/Resources/Textures/Structures/Storage/Crates/command.rsi/icon.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/command.rsi/locked.png b/Resources/Textures/Structures/Storage/Crates/command.rsi/locked.png
index aceacfce597de2..665d411bc434e8 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/command.rsi/locked.png and b/Resources/Textures/Structures/Storage/Crates/command.rsi/locked.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/command.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/command.rsi/meta.json
index 6a4a45c0121287..5c2c859f062e5c 100644
--- a/Resources/Textures/Structures/Storage/Crates/command.rsi/meta.json
+++ b/Resources/Textures/Structures/Storage/Crates/command.rsi/meta.json
@@ -1,10 +1,10 @@
{
"version": 1,
- "license": "CC0-1.0",
- "copyright": "Created by EmoGarbage404 (github) for Space Station 14.",
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation from https://github.com/tgstation/tgstation/pull/854914",
"size": {
"x": 32,
- "y": 32
+ "y": 48
},
"states": [
{
diff --git a/Resources/Textures/Structures/Storage/Crates/command.rsi/open.png b/Resources/Textures/Structures/Storage/Crates/command.rsi/open.png
index 12e6f46a8d2656..0c95530018b612 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/command.rsi/open.png and b/Resources/Textures/Structures/Storage/Crates/command.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/command.rsi/sparking.png b/Resources/Textures/Structures/Storage/Crates/command.rsi/sparking.png
index 87b78b9b4653d5..9d33de7ab5140d 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/command.rsi/sparking.png and b/Resources/Textures/Structures/Storage/Crates/command.rsi/sparking.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/command.rsi/unlocked.png b/Resources/Textures/Structures/Storage/Crates/command.rsi/unlocked.png
index 94b89fa655da94..80eec5d68c013d 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/command.rsi/unlocked.png and b/Resources/Textures/Structures/Storage/Crates/command.rsi/unlocked.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/command.rsi/welded.png b/Resources/Textures/Structures/Storage/Crates/command.rsi/welded.png
index 311739a2701db2..ce876d497cbf3c 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/command.rsi/welded.png and b/Resources/Textures/Structures/Storage/Crates/command.rsi/welded.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/electrical.rsi/base.png b/Resources/Textures/Structures/Storage/Crates/electrical.rsi/base.png
index 23f35903de290a..3efd2e26ee5588 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/electrical.rsi/base.png and b/Resources/Textures/Structures/Storage/Crates/electrical.rsi/base.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/electrical.rsi/closed.png b/Resources/Textures/Structures/Storage/Crates/electrical.rsi/closed.png
index 8b512a5adeef11..0816e5033f4f23 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/electrical.rsi/closed.png and b/Resources/Textures/Structures/Storage/Crates/electrical.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/electrical.rsi/icon.png b/Resources/Textures/Structures/Storage/Crates/electrical.rsi/icon.png
index a559cac7b4a210..969c20c54078e2 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/electrical.rsi/icon.png and b/Resources/Textures/Structures/Storage/Crates/electrical.rsi/icon.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/electrical.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/electrical.rsi/meta.json
index e9dad802e2cc5f..f4cb6edd6211d9 100644
--- a/Resources/Textures/Structures/Storage/Crates/electrical.rsi/meta.json
+++ b/Resources/Textures/Structures/Storage/Crates/electrical.rsi/meta.json
@@ -1,10 +1,10 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
- "copyright": "Created by EmoGarbage404 (github) for Space Station 14.",
+ "copyright": "Taken from tgstation from https://github.com/tgstation/tgstation/pull/854914",
"size": {
"x": 32,
- "y": 32
+ "y": 48
},
"states": [
{
diff --git a/Resources/Textures/Structures/Storage/Crates/electrical.rsi/open.png b/Resources/Textures/Structures/Storage/Crates/electrical.rsi/open.png
index 369177ad4e7f62..e1e2562e9ea5e6 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/electrical.rsi/open.png and b/Resources/Textures/Structures/Storage/Crates/electrical.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/electrical.rsi/sparking.png b/Resources/Textures/Structures/Storage/Crates/electrical.rsi/sparking.png
index 87b78b9b4653d5..9d33de7ab5140d 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/electrical.rsi/sparking.png and b/Resources/Textures/Structures/Storage/Crates/electrical.rsi/sparking.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/electrical.rsi/welded.png b/Resources/Textures/Structures/Storage/Crates/electrical.rsi/welded.png
index 311739a2701db2..ce876d497cbf3c 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/electrical.rsi/welded.png and b/Resources/Textures/Structures/Storage/Crates/electrical.rsi/welded.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/base.png b/Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/base.png
index 267f74e31fea13..3efd2e26ee5588 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/base.png and b/Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/base.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/closed.png b/Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/closed.png
index 3675353fd5d4df..7e1b164f868f44 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/closed.png and b/Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/icon.png b/Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/icon.png
index f40ddee6b9cc5d..693a06b221455b 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/icon.png and b/Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/icon.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/locked.png b/Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/locked.png
index aceacfce597de2..665d411bc434e8 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/locked.png and b/Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/locked.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/meta.json
index 6a4a45c0121287..5c2c859f062e5c 100644
--- a/Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/meta.json
+++ b/Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/meta.json
@@ -1,10 +1,10 @@
{
"version": 1,
- "license": "CC0-1.0",
- "copyright": "Created by EmoGarbage404 (github) for Space Station 14.",
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation from https://github.com/tgstation/tgstation/pull/854914",
"size": {
"x": 32,
- "y": 32
+ "y": 48
},
"states": [
{
diff --git a/Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/open.png b/Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/open.png
index 24dbd6aac2a768..263bf0413f7ec0 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/open.png and b/Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/sparking.png b/Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/sparking.png
index 87b78b9b4653d5..9d33de7ab5140d 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/sparking.png and b/Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/sparking.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/unlocked.png b/Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/unlocked.png
index 94b89fa655da94..80eec5d68c013d 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/unlocked.png and b/Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/unlocked.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/welded.png b/Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/welded.png
index 311739a2701db2..ce876d497cbf3c 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/welded.png and b/Resources/Textures/Structures/Storage/Crates/engicrate_secure.rsi/welded.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/engineering.rsi/base.png b/Resources/Textures/Structures/Storage/Crates/engineering.rsi/base.png
index 3328f00a431b72..3efd2e26ee5588 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/engineering.rsi/base.png and b/Resources/Textures/Structures/Storage/Crates/engineering.rsi/base.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/engineering.rsi/closed.png b/Resources/Textures/Structures/Storage/Crates/engineering.rsi/closed.png
index 67c0442f786c5e..bdc5c9525cf1c1 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/engineering.rsi/closed.png and b/Resources/Textures/Structures/Storage/Crates/engineering.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/engineering.rsi/icon.png b/Resources/Textures/Structures/Storage/Crates/engineering.rsi/icon.png
index 7efbdb3cebca30..b146eaabeb206f 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/engineering.rsi/icon.png and b/Resources/Textures/Structures/Storage/Crates/engineering.rsi/icon.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/engineering.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/engineering.rsi/meta.json
index e9dad802e2cc5f..f4cb6edd6211d9 100644
--- a/Resources/Textures/Structures/Storage/Crates/engineering.rsi/meta.json
+++ b/Resources/Textures/Structures/Storage/Crates/engineering.rsi/meta.json
@@ -1,10 +1,10 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
- "copyright": "Created by EmoGarbage404 (github) for Space Station 14.",
+ "copyright": "Taken from tgstation from https://github.com/tgstation/tgstation/pull/854914",
"size": {
"x": 32,
- "y": 32
+ "y": 48
},
"states": [
{
diff --git a/Resources/Textures/Structures/Storage/Crates/engineering.rsi/open.png b/Resources/Textures/Structures/Storage/Crates/engineering.rsi/open.png
index 1596eaf0c0d036..e1e2562e9ea5e6 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/engineering.rsi/open.png and b/Resources/Textures/Structures/Storage/Crates/engineering.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/engineering.rsi/sparking.png b/Resources/Textures/Structures/Storage/Crates/engineering.rsi/sparking.png
index 87b78b9b4653d5..9d33de7ab5140d 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/engineering.rsi/sparking.png and b/Resources/Textures/Structures/Storage/Crates/engineering.rsi/sparking.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/engineering.rsi/welded.png b/Resources/Textures/Structures/Storage/Crates/engineering.rsi/welded.png
index 311739a2701db2..ce876d497cbf3c 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/engineering.rsi/welded.png and b/Resources/Textures/Structures/Storage/Crates/engineering.rsi/welded.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/freezer.rsi/base.png b/Resources/Textures/Structures/Storage/Crates/freezer.rsi/base.png
index 386dd0845dae63..de1d61c59849ed 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/freezer.rsi/base.png and b/Resources/Textures/Structures/Storage/Crates/freezer.rsi/base.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/freezer.rsi/closed.png b/Resources/Textures/Structures/Storage/Crates/freezer.rsi/closed.png
index e7d29a347937d6..6da53d64ae8244 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/freezer.rsi/closed.png and b/Resources/Textures/Structures/Storage/Crates/freezer.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/freezer.rsi/icon.png b/Resources/Textures/Structures/Storage/Crates/freezer.rsi/icon.png
index 039099b33784ca..377a33ecdcaca6 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/freezer.rsi/icon.png and b/Resources/Textures/Structures/Storage/Crates/freezer.rsi/icon.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/freezer.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/freezer.rsi/meta.json
index e4e3348f8e19f9..f4cb6edd6211d9 100644
--- a/Resources/Textures/Structures/Storage/Crates/freezer.rsi/meta.json
+++ b/Resources/Textures/Structures/Storage/Crates/freezer.rsi/meta.json
@@ -1,10 +1,10 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
- "copyright": "Created by EmoGarbage404 (github) and modified by Potato1234x (github) for Space Station 14.",
+ "copyright": "Taken from tgstation from https://github.com/tgstation/tgstation/pull/854914",
"size": {
"x": 32,
- "y": 32
+ "y": 48
},
"states": [
{
diff --git a/Resources/Textures/Structures/Storage/Crates/freezer.rsi/open.png b/Resources/Textures/Structures/Storage/Crates/freezer.rsi/open.png
index 10129791a7c8f7..f167204a049868 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/freezer.rsi/open.png and b/Resources/Textures/Structures/Storage/Crates/freezer.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/freezer.rsi/sparking.png b/Resources/Textures/Structures/Storage/Crates/freezer.rsi/sparking.png
index 87b78b9b4653d5..9d33de7ab5140d 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/freezer.rsi/sparking.png and b/Resources/Textures/Structures/Storage/Crates/freezer.rsi/sparking.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/freezer.rsi/welded.png b/Resources/Textures/Structures/Storage/Crates/freezer.rsi/welded.png
index 311739a2701db2..ce876d497cbf3c 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/freezer.rsi/welded.png and b/Resources/Textures/Structures/Storage/Crates/freezer.rsi/welded.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/generic.rsi/base.png b/Resources/Textures/Structures/Storage/Crates/generic.rsi/base.png
index a7874456cedbb9..49f618ce818d0e 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/generic.rsi/base.png and b/Resources/Textures/Structures/Storage/Crates/generic.rsi/base.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/generic.rsi/closed.png b/Resources/Textures/Structures/Storage/Crates/generic.rsi/closed.png
index 8b512a5adeef11..e8e2aec48049b0 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/generic.rsi/closed.png and b/Resources/Textures/Structures/Storage/Crates/generic.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/generic.rsi/icon.png b/Resources/Textures/Structures/Storage/Crates/generic.rsi/icon.png
index f70ab724f25d4b..f524439fad2a67 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/generic.rsi/icon.png and b/Resources/Textures/Structures/Storage/Crates/generic.rsi/icon.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/generic.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/generic.rsi/meta.json
index e9dad802e2cc5f..f4cb6edd6211d9 100644
--- a/Resources/Textures/Structures/Storage/Crates/generic.rsi/meta.json
+++ b/Resources/Textures/Structures/Storage/Crates/generic.rsi/meta.json
@@ -1,10 +1,10 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
- "copyright": "Created by EmoGarbage404 (github) for Space Station 14.",
+ "copyright": "Taken from tgstation from https://github.com/tgstation/tgstation/pull/854914",
"size": {
"x": 32,
- "y": 32
+ "y": 48
},
"states": [
{
diff --git a/Resources/Textures/Structures/Storage/Crates/generic.rsi/open.png b/Resources/Textures/Structures/Storage/Crates/generic.rsi/open.png
index 369177ad4e7f62..478bbbcff10f4b 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/generic.rsi/open.png and b/Resources/Textures/Structures/Storage/Crates/generic.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/generic.rsi/sparking.png b/Resources/Textures/Structures/Storage/Crates/generic.rsi/sparking.png
index 87b78b9b4653d5..9d33de7ab5140d 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/generic.rsi/sparking.png and b/Resources/Textures/Structures/Storage/Crates/generic.rsi/sparking.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/generic.rsi/welded.png b/Resources/Textures/Structures/Storage/Crates/generic.rsi/welded.png
index 311739a2701db2..ce876d497cbf3c 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/generic.rsi/welded.png and b/Resources/Textures/Structures/Storage/Crates/generic.rsi/welded.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/base.png b/Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/base.png
index a28a810df03f05..513f54c9822bd1 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/base.png and b/Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/base.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/closed.png b/Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/closed.png
index d6ff085b18131e..e1611dd50c4d23 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/closed.png and b/Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/icon.png b/Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/icon.png
index a8297830833f1f..b9bfd55ea6621d 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/icon.png and b/Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/icon.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/locked.png b/Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/locked.png
index aceacfce597de2..665d411bc434e8 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/locked.png and b/Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/locked.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/meta.json
index 6a4a45c0121287..5c2c859f062e5c 100644
--- a/Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/meta.json
+++ b/Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/meta.json
@@ -1,10 +1,10 @@
{
"version": 1,
- "license": "CC0-1.0",
- "copyright": "Created by EmoGarbage404 (github) for Space Station 14.",
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation from https://github.com/tgstation/tgstation/pull/854914",
"size": {
"x": 32,
- "y": 32
+ "y": 48
},
"states": [
{
diff --git a/Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/open.png b/Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/open.png
index ec1f8c5956ecb8..93eb3abf4ef97c 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/open.png and b/Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/sparking.png b/Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/sparking.png
index 87b78b9b4653d5..9d33de7ab5140d 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/sparking.png and b/Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/sparking.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/unlocked.png b/Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/unlocked.png
index 94b89fa655da94..80eec5d68c013d 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/unlocked.png and b/Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/unlocked.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/welded.png b/Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/welded.png
index 311739a2701db2..ce876d497cbf3c 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/welded.png and b/Resources/Textures/Structures/Storage/Crates/hydro_secure.rsi/welded.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/base.png b/Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/base.png
index c1b84af39361e0..513f54c9822bd1 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/base.png and b/Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/base.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/closed.png b/Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/closed.png
index d6ff085b18131e..57ea04127b013a 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/closed.png and b/Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/icon.png b/Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/icon.png
index da6d7c571658f4..7f1e803eebc94e 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/icon.png and b/Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/icon.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/meta.json
index e9dad802e2cc5f..f4cb6edd6211d9 100644
--- a/Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/meta.json
+++ b/Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/meta.json
@@ -1,10 +1,10 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
- "copyright": "Created by EmoGarbage404 (github) for Space Station 14.",
+ "copyright": "Taken from tgstation from https://github.com/tgstation/tgstation/pull/854914",
"size": {
"x": 32,
- "y": 32
+ "y": 48
},
"states": [
{
diff --git a/Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/open.png b/Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/open.png
index ec1f8c5956ecb8..05073603072f08 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/open.png and b/Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/sparking.png b/Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/sparking.png
index 87b78b9b4653d5..9d33de7ab5140d 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/sparking.png and b/Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/sparking.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/welded.png b/Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/welded.png
index 311739a2701db2..ce876d497cbf3c 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/welded.png and b/Resources/Textures/Structures/Storage/Crates/hydroponics.rsi/welded.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/livestock.rsi/base.png b/Resources/Textures/Structures/Storage/Crates/livestock.rsi/base.png
index a64f85689e3552..f9333e5cbeabf8 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/livestock.rsi/base.png and b/Resources/Textures/Structures/Storage/Crates/livestock.rsi/base.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/livestock.rsi/closed.png b/Resources/Textures/Structures/Storage/Crates/livestock.rsi/closed.png
index 7a9d025c27724a..7850399a30ad1b 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/livestock.rsi/closed.png and b/Resources/Textures/Structures/Storage/Crates/livestock.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/livestock.rsi/open.png b/Resources/Textures/Structures/Storage/Crates/livestock.rsi/open.png
index 0a258654c0a4f7..17ce5317f0f824 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/livestock.rsi/open.png and b/Resources/Textures/Structures/Storage/Crates/livestock.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/medical.rsi/base.png b/Resources/Textures/Structures/Storage/Crates/medical.rsi/base.png
index 5e386cc49b749b..bebd17249eb668 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/medical.rsi/base.png and b/Resources/Textures/Structures/Storage/Crates/medical.rsi/base.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/medical.rsi/closed.png b/Resources/Textures/Structures/Storage/Crates/medical.rsi/closed.png
index d6ff085b18131e..620893e6267ed1 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/medical.rsi/closed.png and b/Resources/Textures/Structures/Storage/Crates/medical.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/medical.rsi/icon.png b/Resources/Textures/Structures/Storage/Crates/medical.rsi/icon.png
index 07d323ea2d17e0..94bae9923ea9c3 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/medical.rsi/icon.png and b/Resources/Textures/Structures/Storage/Crates/medical.rsi/icon.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/medical.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/medical.rsi/meta.json
index e9dad802e2cc5f..f4cb6edd6211d9 100644
--- a/Resources/Textures/Structures/Storage/Crates/medical.rsi/meta.json
+++ b/Resources/Textures/Structures/Storage/Crates/medical.rsi/meta.json
@@ -1,10 +1,10 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
- "copyright": "Created by EmoGarbage404 (github) for Space Station 14.",
+ "copyright": "Taken from tgstation from https://github.com/tgstation/tgstation/pull/854914",
"size": {
"x": 32,
- "y": 32
+ "y": 48
},
"states": [
{
diff --git a/Resources/Textures/Structures/Storage/Crates/medical.rsi/open.png b/Resources/Textures/Structures/Storage/Crates/medical.rsi/open.png
index ec1f8c5956ecb8..d1f946641357b5 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/medical.rsi/open.png and b/Resources/Textures/Structures/Storage/Crates/medical.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/medical.rsi/sparking.png b/Resources/Textures/Structures/Storage/Crates/medical.rsi/sparking.png
index 87b78b9b4653d5..9d33de7ab5140d 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/medical.rsi/sparking.png and b/Resources/Textures/Structures/Storage/Crates/medical.rsi/sparking.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/medical.rsi/welded.png b/Resources/Textures/Structures/Storage/Crates/medical.rsi/welded.png
index 311739a2701db2..ce876d497cbf3c 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/medical.rsi/welded.png and b/Resources/Textures/Structures/Storage/Crates/medical.rsi/welded.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/base.png b/Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/base.png
index 2896fb7ba1e5f1..f01397e5844a59 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/base.png and b/Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/base.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/closed.png b/Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/closed.png
index d6ff085b18131e..1df5ba35f30068 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/closed.png and b/Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/icon.png b/Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/icon.png
index 4fbe1f965e1b29..0aa79b3821b2ca 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/icon.png and b/Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/icon.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/locked.png b/Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/locked.png
index aceacfce597de2..665d411bc434e8 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/locked.png and b/Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/locked.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/meta.json
index 6a4a45c0121287..5c2c859f062e5c 100644
--- a/Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/meta.json
+++ b/Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/meta.json
@@ -1,10 +1,10 @@
{
"version": 1,
- "license": "CC0-1.0",
- "copyright": "Created by EmoGarbage404 (github) for Space Station 14.",
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation from https://github.com/tgstation/tgstation/pull/854914",
"size": {
"x": 32,
- "y": 32
+ "y": 48
},
"states": [
{
diff --git a/Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/open.png b/Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/open.png
index ec1f8c5956ecb8..5871cfb3c70ca6 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/open.png and b/Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/sparking.png b/Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/sparking.png
index 87b78b9b4653d5..9d33de7ab5140d 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/sparking.png and b/Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/sparking.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/unlocked.png b/Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/unlocked.png
index 94b89fa655da94..80eec5d68c013d 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/unlocked.png and b/Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/unlocked.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/welded.png b/Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/welded.png
index 311739a2701db2..ce876d497cbf3c 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/welded.png and b/Resources/Textures/Structures/Storage/Crates/medicalcrate_secure.rsi/welded.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/o2.rsi/base.png b/Resources/Textures/Structures/Storage/Crates/o2.rsi/base.png
index d7cf6a7311884d..26af4825680948 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/o2.rsi/base.png and b/Resources/Textures/Structures/Storage/Crates/o2.rsi/base.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/o2.rsi/closed.png b/Resources/Textures/Structures/Storage/Crates/o2.rsi/closed.png
index b6d55ce0e27d77..4f1498cb7dcba5 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/o2.rsi/closed.png and b/Resources/Textures/Structures/Storage/Crates/o2.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/o2.rsi/icon.png b/Resources/Textures/Structures/Storage/Crates/o2.rsi/icon.png
index 068bf07b55dbf2..6fc5b083195b10 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/o2.rsi/icon.png and b/Resources/Textures/Structures/Storage/Crates/o2.rsi/icon.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/o2.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/o2.rsi/meta.json
index e9dad802e2cc5f..f4cb6edd6211d9 100644
--- a/Resources/Textures/Structures/Storage/Crates/o2.rsi/meta.json
+++ b/Resources/Textures/Structures/Storage/Crates/o2.rsi/meta.json
@@ -1,10 +1,10 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
- "copyright": "Created by EmoGarbage404 (github) for Space Station 14.",
+ "copyright": "Taken from tgstation from https://github.com/tgstation/tgstation/pull/854914",
"size": {
"x": 32,
- "y": 32
+ "y": 48
},
"states": [
{
diff --git a/Resources/Textures/Structures/Storage/Crates/o2.rsi/open.png b/Resources/Textures/Structures/Storage/Crates/o2.rsi/open.png
index 983d1727955d2a..33504149069979 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/o2.rsi/open.png and b/Resources/Textures/Structures/Storage/Crates/o2.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/o2.rsi/sparking.png b/Resources/Textures/Structures/Storage/Crates/o2.rsi/sparking.png
index 87b78b9b4653d5..9d33de7ab5140d 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/o2.rsi/sparking.png and b/Resources/Textures/Structures/Storage/Crates/o2.rsi/sparking.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/o2.rsi/welded.png b/Resources/Textures/Structures/Storage/Crates/o2.rsi/welded.png
index 311739a2701db2..ce876d497cbf3c 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/o2.rsi/welded.png and b/Resources/Textures/Structures/Storage/Crates/o2.rsi/welded.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/plasma.rsi/base.png b/Resources/Textures/Structures/Storage/Crates/plasma.rsi/base.png
index 4bf4aafad0d5b3..6e606c0fa5adb0 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/plasma.rsi/base.png and b/Resources/Textures/Structures/Storage/Crates/plasma.rsi/base.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/plasma.rsi/closed.png b/Resources/Textures/Structures/Storage/Crates/plasma.rsi/closed.png
index 71706982943bb5..ab8e5a35c7776d 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/plasma.rsi/closed.png and b/Resources/Textures/Structures/Storage/Crates/plasma.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/plasma.rsi/icon.png b/Resources/Textures/Structures/Storage/Crates/plasma.rsi/icon.png
index feab7c1c9bd976..4f3e6e3a325f53 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/plasma.rsi/icon.png and b/Resources/Textures/Structures/Storage/Crates/plasma.rsi/icon.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/plasma.rsi/locked.png b/Resources/Textures/Structures/Storage/Crates/plasma.rsi/locked.png
index aceacfce597de2..665d411bc434e8 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/plasma.rsi/locked.png and b/Resources/Textures/Structures/Storage/Crates/plasma.rsi/locked.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/plasma.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/plasma.rsi/meta.json
index 6a4a45c0121287..5c2c859f062e5c 100644
--- a/Resources/Textures/Structures/Storage/Crates/plasma.rsi/meta.json
+++ b/Resources/Textures/Structures/Storage/Crates/plasma.rsi/meta.json
@@ -1,10 +1,10 @@
{
"version": 1,
- "license": "CC0-1.0",
- "copyright": "Created by EmoGarbage404 (github) for Space Station 14.",
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation from https://github.com/tgstation/tgstation/pull/854914",
"size": {
"x": 32,
- "y": 32
+ "y": 48
},
"states": [
{
diff --git a/Resources/Textures/Structures/Storage/Crates/plasma.rsi/open.png b/Resources/Textures/Structures/Storage/Crates/plasma.rsi/open.png
index de957954873854..c908b30d71917f 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/plasma.rsi/open.png and b/Resources/Textures/Structures/Storage/Crates/plasma.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/plasma.rsi/sparking.png b/Resources/Textures/Structures/Storage/Crates/plasma.rsi/sparking.png
index 87b78b9b4653d5..9d33de7ab5140d 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/plasma.rsi/sparking.png and b/Resources/Textures/Structures/Storage/Crates/plasma.rsi/sparking.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/plasma.rsi/unlocked.png b/Resources/Textures/Structures/Storage/Crates/plasma.rsi/unlocked.png
index 94b89fa655da94..80eec5d68c013d 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/plasma.rsi/unlocked.png and b/Resources/Textures/Structures/Storage/Crates/plasma.rsi/unlocked.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/plasma.rsi/welded.png b/Resources/Textures/Structures/Storage/Crates/plasma.rsi/welded.png
index 311739a2701db2..ce876d497cbf3c 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/plasma.rsi/welded.png and b/Resources/Textures/Structures/Storage/Crates/plasma.rsi/welded.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/plastic.rsi/base.png b/Resources/Textures/Structures/Storage/Crates/plastic.rsi/base.png
index 9086db2a1ac63d..6f65979162161f 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/plastic.rsi/base.png and b/Resources/Textures/Structures/Storage/Crates/plastic.rsi/base.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/plastic.rsi/closed.png b/Resources/Textures/Structures/Storage/Crates/plastic.rsi/closed.png
index d6ff085b18131e..c1e240d2bf5681 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/plastic.rsi/closed.png and b/Resources/Textures/Structures/Storage/Crates/plastic.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/plastic.rsi/icon.png b/Resources/Textures/Structures/Storage/Crates/plastic.rsi/icon.png
index 1811ddbf63ed27..48583ebf31b8c5 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/plastic.rsi/icon.png and b/Resources/Textures/Structures/Storage/Crates/plastic.rsi/icon.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/plastic.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/plastic.rsi/meta.json
index e9dad802e2cc5f..f4cb6edd6211d9 100644
--- a/Resources/Textures/Structures/Storage/Crates/plastic.rsi/meta.json
+++ b/Resources/Textures/Structures/Storage/Crates/plastic.rsi/meta.json
@@ -1,10 +1,10 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
- "copyright": "Created by EmoGarbage404 (github) for Space Station 14.",
+ "copyright": "Taken from tgstation from https://github.com/tgstation/tgstation/pull/854914",
"size": {
"x": 32,
- "y": 32
+ "y": 48
},
"states": [
{
diff --git a/Resources/Textures/Structures/Storage/Crates/plastic.rsi/open.png b/Resources/Textures/Structures/Storage/Crates/plastic.rsi/open.png
index ec1f8c5956ecb8..380f6c0ad671e9 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/plastic.rsi/open.png and b/Resources/Textures/Structures/Storage/Crates/plastic.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/plastic.rsi/sparking.png b/Resources/Textures/Structures/Storage/Crates/plastic.rsi/sparking.png
index 87b78b9b4653d5..9d33de7ab5140d 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/plastic.rsi/sparking.png and b/Resources/Textures/Structures/Storage/Crates/plastic.rsi/sparking.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/plastic.rsi/welded.png b/Resources/Textures/Structures/Storage/Crates/plastic.rsi/welded.png
index 311739a2701db2..ce876d497cbf3c 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/plastic.rsi/welded.png and b/Resources/Textures/Structures/Storage/Crates/plastic.rsi/welded.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/base.png b/Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/base.png
index 76183f9af09889..da5e41fad1d660 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/base.png and b/Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/base.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/closed.png b/Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/closed.png
index ea51a95f56cdda..75f1377175599a 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/closed.png and b/Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/icon.png b/Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/icon.png
index 4cf8a5660feb84..f194debc0812e3 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/icon.png and b/Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/icon.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/locked.png b/Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/locked.png
index aceacfce597de2..665d411bc434e8 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/locked.png and b/Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/locked.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/meta.json
index 6a4a45c0121287..5c2c859f062e5c 100644
--- a/Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/meta.json
+++ b/Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/meta.json
@@ -1,10 +1,10 @@
{
"version": 1,
- "license": "CC0-1.0",
- "copyright": "Created by EmoGarbage404 (github) for Space Station 14.",
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation from https://github.com/tgstation/tgstation/pull/854914",
"size": {
"x": 32,
- "y": 32
+ "y": 48
},
"states": [
{
diff --git a/Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/open.png b/Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/open.png
index c9c0e9df17c2fd..7b40ffb009ba9c 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/open.png and b/Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/sparking.png b/Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/sparking.png
index 87b78b9b4653d5..9d33de7ab5140d 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/sparking.png and b/Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/sparking.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/unlocked.png b/Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/unlocked.png
index 94b89fa655da94..80eec5d68c013d 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/unlocked.png and b/Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/unlocked.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/welded.png b/Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/welded.png
index 311739a2701db2..ce876d497cbf3c 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/welded.png and b/Resources/Textures/Structures/Storage/Crates/privatecrate_secure.rsi/welded.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/radiation.rsi/base.png b/Resources/Textures/Structures/Storage/Crates/radiation.rsi/base.png
index aad1114a412e7c..c3512d67a2e0ee 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/radiation.rsi/base.png and b/Resources/Textures/Structures/Storage/Crates/radiation.rsi/base.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/radiation.rsi/closed.png b/Resources/Textures/Structures/Storage/Crates/radiation.rsi/closed.png
index aeea5e305ae5c0..bba8fede8e9255 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/radiation.rsi/closed.png and b/Resources/Textures/Structures/Storage/Crates/radiation.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/radiation.rsi/icon.png b/Resources/Textures/Structures/Storage/Crates/radiation.rsi/icon.png
index 7d869806105ffc..16f8a4193d82b3 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/radiation.rsi/icon.png and b/Resources/Textures/Structures/Storage/Crates/radiation.rsi/icon.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/radiation.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/radiation.rsi/meta.json
index e9dad802e2cc5f..f4cb6edd6211d9 100644
--- a/Resources/Textures/Structures/Storage/Crates/radiation.rsi/meta.json
+++ b/Resources/Textures/Structures/Storage/Crates/radiation.rsi/meta.json
@@ -1,10 +1,10 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
- "copyright": "Created by EmoGarbage404 (github) for Space Station 14.",
+ "copyright": "Taken from tgstation from https://github.com/tgstation/tgstation/pull/854914",
"size": {
"x": 32,
- "y": 32
+ "y": 48
},
"states": [
{
diff --git a/Resources/Textures/Structures/Storage/Crates/radiation.rsi/open.png b/Resources/Textures/Structures/Storage/Crates/radiation.rsi/open.png
index 562c10fc6fda81..7c0f55038ec2f1 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/radiation.rsi/open.png and b/Resources/Textures/Structures/Storage/Crates/radiation.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/radiation.rsi/sparking.png b/Resources/Textures/Structures/Storage/Crates/radiation.rsi/sparking.png
index 87b78b9b4653d5..9d33de7ab5140d 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/radiation.rsi/sparking.png and b/Resources/Textures/Structures/Storage/Crates/radiation.rsi/sparking.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/radiation.rsi/welded.png b/Resources/Textures/Structures/Storage/Crates/radiation.rsi/welded.png
index 311739a2701db2..ce876d497cbf3c 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/radiation.rsi/welded.png and b/Resources/Textures/Structures/Storage/Crates/radiation.rsi/welded.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/base.png b/Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/base.png
index 349469262c66fe..24f9d1e4d6ca71 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/base.png and b/Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/base.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/closed.png b/Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/closed.png
index d6ff085b18131e..9672db7e7664ec 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/closed.png and b/Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/icon.png b/Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/icon.png
index d17b5298b0ef98..4b69b7df20a0e6 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/icon.png and b/Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/icon.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/locked.png b/Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/locked.png
index aceacfce597de2..665d411bc434e8 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/locked.png and b/Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/locked.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/meta.json
index 6a4a45c0121287..5c2c859f062e5c 100644
--- a/Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/meta.json
+++ b/Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/meta.json
@@ -1,10 +1,10 @@
{
"version": 1,
- "license": "CC0-1.0",
- "copyright": "Created by EmoGarbage404 (github) for Space Station 14.",
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation from https://github.com/tgstation/tgstation/pull/854914",
"size": {
"x": 32,
- "y": 32
+ "y": 48
},
"states": [
{
diff --git a/Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/open.png b/Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/open.png
index ec1f8c5956ecb8..3c6efb957b64a3 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/open.png and b/Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/sparking.png b/Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/sparking.png
index 87b78b9b4653d5..9d33de7ab5140d 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/sparking.png and b/Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/sparking.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/unlocked.png b/Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/unlocked.png
index 94b89fa655da94..80eec5d68c013d 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/unlocked.png and b/Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/unlocked.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/welded.png b/Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/welded.png
index 311739a2701db2..ce876d497cbf3c 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/welded.png and b/Resources/Textures/Structures/Storage/Crates/scicrate_secure.rsi/welded.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/science.rsi/base.png b/Resources/Textures/Structures/Storage/Crates/science.rsi/base.png
index 7ce2c6a4442671..24f9d1e4d6ca71 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/science.rsi/base.png and b/Resources/Textures/Structures/Storage/Crates/science.rsi/base.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/science.rsi/closed.png b/Resources/Textures/Structures/Storage/Crates/science.rsi/closed.png
index d6ff085b18131e..9708c53b836db1 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/science.rsi/closed.png and b/Resources/Textures/Structures/Storage/Crates/science.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/science.rsi/icon.png b/Resources/Textures/Structures/Storage/Crates/science.rsi/icon.png
index 3a493fda211223..ba66ee411001da 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/science.rsi/icon.png and b/Resources/Textures/Structures/Storage/Crates/science.rsi/icon.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/science.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/science.rsi/meta.json
index e9dad802e2cc5f..f4cb6edd6211d9 100644
--- a/Resources/Textures/Structures/Storage/Crates/science.rsi/meta.json
+++ b/Resources/Textures/Structures/Storage/Crates/science.rsi/meta.json
@@ -1,10 +1,10 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
- "copyright": "Created by EmoGarbage404 (github) for Space Station 14.",
+ "copyright": "Taken from tgstation from https://github.com/tgstation/tgstation/pull/854914",
"size": {
"x": 32,
- "y": 32
+ "y": 48
},
"states": [
{
diff --git a/Resources/Textures/Structures/Storage/Crates/science.rsi/open.png b/Resources/Textures/Structures/Storage/Crates/science.rsi/open.png
index ec1f8c5956ecb8..45b24cab10538e 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/science.rsi/open.png and b/Resources/Textures/Structures/Storage/Crates/science.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/science.rsi/sparking.png b/Resources/Textures/Structures/Storage/Crates/science.rsi/sparking.png
index 87b78b9b4653d5..9d33de7ab5140d 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/science.rsi/sparking.png and b/Resources/Textures/Structures/Storage/Crates/science.rsi/sparking.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/science.rsi/welded.png b/Resources/Textures/Structures/Storage/Crates/science.rsi/welded.png
index 311739a2701db2..ce876d497cbf3c 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/science.rsi/welded.png and b/Resources/Textures/Structures/Storage/Crates/science.rsi/welded.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/base.png b/Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/base.png
index f58738d92ca325..c50729477df7dc 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/base.png and b/Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/base.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/closed.png b/Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/closed.png
index 0f4848a7b359e5..a851f7c42a41d8 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/closed.png and b/Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/icon.png b/Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/icon.png
index d973546e0066ce..78776717e355bf 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/icon.png and b/Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/icon.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/locked.png b/Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/locked.png
index aceacfce597de2..665d411bc434e8 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/locked.png and b/Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/locked.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/meta.json
index 6a4a45c0121287..5c2c859f062e5c 100644
--- a/Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/meta.json
+++ b/Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/meta.json
@@ -1,10 +1,10 @@
{
"version": 1,
- "license": "CC0-1.0",
- "copyright": "Created by EmoGarbage404 (github) for Space Station 14.",
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation from https://github.com/tgstation/tgstation/pull/854914",
"size": {
"x": 32,
- "y": 32
+ "y": 48
},
"states": [
{
diff --git a/Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/open.png b/Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/open.png
index 39fba5953fbef5..be27e93656f469 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/open.png and b/Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/sparking.png b/Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/sparking.png
index 87b78b9b4653d5..9d33de7ab5140d 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/sparking.png and b/Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/sparking.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/unlocked.png b/Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/unlocked.png
index 94b89fa655da94..80eec5d68c013d 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/unlocked.png and b/Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/unlocked.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/welded.png b/Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/welded.png
index 311739a2701db2..ce876d497cbf3c 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/welded.png and b/Resources/Textures/Structures/Storage/Crates/sec_gear.rsi/welded.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/secure.rsi/base.png b/Resources/Textures/Structures/Storage/Crates/secure.rsi/base.png
index 18a9da738dc6c6..49f618ce818d0e 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/secure.rsi/base.png and b/Resources/Textures/Structures/Storage/Crates/secure.rsi/base.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/secure.rsi/closed.png b/Resources/Textures/Structures/Storage/Crates/secure.rsi/closed.png
index 8b512a5adeef11..15e27b4bedb8d2 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/secure.rsi/closed.png and b/Resources/Textures/Structures/Storage/Crates/secure.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/secure.rsi/icon.png b/Resources/Textures/Structures/Storage/Crates/secure.rsi/icon.png
index c73b9ce0714a7a..8789ddb4886f35 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/secure.rsi/icon.png and b/Resources/Textures/Structures/Storage/Crates/secure.rsi/icon.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/secure.rsi/locked.png b/Resources/Textures/Structures/Storage/Crates/secure.rsi/locked.png
index aceacfce597de2..665d411bc434e8 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/secure.rsi/locked.png and b/Resources/Textures/Structures/Storage/Crates/secure.rsi/locked.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/secure.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/secure.rsi/meta.json
index 6a4a45c0121287..5c2c859f062e5c 100644
--- a/Resources/Textures/Structures/Storage/Crates/secure.rsi/meta.json
+++ b/Resources/Textures/Structures/Storage/Crates/secure.rsi/meta.json
@@ -1,10 +1,10 @@
{
"version": 1,
- "license": "CC0-1.0",
- "copyright": "Created by EmoGarbage404 (github) for Space Station 14.",
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation from https://github.com/tgstation/tgstation/pull/854914",
"size": {
"x": 32,
- "y": 32
+ "y": 48
},
"states": [
{
diff --git a/Resources/Textures/Structures/Storage/Crates/secure.rsi/open.png b/Resources/Textures/Structures/Storage/Crates/secure.rsi/open.png
index 369177ad4e7f62..5ea0a37e02b043 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/secure.rsi/open.png and b/Resources/Textures/Structures/Storage/Crates/secure.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/secure.rsi/sparking.png b/Resources/Textures/Structures/Storage/Crates/secure.rsi/sparking.png
index 87b78b9b4653d5..9d33de7ab5140d 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/secure.rsi/sparking.png and b/Resources/Textures/Structures/Storage/Crates/secure.rsi/sparking.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/secure.rsi/unlocked.png b/Resources/Textures/Structures/Storage/Crates/secure.rsi/unlocked.png
index 94b89fa655da94..80eec5d68c013d 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/secure.rsi/unlocked.png and b/Resources/Textures/Structures/Storage/Crates/secure.rsi/unlocked.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/secure.rsi/welded.png b/Resources/Textures/Structures/Storage/Crates/secure.rsi/welded.png
index 311739a2701db2..ce876d497cbf3c 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/secure.rsi/welded.png and b/Resources/Textures/Structures/Storage/Crates/secure.rsi/welded.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/surgery.rsi/base.png b/Resources/Textures/Structures/Storage/Crates/surgery.rsi/base.png
index 899629b37b4c8d..ac8f128c6d070a 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/surgery.rsi/base.png and b/Resources/Textures/Structures/Storage/Crates/surgery.rsi/base.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/surgery.rsi/closed.png b/Resources/Textures/Structures/Storage/Crates/surgery.rsi/closed.png
index d6ff085b18131e..d5dc6a24b2a9cd 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/surgery.rsi/closed.png and b/Resources/Textures/Structures/Storage/Crates/surgery.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/surgery.rsi/icon.png b/Resources/Textures/Structures/Storage/Crates/surgery.rsi/icon.png
index 5420957a70606b..1b54f5ddc5e7d5 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/surgery.rsi/icon.png and b/Resources/Textures/Structures/Storage/Crates/surgery.rsi/icon.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/surgery.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/surgery.rsi/meta.json
index e9dad802e2cc5f..f4cb6edd6211d9 100644
--- a/Resources/Textures/Structures/Storage/Crates/surgery.rsi/meta.json
+++ b/Resources/Textures/Structures/Storage/Crates/surgery.rsi/meta.json
@@ -1,10 +1,10 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
- "copyright": "Created by EmoGarbage404 (github) for Space Station 14.",
+ "copyright": "Taken from tgstation from https://github.com/tgstation/tgstation/pull/854914",
"size": {
"x": 32,
- "y": 32
+ "y": 48
},
"states": [
{
diff --git a/Resources/Textures/Structures/Storage/Crates/surgery.rsi/open.png b/Resources/Textures/Structures/Storage/Crates/surgery.rsi/open.png
index f436828411fea8..7f86cb2ab8b33e 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/surgery.rsi/open.png and b/Resources/Textures/Structures/Storage/Crates/surgery.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/surgery.rsi/sparking.png b/Resources/Textures/Structures/Storage/Crates/surgery.rsi/sparking.png
index 87b78b9b4653d5..9d33de7ab5140d 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/surgery.rsi/sparking.png and b/Resources/Textures/Structures/Storage/Crates/surgery.rsi/sparking.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/surgery.rsi/welded.png b/Resources/Textures/Structures/Storage/Crates/surgery.rsi/welded.png
index 311739a2701db2..ce876d497cbf3c 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/surgery.rsi/welded.png and b/Resources/Textures/Structures/Storage/Crates/surgery.rsi/welded.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/syndicate.rsi/base.png b/Resources/Textures/Structures/Storage/Crates/syndicate.rsi/base.png
index 2d6f667a4e9926..a5cd44f0226997 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/syndicate.rsi/base.png and b/Resources/Textures/Structures/Storage/Crates/syndicate.rsi/base.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/syndicate.rsi/closed.png b/Resources/Textures/Structures/Storage/Crates/syndicate.rsi/closed.png
index 625914054bea61..04f3270b011928 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/syndicate.rsi/closed.png and b/Resources/Textures/Structures/Storage/Crates/syndicate.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/syndicate.rsi/icon.png b/Resources/Textures/Structures/Storage/Crates/syndicate.rsi/icon.png
index bb56b23f846de3..7e6deba6838596 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/syndicate.rsi/icon.png and b/Resources/Textures/Structures/Storage/Crates/syndicate.rsi/icon.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/syndicate.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/syndicate.rsi/meta.json
index cfd113efd3b96c..f4cb6edd6211d9 100644
--- a/Resources/Textures/Structures/Storage/Crates/syndicate.rsi/meta.json
+++ b/Resources/Textures/Structures/Storage/Crates/syndicate.rsi/meta.json
@@ -1,10 +1,10 @@
{
"version": 1,
- "license": "CC-BY-SA-4.0",
- "copyright": "Hyenh#6078 (313846233099927552)",
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation from https://github.com/tgstation/tgstation/pull/854914",
"size": {
"x": 32,
- "y": 32
+ "y": 48
},
"states": [
{
@@ -36,4 +36,4 @@
]
}
]
-}
\ No newline at end of file
+}
diff --git a/Resources/Textures/Structures/Storage/Crates/syndicate.rsi/open.png b/Resources/Textures/Structures/Storage/Crates/syndicate.rsi/open.png
index faef025ed9fc7a..db2278cae2c0a0 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/syndicate.rsi/open.png and b/Resources/Textures/Structures/Storage/Crates/syndicate.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/syndicate.rsi/sparking.png b/Resources/Textures/Structures/Storage/Crates/syndicate.rsi/sparking.png
index 87b78b9b4653d5..9d33de7ab5140d 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/syndicate.rsi/sparking.png and b/Resources/Textures/Structures/Storage/Crates/syndicate.rsi/sparking.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/syndicate.rsi/welded.png b/Resources/Textures/Structures/Storage/Crates/syndicate.rsi/welded.png
index 311739a2701db2..ce876d497cbf3c 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/syndicate.rsi/welded.png and b/Resources/Textures/Structures/Storage/Crates/syndicate.rsi/welded.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/trashcart.rsi/base.png b/Resources/Textures/Structures/Storage/Crates/trashcart.rsi/base.png
index 85d7c299925a84..29ff613d91b5a6 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/trashcart.rsi/base.png and b/Resources/Textures/Structures/Storage/Crates/trashcart.rsi/base.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/trashcart.rsi/closed.png b/Resources/Textures/Structures/Storage/Crates/trashcart.rsi/closed.png
index 1c11bc8942e213..a562664525cbc1 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/trashcart.rsi/closed.png and b/Resources/Textures/Structures/Storage/Crates/trashcart.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/trashcart.rsi/icon.png b/Resources/Textures/Structures/Storage/Crates/trashcart.rsi/icon.png
index 6c212de3288f9a..286fd9441bee59 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/trashcart.rsi/icon.png and b/Resources/Textures/Structures/Storage/Crates/trashcart.rsi/icon.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/trashcart.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/trashcart.rsi/meta.json
index c4315ace71e649..f4cb6edd6211d9 100644
--- a/Resources/Textures/Structures/Storage/Crates/trashcart.rsi/meta.json
+++ b/Resources/Textures/Structures/Storage/Crates/trashcart.rsi/meta.json
@@ -1,10 +1,10 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
- "copyright": "Modified from https://github.com/tgstation/tgstation/commit/571e401e19514e8b0216e2efbbc95302007bfe9c by potato1234x (Github) for SS14",
+ "copyright": "Taken from tgstation from https://github.com/tgstation/tgstation/pull/854914",
"size": {
"x": 32,
- "y": 32
+ "y": 48
},
"states": [
{
diff --git a/Resources/Textures/Structures/Storage/Crates/trashcart.rsi/open.png b/Resources/Textures/Structures/Storage/Crates/trashcart.rsi/open.png
index 58f97286f2c2dc..3fcbfbe36b8594 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/trashcart.rsi/open.png and b/Resources/Textures/Structures/Storage/Crates/trashcart.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/trashcart.rsi/sparking.png b/Resources/Textures/Structures/Storage/Crates/trashcart.rsi/sparking.png
index 87b78b9b4653d5..9d33de7ab5140d 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/trashcart.rsi/sparking.png and b/Resources/Textures/Structures/Storage/Crates/trashcart.rsi/sparking.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/trashcart.rsi/welded.png b/Resources/Textures/Structures/Storage/Crates/trashcart.rsi/welded.png
index cad0a0f18a1620..ce876d497cbf3c 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/trashcart.rsi/welded.png and b/Resources/Textures/Structures/Storage/Crates/trashcart.rsi/welded.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/base.png b/Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/base.png
index dc61d52d0cbbb2..7409e44b8f6d87 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/base.png and b/Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/base.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/closed.png b/Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/closed.png
index b4dc8828b3ce5c..a562664525cbc1 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/closed.png and b/Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/icon.png b/Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/icon.png
index 6cbe5071747249..cf34e705fb93c6 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/icon.png and b/Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/icon.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/locked.png b/Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/locked.png
index 4c3d5df9e7a7bd..05abb72a77e25d 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/locked.png and b/Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/locked.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/meta.json
index b45e84deb3f88e..5c2c859f062e5c 100644
--- a/Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/meta.json
+++ b/Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/meta.json
@@ -1,10 +1,10 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
- "copyright": "Modified from https://github.com/tgstation/tgstation/commit/571e401e19514e8b0216e2efbbc95302007bfe9c by potato1234x (Github) for SS14",
+ "copyright": "Taken from tgstation from https://github.com/tgstation/tgstation/pull/854914",
"size": {
"x": 32,
- "y": 32
+ "y": 48
},
"states": [
{
diff --git a/Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/open.png b/Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/open.png
index 58f97286f2c2dc..3fcbfbe36b8594 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/open.png and b/Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/sparking.png b/Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/sparking.png
index 87b78b9b4653d5..9d33de7ab5140d 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/sparking.png and b/Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/sparking.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/unlocked.png b/Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/unlocked.png
index 61625a29c20da0..67ea5d459ed44a 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/unlocked.png and b/Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/unlocked.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/welded.png b/Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/welded.png
index cad0a0f18a1620..ce876d497cbf3c 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/welded.png and b/Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/welded.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/weapon.rsi/base.png b/Resources/Textures/Structures/Storage/Crates/weapon.rsi/base.png
index ad024e70a88ad3..733ed6a2a89735 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/weapon.rsi/base.png and b/Resources/Textures/Structures/Storage/Crates/weapon.rsi/base.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/weapon.rsi/closed.png b/Resources/Textures/Structures/Storage/Crates/weapon.rsi/closed.png
index 4142c4e14261e1..7ce9ff4ddc4727 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/weapon.rsi/closed.png and b/Resources/Textures/Structures/Storage/Crates/weapon.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/weapon.rsi/icon.png b/Resources/Textures/Structures/Storage/Crates/weapon.rsi/icon.png
index 7ea3df8bea541a..3bdf8b2640a56a 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/weapon.rsi/icon.png and b/Resources/Textures/Structures/Storage/Crates/weapon.rsi/icon.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/weapon.rsi/locked.png b/Resources/Textures/Structures/Storage/Crates/weapon.rsi/locked.png
index aceacfce597de2..665d411bc434e8 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/weapon.rsi/locked.png and b/Resources/Textures/Structures/Storage/Crates/weapon.rsi/locked.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/weapon.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/weapon.rsi/meta.json
index 6a4a45c0121287..5c2c859f062e5c 100644
--- a/Resources/Textures/Structures/Storage/Crates/weapon.rsi/meta.json
+++ b/Resources/Textures/Structures/Storage/Crates/weapon.rsi/meta.json
@@ -1,10 +1,10 @@
{
"version": 1,
- "license": "CC0-1.0",
- "copyright": "Created by EmoGarbage404 (github) for Space Station 14.",
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Taken from tgstation from https://github.com/tgstation/tgstation/pull/854914",
"size": {
"x": 32,
- "y": 32
+ "y": 48
},
"states": [
{
diff --git a/Resources/Textures/Structures/Storage/Crates/weapon.rsi/open.png b/Resources/Textures/Structures/Storage/Crates/weapon.rsi/open.png
index 6c986d7596c6e1..fcb836ffe94e31 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/weapon.rsi/open.png and b/Resources/Textures/Structures/Storage/Crates/weapon.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/weapon.rsi/sparking.png b/Resources/Textures/Structures/Storage/Crates/weapon.rsi/sparking.png
index 87b78b9b4653d5..9d33de7ab5140d 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/weapon.rsi/sparking.png and b/Resources/Textures/Structures/Storage/Crates/weapon.rsi/sparking.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/weapon.rsi/unlocked.png b/Resources/Textures/Structures/Storage/Crates/weapon.rsi/unlocked.png
index 94b89fa655da94..80eec5d68c013d 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/weapon.rsi/unlocked.png and b/Resources/Textures/Structures/Storage/Crates/weapon.rsi/unlocked.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/weapon.rsi/welded.png b/Resources/Textures/Structures/Storage/Crates/weapon.rsi/welded.png
index 311739a2701db2..ce876d497cbf3c 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/weapon.rsi/welded.png and b/Resources/Textures/Structures/Storage/Crates/weapon.rsi/welded.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/web.rsi/base.png b/Resources/Textures/Structures/Storage/Crates/web.rsi/base.png
index 1e252634a8320b..bfa3c50449d9f1 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/web.rsi/base.png and b/Resources/Textures/Structures/Storage/Crates/web.rsi/base.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/web.rsi/closed.png b/Resources/Textures/Structures/Storage/Crates/web.rsi/closed.png
index 780974b07ea6df..b53998fa6729f0 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/web.rsi/closed.png and b/Resources/Textures/Structures/Storage/Crates/web.rsi/closed.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/web.rsi/icon.png b/Resources/Textures/Structures/Storage/Crates/web.rsi/icon.png
index bc2da33a323f28..8346fb00dea10e 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/web.rsi/icon.png and b/Resources/Textures/Structures/Storage/Crates/web.rsi/icon.png differ
diff --git a/Resources/Textures/Structures/Storage/Crates/web.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/web.rsi/meta.json
index 489c06d445ae99..e938b9c69ce016 100644
--- a/Resources/Textures/Structures/Storage/Crates/web.rsi/meta.json
+++ b/Resources/Textures/Structures/Storage/Crates/web.rsi/meta.json
@@ -1,10 +1,10 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
- "copyright": "Made by PixelTheKermit (github) for SS14",
+ "copyright": "Taken from tgstation from https://github.com/tgstation/tgstation/pull/854914",
"size": {
"x": 32,
- "y": 32
+ "y": 48
},
"states": [
{
diff --git a/Resources/Textures/Structures/Storage/Crates/web.rsi/open.png b/Resources/Textures/Structures/Storage/Crates/web.rsi/open.png
index d387805acf49af..92f99acc9a3676 100644
Binary files a/Resources/Textures/Structures/Storage/Crates/web.rsi/open.png and b/Resources/Textures/Structures/Storage/Crates/web.rsi/open.png differ
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/black-1.png b/Resources/Textures/Structures/Storage/canister.rsi/black-1.png
index 791f22c9585e4e..bb56e0ef99bc64 100644
Binary files a/Resources/Textures/Structures/Storage/canister.rsi/black-1.png and b/Resources/Textures/Structures/Storage/canister.rsi/black-1.png differ
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/black.png b/Resources/Textures/Structures/Storage/canister.rsi/black.png
index c7c4d4732e82d7..2b5b07cb923c7b 100644
Binary files a/Resources/Textures/Structures/Storage/canister.rsi/black.png and b/Resources/Textures/Structures/Storage/canister.rsi/black.png differ
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/blue-1.png b/Resources/Textures/Structures/Storage/canister.rsi/blue-1.png
index f07bedd7eab11b..3a29c4694a1a8b 100644
Binary files a/Resources/Textures/Structures/Storage/canister.rsi/blue-1.png and b/Resources/Textures/Structures/Storage/canister.rsi/blue-1.png differ
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/blue.png b/Resources/Textures/Structures/Storage/canister.rsi/blue.png
index 412994d96c8a01..5257c777cc590a 100644
Binary files a/Resources/Textures/Structures/Storage/canister.rsi/blue.png and b/Resources/Textures/Structures/Storage/canister.rsi/blue.png differ
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/can-connector.png b/Resources/Textures/Structures/Storage/canister.rsi/can-connector.png
index 7996e1b26dbe64..a52b79bf9c44a6 100644
Binary files a/Resources/Textures/Structures/Storage/canister.rsi/can-connector.png and b/Resources/Textures/Structures/Storage/canister.rsi/can-connector.png differ
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/can-o0.png b/Resources/Textures/Structures/Storage/canister.rsi/can-o0.png
index 5f13bbacae63b8..66ddef62e774d7 100644
Binary files a/Resources/Textures/Structures/Storage/canister.rsi/can-o0.png and b/Resources/Textures/Structures/Storage/canister.rsi/can-o0.png differ
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/can-o1.png b/Resources/Textures/Structures/Storage/canister.rsi/can-o1.png
index 2e548fcaca256a..0a35f51d73b559 100644
Binary files a/Resources/Textures/Structures/Storage/canister.rsi/can-o1.png and b/Resources/Textures/Structures/Storage/canister.rsi/can-o1.png differ
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/can-o2.png b/Resources/Textures/Structures/Storage/canister.rsi/can-o2.png
index 094ee1e3c60e7e..360911e8d244a0 100644
Binary files a/Resources/Textures/Structures/Storage/canister.rsi/can-o2.png and b/Resources/Textures/Structures/Storage/canister.rsi/can-o2.png differ
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/can-o3.png b/Resources/Textures/Structures/Storage/canister.rsi/can-o3.png
index 014ed7833d45f8..a5ec80d804d6ff 100644
Binary files a/Resources/Textures/Structures/Storage/canister.rsi/can-o3.png and b/Resources/Textures/Structures/Storage/canister.rsi/can-o3.png differ
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/can-open.png b/Resources/Textures/Structures/Storage/canister.rsi/can-open.png
index 67f9117ebd80f3..f9ac4cba618ffd 100644
Binary files a/Resources/Textures/Structures/Storage/canister.rsi/can-open.png and b/Resources/Textures/Structures/Storage/canister.rsi/can-open.png differ
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/darkblue-1.png b/Resources/Textures/Structures/Storage/canister.rsi/darkblue-1.png
index c8bea6c38af095..c81e0d2d86d9b8 100644
Binary files a/Resources/Textures/Structures/Storage/canister.rsi/darkblue-1.png and b/Resources/Textures/Structures/Storage/canister.rsi/darkblue-1.png differ
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/darkblue.png b/Resources/Textures/Structures/Storage/canister.rsi/darkblue.png
index 06a097b0bd1f93..902682f4e9bd33 100644
Binary files a/Resources/Textures/Structures/Storage/canister.rsi/darkblue.png and b/Resources/Textures/Structures/Storage/canister.rsi/darkblue.png differ
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/frezon-1.png b/Resources/Textures/Structures/Storage/canister.rsi/frezon-1.png
index 7c02c3993e0182..526acc6ce3d950 100644
Binary files a/Resources/Textures/Structures/Storage/canister.rsi/frezon-1.png and b/Resources/Textures/Structures/Storage/canister.rsi/frezon-1.png differ
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/frezon.png b/Resources/Textures/Structures/Storage/canister.rsi/frezon.png
index 37b05e7c833a75..f3d40e1b4cc902 100644
Binary files a/Resources/Textures/Structures/Storage/canister.rsi/frezon.png and b/Resources/Textures/Structures/Storage/canister.rsi/frezon.png differ
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/green-1.png b/Resources/Textures/Structures/Storage/canister.rsi/green-1.png
index df9958d3e6a7ee..d64c4f3c32afe3 100644
Binary files a/Resources/Textures/Structures/Storage/canister.rsi/green-1.png and b/Resources/Textures/Structures/Storage/canister.rsi/green-1.png differ
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/green.png b/Resources/Textures/Structures/Storage/canister.rsi/green.png
index 75d21b09181350..ced115252b08e5 100644
Binary files a/Resources/Textures/Structures/Storage/canister.rsi/green.png and b/Resources/Textures/Structures/Storage/canister.rsi/green.png differ
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/greenys-1.png b/Resources/Textures/Structures/Storage/canister.rsi/greenys-1.png
index ecc5294699b5da..1e28cd57d19686 100644
Binary files a/Resources/Textures/Structures/Storage/canister.rsi/greenys-1.png and b/Resources/Textures/Structures/Storage/canister.rsi/greenys-1.png differ
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/greenys.png b/Resources/Textures/Structures/Storage/canister.rsi/greenys.png
index a414a192812248..537eb1ee4b292b 100644
Binary files a/Resources/Textures/Structures/Storage/canister.rsi/greenys.png and b/Resources/Textures/Structures/Storage/canister.rsi/greenys.png differ
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/grey-1.png b/Resources/Textures/Structures/Storage/canister.rsi/grey-1.png
index 1782cc29e89c99..d57ab852d91b63 100644
Binary files a/Resources/Textures/Structures/Storage/canister.rsi/grey-1.png and b/Resources/Textures/Structures/Storage/canister.rsi/grey-1.png differ
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/grey.png b/Resources/Textures/Structures/Storage/canister.rsi/grey.png
index f7ef5a60f9a279..93b680c016eb0b 100644
Binary files a/Resources/Textures/Structures/Storage/canister.rsi/grey.png and b/Resources/Textures/Structures/Storage/canister.rsi/grey.png differ
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/locked.png b/Resources/Textures/Structures/Storage/canister.rsi/locked.png
index 9edd84975f38e5..ffb18dcea2de42 100644
Binary files a/Resources/Textures/Structures/Storage/canister.rsi/locked.png and b/Resources/Textures/Structures/Storage/canister.rsi/locked.png differ
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/meta.json b/Resources/Textures/Structures/Storage/canister.rsi/meta.json
index 95d67cc8ae18e3..84e8b3dc58cf07 100644
--- a/Resources/Textures/Structures/Storage/canister.rsi/meta.json
+++ b/Resources/Textures/Structures/Storage/canister.rsi/meta.json
@@ -32,8 +32,10 @@
"name": "can-o0",
"delays": [
[
- 0.2,
- 0.2
+ 0.25,
+ 0.25,
+ 0.25,
+ 0.25
]
]
},
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/orange-1.png b/Resources/Textures/Structures/Storage/canister.rsi/orange-1.png
index 4d0714e5457108..b03e85fcc5eb3f 100644
Binary files a/Resources/Textures/Structures/Storage/canister.rsi/orange-1.png and b/Resources/Textures/Structures/Storage/canister.rsi/orange-1.png differ
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/orange.png b/Resources/Textures/Structures/Storage/canister.rsi/orange.png
index 2c8b6b429fe0c8..b9217667637ccf 100644
Binary files a/Resources/Textures/Structures/Storage/canister.rsi/orange.png and b/Resources/Textures/Structures/Storage/canister.rsi/orange.png differ
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/red-1.png b/Resources/Textures/Structures/Storage/canister.rsi/red-1.png
index 0f43f9d1421a6d..48c906e3986723 100644
Binary files a/Resources/Textures/Structures/Storage/canister.rsi/red-1.png and b/Resources/Textures/Structures/Storage/canister.rsi/red-1.png differ
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/red.png b/Resources/Textures/Structures/Storage/canister.rsi/red.png
index 4e1a047b387aea..4948dd41694085 100644
Binary files a/Resources/Textures/Structures/Storage/canister.rsi/red.png and b/Resources/Textures/Structures/Storage/canister.rsi/red.png differ
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/redws-1.png b/Resources/Textures/Structures/Storage/canister.rsi/redws-1.png
index d5c412875d8a12..3ebb7dfe73a5a6 100644
Binary files a/Resources/Textures/Structures/Storage/canister.rsi/redws-1.png and b/Resources/Textures/Structures/Storage/canister.rsi/redws-1.png differ
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/redws.png b/Resources/Textures/Structures/Storage/canister.rsi/redws.png
index 8390cb6539a4d0..5734fa3e4f7bbf 100644
Binary files a/Resources/Textures/Structures/Storage/canister.rsi/redws.png and b/Resources/Textures/Structures/Storage/canister.rsi/redws.png differ
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/scrubber-connector.png b/Resources/Textures/Structures/Storage/canister.rsi/scrubber-connector.png
index 261bbdb3403aa1..9c84c092715633 100644
Binary files a/Resources/Textures/Structures/Storage/canister.rsi/scrubber-connector.png and b/Resources/Textures/Structures/Storage/canister.rsi/scrubber-connector.png differ
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/unlocked.png b/Resources/Textures/Structures/Storage/canister.rsi/unlocked.png
index 5ba12d06af22d3..de60db8c21fa43 100644
Binary files a/Resources/Textures/Structures/Storage/canister.rsi/unlocked.png and b/Resources/Textures/Structures/Storage/canister.rsi/unlocked.png differ
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/water_vapor-1.png b/Resources/Textures/Structures/Storage/canister.rsi/water_vapor-1.png
index ec8c065097ef68..f162ad8a894e10 100644
Binary files a/Resources/Textures/Structures/Storage/canister.rsi/water_vapor-1.png and b/Resources/Textures/Structures/Storage/canister.rsi/water_vapor-1.png differ
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/water_vapor.png b/Resources/Textures/Structures/Storage/canister.rsi/water_vapor.png
index ee8b7979ce93f3..7d08c201684de2 100644
Binary files a/Resources/Textures/Structures/Storage/canister.rsi/water_vapor.png and b/Resources/Textures/Structures/Storage/canister.rsi/water_vapor.png differ
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/yellow-1.png b/Resources/Textures/Structures/Storage/canister.rsi/yellow-1.png
index 3937104ebe712d..2976abf1500740 100644
Binary files a/Resources/Textures/Structures/Storage/canister.rsi/yellow-1.png and b/Resources/Textures/Structures/Storage/canister.rsi/yellow-1.png differ
diff --git a/Resources/Textures/Structures/Storage/canister.rsi/yellow.png b/Resources/Textures/Structures/Storage/canister.rsi/yellow.png
index 595ceb298b0473..5895fb7265a520 100644
Binary files a/Resources/Textures/Structures/Storage/canister.rsi/yellow.png and b/Resources/Textures/Structures/Storage/canister.rsi/yellow.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/armory.png b/Resources/Textures/Structures/Storage/closet.rsi/armory.png
index 5744c176e3aa64..2643be854fbfc1 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/armory.png and b/Resources/Textures/Structures/Storage/closet.rsi/armory.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/armory_door.png b/Resources/Textures/Structures/Storage/closet.rsi/armory_door.png
index 73837efd9044e6..658292983f6b7c 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/armory_door.png and b/Resources/Textures/Structures/Storage/closet.rsi/armory_door.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/armory_open.png b/Resources/Textures/Structures/Storage/closet.rsi/armory_open.png
index f50ff803b0664a..8c853efd0b519c 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/armory_open.png and b/Resources/Textures/Structures/Storage/closet.rsi/armory_open.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/atmos.png b/Resources/Textures/Structures/Storage/closet.rsi/atmos.png
index e46f02cf37969d..f86389a5580d6c 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/atmos.png and b/Resources/Textures/Structures/Storage/closet.rsi/atmos.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/atmos_door.png b/Resources/Textures/Structures/Storage/closet.rsi/atmos_door.png
index 447ff7b5b0eb22..a2399ee651f9a2 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/atmos_door.png and b/Resources/Textures/Structures/Storage/closet.rsi/atmos_door.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/atmos_open.png b/Resources/Textures/Structures/Storage/closet.rsi/atmos_open.png
index 87124332c26e79..22c408d1701aad 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/atmos_open.png and b/Resources/Textures/Structures/Storage/closet.rsi/atmos_open.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/atmos_wardrobe_door.png b/Resources/Textures/Structures/Storage/closet.rsi/atmos_wardrobe_door.png
index 8f20752f7d2740..24d66bb85a2073 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/atmos_wardrobe_door.png and b/Resources/Textures/Structures/Storage/closet.rsi/atmos_wardrobe_door.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/bio.png b/Resources/Textures/Structures/Storage/closet.rsi/bio.png
index e0fbe655e50f59..16c52fe1bff881 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/bio.png and b/Resources/Textures/Structures/Storage/closet.rsi/bio.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/bio_door.png b/Resources/Textures/Structures/Storage/closet.rsi/bio_door.png
index 38bc16123e672c..08568f8f1dbe7e 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/bio_door.png and b/Resources/Textures/Structures/Storage/closet.rsi/bio_door.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/bio_jan.png b/Resources/Textures/Structures/Storage/closet.rsi/bio_jan.png
index f19ba3638a06b7..85a5c46f85bc2a 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/bio_jan.png and b/Resources/Textures/Structures/Storage/closet.rsi/bio_jan.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/bio_jan_door.png b/Resources/Textures/Structures/Storage/closet.rsi/bio_jan_door.png
index 09fc5d4faddc87..ef318bf597f325 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/bio_jan_door.png and b/Resources/Textures/Structures/Storage/closet.rsi/bio_jan_door.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/bio_jan_open.png b/Resources/Textures/Structures/Storage/closet.rsi/bio_jan_open.png
index b9869981337d93..e253a74274e928 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/bio_jan_open.png and b/Resources/Textures/Structures/Storage/closet.rsi/bio_jan_open.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/bio_open.png b/Resources/Textures/Structures/Storage/closet.rsi/bio_open.png
index a71ac22eef7c7d..e253a74274e928 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/bio_open.png and b/Resources/Textures/Structures/Storage/closet.rsi/bio_open.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/bio_sec.png b/Resources/Textures/Structures/Storage/closet.rsi/bio_sec.png
index d241c64b04acb6..5c91452a37e7c3 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/bio_sec.png and b/Resources/Textures/Structures/Storage/closet.rsi/bio_sec.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/bio_sec_door.png b/Resources/Textures/Structures/Storage/closet.rsi/bio_sec_door.png
index de68858255c7db..109de9a58d1939 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/bio_sec_door.png and b/Resources/Textures/Structures/Storage/closet.rsi/bio_sec_door.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/bio_sec_open.png b/Resources/Textures/Structures/Storage/closet.rsi/bio_sec_open.png
index 15f9dbe0a24eb4..e253a74274e928 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/bio_sec_open.png and b/Resources/Textures/Structures/Storage/closet.rsi/bio_sec_open.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/bio_viro.png b/Resources/Textures/Structures/Storage/closet.rsi/bio_viro.png
index a7929be38576b0..79922fdfda457a 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/bio_viro.png and b/Resources/Textures/Structures/Storage/closet.rsi/bio_viro.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/bio_viro_door.png b/Resources/Textures/Structures/Storage/closet.rsi/bio_viro_door.png
index e031cfdeec9336..da66f6d0b4374e 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/bio_viro_door.png and b/Resources/Textures/Structures/Storage/closet.rsi/bio_viro_door.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/bio_viro_open.png b/Resources/Textures/Structures/Storage/closet.rsi/bio_viro_open.png
index fe453299965187..e253a74274e928 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/bio_viro_open.png and b/Resources/Textures/Structures/Storage/closet.rsi/bio_viro_open.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/black_door.png b/Resources/Textures/Structures/Storage/closet.rsi/black_door.png
index 154d198a45d15d..ac9b2afdc00097 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/black_door.png and b/Resources/Textures/Structures/Storage/closet.rsi/black_door.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/blue_door.png b/Resources/Textures/Structures/Storage/closet.rsi/blue_door.png
index 070ba79ed079c6..dfcee2b7cfa596 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/blue_door.png and b/Resources/Textures/Structures/Storage/closet.rsi/blue_door.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/bomb.png b/Resources/Textures/Structures/Storage/closet.rsi/bomb.png
index 4166703ee8a882..9321b7a8c0d0ef 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/bomb.png and b/Resources/Textures/Structures/Storage/closet.rsi/bomb.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/bomb_door.png b/Resources/Textures/Structures/Storage/closet.rsi/bomb_door.png
index ef326afd362963..2c9796ebd4b877 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/bomb_door.png and b/Resources/Textures/Structures/Storage/closet.rsi/bomb_door.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/bomb_open.png b/Resources/Textures/Structures/Storage/closet.rsi/bomb_open.png
index ad07e6fdd6c5c3..e253a74274e928 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/bomb_open.png and b/Resources/Textures/Structures/Storage/closet.rsi/bomb_open.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/brigmedic.png b/Resources/Textures/Structures/Storage/closet.rsi/brigmedic.png
index 3946b284e6d829..5c91452a37e7c3 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/brigmedic.png and b/Resources/Textures/Structures/Storage/closet.rsi/brigmedic.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/brigmedic_door.png b/Resources/Textures/Structures/Storage/closet.rsi/brigmedic_door.png
index 0534af870c8d4e..03195551b94c20 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/brigmedic_door.png and b/Resources/Textures/Structures/Storage/closet.rsi/brigmedic_door.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/cabinet.png b/Resources/Textures/Structures/Storage/closet.rsi/cabinet.png
index e7b012ff949ce0..22c7cfa69ea5e9 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/cabinet.png and b/Resources/Textures/Structures/Storage/closet.rsi/cabinet.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/cabinet_door.png b/Resources/Textures/Structures/Storage/closet.rsi/cabinet_door.png
index e004d3e43d74b9..a8d8392074585c 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/cabinet_door.png and b/Resources/Textures/Structures/Storage/closet.rsi/cabinet_door.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/cabinet_open.png b/Resources/Textures/Structures/Storage/closet.rsi/cabinet_open.png
index 4ead750b31ade7..75baa0653e7bc4 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/cabinet_open.png and b/Resources/Textures/Structures/Storage/closet.rsi/cabinet_open.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/cap.png b/Resources/Textures/Structures/Storage/closet.rsi/cap.png
index 820d9c4b9e7a73..95c89a7a699002 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/cap.png and b/Resources/Textures/Structures/Storage/closet.rsi/cap.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/cap_door.png b/Resources/Textures/Structures/Storage/closet.rsi/cap_door.png
index b80523d66e48a7..63ef6550a14339 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/cap_door.png and b/Resources/Textures/Structures/Storage/closet.rsi/cap_door.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/cap_open.png b/Resources/Textures/Structures/Storage/closet.rsi/cap_open.png
index 1f8e0cdc7d2b9b..85fea0e74dcbd6 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/cap_open.png and b/Resources/Textures/Structures/Storage/closet.rsi/cap_open.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/cargo.png b/Resources/Textures/Structures/Storage/closet.rsi/cargo.png
index 146b78d917d6d8..d16fbcd8d6ab46 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/cargo.png and b/Resources/Textures/Structures/Storage/closet.rsi/cargo.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/cargo_door.png b/Resources/Textures/Structures/Storage/closet.rsi/cargo_door.png
index bd9a8aaf86cc08..1dee31db54adca 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/cargo_door.png and b/Resources/Textures/Structures/Storage/closet.rsi/cargo_door.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/cargo_open.png b/Resources/Textures/Structures/Storage/closet.rsi/cargo_open.png
index 84aa52103e52f0..210a5dd0eb88a4 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/cargo_open.png and b/Resources/Textures/Structures/Storage/closet.rsi/cargo_open.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/ce.png b/Resources/Textures/Structures/Storage/closet.rsi/ce.png
index fbbc7c06f8aab4..5830f9289e8d1e 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/ce.png and b/Resources/Textures/Structures/Storage/closet.rsi/ce.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/ce_door.png b/Resources/Textures/Structures/Storage/closet.rsi/ce_door.png
index 3d4a96e56d104c..86bb5906f27899 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/ce_door.png and b/Resources/Textures/Structures/Storage/closet.rsi/ce_door.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/ce_open.png b/Resources/Textures/Structures/Storage/closet.rsi/ce_open.png
index 827ca8f2083c4a..85fea0e74dcbd6 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/ce_open.png and b/Resources/Textures/Structures/Storage/closet.rsi/ce_open.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/chemical_door.png b/Resources/Textures/Structures/Storage/closet.rsi/chemical_door.png
index 63ab4f468cd9bc..e8fae35324a172 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/chemical_door.png and b/Resources/Textures/Structures/Storage/closet.rsi/chemical_door.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/clown.png b/Resources/Textures/Structures/Storage/closet.rsi/clown.png
index e84db4906e1255..ceba76905cd945 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/clown.png and b/Resources/Textures/Structures/Storage/closet.rsi/clown.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/clown_door.png b/Resources/Textures/Structures/Storage/closet.rsi/clown_door.png
index db53379a028d34..d59f74817bc4ea 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/clown_door.png and b/Resources/Textures/Structures/Storage/closet.rsi/clown_door.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/clown_open.png b/Resources/Textures/Structures/Storage/closet.rsi/clown_open.png
index 5e89726c581718..210a5dd0eb88a4 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/clown_open.png and b/Resources/Textures/Structures/Storage/closet.rsi/clown_open.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/cmo.png b/Resources/Textures/Structures/Storage/closet.rsi/cmo.png
index fc002ac1d90161..9c4d8d5deafbc3 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/cmo.png and b/Resources/Textures/Structures/Storage/closet.rsi/cmo.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/cmo_door.png b/Resources/Textures/Structures/Storage/closet.rsi/cmo_door.png
index 51fae89fb4432c..86f89e232d1616 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/cmo_door.png and b/Resources/Textures/Structures/Storage/closet.rsi/cmo_door.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/cmo_open.png b/Resources/Textures/Structures/Storage/closet.rsi/cmo_open.png
index bf1152065004f3..85fea0e74dcbd6 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/cmo_open.png and b/Resources/Textures/Structures/Storage/closet.rsi/cmo_open.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/emergency.png b/Resources/Textures/Structures/Storage/closet.rsi/emergency.png
index 7898b15d4e4953..919cafa255b315 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/emergency.png and b/Resources/Textures/Structures/Storage/closet.rsi/emergency.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/emergency_door.png b/Resources/Textures/Structures/Storage/closet.rsi/emergency_door.png
index 0eed199759742d..f7298bc54e1a9e 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/emergency_door.png and b/Resources/Textures/Structures/Storage/closet.rsi/emergency_door.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/emergency_open.png b/Resources/Textures/Structures/Storage/closet.rsi/emergency_open.png
index a9882106489cc0..3a81c42d17f307 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/emergency_open.png and b/Resources/Textures/Structures/Storage/closet.rsi/emergency_open.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/eng.png b/Resources/Textures/Structures/Storage/closet.rsi/eng.png
index db038888264c66..1b67a5a2462284 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/eng.png and b/Resources/Textures/Structures/Storage/closet.rsi/eng.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/eng_elec_door.png b/Resources/Textures/Structures/Storage/closet.rsi/eng_elec_door.png
index 4a2693c6658487..2113a4c67de972 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/eng_elec_door.png and b/Resources/Textures/Structures/Storage/closet.rsi/eng_elec_door.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/eng_open.png b/Resources/Textures/Structures/Storage/closet.rsi/eng_open.png
index 0beb4b678ae749..e253a74274e928 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/eng_open.png and b/Resources/Textures/Structures/Storage/closet.rsi/eng_open.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/eng_rad_door.png b/Resources/Textures/Structures/Storage/closet.rsi/eng_rad_door.png
index d2b2643b0a6e06..fd33707f2f9cce 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/eng_rad_door.png and b/Resources/Textures/Structures/Storage/closet.rsi/eng_rad_door.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/eng_secure.png b/Resources/Textures/Structures/Storage/closet.rsi/eng_secure.png
index 40a34a405ea7a7..2a34f5c4bf207c 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/eng_secure.png and b/Resources/Textures/Structures/Storage/closet.rsi/eng_secure.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/eng_secure_door.png b/Resources/Textures/Structures/Storage/closet.rsi/eng_secure_door.png
index 48b6cc684d56a6..de1c2d5b668d53 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/eng_secure_door.png and b/Resources/Textures/Structures/Storage/closet.rsi/eng_secure_door.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/eng_secure_open.png b/Resources/Textures/Structures/Storage/closet.rsi/eng_secure_open.png
index 0307b87e0a59b7..210a5dd0eb88a4 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/eng_secure_open.png and b/Resources/Textures/Structures/Storage/closet.rsi/eng_secure_open.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/eng_tool_door.png b/Resources/Textures/Structures/Storage/closet.rsi/eng_tool_door.png
index 70bd0f5b3bcc8d..c3cb53c76a82ba 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/eng_tool_door.png and b/Resources/Textures/Structures/Storage/closet.rsi/eng_tool_door.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/eng_weld_door.png b/Resources/Textures/Structures/Storage/closet.rsi/eng_weld_door.png
index bd3e4e93a6a6cb..177f6c71eb4fba 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/eng_weld_door.png and b/Resources/Textures/Structures/Storage/closet.rsi/eng_weld_door.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/fire.png b/Resources/Textures/Structures/Storage/closet.rsi/fire.png
index fdc24e14696c8d..860032b0dfb058 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/fire.png and b/Resources/Textures/Structures/Storage/closet.rsi/fire.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/fire_door.png b/Resources/Textures/Structures/Storage/closet.rsi/fire_door.png
index 9a9dc584d36cc1..90558496907e12 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/fire_door.png and b/Resources/Textures/Structures/Storage/closet.rsi/fire_door.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/fire_open.png b/Resources/Textures/Structures/Storage/closet.rsi/fire_open.png
index b0e5c177e66a47..00e51a7dafe6c4 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/fire_open.png and b/Resources/Textures/Structures/Storage/closet.rsi/fire_open.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/freezer.png b/Resources/Textures/Structures/Storage/closet.rsi/freezer.png
index 68d8bf4ad718fc..9aaa8907dc8245 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/freezer.png and b/Resources/Textures/Structures/Storage/closet.rsi/freezer.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/freezer_door.png b/Resources/Textures/Structures/Storage/closet.rsi/freezer_door.png
index 1d098cc8460cd9..b599c88551462f 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/freezer_door.png and b/Resources/Textures/Structures/Storage/closet.rsi/freezer_door.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/freezer_icon.png b/Resources/Textures/Structures/Storage/closet.rsi/freezer_icon.png
index ab148aa7cb258b..2c180b7b21fe18 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/freezer_icon.png and b/Resources/Textures/Structures/Storage/closet.rsi/freezer_icon.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/freezer_open.png b/Resources/Textures/Structures/Storage/closet.rsi/freezer_open.png
index 8e32b786392518..80fe765332fc07 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/freezer_open.png and b/Resources/Textures/Structures/Storage/closet.rsi/freezer_open.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/generic.png b/Resources/Textures/Structures/Storage/closet.rsi/generic.png
index cd0c0ff2ea19a9..db46cb881cc7af 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/generic.png and b/Resources/Textures/Structures/Storage/closet.rsi/generic.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/generic_door.png b/Resources/Textures/Structures/Storage/closet.rsi/generic_door.png
index 26498527779b4d..5b8b9c2fd92740 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/generic_door.png and b/Resources/Textures/Structures/Storage/closet.rsi/generic_door.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/generic_icon.png b/Resources/Textures/Structures/Storage/closet.rsi/generic_icon.png
index 2487eae1fdd116..0f0b1c185d9767 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/generic_icon.png and b/Resources/Textures/Structures/Storage/closet.rsi/generic_icon.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/generic_open.png b/Resources/Textures/Structures/Storage/closet.rsi/generic_open.png
index 01ed5bf73b6c54..e32e44af5e9d37 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/generic_open.png and b/Resources/Textures/Structures/Storage/closet.rsi/generic_open.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/green_door.png b/Resources/Textures/Structures/Storage/closet.rsi/green_door.png
index fff7ffbc3ddb67..d8c7ba1e835286 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/green_door.png and b/Resources/Textures/Structures/Storage/closet.rsi/green_door.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/grey_door.png b/Resources/Textures/Structures/Storage/closet.rsi/grey_door.png
index d4d877d7662661..7d970ffe5a67e5 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/grey_door.png and b/Resources/Textures/Structures/Storage/closet.rsi/grey_door.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/hop.png b/Resources/Textures/Structures/Storage/closet.rsi/hop.png
index b72372656e99f0..ef3b3e46c4321c 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/hop.png and b/Resources/Textures/Structures/Storage/closet.rsi/hop.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/hop_door.png b/Resources/Textures/Structures/Storage/closet.rsi/hop_door.png
index c8ef16d9349e00..e980214707e076 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/hop_door.png and b/Resources/Textures/Structures/Storage/closet.rsi/hop_door.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/hop_open.png b/Resources/Textures/Structures/Storage/closet.rsi/hop_open.png
index e3025fe37e37e5..85fea0e74dcbd6 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/hop_open.png and b/Resources/Textures/Structures/Storage/closet.rsi/hop_open.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/hos.png b/Resources/Textures/Structures/Storage/closet.rsi/hos.png
index 644a4845bd0355..c0c61696660076 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/hos.png and b/Resources/Textures/Structures/Storage/closet.rsi/hos.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/hos_door.png b/Resources/Textures/Structures/Storage/closet.rsi/hos_door.png
index 70a0617de9344e..87c654f94eb66c 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/hos_door.png and b/Resources/Textures/Structures/Storage/closet.rsi/hos_door.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/hos_open.png b/Resources/Textures/Structures/Storage/closet.rsi/hos_open.png
index 18682e6c64158d..85fea0e74dcbd6 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/hos_open.png and b/Resources/Textures/Structures/Storage/closet.rsi/hos_open.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/hydro.png b/Resources/Textures/Structures/Storage/closet.rsi/hydro.png
index 709a94ddae967e..684b886e4e50f9 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/hydro.png and b/Resources/Textures/Structures/Storage/closet.rsi/hydro.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/hydro_door.png b/Resources/Textures/Structures/Storage/closet.rsi/hydro_door.png
index 19471d491fb28e..7e8d4a5fc9fc97 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/hydro_door.png and b/Resources/Textures/Structures/Storage/closet.rsi/hydro_door.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/hydro_open.png b/Resources/Textures/Structures/Storage/closet.rsi/hydro_open.png
index 863d2cc63dc3ce..210a5dd0eb88a4 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/hydro_open.png and b/Resources/Textures/Structures/Storage/closet.rsi/hydro_open.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/janitor_bomb.png b/Resources/Textures/Structures/Storage/closet.rsi/janitor_bomb.png
index a25fb4a6ed747a..85a5c46f85bc2a 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/janitor_bomb.png and b/Resources/Textures/Structures/Storage/closet.rsi/janitor_bomb.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/janitor_bomb_door.png b/Resources/Textures/Structures/Storage/closet.rsi/janitor_bomb_door.png
index f90fd31254e7f4..87f985d1fe9a8e 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/janitor_bomb_door.png and b/Resources/Textures/Structures/Storage/closet.rsi/janitor_bomb_door.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/janitor_bomb_open.png b/Resources/Textures/Structures/Storage/closet.rsi/janitor_bomb_open.png
index 2e0e6f716f2acf..e253a74274e928 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/janitor_bomb_open.png and b/Resources/Textures/Structures/Storage/closet.rsi/janitor_bomb_open.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/locked.png b/Resources/Textures/Structures/Storage/closet.rsi/locked.png
index d90218d19e26a9..39177dd1b27694 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/locked.png and b/Resources/Textures/Structures/Storage/closet.rsi/locked.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/med.png b/Resources/Textures/Structures/Storage/closet.rsi/med.png
index b51e8e1e760ce6..a484e772edbe54 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/med.png and b/Resources/Textures/Structures/Storage/closet.rsi/med.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/med_door.png b/Resources/Textures/Structures/Storage/closet.rsi/med_door.png
index 4651806d8d6ecf..caa71328aa0cac 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/med_door.png and b/Resources/Textures/Structures/Storage/closet.rsi/med_door.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/med_open.png b/Resources/Textures/Structures/Storage/closet.rsi/med_open.png
index 0753a8987b4677..0dd5823522eb7b 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/med_open.png and b/Resources/Textures/Structures/Storage/closet.rsi/med_open.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/med_secure.png b/Resources/Textures/Structures/Storage/closet.rsi/med_secure.png
index 01936972ffe1a2..16c52fe1bff881 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/med_secure.png and b/Resources/Textures/Structures/Storage/closet.rsi/med_secure.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/med_secure_door.png b/Resources/Textures/Structures/Storage/closet.rsi/med_secure_door.png
index 43040db0df3408..ac5a4439dc8c6d 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/med_secure_door.png and b/Resources/Textures/Structures/Storage/closet.rsi/med_secure_door.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/med_secure_open.png b/Resources/Textures/Structures/Storage/closet.rsi/med_secure_open.png
index d365ba2f837e7e..aa4d775b727c0b 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/med_secure_open.png and b/Resources/Textures/Structures/Storage/closet.rsi/med_secure_open.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/meta.json b/Resources/Textures/Structures/Storage/closet.rsi/meta.json
index 9f43a13946a1bb..eced09288b35e3 100644
--- a/Resources/Textures/Structures/Storage/closet.rsi/meta.json
+++ b/Resources/Textures/Structures/Storage/closet.rsi/meta.json
@@ -4,7 +4,7 @@
"x": 32,
"y": 32
},
- "copyright": "Taken from tgstation, brigmedic locker is a resprited CMO locker by PuroSlavKing (Github), n2 sprites based on fire and emergency sprites",
+ "copyright": "Taken from tgstation from https://github.com/tgstation/tgstation/pull/85491. Resprited for 32x32 dimensions.",
"license": "CC-BY-SA-3.0",
"states": [
{
@@ -561,14 +561,6 @@
},
{
"name": "representative_door"
- },
- {
- "name": "littletykescar",
- "directions": 4
- },
- {
- "name": "littletykescar_open",
- "directions": 4
}
]
}
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/mime.png b/Resources/Textures/Structures/Storage/closet.rsi/mime.png
index 80e7a67d32e521..16c52fe1bff881 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/mime.png and b/Resources/Textures/Structures/Storage/closet.rsi/mime.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/mime_door.png b/Resources/Textures/Structures/Storage/closet.rsi/mime_door.png
index 45f3657175e753..da8b383fc6a583 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/mime_door.png and b/Resources/Textures/Structures/Storage/closet.rsi/mime_door.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/mime_open.png b/Resources/Textures/Structures/Storage/closet.rsi/mime_open.png
index fca2d509216ac1..191a334dbef74e 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/mime_open.png and b/Resources/Textures/Structures/Storage/closet.rsi/mime_open.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/mining.png b/Resources/Textures/Structures/Storage/closet.rsi/mining.png
index 131d938dabc83d..a655329163965a 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/mining.png and b/Resources/Textures/Structures/Storage/closet.rsi/mining.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/mining_door.png b/Resources/Textures/Structures/Storage/closet.rsi/mining_door.png
index 685af949ea5102..1ca0b4b431930c 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/mining_door.png and b/Resources/Textures/Structures/Storage/closet.rsi/mining_door.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/mining_open.png b/Resources/Textures/Structures/Storage/closet.rsi/mining_open.png
index bca49707546a6c..210a5dd0eb88a4 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/mining_open.png and b/Resources/Textures/Structures/Storage/closet.rsi/mining_open.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/mixed_door.png b/Resources/Textures/Structures/Storage/closet.rsi/mixed_door.png
index 772b9ba09ea3bc..a1410590c05209 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/mixed_door.png and b/Resources/Textures/Structures/Storage/closet.rsi/mixed_door.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/n2.png b/Resources/Textures/Structures/Storage/closet.rsi/n2.png
index c7b975f763b60f..860032b0dfb058 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/n2.png and b/Resources/Textures/Structures/Storage/closet.rsi/n2.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/n2_door.png b/Resources/Textures/Structures/Storage/closet.rsi/n2_door.png
index a1e279b81b10e1..965b8b30b71fad 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/n2_door.png and b/Resources/Textures/Structures/Storage/closet.rsi/n2_door.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/n2_open.png b/Resources/Textures/Structures/Storage/closet.rsi/n2_open.png
index 9851d97c0a0cf1..00e51a7dafe6c4 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/n2_open.png and b/Resources/Textures/Structures/Storage/closet.rsi/n2_open.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/orange_door.png b/Resources/Textures/Structures/Storage/closet.rsi/orange_door.png
index 28a233aed942cc..425ae023b9526f 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/orange_door.png and b/Resources/Textures/Structures/Storage/closet.rsi/orange_door.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/paramed.png b/Resources/Textures/Structures/Storage/closet.rsi/paramed.png
index 245fa9cea17b25..619dfb35eabfec 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/paramed.png and b/Resources/Textures/Structures/Storage/closet.rsi/paramed.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/paramed_door.png b/Resources/Textures/Structures/Storage/closet.rsi/paramed_door.png
index 5588ffcd11ff1a..8325089b919f65 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/paramed_door.png and b/Resources/Textures/Structures/Storage/closet.rsi/paramed_door.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/paramed_open.png b/Resources/Textures/Structures/Storage/closet.rsi/paramed_open.png
index d365ba2f837e7e..aa4d775b727c0b 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/paramed_open.png and b/Resources/Textures/Structures/Storage/closet.rsi/paramed_open.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/pink_door.png b/Resources/Textures/Structures/Storage/closet.rsi/pink_door.png
index 446158f8c6c5ef..512e70f307869b 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/pink_door.png and b/Resources/Textures/Structures/Storage/closet.rsi/pink_door.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/qm.png b/Resources/Textures/Structures/Storage/closet.rsi/qm.png
index 9870b812a7b05c..164995f5ca621d 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/qm.png and b/Resources/Textures/Structures/Storage/closet.rsi/qm.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/qm_door.png b/Resources/Textures/Structures/Storage/closet.rsi/qm_door.png
index 8568de2bb36ef3..79899384df463c 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/qm_door.png and b/Resources/Textures/Structures/Storage/closet.rsi/qm_door.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/qm_open.png b/Resources/Textures/Structures/Storage/closet.rsi/qm_open.png
index 84aa52103e52f0..85fea0e74dcbd6 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/qm_open.png and b/Resources/Textures/Structures/Storage/closet.rsi/qm_open.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/rd.png b/Resources/Textures/Structures/Storage/closet.rsi/rd.png
index c2cf564af2eaea..a739eb3168050b 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/rd.png and b/Resources/Textures/Structures/Storage/closet.rsi/rd.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/rd_door.png b/Resources/Textures/Structures/Storage/closet.rsi/rd_door.png
index aee46909d266ec..90888f9714c9d1 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/rd_door.png and b/Resources/Textures/Structures/Storage/closet.rsi/rd_door.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/rd_open.png b/Resources/Textures/Structures/Storage/closet.rsi/rd_open.png
index 7fbdb151ee92f6..85fea0e74dcbd6 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/rd_open.png and b/Resources/Textures/Structures/Storage/closet.rsi/rd_open.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/red_door.png b/Resources/Textures/Structures/Storage/closet.rsi/red_door.png
index db028e9e1e22d1..be687a1ae0eef7 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/red_door.png and b/Resources/Textures/Structures/Storage/closet.rsi/red_door.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/representative_door.png b/Resources/Textures/Structures/Storage/closet.rsi/representative_door.png
index 474cf1ba272aa2..4a137f836a2eb6 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/representative_door.png and b/Resources/Textures/Structures/Storage/closet.rsi/representative_door.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/science.png b/Resources/Textures/Structures/Storage/closet.rsi/science.png
index 3a10fee58ecda9..2f44be63215a99 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/science.png and b/Resources/Textures/Structures/Storage/closet.rsi/science.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/science_door.png b/Resources/Textures/Structures/Storage/closet.rsi/science_door.png
index a4075095236edd..910206fbd0aeff 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/science_door.png and b/Resources/Textures/Structures/Storage/closet.rsi/science_door.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/science_open.png b/Resources/Textures/Structures/Storage/closet.rsi/science_open.png
index 039b747226fa2e..210a5dd0eb88a4 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/science_open.png and b/Resources/Textures/Structures/Storage/closet.rsi/science_open.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/sec.png b/Resources/Textures/Structures/Storage/closet.rsi/sec.png
index f27757cf7c7f70..fcf113b8b5b145 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/sec.png and b/Resources/Textures/Structures/Storage/closet.rsi/sec.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/sec_door.png b/Resources/Textures/Structures/Storage/closet.rsi/sec_door.png
index 0c211d159b5382..a06cbaf7553886 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/sec_door.png and b/Resources/Textures/Structures/Storage/closet.rsi/sec_door.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/sec_open.png b/Resources/Textures/Structures/Storage/closet.rsi/sec_open.png
index f50ff803b0664a..8c853efd0b519c 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/sec_open.png and b/Resources/Textures/Structures/Storage/closet.rsi/sec_open.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/secure.png b/Resources/Textures/Structures/Storage/closet.rsi/secure.png
index 1c1a305ebe3399..db46cb881cc7af 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/secure.png and b/Resources/Textures/Structures/Storage/closet.rsi/secure.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/secure_door.png b/Resources/Textures/Structures/Storage/closet.rsi/secure_door.png
index 6e2507406eb47c..f0e34de3e077d3 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/secure_door.png and b/Resources/Textures/Structures/Storage/closet.rsi/secure_door.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/secure_icon.png b/Resources/Textures/Structures/Storage/closet.rsi/secure_icon.png
index 03b98c64db4675..888cfd72cf79d0 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/secure_icon.png and b/Resources/Textures/Structures/Storage/closet.rsi/secure_icon.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/secure_open.png b/Resources/Textures/Structures/Storage/closet.rsi/secure_open.png
index 8437fe8a9860b7..92915c85126913 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/secure_open.png and b/Resources/Textures/Structures/Storage/closet.rsi/secure_open.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/shotguncase.png b/Resources/Textures/Structures/Storage/closet.rsi/shotguncase.png
index 8af8da190667b5..cd699edd42f859 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/shotguncase.png and b/Resources/Textures/Structures/Storage/closet.rsi/shotguncase.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/shotguncase_door.png b/Resources/Textures/Structures/Storage/closet.rsi/shotguncase_door.png
index de486de093aafa..a8e80300fdc1d2 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/shotguncase_door.png and b/Resources/Textures/Structures/Storage/closet.rsi/shotguncase_door.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/shotguncase_open.png b/Resources/Textures/Structures/Storage/closet.rsi/shotguncase_open.png
index 4d2d27196c262f..2fdbfa25723c63 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/shotguncase_open.png and b/Resources/Textures/Structures/Storage/closet.rsi/shotguncase_open.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/syndicate.png b/Resources/Textures/Structures/Storage/closet.rsi/syndicate.png
index a02210e579a512..fd805c93e93c1b 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/syndicate.png and b/Resources/Textures/Structures/Storage/closet.rsi/syndicate.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/syndicate_door.png b/Resources/Textures/Structures/Storage/closet.rsi/syndicate_door.png
index 3011253d036297..cb18e384851ca2 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/syndicate_door.png and b/Resources/Textures/Structures/Storage/closet.rsi/syndicate_door.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/syndicate_open.png b/Resources/Textures/Structures/Storage/closet.rsi/syndicate_open.png
index a879eb63c1b684..46d439ce6d237c 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/syndicate_open.png and b/Resources/Textures/Structures/Storage/closet.rsi/syndicate_open.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/unlocked.png b/Resources/Textures/Structures/Storage/closet.rsi/unlocked.png
index 418607bfaf59e0..1a4b6c29328f31 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/unlocked.png and b/Resources/Textures/Structures/Storage/closet.rsi/unlocked.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/warden.png b/Resources/Textures/Structures/Storage/closet.rsi/warden.png
index 08a9fb29e7532b..243a88f718417d 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/warden.png and b/Resources/Textures/Structures/Storage/closet.rsi/warden.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/warden_door.png b/Resources/Textures/Structures/Storage/closet.rsi/warden_door.png
index 4de649abc4371a..04a4f87b25642e 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/warden_door.png and b/Resources/Textures/Structures/Storage/closet.rsi/warden_door.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/warden_open.png b/Resources/Textures/Structures/Storage/closet.rsi/warden_open.png
index f50ff803b0664a..85fea0e74dcbd6 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/warden_open.png and b/Resources/Textures/Structures/Storage/closet.rsi/warden_open.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/white_door.png b/Resources/Textures/Structures/Storage/closet.rsi/white_door.png
index 802e18e25f02fb..ff1684f784ee78 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/white_door.png and b/Resources/Textures/Structures/Storage/closet.rsi/white_door.png differ
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/yellow_door.png b/Resources/Textures/Structures/Storage/closet.rsi/yellow_door.png
index a8c6ff0fbf2ccf..7904a2f0c38f28 100644
Binary files a/Resources/Textures/Structures/Storage/closet.rsi/yellow_door.png and b/Resources/Textures/Structures/Storage/closet.rsi/yellow_door.png differ
diff --git a/Resources/Textures/Structures/Storage/suit_storage.rsi/base.png b/Resources/Textures/Structures/Storage/suit_storage.rsi/base.png
index 0de3196726e0a8..dd05bcc27d3bd7 100644
Binary files a/Resources/Textures/Structures/Storage/suit_storage.rsi/base.png and b/Resources/Textures/Structures/Storage/suit_storage.rsi/base.png differ
diff --git a/Resources/Textures/Structures/Storage/suit_storage.rsi/door.png b/Resources/Textures/Structures/Storage/suit_storage.rsi/door.png
index 53ab3f15cc4aa1..4578a19c1d955e 100644
Binary files a/Resources/Textures/Structures/Storage/suit_storage.rsi/door.png and b/Resources/Textures/Structures/Storage/suit_storage.rsi/door.png differ
diff --git a/Resources/Textures/Structures/Storage/suit_storage.rsi/locked.png b/Resources/Textures/Structures/Storage/suit_storage.rsi/locked.png
index 454c035fdd3229..4252b2d0f47ffc 100644
Binary files a/Resources/Textures/Structures/Storage/suit_storage.rsi/locked.png and b/Resources/Textures/Structures/Storage/suit_storage.rsi/locked.png differ
diff --git a/Resources/Textures/Structures/Storage/suit_storage.rsi/meta.json b/Resources/Textures/Structures/Storage/suit_storage.rsi/meta.json
index 561b5678da2f8c..1d60a32b0bebb5 100644
--- a/Resources/Textures/Structures/Storage/suit_storage.rsi/meta.json
+++ b/Resources/Textures/Structures/Storage/suit_storage.rsi/meta.json
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
- "copyright": "Taken from /tg/station commit https://github.com/tgstation/tgstation/commit/af7b7043df593807f7a98b7a07880d7a977cda14 and resprited by Alekshhh, welded state drawn by Flareguy for Space Station 14",
+ "copyright": "Taken from tgstation from https://github.com/tgstation/tgstation/pull/85491, with minor respriting adjustments.",
"size": {
"x": 32,
"y": 32
diff --git a/Resources/Textures/Structures/Storage/suit_storage.rsi/panel.png b/Resources/Textures/Structures/Storage/suit_storage.rsi/panel.png
index 9f587b0025d2f7..11be9c002e95ff 100644
Binary files a/Resources/Textures/Structures/Storage/suit_storage.rsi/panel.png and b/Resources/Textures/Structures/Storage/suit_storage.rsi/panel.png differ
diff --git a/Resources/Textures/Structures/Storage/suit_storage.rsi/unlocked.png b/Resources/Textures/Structures/Storage/suit_storage.rsi/unlocked.png
index 3ad29d8317f341..d9b2d44cbd4bfc 100644
Binary files a/Resources/Textures/Structures/Storage/suit_storage.rsi/unlocked.png and b/Resources/Textures/Structures/Storage/suit_storage.rsi/unlocked.png differ
diff --git a/Resources/Textures/Structures/Storage/suit_storage.rsi/welded.png b/Resources/Textures/Structures/Storage/suit_storage.rsi/welded.png
index b01290de40f315..c6b9f00e9dd404 100644
Binary files a/Resources/Textures/Structures/Storage/suit_storage.rsi/welded.png and b/Resources/Textures/Structures/Storage/suit_storage.rsi/welded.png differ
diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/fueltank-2-1.png b/Resources/Textures/Structures/Storage/tanks.rsi/fueltank-2-1.png
deleted file mode 100644
index 7762e721270916..00000000000000
Binary files a/Resources/Textures/Structures/Storage/tanks.rsi/fueltank-2-1.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/fueltank-2-2.png b/Resources/Textures/Structures/Storage/tanks.rsi/fueltank-2-2.png
deleted file mode 100644
index 28611bf0584aa9..00000000000000
Binary files a/Resources/Textures/Structures/Storage/tanks.rsi/fueltank-2-2.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/fueltank-2-3.png b/Resources/Textures/Structures/Storage/tanks.rsi/fueltank-2-3.png
deleted file mode 100644
index c4cb4609d52083..00000000000000
Binary files a/Resources/Textures/Structures/Storage/tanks.rsi/fueltank-2-3.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/fueltank-2.png b/Resources/Textures/Structures/Storage/tanks.rsi/fueltank-2.png
index 5a193dc798e498..8dd4ed80e27344 100644
Binary files a/Resources/Textures/Structures/Storage/tanks.rsi/fueltank-2.png and b/Resources/Textures/Structures/Storage/tanks.rsi/fueltank-2.png differ
diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/fueltank.png b/Resources/Textures/Structures/Storage/tanks.rsi/fueltank.png
index 6daab863e380be..8dd4ed80e27344 100644
Binary files a/Resources/Textures/Structures/Storage/tanks.rsi/fueltank.png and b/Resources/Textures/Structures/Storage/tanks.rsi/fueltank.png differ
diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/highfueltank-2-1.png b/Resources/Textures/Structures/Storage/tanks.rsi/highfueltank-2-1.png
deleted file mode 100644
index 7ee4ba996cc442..00000000000000
Binary files a/Resources/Textures/Structures/Storage/tanks.rsi/highfueltank-2-1.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/highfueltank-2-2.png b/Resources/Textures/Structures/Storage/tanks.rsi/highfueltank-2-2.png
deleted file mode 100644
index 94399242b95307..00000000000000
Binary files a/Resources/Textures/Structures/Storage/tanks.rsi/highfueltank-2-2.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/highfueltank-2-3.png b/Resources/Textures/Structures/Storage/tanks.rsi/highfueltank-2-3.png
deleted file mode 100644
index 3a44e4c45c799e..00000000000000
Binary files a/Resources/Textures/Structures/Storage/tanks.rsi/highfueltank-2-3.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/highfueltank-2-4.png b/Resources/Textures/Structures/Storage/tanks.rsi/highfueltank-2-4.png
deleted file mode 100644
index 4bd1de4bb689e1..00000000000000
Binary files a/Resources/Textures/Structures/Storage/tanks.rsi/highfueltank-2-4.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/highfueltank-2-5.png b/Resources/Textures/Structures/Storage/tanks.rsi/highfueltank-2-5.png
deleted file mode 100644
index 41a42d683d23a5..00000000000000
Binary files a/Resources/Textures/Structures/Storage/tanks.rsi/highfueltank-2-5.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/highfueltank-2-6.png b/Resources/Textures/Structures/Storage/tanks.rsi/highfueltank-2-6.png
deleted file mode 100644
index 2da7e8de261cb6..00000000000000
Binary files a/Resources/Textures/Structures/Storage/tanks.rsi/highfueltank-2-6.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/highfueltank-2-7.png b/Resources/Textures/Structures/Storage/tanks.rsi/highfueltank-2-7.png
deleted file mode 100644
index 3d880f13222804..00000000000000
Binary files a/Resources/Textures/Structures/Storage/tanks.rsi/highfueltank-2-7.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/highfueltank-2.png b/Resources/Textures/Structures/Storage/tanks.rsi/highfueltank-2.png
index 221b2c62f54af4..6af3c53c07be28 100644
Binary files a/Resources/Textures/Structures/Storage/tanks.rsi/highfueltank-2.png and b/Resources/Textures/Structures/Storage/tanks.rsi/highfueltank-2.png differ
diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/hightank-2-1.png b/Resources/Textures/Structures/Storage/tanks.rsi/hightank-2-1.png
new file mode 100644
index 00000000000000..e2bbce7dccfa1a
Binary files /dev/null and b/Resources/Textures/Structures/Storage/tanks.rsi/hightank-2-1.png differ
diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/hightank-2-2.png b/Resources/Textures/Structures/Storage/tanks.rsi/hightank-2-2.png
new file mode 100644
index 00000000000000..52038b04b87cb9
Binary files /dev/null and b/Resources/Textures/Structures/Storage/tanks.rsi/hightank-2-2.png differ
diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/hightank-2-3.png b/Resources/Textures/Structures/Storage/tanks.rsi/hightank-2-3.png
new file mode 100644
index 00000000000000..7f71c3c58ae248
Binary files /dev/null and b/Resources/Textures/Structures/Storage/tanks.rsi/hightank-2-3.png differ
diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/hightank-2-4.png b/Resources/Textures/Structures/Storage/tanks.rsi/hightank-2-4.png
new file mode 100644
index 00000000000000..c21c679afe0d5e
Binary files /dev/null and b/Resources/Textures/Structures/Storage/tanks.rsi/hightank-2-4.png differ
diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/hightank-2-5.png b/Resources/Textures/Structures/Storage/tanks.rsi/hightank-2-5.png
new file mode 100644
index 00000000000000..fac632b2322e01
Binary files /dev/null and b/Resources/Textures/Structures/Storage/tanks.rsi/hightank-2-5.png differ
diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/highwatertank-2-1.png b/Resources/Textures/Structures/Storage/tanks.rsi/highwatertank-2-1.png
deleted file mode 100644
index 7ee4ba996cc442..00000000000000
Binary files a/Resources/Textures/Structures/Storage/tanks.rsi/highwatertank-2-1.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/highwatertank-2-2.png b/Resources/Textures/Structures/Storage/tanks.rsi/highwatertank-2-2.png
deleted file mode 100644
index 94399242b95307..00000000000000
Binary files a/Resources/Textures/Structures/Storage/tanks.rsi/highwatertank-2-2.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/highwatertank-2-3.png b/Resources/Textures/Structures/Storage/tanks.rsi/highwatertank-2-3.png
deleted file mode 100644
index 3a44e4c45c799e..00000000000000
Binary files a/Resources/Textures/Structures/Storage/tanks.rsi/highwatertank-2-3.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/highwatertank-2-4.png b/Resources/Textures/Structures/Storage/tanks.rsi/highwatertank-2-4.png
deleted file mode 100644
index 0d05a27c5d4ae7..00000000000000
Binary files a/Resources/Textures/Structures/Storage/tanks.rsi/highwatertank-2-4.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/highwatertank-2-5.png b/Resources/Textures/Structures/Storage/tanks.rsi/highwatertank-2-5.png
deleted file mode 100644
index 50b6075df5b04e..00000000000000
Binary files a/Resources/Textures/Structures/Storage/tanks.rsi/highwatertank-2-5.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/highwatertank-2-6.png b/Resources/Textures/Structures/Storage/tanks.rsi/highwatertank-2-6.png
deleted file mode 100644
index 5d0e0c5713b656..00000000000000
Binary files a/Resources/Textures/Structures/Storage/tanks.rsi/highwatertank-2-6.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/highwatertank-2-7.png b/Resources/Textures/Structures/Storage/tanks.rsi/highwatertank-2-7.png
deleted file mode 100644
index e610d87d820ba4..00000000000000
Binary files a/Resources/Textures/Structures/Storage/tanks.rsi/highwatertank-2-7.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/highwatertank-2.png b/Resources/Textures/Structures/Storage/tanks.rsi/highwatertank-2.png
index 817873ed92d456..830d46a5392793 100644
Binary files a/Resources/Textures/Structures/Storage/tanks.rsi/highwatertank-2.png and b/Resources/Textures/Structures/Storage/tanks.rsi/highwatertank-2.png differ
diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/meta.json b/Resources/Textures/Structures/Storage/tanks.rsi/meta.json
index c4d31e80b26514..2e1bdf92d10dc3 100644
--- a/Resources/Textures/Structures/Storage/tanks.rsi/meta.json
+++ b/Resources/Textures/Structures/Storage/tanks.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/8442af39ee82b813194f71db82edd2923d97818d, watercooler Taken from paradise at https://github.com/ParadiseSS13/Paradise/commit/ae2258d9235752ac6d80ec11e36553fe3b6ae59e, dispensers taken from paradise at https://github.com/ParadiseSS13/Paradise/commit/846ce475b2258a4336d8895f07f2c0f4053963bc",
+ "copyright": "Tanks taken from Eris https://github.com/discordia-space/CEV-Eris/blob/master/icons/obj/objects.dmi, watercooler Taken from paradise at https://github.com/ParadiseSS13/Paradise/commit/ae2258d9235752ac6d80ec11e36553fe3b6ae59e, dispensers taken from paradise at https://github.com/ParadiseSS13/Paradise/commit/846ce475b2258a4336d8895f07f2c0f4053963bc",
"size": {
"x": 32,
"y": 32
@@ -26,79 +26,43 @@
"name": "watertank-2"
},
{
- "name": "watertank-2-1"
+ "name": "tank-2-1"
},
{
- "name": "watertank-2-2"
+ "name": "tank-2-2"
},
{
- "name": "watertank-2-3"
+ "name": "tank-2-3"
},
{
- "name": "watertank-2-4"
+ "name": "tank-2-4"
},
{
- "name": "watertank-2-5"
+ "name": "tank-2-5"
},
{
"name": "fueltank-2"
},
- {
- "name": "fueltank-2-1"
- },
- {
- "name": "fueltank-2-2"
- },
- {
- "name": "fueltank-2-3"
- },
{
"name": "highwatertank-2"
},
- {
- "name": "highwatertank-2-1"
- },
- {
- "name": "highwatertank-2-2"
- },
- {
- "name": "highwatertank-2-3"
- },
- {
- "name": "highwatertank-2-4"
- },
- {
- "name": "highwatertank-2-5"
- },
- {
- "name": "highwatertank-2-6"
- },
- {
- "name": "highwatertank-2-7"
- },
{
"name": "highfueltank-2"
},
{
- "name": "highfueltank-2-1"
- },
- {
- "name": "highfueltank-2-2"
- },
- {
- "name": "highfueltank-2-3"
+ "name": "hightank-2-1"
},
{
- "name": "highfueltank-2-4"
+ "name": "hightank-2-2"
},
{
- "name": "highfueltank-2-5"
+ "name": "hightank-2-3"
},
{
- "name": "highfueltank-2-6"
+ "name": "hightank-2-4"
},
{
- "name": "highfueltank-2-7"
+ "name": "hightank-2-5"
},
{
"name": "watercooler-2"
diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/tank-2-1.png b/Resources/Textures/Structures/Storage/tanks.rsi/tank-2-1.png
new file mode 100644
index 00000000000000..d0bdf4a173a2c3
Binary files /dev/null and b/Resources/Textures/Structures/Storage/tanks.rsi/tank-2-1.png differ
diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/tank-2-2.png b/Resources/Textures/Structures/Storage/tanks.rsi/tank-2-2.png
new file mode 100644
index 00000000000000..da4d980a8cf0d7
Binary files /dev/null and b/Resources/Textures/Structures/Storage/tanks.rsi/tank-2-2.png differ
diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/tank-2-3.png b/Resources/Textures/Structures/Storage/tanks.rsi/tank-2-3.png
new file mode 100644
index 00000000000000..4bb34291b2f0af
Binary files /dev/null and b/Resources/Textures/Structures/Storage/tanks.rsi/tank-2-3.png differ
diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/tank-2-4.png b/Resources/Textures/Structures/Storage/tanks.rsi/tank-2-4.png
new file mode 100644
index 00000000000000..16592bdac285b0
Binary files /dev/null and b/Resources/Textures/Structures/Storage/tanks.rsi/tank-2-4.png differ
diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/tank-2-5.png b/Resources/Textures/Structures/Storage/tanks.rsi/tank-2-5.png
new file mode 100644
index 00000000000000..657e3aef735c54
Binary files /dev/null and b/Resources/Textures/Structures/Storage/tanks.rsi/tank-2-5.png differ
diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/watertank-2-1.png b/Resources/Textures/Structures/Storage/tanks.rsi/watertank-2-1.png
deleted file mode 100644
index 41c5afb8815a8c..00000000000000
Binary files a/Resources/Textures/Structures/Storage/tanks.rsi/watertank-2-1.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/watertank-2-2.png b/Resources/Textures/Structures/Storage/tanks.rsi/watertank-2-2.png
deleted file mode 100644
index 6c353994c48869..00000000000000
Binary files a/Resources/Textures/Structures/Storage/tanks.rsi/watertank-2-2.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/watertank-2-3.png b/Resources/Textures/Structures/Storage/tanks.rsi/watertank-2-3.png
deleted file mode 100644
index f0218c89d212ff..00000000000000
Binary files a/Resources/Textures/Structures/Storage/tanks.rsi/watertank-2-3.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/watertank-2-4.png b/Resources/Textures/Structures/Storage/tanks.rsi/watertank-2-4.png
deleted file mode 100644
index 75505d0e5c2cee..00000000000000
Binary files a/Resources/Textures/Structures/Storage/tanks.rsi/watertank-2-4.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/watertank-2-5.png b/Resources/Textures/Structures/Storage/tanks.rsi/watertank-2-5.png
deleted file mode 100644
index e81b6e99747e9f..00000000000000
Binary files a/Resources/Textures/Structures/Storage/tanks.rsi/watertank-2-5.png and /dev/null differ
diff --git a/Resources/Textures/Structures/Storage/tanks.rsi/watertank-2.png b/Resources/Textures/Structures/Storage/tanks.rsi/watertank-2.png
index 184f8314586476..83d2b80cb98b0d 100644
Binary files a/Resources/Textures/Structures/Storage/tanks.rsi/watertank-2.png and b/Resources/Textures/Structures/Storage/tanks.rsi/watertank-2.png differ
diff --git a/Resources/Textures/Structures/Storage/wall_locker.rsi/emergency.png b/Resources/Textures/Structures/Storage/wall_locker.rsi/emergency.png
index adc1a5f903923b..996405cea0f9e6 100644
Binary files a/Resources/Textures/Structures/Storage/wall_locker.rsi/emergency.png and b/Resources/Textures/Structures/Storage/wall_locker.rsi/emergency.png differ
diff --git a/Resources/Textures/Structures/Storage/wall_locker.rsi/emergency_door.png b/Resources/Textures/Structures/Storage/wall_locker.rsi/emergency_door.png
index a4db426752f157..62a486e8e3a28d 100644
Binary files a/Resources/Textures/Structures/Storage/wall_locker.rsi/emergency_door.png and b/Resources/Textures/Structures/Storage/wall_locker.rsi/emergency_door.png differ
diff --git a/Resources/Textures/Structures/Storage/wall_locker.rsi/emergency_open.png b/Resources/Textures/Structures/Storage/wall_locker.rsi/emergency_open.png
index 13c48821afc3a4..407c9a4213a466 100644
Binary files a/Resources/Textures/Structures/Storage/wall_locker.rsi/emergency_open.png and b/Resources/Textures/Structures/Storage/wall_locker.rsi/emergency_open.png differ
diff --git a/Resources/Textures/Structures/Storage/wall_locker.rsi/emergencynit.png b/Resources/Textures/Structures/Storage/wall_locker.rsi/emergencynit.png
index fbe438223925e6..6ed664c559d2ad 100644
Binary files a/Resources/Textures/Structures/Storage/wall_locker.rsi/emergencynit.png and b/Resources/Textures/Structures/Storage/wall_locker.rsi/emergencynit.png differ
diff --git a/Resources/Textures/Structures/Storage/wall_locker.rsi/emergencynit_door.png b/Resources/Textures/Structures/Storage/wall_locker.rsi/emergencynit_door.png
index a55ed961de18b2..454ddc07a4bfbe 100644
Binary files a/Resources/Textures/Structures/Storage/wall_locker.rsi/emergencynit_door.png and b/Resources/Textures/Structures/Storage/wall_locker.rsi/emergencynit_door.png differ
diff --git a/Resources/Textures/Structures/Storage/wall_locker.rsi/emergencynit_open.png b/Resources/Textures/Structures/Storage/wall_locker.rsi/emergencynit_open.png
index aa743ba3dfb41e..9820b75cfe8696 100644
Binary files a/Resources/Textures/Structures/Storage/wall_locker.rsi/emergencynit_open.png and b/Resources/Textures/Structures/Storage/wall_locker.rsi/emergencynit_open.png differ
diff --git a/Resources/Textures/Structures/Storage/wall_locker.rsi/fire.png b/Resources/Textures/Structures/Storage/wall_locker.rsi/fire.png
index 19da33015160eb..8af4834388ede4 100644
Binary files a/Resources/Textures/Structures/Storage/wall_locker.rsi/fire.png and b/Resources/Textures/Structures/Storage/wall_locker.rsi/fire.png differ
diff --git a/Resources/Textures/Structures/Storage/wall_locker.rsi/fire_door.png b/Resources/Textures/Structures/Storage/wall_locker.rsi/fire_door.png
index b670493c89ccf3..32a2830e4c2eab 100644
Binary files a/Resources/Textures/Structures/Storage/wall_locker.rsi/fire_door.png and b/Resources/Textures/Structures/Storage/wall_locker.rsi/fire_door.png differ
diff --git a/Resources/Textures/Structures/Storage/wall_locker.rsi/fire_open.png b/Resources/Textures/Structures/Storage/wall_locker.rsi/fire_open.png
index 3fa1f68bba1452..7b7ad050e1ca44 100644
Binary files a/Resources/Textures/Structures/Storage/wall_locker.rsi/fire_open.png and b/Resources/Textures/Structures/Storage/wall_locker.rsi/fire_open.png differ
diff --git a/Resources/Textures/Structures/Storage/wall_locker.rsi/generic.png b/Resources/Textures/Structures/Storage/wall_locker.rsi/generic.png
index 6806e85f43fadb..a775cd7132969e 100644
Binary files a/Resources/Textures/Structures/Storage/wall_locker.rsi/generic.png and b/Resources/Textures/Structures/Storage/wall_locker.rsi/generic.png differ
diff --git a/Resources/Textures/Structures/Storage/wall_locker.rsi/generic_door.png b/Resources/Textures/Structures/Storage/wall_locker.rsi/generic_door.png
index 07c4d1336d0bdc..de752a91a121d3 100644
Binary files a/Resources/Textures/Structures/Storage/wall_locker.rsi/generic_door.png and b/Resources/Textures/Structures/Storage/wall_locker.rsi/generic_door.png differ
diff --git a/Resources/Textures/Structures/Storage/wall_locker.rsi/generic_icon.png b/Resources/Textures/Structures/Storage/wall_locker.rsi/generic_icon.png
index 63e9dcb0fad5eb..fa2d0a2cf9e0a4 100644
Binary files a/Resources/Textures/Structures/Storage/wall_locker.rsi/generic_icon.png and b/Resources/Textures/Structures/Storage/wall_locker.rsi/generic_icon.png differ
diff --git a/Resources/Textures/Structures/Storage/wall_locker.rsi/generic_open.png b/Resources/Textures/Structures/Storage/wall_locker.rsi/generic_open.png
index 6122db13f86d11..93ecdd614b763f 100644
Binary files a/Resources/Textures/Structures/Storage/wall_locker.rsi/generic_open.png and b/Resources/Textures/Structures/Storage/wall_locker.rsi/generic_open.png differ
diff --git a/Resources/Textures/Structures/Storage/wall_locker.rsi/gray_door.png b/Resources/Textures/Structures/Storage/wall_locker.rsi/gray_door.png
index c223f60a3cab93..a7432934373181 100644
Binary files a/Resources/Textures/Structures/Storage/wall_locker.rsi/gray_door.png and b/Resources/Textures/Structures/Storage/wall_locker.rsi/gray_door.png differ
diff --git a/Resources/Textures/Structures/Storage/wall_locker.rsi/green_door.png b/Resources/Textures/Structures/Storage/wall_locker.rsi/green_door.png
index b9c0977ade27e7..45d71c49232719 100644
Binary files a/Resources/Textures/Structures/Storage/wall_locker.rsi/green_door.png and b/Resources/Textures/Structures/Storage/wall_locker.rsi/green_door.png differ
diff --git a/Resources/Textures/Structures/Storage/wall_locker.rsi/locked.png b/Resources/Textures/Structures/Storage/wall_locker.rsi/locked.png
index 53f33d7893e800..814c2541ccd6b4 100644
Binary files a/Resources/Textures/Structures/Storage/wall_locker.rsi/locked.png and b/Resources/Textures/Structures/Storage/wall_locker.rsi/locked.png differ
diff --git a/Resources/Textures/Structures/Storage/wall_locker.rsi/med.png b/Resources/Textures/Structures/Storage/wall_locker.rsi/med.png
index 231240bb205ee2..a9c21bfee19715 100644
Binary files a/Resources/Textures/Structures/Storage/wall_locker.rsi/med.png and b/Resources/Textures/Structures/Storage/wall_locker.rsi/med.png differ
diff --git a/Resources/Textures/Structures/Storage/wall_locker.rsi/med_door.png b/Resources/Textures/Structures/Storage/wall_locker.rsi/med_door.png
index 479297ff34ef7c..e6c8e2955c2089 100644
Binary files a/Resources/Textures/Structures/Storage/wall_locker.rsi/med_door.png and b/Resources/Textures/Structures/Storage/wall_locker.rsi/med_door.png differ
diff --git a/Resources/Textures/Structures/Storage/wall_locker.rsi/med_open.png b/Resources/Textures/Structures/Storage/wall_locker.rsi/med_open.png
index 3e34a349c26042..6c895e922c7410 100644
Binary files a/Resources/Textures/Structures/Storage/wall_locker.rsi/med_open.png and b/Resources/Textures/Structures/Storage/wall_locker.rsi/med_open.png differ
diff --git a/Resources/Textures/Structures/Storage/wall_locker.rsi/mixed_door.png b/Resources/Textures/Structures/Storage/wall_locker.rsi/mixed_door.png
index dc9a559e57e406..c0deb7abfc23c5 100644
Binary files a/Resources/Textures/Structures/Storage/wall_locker.rsi/mixed_door.png and b/Resources/Textures/Structures/Storage/wall_locker.rsi/mixed_door.png differ
diff --git a/Resources/Textures/Structures/Storage/wall_locker.rsi/orange_door.png b/Resources/Textures/Structures/Storage/wall_locker.rsi/orange_door.png
index 893752ea7e7b8f..602dafef2f0d00 100644
Binary files a/Resources/Textures/Structures/Storage/wall_locker.rsi/orange_door.png and b/Resources/Textures/Structures/Storage/wall_locker.rsi/orange_door.png differ
diff --git a/Resources/Textures/Structures/Storage/wall_locker.rsi/pink_door.png b/Resources/Textures/Structures/Storage/wall_locker.rsi/pink_door.png
index a9d23ace4bd34a..fd6a4c73182d7d 100644
Binary files a/Resources/Textures/Structures/Storage/wall_locker.rsi/pink_door.png and b/Resources/Textures/Structures/Storage/wall_locker.rsi/pink_door.png differ
diff --git a/Resources/Textures/Structures/Storage/wall_locker.rsi/red_door.png b/Resources/Textures/Structures/Storage/wall_locker.rsi/red_door.png
index c2e8c6a1ed2816..ce8fe7b938dd1f 100644
Binary files a/Resources/Textures/Structures/Storage/wall_locker.rsi/red_door.png and b/Resources/Textures/Structures/Storage/wall_locker.rsi/red_door.png differ
diff --git a/Resources/Textures/Structures/Storage/wall_locker.rsi/unlocked.png b/Resources/Textures/Structures/Storage/wall_locker.rsi/unlocked.png
index 8c761c05adb2ae..04dff3d7eb008d 100644
Binary files a/Resources/Textures/Structures/Storage/wall_locker.rsi/unlocked.png and b/Resources/Textures/Structures/Storage/wall_locker.rsi/unlocked.png differ
diff --git a/Resources/Textures/Structures/Storage/wall_locker.rsi/welded.png b/Resources/Textures/Structures/Storage/wall_locker.rsi/welded.png
index 355d7fa0cb2d93..dc7b5fc70b30c3 100644
Binary files a/Resources/Textures/Structures/Storage/wall_locker.rsi/welded.png and b/Resources/Textures/Structures/Storage/wall_locker.rsi/welded.png differ
diff --git a/Resources/Textures/Structures/Storage/wall_locker.rsi/white_door.png b/Resources/Textures/Structures/Storage/wall_locker.rsi/white_door.png
index 3d42e08b60b06c..03873dee15ca81 100644
Binary files a/Resources/Textures/Structures/Storage/wall_locker.rsi/white_door.png and b/Resources/Textures/Structures/Storage/wall_locker.rsi/white_door.png differ
diff --git a/Resources/Textures/Structures/Storage/wall_locker.rsi/yellow_door.png b/Resources/Textures/Structures/Storage/wall_locker.rsi/yellow_door.png
index d321695596d4f1..ec28c166f54e05 100644
Binary files a/Resources/Textures/Structures/Storage/wall_locker.rsi/yellow_door.png and b/Resources/Textures/Structures/Storage/wall_locker.rsi/yellow_door.png differ
diff --git a/Resources/Textures/_Impstation/Clothing/Head/Hoods/hoodpassenger.rsi/equipped-HELMET.png b/Resources/Textures/_Impstation/Clothing/Head/Hoods/hoodpassenger.rsi/equipped-HELMET.png
new file mode 100644
index 00000000000000..32571d3cae30a0
Binary files /dev/null and b/Resources/Textures/_Impstation/Clothing/Head/Hoods/hoodpassenger.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/_Impstation/Clothing/Head/Hoods/hoodpassenger.rsi/icon.png b/Resources/Textures/_Impstation/Clothing/Head/Hoods/hoodpassenger.rsi/icon.png
new file mode 100644
index 00000000000000..68241a06b1a90e
Binary files /dev/null and b/Resources/Textures/_Impstation/Clothing/Head/Hoods/hoodpassenger.rsi/icon.png differ
diff --git a/Resources/Textures/_Impstation/Clothing/Head/Hoods/hoodpassenger.rsi/meta.json b/Resources/Textures/_Impstation/Clothing/Head/Hoods/hoodpassenger.rsi/meta.json
new file mode 100644
index 00000000000000..4b64fa30284f6c
--- /dev/null
+++ b/Resources/Textures/_Impstation/Clothing/Head/Hoods/hoodpassenger.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "made by widgetbeck, based on the goliath cloak hood from ss14",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Impstation/Clothing/Head/Soft/brigmedicsoft.rsi/equipped-HELMET.png b/Resources/Textures/_Impstation/Clothing/Head/Soft/brigmedicsoft.rsi/equipped-HELMET.png
new file mode 100644
index 00000000000000..8f8948da9b2094
Binary files /dev/null and b/Resources/Textures/_Impstation/Clothing/Head/Soft/brigmedicsoft.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/_Impstation/Clothing/Head/Soft/brigmedicsoft.rsi/flipped-equipped-HELMET.png b/Resources/Textures/_Impstation/Clothing/Head/Soft/brigmedicsoft.rsi/flipped-equipped-HELMET.png
new file mode 100644
index 00000000000000..1f5cc6f793114a
Binary files /dev/null and b/Resources/Textures/_Impstation/Clothing/Head/Soft/brigmedicsoft.rsi/flipped-equipped-HELMET.png differ
diff --git a/Resources/Textures/_Impstation/Clothing/Head/Soft/brigmedicsoft.rsi/flipped-inhand-left.png b/Resources/Textures/_Impstation/Clothing/Head/Soft/brigmedicsoft.rsi/flipped-inhand-left.png
new file mode 100644
index 00000000000000..6ce1f4b5a6ffa5
Binary files /dev/null and b/Resources/Textures/_Impstation/Clothing/Head/Soft/brigmedicsoft.rsi/flipped-inhand-left.png differ
diff --git a/Resources/Textures/_Impstation/Clothing/Head/Soft/brigmedicsoft.rsi/flipped-inhand-right.png b/Resources/Textures/_Impstation/Clothing/Head/Soft/brigmedicsoft.rsi/flipped-inhand-right.png
new file mode 100644
index 00000000000000..d6542863a47060
Binary files /dev/null and b/Resources/Textures/_Impstation/Clothing/Head/Soft/brigmedicsoft.rsi/flipped-inhand-right.png differ
diff --git a/Resources/Textures/_Impstation/Clothing/Head/Soft/brigmedicsoft.rsi/icon.png b/Resources/Textures/_Impstation/Clothing/Head/Soft/brigmedicsoft.rsi/icon.png
new file mode 100644
index 00000000000000..c5ec7547de9bdb
Binary files /dev/null and b/Resources/Textures/_Impstation/Clothing/Head/Soft/brigmedicsoft.rsi/icon.png differ
diff --git a/Resources/Textures/_Impstation/Clothing/Head/Soft/brigmedicsoft.rsi/icon_flipped.png b/Resources/Textures/_Impstation/Clothing/Head/Soft/brigmedicsoft.rsi/icon_flipped.png
new file mode 100644
index 00000000000000..367488e0fc4d6d
Binary files /dev/null and b/Resources/Textures/_Impstation/Clothing/Head/Soft/brigmedicsoft.rsi/icon_flipped.png differ
diff --git a/Resources/Textures/_Impstation/Clothing/Head/Soft/brigmedicsoft.rsi/inhand-left.png b/Resources/Textures/_Impstation/Clothing/Head/Soft/brigmedicsoft.rsi/inhand-left.png
new file mode 100644
index 00000000000000..0675485469f01a
Binary files /dev/null and b/Resources/Textures/_Impstation/Clothing/Head/Soft/brigmedicsoft.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Impstation/Clothing/Head/Soft/brigmedicsoft.rsi/inhand-right.png b/Resources/Textures/_Impstation/Clothing/Head/Soft/brigmedicsoft.rsi/inhand-right.png
new file mode 100644
index 00000000000000..da023dfb748d58
Binary files /dev/null and b/Resources/Textures/_Impstation/Clothing/Head/Soft/brigmedicsoft.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Impstation/Clothing/Head/Soft/brigmedicsoft.rsi/meta.json b/Resources/Textures/_Impstation/Clothing/Head/Soft/brigmedicsoft.rsi/meta.json
new file mode 100644
index 00000000000000..664da3e291b434
--- /dev/null
+++ b/Resources/Textures/_Impstation/Clothing/Head/Soft/brigmedicsoft.rsi/meta.json
@@ -0,0 +1,41 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Made by Sha-Seng (Github) for Impstation",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "icon_flipped"
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "flipped-equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "flipped-inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ },
+ {
+ "name": "flipped-inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Impstation/Clothing/Neck/Cloaks/passenger.rsi/equipped-NECK.png b/Resources/Textures/_Impstation/Clothing/Neck/Cloaks/passenger.rsi/equipped-NECK.png
new file mode 100644
index 00000000000000..0db18c0b6b3a83
Binary files /dev/null and b/Resources/Textures/_Impstation/Clothing/Neck/Cloaks/passenger.rsi/equipped-NECK.png differ
diff --git a/Resources/Textures/_Impstation/Clothing/Neck/Cloaks/passenger.rsi/folded-equipped-NECK.png b/Resources/Textures/_Impstation/Clothing/Neck/Cloaks/passenger.rsi/folded-equipped-NECK.png
new file mode 100644
index 00000000000000..e393948a80d6e7
Binary files /dev/null and b/Resources/Textures/_Impstation/Clothing/Neck/Cloaks/passenger.rsi/folded-equipped-NECK.png differ
diff --git a/Resources/Textures/_Impstation/Clothing/Neck/Cloaks/passenger.rsi/icon.png b/Resources/Textures/_Impstation/Clothing/Neck/Cloaks/passenger.rsi/icon.png
new file mode 100644
index 00000000000000..da943b3694aef3
Binary files /dev/null and b/Resources/Textures/_Impstation/Clothing/Neck/Cloaks/passenger.rsi/icon.png differ
diff --git a/Resources/Textures/_Impstation/Clothing/Neck/Cloaks/passenger.rsi/inhand-left.png b/Resources/Textures/_Impstation/Clothing/Neck/Cloaks/passenger.rsi/inhand-left.png
new file mode 100644
index 00000000000000..64f3ce05267b3a
Binary files /dev/null and b/Resources/Textures/_Impstation/Clothing/Neck/Cloaks/passenger.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Impstation/Clothing/Neck/Cloaks/passenger.rsi/inhand-right.png b/Resources/Textures/_Impstation/Clothing/Neck/Cloaks/passenger.rsi/inhand-right.png
new file mode 100644
index 00000000000000..ee5228df0c27b7
Binary files /dev/null and b/Resources/Textures/_Impstation/Clothing/Neck/Cloaks/passenger.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Impstation/Clothing/Neck/Cloaks/passenger.rsi/meta.json b/Resources/Textures/_Impstation/Clothing/Neck/Cloaks/passenger.rsi/meta.json
new file mode 100644
index 00000000000000..4ee5d1a05aebe2
--- /dev/null
+++ b/Resources/Textures/_Impstation/Clothing/Neck/Cloaks/passenger.rsi/meta.json
@@ -0,0 +1,30 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Made by Widgetbeck (github) for Space Station 14",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-NECK",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-NECK",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Shoes/Misc/heelsblack.rsi/equipped-FEET.png b/Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelsblack.rsi/equipped-FEET.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/Misc/heelsblack.rsi/equipped-FEET.png
rename to Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelsblack.rsi/equipped-FEET.png
diff --git a/Resources/Textures/Clothing/Shoes/Misc/heelsblack.rsi/icon.png b/Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelsblack.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/Misc/heelsblack.rsi/icon.png
rename to Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelsblack.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Shoes/Misc/heelsblack.rsi/inhand-left.png b/Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelsblack.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/Misc/heelsblack.rsi/inhand-left.png
rename to Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelsblack.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Shoes/Misc/heelsblack.rsi/inhand-right.png b/Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelsblack.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/Misc/heelsblack.rsi/inhand-right.png
rename to Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelsblack.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Shoes/Misc/heelsblack.rsi/meta.json b/Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelsblack.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/Misc/heelsblack.rsi/meta.json
rename to Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelsblack.rsi/meta.json
diff --git a/Resources/Textures/Clothing/Shoes/Misc/heelsblue.rsi/equipped-FEET.png b/Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelsblue.rsi/equipped-FEET.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/Misc/heelsblue.rsi/equipped-FEET.png
rename to Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelsblue.rsi/equipped-FEET.png
diff --git a/Resources/Textures/Clothing/Shoes/Misc/heelsblue.rsi/icon.png b/Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelsblue.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/Misc/heelsblue.rsi/icon.png
rename to Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelsblue.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Shoes/Misc/heelsblue.rsi/inhand-left.png b/Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelsblue.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/Misc/heelsblue.rsi/inhand-left.png
rename to Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelsblue.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Shoes/Misc/heelsblue.rsi/inhand-right.png b/Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelsblue.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/Misc/heelsblue.rsi/inhand-right.png
rename to Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelsblue.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Shoes/Misc/heelsblue.rsi/meta.json b/Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelsblue.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/Misc/heelsblue.rsi/meta.json
rename to Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelsblue.rsi/meta.json
diff --git a/Resources/Textures/Clothing/Shoes/Misc/heelsbrown.rsi/equipped-FEET.png b/Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelsbrown.rsi/equipped-FEET.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/Misc/heelsbrown.rsi/equipped-FEET.png
rename to Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelsbrown.rsi/equipped-FEET.png
diff --git a/Resources/Textures/Clothing/Shoes/Misc/heelsbrown.rsi/icon.png b/Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelsbrown.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/Misc/heelsbrown.rsi/icon.png
rename to Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelsbrown.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Shoes/Misc/heelsbrown.rsi/inhand-left.png b/Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelsbrown.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/Misc/heelsbrown.rsi/inhand-left.png
rename to Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelsbrown.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Shoes/Misc/heelsbrown.rsi/inhand-right.png b/Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelsbrown.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/Misc/heelsbrown.rsi/inhand-right.png
rename to Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelsbrown.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Shoes/Misc/heelsbrown.rsi/meta.json b/Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelsbrown.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/Misc/heelsbrown.rsi/meta.json
rename to Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelsbrown.rsi/meta.json
diff --git a/Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelscommandblack.rsi/equipped-FEET.png b/Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelscommandblack.rsi/equipped-FEET.png
new file mode 100644
index 00000000000000..af1827d295b697
Binary files /dev/null and b/Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelscommandblack.rsi/equipped-FEET.png differ
diff --git a/Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelscommandblack.rsi/icon.png b/Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelscommandblack.rsi/icon.png
new file mode 100644
index 00000000000000..884524410a80ec
Binary files /dev/null and b/Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelscommandblack.rsi/icon.png differ
diff --git a/Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelscommandblack.rsi/inhand-left.png b/Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelscommandblack.rsi/inhand-left.png
new file mode 100644
index 00000000000000..f6ff5ed2de0536
Binary files /dev/null and b/Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelscommandblack.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelscommandblack.rsi/inhand-right.png b/Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelscommandblack.rsi/inhand-right.png
new file mode 100644
index 00000000000000..05f95aacd93d08
Binary files /dev/null and b/Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelscommandblack.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Misc/heelsgold.rsi/meta.json b/Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelscommandblack.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/Misc/heelsgold.rsi/meta.json
rename to Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelscommandblack.rsi/meta.json
diff --git a/Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelscommandblue.rsi/equipped-FEET.png b/Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelscommandblue.rsi/equipped-FEET.png
new file mode 100644
index 00000000000000..bb36f406e9b0d7
Binary files /dev/null and b/Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelscommandblue.rsi/equipped-FEET.png differ
diff --git a/Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelscommandblue.rsi/icon.png b/Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelscommandblue.rsi/icon.png
new file mode 100644
index 00000000000000..e943e25d6ffc0c
Binary files /dev/null and b/Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelscommandblue.rsi/icon.png differ
diff --git a/Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelscommandblue.rsi/inhand-left.png b/Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelscommandblue.rsi/inhand-left.png
new file mode 100644
index 00000000000000..3d153226ba5f53
Binary files /dev/null and b/Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelscommandblue.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelscommandblue.rsi/inhand-right.png b/Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelscommandblue.rsi/inhand-right.png
new file mode 100644
index 00000000000000..e15235e34920d3
Binary files /dev/null and b/Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelscommandblue.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Shoes/Misc/heelsgreen.rsi/meta.json b/Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelscommandblue.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/Misc/heelsgreen.rsi/meta.json
rename to Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelscommandblue.rsi/meta.json
diff --git a/Resources/Textures/Clothing/Shoes/Misc/heelsgold.rsi/equipped-FEET.png b/Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelsgold.rsi/equipped-FEET.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/Misc/heelsgold.rsi/equipped-FEET.png
rename to Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelsgold.rsi/equipped-FEET.png
diff --git a/Resources/Textures/Clothing/Shoes/Misc/heelsgold.rsi/icon.png b/Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelsgold.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/Misc/heelsgold.rsi/icon.png
rename to Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelsgold.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Shoes/Misc/heelsgold.rsi/inhand-left.png b/Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelsgold.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/Misc/heelsgold.rsi/inhand-left.png
rename to Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelsgold.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Shoes/Misc/heelsgold.rsi/inhand-right.png b/Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelsgold.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/Misc/heelsgold.rsi/inhand-right.png
rename to Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelsgold.rsi/inhand-right.png
diff --git a/Resources/Textures/Clothing/Shoes/Misc/heelsred.rsi/meta.json b/Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelsgold.rsi/meta.json
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/Misc/heelsred.rsi/meta.json
rename to Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelsgold.rsi/meta.json
diff --git a/Resources/Textures/Clothing/Shoes/Misc/heelsgreen.rsi/equipped-FEET.png b/Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelsgreen.rsi/equipped-FEET.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/Misc/heelsgreen.rsi/equipped-FEET.png
rename to Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelsgreen.rsi/equipped-FEET.png
diff --git a/Resources/Textures/Clothing/Shoes/Misc/heelsgreen.rsi/icon.png b/Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelsgreen.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/Misc/heelsgreen.rsi/icon.png
rename to Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelsgreen.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Shoes/Misc/heelsgreen.rsi/inhand-left.png b/Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelsgreen.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/Misc/heelsgreen.rsi/inhand-left.png
rename to Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelsgreen.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Shoes/Misc/heelsgreen.rsi/inhand-right.png b/Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelsgreen.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/Misc/heelsgreen.rsi/inhand-right.png
rename to Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelsgreen.rsi/inhand-right.png
diff --git a/Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelsgreen.rsi/meta.json b/Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelsgreen.rsi/meta.json
new file mode 100644
index 00000000000000..67e64dc4124a95
--- /dev/null
+++ b/Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelsgreen.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Made by honeyed_lemons_",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-FEET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/Clothing/Shoes/Misc/heelsred.rsi/equipped-FEET.png b/Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelsred.rsi/equipped-FEET.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/Misc/heelsred.rsi/equipped-FEET.png
rename to Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelsred.rsi/equipped-FEET.png
diff --git a/Resources/Textures/Clothing/Shoes/Misc/heelsred.rsi/icon.png b/Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelsred.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/Misc/heelsred.rsi/icon.png
rename to Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelsred.rsi/icon.png
diff --git a/Resources/Textures/Clothing/Shoes/Misc/heelsred.rsi/inhand-left.png b/Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelsred.rsi/inhand-left.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/Misc/heelsred.rsi/inhand-left.png
rename to Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelsred.rsi/inhand-left.png
diff --git a/Resources/Textures/Clothing/Shoes/Misc/heelsred.rsi/inhand-right.png b/Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelsred.rsi/inhand-right.png
similarity index 100%
rename from Resources/Textures/Clothing/Shoes/Misc/heelsred.rsi/inhand-right.png
rename to Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelsred.rsi/inhand-right.png
diff --git a/Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelsred.rsi/meta.json b/Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelsred.rsi/meta.json
new file mode 100644
index 00000000000000..67e64dc4124a95
--- /dev/null
+++ b/Resources/Textures/_Impstation/Clothing/Shoes/Heels/heelsred.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Made by honeyed_lemons_",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-FEET",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/spacegreytider.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/spacegreytider.rsi/equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000000..2a24344fa2f119
Binary files /dev/null and b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/spacegreytider.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/spacegreytider.rsi/folded-equipped-INNERCLOTHING.png b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/spacegreytider.rsi/folded-equipped-INNERCLOTHING.png
new file mode 100644
index 00000000000000..f0f56ecbe1bb73
Binary files /dev/null and b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/spacegreytider.rsi/folded-equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/spacegreytider.rsi/icon.png b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/spacegreytider.rsi/icon.png
new file mode 100644
index 00000000000000..67818ba355cb67
Binary files /dev/null and b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/spacegreytider.rsi/icon.png differ
diff --git a/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/spacegreytider.rsi/inhand-left.png b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/spacegreytider.rsi/inhand-left.png
new file mode 100644
index 00000000000000..7ff18eefe4c12b
Binary files /dev/null and b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/spacegreytider.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/spacegreytider.rsi/inhand-right.png b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/spacegreytider.rsi/inhand-right.png
new file mode 100644
index 00000000000000..aeeb01949a4b1f
Binary files /dev/null and b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/spacegreytider.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/spacegreytider.rsi/meta.json b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/spacegreytider.rsi/meta.json
new file mode 100644
index 00000000000000..1cc8641ab416c3
--- /dev/null
+++ b/Resources/Textures/_Impstation/Clothing/Uniforms/Jumpsuit/spacegreytider.rsi/meta.json
@@ -0,0 +1,30 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Made by Honeyed_Lemons for Impstation",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "folded-equipped-INNERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Impstation/CosmicCult/Clothing/cosmiccult_armor.rsi/equipped-HELMET-vox.png b/Resources/Textures/_Impstation/CosmicCult/Clothing/cosmiccult_armor.rsi/equipped-HELMET-vox.png
new file mode 100644
index 00000000000000..a34db7d41ad5f4
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Clothing/cosmiccult_armor.rsi/equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Clothing/cosmiccult_armor.rsi/equipped-HELMET.png b/Resources/Textures/_Impstation/CosmicCult/Clothing/cosmiccult_armor.rsi/equipped-HELMET.png
new file mode 100644
index 00000000000000..4b5764c817582f
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Clothing/cosmiccult_armor.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Clothing/cosmiccult_armor.rsi/equipped-OUTERCLOTHING-light.png b/Resources/Textures/_Impstation/CosmicCult/Clothing/cosmiccult_armor.rsi/equipped-OUTERCLOTHING-light.png
new file mode 100644
index 00000000000000..eb86d359c303d9
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Clothing/cosmiccult_armor.rsi/equipped-OUTERCLOTHING-light.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Clothing/cosmiccult_armor.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/_Impstation/CosmicCult/Clothing/cosmiccult_armor.rsi/equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 00000000000000..9173c486901a1e
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Clothing/cosmiccult_armor.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Clothing/cosmiccult_armor.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_Impstation/CosmicCult/Clothing/cosmiccult_armor.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 00000000000000..b1103bd0b783e1
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Clothing/cosmiccult_armor.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Clothing/cosmiccult_armor.rsi/icon-helmet.png b/Resources/Textures/_Impstation/CosmicCult/Clothing/cosmiccult_armor.rsi/icon-helmet.png
new file mode 100644
index 00000000000000..52b3d127cb6329
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Clothing/cosmiccult_armor.rsi/icon-helmet.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Clothing/cosmiccult_armor.rsi/icon-light.png b/Resources/Textures/_Impstation/CosmicCult/Clothing/cosmiccult_armor.rsi/icon-light.png
new file mode 100644
index 00000000000000..00898b17a295e2
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Clothing/cosmiccult_armor.rsi/icon-light.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Clothing/cosmiccult_armor.rsi/icon.png b/Resources/Textures/_Impstation/CosmicCult/Clothing/cosmiccult_armor.rsi/icon.png
new file mode 100644
index 00000000000000..0532831cb9712c
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Clothing/cosmiccult_armor.rsi/icon.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Clothing/cosmiccult_armor.rsi/inhand-left.png b/Resources/Textures/_Impstation/CosmicCult/Clothing/cosmiccult_armor.rsi/inhand-left.png
new file mode 100644
index 00000000000000..6bf8bc06c89024
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Clothing/cosmiccult_armor.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Clothing/cosmiccult_armor.rsi/inhand-right.png b/Resources/Textures/_Impstation/CosmicCult/Clothing/cosmiccult_armor.rsi/inhand-right.png
new file mode 100644
index 00000000000000..cb7c7a2a15dc6e
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Clothing/cosmiccult_armor.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Clothing/cosmiccult_armor.rsi/meta.json b/Resources/Textures/_Impstation/CosmicCult/Clothing/cosmiccult_armor.rsi/meta.json
new file mode 100644
index 00000000000000..ba72137ec00c84
--- /dev/null
+++ b/Resources/Textures/_Impstation/CosmicCult/Clothing/cosmiccult_armor.rsi/meta.json
@@ -0,0 +1,54 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "A custom item by AftrLite (Github).",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "icon-light"
+ },
+ {
+ "name": "icon-helmet"
+ },
+
+
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ },
+
+
+ {
+ "name": "equipped-OUTERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "equipped-OUTERCLOTHING-light",
+ "directions": 4
+ },
+ {
+ "name": "equipped-HELMET",
+ "directions": 4
+ },
+
+
+ {
+ "name": "equipped-OUTERCLOTHING-vox",
+ "directions": 4
+ },
+ {
+ "name": "equipped-HELMET-vox",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Impstation/CosmicCult/Effects/cultrevealed.rsi/effect.png b/Resources/Textures/_Impstation/CosmicCult/Effects/cultrevealed.rsi/effect.png
new file mode 100644
index 00000000000000..94564e3251abbf
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Effects/cultrevealed.rsi/effect.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Effects/cultrevealed.rsi/meta.json b/Resources/Textures/_Impstation/CosmicCult/Effects/cultrevealed.rsi/meta.json
new file mode 100644
index 00000000000000..9253807a18d57a
--- /dev/null
+++ b/Resources/Textures/_Impstation/CosmicCult/Effects/cultrevealed.rsi/meta.json
@@ -0,0 +1,57 @@
+{
+ "version": 1,
+ "size": {
+ "x": 64,
+ "y": 64
+ },
+ "license": "CC-BY-SA-3.0",
+ "copyright": "A custom item by AftrLite (Github).",
+ "states": [
+ {
+ "name": "effect",
+ "directions": 4,
+ "delays": [
+ [
+ 0.11,
+ 0.11,
+ 0.11,
+ 0.11,
+ 0.11,
+ 0.11,
+ 0.11,
+ 0.11
+ ],
+ [
+ 0.11,
+ 0.11,
+ 0.11,
+ 0.11,
+ 0.11,
+ 0.11,
+ 0.11,
+ 0.11
+ ],
+ [
+ 0.11,
+ 0.11,
+ 0.11,
+ 0.11,
+ 0.11,
+ 0.11,
+ 0.11,
+ 0.11
+ ],
+ [
+ 0.11,
+ 0.11,
+ 0.11,
+ 0.11,
+ 0.11,
+ 0.11,
+ 0.11,
+ 0.11
+ ]
+ ]
+ }
+ ]
+}
diff --git a/Resources/Textures/_Impstation/CosmicCult/Effects/lapse.rsi/crab.png b/Resources/Textures/_Impstation/CosmicCult/Effects/lapse.rsi/crab.png
new file mode 100644
index 00000000000000..41a6e417a77cda
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Effects/lapse.rsi/crab.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Effects/lapse.rsi/diona.png b/Resources/Textures/_Impstation/CosmicCult/Effects/lapse.rsi/diona.png
new file mode 100644
index 00000000000000..5edc4e4311ccbd
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Effects/lapse.rsi/diona.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Effects/lapse.rsi/humanoid.png b/Resources/Textures/_Impstation/CosmicCult/Effects/lapse.rsi/humanoid.png
new file mode 100644
index 00000000000000..74453f866523a9
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Effects/lapse.rsi/humanoid.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Effects/lapse.rsi/moth.png b/Resources/Textures/_Impstation/CosmicCult/Effects/lapse.rsi/moth.png
new file mode 100644
index 00000000000000..90215e6dcfdc0e
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Effects/lapse.rsi/moth.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Effects/lapse.rsi/snail.png b/Resources/Textures/_Impstation/CosmicCult/Effects/lapse.rsi/snail.png
new file mode 100644
index 00000000000000..16789199fe53ea
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Effects/lapse.rsi/snail.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Effects/lapse.rsi/spider.png b/Resources/Textures/_Impstation/CosmicCult/Effects/lapse.rsi/spider.png
new file mode 100644
index 00000000000000..5bf30c63c06d8c
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Effects/lapse.rsi/spider.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Effects/lapse.rsi/vox.png b/Resources/Textures/_Impstation/CosmicCult/Effects/lapse.rsi/vox.png
new file mode 100644
index 00000000000000..8b87db24ef0b71
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Effects/lapse.rsi/vox.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Effects/weaponarcs.rsi/arc_cosmic.png b/Resources/Textures/_Impstation/CosmicCult/Effects/weaponarcs.rsi/arc_cosmic.png
new file mode 100644
index 00000000000000..82b23449e22994
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Effects/weaponarcs.rsi/arc_cosmic.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Effects/weaponarcs.rsi/meta.json b/Resources/Textures/_Impstation/CosmicCult/Effects/weaponarcs.rsi/meta.json
new file mode 100644
index 00000000000000..8008579537a989
--- /dev/null
+++ b/Resources/Textures/_Impstation/CosmicCult/Effects/weaponarcs.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+ "version": 1,
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "license": "CC-BY-SA-3.0",
+ "copyright": "A custom item by AftrLite (Github).",
+ "states": [
+ {
+ "name": "arc_cosmic",
+ "delays": [
+ [
+ 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05, 0.05
+ ]
+ ]
+ }
+ ]
+}
diff --git a/Resources/Textures/_Impstation/CosmicCult/God/cosmicgod.rsi/god.png b/Resources/Textures/_Impstation/CosmicCult/God/cosmicgod.rsi/god.png
new file mode 100644
index 00000000000000..5d06dda15e3a64
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/God/cosmicgod.rsi/god.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/God/cosmicgod.rsi/meta.json b/Resources/Textures/_Impstation/CosmicCult/God/cosmicgod.rsi/meta.json
new file mode 100644
index 00000000000000..b3242c6ba60a93
--- /dev/null
+++ b/Resources/Textures/_Impstation/CosmicCult/God/cosmicgod.rsi/meta.json
@@ -0,0 +1,36 @@
+{
+ "version": 1,
+ "size": {
+ "x": 255,
+ "y": 260
+ },
+ "license": "CC-BY-SA-3.0",
+ "copyright": "A custom item by AftrLite (Github).",
+ "states": [
+ {
+ "name": "god",
+ "delays": [
+ [
+ 0.11, 0.11, 0.11, 0.11, 0.11,
+ 0.11, 0.11, 0.11, 0.11, 0.11,
+ 0.11, 0.11, 0.11, 0.11, 0.11,
+ 0.11, 0.11, 0.11, 0.11, 0.11,
+ 0.11, 0.11, 0.11, 0.11, 0.11
+ ]
+ ]
+ },
+ {
+ "name": "spawn",
+ "delays": [
+ [
+ 0.22, 0.22, 0.22, 0.22, 0.22, 0.22,
+ 0.11, 0.11, 0.11, 0.11, 0.11, 0.11,
+ 0.11, 0.11, 0.11, 0.11, 0.11, 0.11,
+ 0.11, 0.11, 0.11, 0.11, 0.11, 0.11,
+ 0.11, 0.11, 0.11, 0.11, 0.11, 0.11,
+ 0.11, 0.11, 0.11, 0.11, 0.11, 0.11
+ ]
+ ]
+ }
+ ]
+}
diff --git a/Resources/Textures/_Impstation/CosmicCult/God/cosmicgod.rsi/spawn.png b/Resources/Textures/_Impstation/CosmicCult/God/cosmicgod.rsi/spawn.png
new file mode 100644
index 00000000000000..fff55197faa69a
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/God/cosmicgod.rsi/spawn.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Icons/antag_icons.rsi/CosmicCult.png b/Resources/Textures/_Impstation/CosmicCult/Icons/antag_icons.rsi/CosmicCult.png
new file mode 100644
index 00000000000000..32233ae45310e0
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Icons/antag_icons.rsi/CosmicCult.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Icons/antag_icons.rsi/CosmicCultLead.png b/Resources/Textures/_Impstation/CosmicCult/Icons/antag_icons.rsi/CosmicCultLead.png
new file mode 100644
index 00000000000000..82805954f39223
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Icons/antag_icons.rsi/CosmicCultLead.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Icons/antag_icons.rsi/meta.json b/Resources/Textures/_Impstation/CosmicCult/Icons/antag_icons.rsi/meta.json
new file mode 100644
index 00000000000000..918de6be40e928
--- /dev/null
+++ b/Resources/Textures/_Impstation/CosmicCult/Icons/antag_icons.rsi/meta.json
@@ -0,0 +1,23 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "me me",
+
+ "size": {
+ "x": 10,
+ "y": 10
+ },
+ "states": [
+ {
+ "name": "CosmicCult"
+ },
+ {
+ "name": "CosmicCultLead",
+ "delays": [
+ [
+ 0.165, 0.165, 0.165, 0.165, 0.165, 0.165, 0.165
+ ]
+ ]
+ }
+ ]
+}
diff --git a/Resources/Textures/_Impstation/CosmicCult/Icons/cosmiccult_abilities.rsi/blank.png b/Resources/Textures/_Impstation/CosmicCult/Icons/cosmiccult_abilities.rsi/blank.png
new file mode 100644
index 00000000000000..21a11d91c09256
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Icons/cosmiccult_abilities.rsi/blank.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Icons/cosmiccult_abilities.rsi/compass.png b/Resources/Textures/_Impstation/CosmicCult/Icons/cosmiccult_abilities.rsi/compass.png
new file mode 100644
index 00000000000000..a8d470b2df30bc
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Icons/cosmiccult_abilities.rsi/compass.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Icons/cosmiccult_abilities.rsi/glare.png b/Resources/Textures/_Impstation/CosmicCult/Icons/cosmiccult_abilities.rsi/glare.png
new file mode 100644
index 00000000000000..b40bc8fe30521e
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Icons/cosmiccult_abilities.rsi/glare.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Icons/cosmiccult_abilities.rsi/lapse.png b/Resources/Textures/_Impstation/CosmicCult/Icons/cosmiccult_abilities.rsi/lapse.png
new file mode 100644
index 00000000000000..7fb96569762083
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Icons/cosmiccult_abilities.rsi/lapse.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Icons/cosmiccult_abilities.rsi/meta.json b/Resources/Textures/_Impstation/CosmicCult/Icons/cosmiccult_abilities.rsi/meta.json
new file mode 100644
index 00000000000000..3ed07216f4c0b2
--- /dev/null
+++ b/Resources/Textures/_Impstation/CosmicCult/Icons/cosmiccult_abilities.rsi/meta.json
@@ -0,0 +1,29 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Sprites by AftrLite(Github).",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "compass"
+ },
+ {
+ "name": "siphon"
+ },
+ {
+ "name": "lapse"
+ },
+ {
+ "name": "glare"
+ },
+ {
+ "name": "blank"
+ },
+ {
+ "name": "monument"
+ }
+ ]
+}
diff --git a/Resources/Textures/_Impstation/CosmicCult/Icons/cosmiccult_abilities.rsi/monument.png b/Resources/Textures/_Impstation/CosmicCult/Icons/cosmiccult_abilities.rsi/monument.png
new file mode 100644
index 00000000000000..5d66dc93c85367
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Icons/cosmiccult_abilities.rsi/monument.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Icons/cosmiccult_abilities.rsi/siphon.png b/Resources/Textures/_Impstation/CosmicCult/Icons/cosmiccult_abilities.rsi/siphon.png
new file mode 100644
index 00000000000000..62810a30529aa5
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Icons/cosmiccult_abilities.rsi/siphon.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Interface/glare.png b/Resources/Textures/_Impstation/CosmicCult/Interface/glare.png
new file mode 100644
index 00000000000000..b40bc8fe30521e
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Interface/glare.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/LightMasks/cosmic.png b/Resources/Textures/_Impstation/CosmicCult/LightMasks/cosmic.png
new file mode 100644
index 00000000000000..e0af79778ab215
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/LightMasks/cosmic.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Objects/compass.rsi/icon.png b/Resources/Textures/_Impstation/CosmicCult/Objects/compass.rsi/icon.png
new file mode 100644
index 00000000000000..6ae823106d3754
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Objects/compass.rsi/icon.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Objects/compass.rsi/meta.json b/Resources/Textures/_Impstation/CosmicCult/Objects/compass.rsi/meta.json
new file mode 100644
index 00000000000000..f616f38dd9fd28
--- /dev/null
+++ b/Resources/Textures/_Impstation/CosmicCult/Objects/compass.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "A custom item by AftrLite (Github).",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ }
+ ]
+}
diff --git a/Resources/Textures/_Impstation/CosmicCult/Objects/cosmiclance-inhands.rsi/inhand-left.png b/Resources/Textures/_Impstation/CosmicCult/Objects/cosmiclance-inhands.rsi/inhand-left.png
new file mode 100644
index 00000000000000..6f3dff21b529ab
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Objects/cosmiclance-inhands.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Objects/cosmiclance-inhands.rsi/inhand-right.png b/Resources/Textures/_Impstation/CosmicCult/Objects/cosmiclance-inhands.rsi/inhand-right.png
new file mode 100644
index 00000000000000..04c47f9cb36d49
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Objects/cosmiclance-inhands.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Objects/cosmiclance-inhands.rsi/meta.json b/Resources/Textures/_Impstation/CosmicCult/Objects/cosmiclance-inhands.rsi/meta.json
new file mode 100644
index 00000000000000..62b85c59c7ea5c
--- /dev/null
+++ b/Resources/Textures/_Impstation/CosmicCult/Objects/cosmiclance-inhands.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "A custom item by AftrLite (Github).",
+ "size": {
+ "x": 64,
+ "y": 64
+ },
+ "states": [
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Impstation/CosmicCult/Objects/cosmiclance.rsi/icon-overlay.png b/Resources/Textures/_Impstation/CosmicCult/Objects/cosmiclance.rsi/icon-overlay.png
new file mode 100644
index 00000000000000..1562ccf4cbf638
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Objects/cosmiclance.rsi/icon-overlay.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Objects/cosmiclance.rsi/icon.png b/Resources/Textures/_Impstation/CosmicCult/Objects/cosmiclance.rsi/icon.png
new file mode 100644
index 00000000000000..60763a68ea5ca1
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Objects/cosmiclance.rsi/icon.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Objects/cosmiclance.rsi/meta.json b/Resources/Textures/_Impstation/CosmicCult/Objects/cosmiclance.rsi/meta.json
new file mode 100644
index 00000000000000..cad8bf682ff24b
--- /dev/null
+++ b/Resources/Textures/_Impstation/CosmicCult/Objects/cosmiclance.rsi/meta.json
@@ -0,0 +1,17 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "A custom item by AftrLite (Github).",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "icon-overlay"
+ }
+ ]
+}
diff --git a/Resources/Textures/_Impstation/CosmicCult/Objects/cosmicsword-inhands.rsi/inhand-left.png b/Resources/Textures/_Impstation/CosmicCult/Objects/cosmicsword-inhands.rsi/inhand-left.png
new file mode 100644
index 00000000000000..90b81c8517583f
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Objects/cosmicsword-inhands.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Objects/cosmicsword-inhands.rsi/inhand-right.png b/Resources/Textures/_Impstation/CosmicCult/Objects/cosmicsword-inhands.rsi/inhand-right.png
new file mode 100644
index 00000000000000..93386c14d67080
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Objects/cosmicsword-inhands.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Objects/cosmicsword-inhands.rsi/meta.json b/Resources/Textures/_Impstation/CosmicCult/Objects/cosmicsword-inhands.rsi/meta.json
new file mode 100644
index 00000000000000..62b85c59c7ea5c
--- /dev/null
+++ b/Resources/Textures/_Impstation/CosmicCult/Objects/cosmicsword-inhands.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "A custom item by AftrLite (Github).",
+ "size": {
+ "x": 64,
+ "y": 64
+ },
+ "states": [
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Impstation/CosmicCult/Objects/cosmicsword.rsi/icon-overlay.png b/Resources/Textures/_Impstation/CosmicCult/Objects/cosmicsword.rsi/icon-overlay.png
new file mode 100644
index 00000000000000..4ff33b90c91373
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Objects/cosmicsword.rsi/icon-overlay.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Objects/cosmicsword.rsi/icon.png b/Resources/Textures/_Impstation/CosmicCult/Objects/cosmicsword.rsi/icon.png
new file mode 100644
index 00000000000000..7c52cd5fe3a66d
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Objects/cosmicsword.rsi/icon.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Objects/cosmicsword.rsi/meta.json b/Resources/Textures/_Impstation/CosmicCult/Objects/cosmicsword.rsi/meta.json
new file mode 100644
index 00000000000000..cad8bf682ff24b
--- /dev/null
+++ b/Resources/Textures/_Impstation/CosmicCult/Objects/cosmicsword.rsi/meta.json
@@ -0,0 +1,17 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "A custom item by AftrLite (Github).",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "icon-overlay"
+ }
+ ]
+}
diff --git a/Resources/Textures/_Impstation/CosmicCult/Objects/entropymote.rsi/meta.json b/Resources/Textures/_Impstation/CosmicCult/Objects/entropymote.rsi/meta.json
new file mode 100644
index 00000000000000..379b5dd16f7c22
--- /dev/null
+++ b/Resources/Textures/_Impstation/CosmicCult/Objects/entropymote.rsi/meta.json
@@ -0,0 +1,20 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "A custom item by AftrLite (Github).",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "mote"
+ },
+ {
+ "name": "mote_2"
+ },
+ {
+ "name": "mote_3"
+ }
+ ]
+}
diff --git a/Resources/Textures/_Impstation/CosmicCult/Objects/entropymote.rsi/mote.png b/Resources/Textures/_Impstation/CosmicCult/Objects/entropymote.rsi/mote.png
new file mode 100644
index 00000000000000..3dac05b502cef0
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Objects/entropymote.rsi/mote.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Objects/entropymote.rsi/mote_2.png b/Resources/Textures/_Impstation/CosmicCult/Objects/entropymote.rsi/mote_2.png
new file mode 100644
index 00000000000000..db77c608941cce
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Objects/entropymote.rsi/mote_2.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Objects/entropymote.rsi/mote_3.png b/Resources/Textures/_Impstation/CosmicCult/Objects/entropymote.rsi/mote_3.png
new file mode 100644
index 00000000000000..ccd7f29f8c825e
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Objects/entropymote.rsi/mote_3.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Objects/monumentflatpack.rsi/icon.png b/Resources/Textures/_Impstation/CosmicCult/Objects/monumentflatpack.rsi/icon.png
new file mode 100644
index 00000000000000..2b451d71454398
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Objects/monumentflatpack.rsi/icon.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Objects/monumentflatpack.rsi/meta.json b/Resources/Textures/_Impstation/CosmicCult/Objects/monumentflatpack.rsi/meta.json
new file mode 100644
index 00000000000000..8b26ab192ed172
--- /dev/null
+++ b/Resources/Textures/_Impstation/CosmicCult/Objects/monumentflatpack.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "A custom item by AftrLite (Github).",
+ "size": {
+ "x": 96,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ }
+ ]
+}
diff --git a/Resources/Textures/_Impstation/CosmicCult/Parallaxes/Cosmic_Blackhole.png b/Resources/Textures/_Impstation/CosmicCult/Parallaxes/Cosmic_Blackhole.png
new file mode 100644
index 00000000000000..df283b75dff4a4
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Parallaxes/Cosmic_Blackhole.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Parallaxes/Cosmic_Dust.png b/Resources/Textures/_Impstation/CosmicCult/Parallaxes/Cosmic_Dust.png
new file mode 100644
index 00000000000000..a45cb215c4116c
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Parallaxes/Cosmic_Dust.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Parallaxes/Cosmic_Nebulae.png b/Resources/Textures/_Impstation/CosmicCult/Parallaxes/Cosmic_Nebulae.png
new file mode 100644
index 00000000000000..a6e8a3f199a361
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Parallaxes/Cosmic_Nebulae.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Parallaxes/Cosmic_Stars.png b/Resources/Textures/_Impstation/CosmicCult/Parallaxes/Cosmic_Stars.png
new file mode 100644
index 00000000000000..d257075fbf3585
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Parallaxes/Cosmic_Stars.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/computer.png b/Resources/Textures/_Impstation/CosmicCult/Tileset/computer.png
new file mode 100644
index 00000000000000..5de77a90b91be2
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Tileset/computer.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicchair.rsi/chair.png b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicchair.rsi/chair.png
new file mode 100644
index 00000000000000..bf809250e21e82
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicchair.rsi/chair.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicchair.rsi/meta.json b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicchair.rsi/meta.json
new file mode 100644
index 00000000000000..e385cf8149242e
--- /dev/null
+++ b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicchair.rsi/meta.json
@@ -0,0 +1,12 @@
+{"version": 1,
+"size": {"x": 32, "y": 32},
+"license": "CC-BY-SA-3.0",
+"copyright": "A custom item by AftrLite (Github).",
+
+"states": [
+{
+ "name": "chair",
+ "directions": 4
+}
+]
+}
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmiccomputer.rsi/computer-unshaded.png b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmiccomputer.rsi/computer-unshaded.png
new file mode 100644
index 00000000000000..e9b77600200fa1
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmiccomputer.rsi/computer-unshaded.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmiccomputer.rsi/computer.png b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmiccomputer.rsi/computer.png
new file mode 100644
index 00000000000000..f1d9e17feb244c
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmiccomputer.rsi/computer.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmiccomputer.rsi/meta.json b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmiccomputer.rsi/meta.json
new file mode 100644
index 00000000000000..8625c5a2116566
--- /dev/null
+++ b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmiccomputer.rsi/meta.json
@@ -0,0 +1,16 @@
+{"version": 1,
+"size": {"x": 32, "y": 32},
+"license": "CC-BY-SA-3.0",
+"copyright": "A custom item by AftrLite (Github).",
+
+"states": [
+{
+ "name": "computer",
+ "directions": 4
+},
+{
+ "name": "computer-unshaded",
+ "directions": 4
+}
+]
+}
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicdecay.rsi/decay.png b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicdecay.rsi/decay.png
new file mode 100644
index 00000000000000..d539a8e5f7466d
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicdecay.rsi/decay.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicdecay.rsi/decay0.png b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicdecay.rsi/decay0.png
new file mode 100644
index 00000000000000..2c2aafd5b5d41a
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicdecay.rsi/decay0.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicdecay.rsi/decay1.png b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicdecay.rsi/decay1.png
new file mode 100644
index 00000000000000..deefb7e7eb1cce
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicdecay.rsi/decay1.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicdecay.rsi/decay2.png b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicdecay.rsi/decay2.png
new file mode 100644
index 00000000000000..2c2aafd5b5d41a
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicdecay.rsi/decay2.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicdecay.rsi/decay3.png b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicdecay.rsi/decay3.png
new file mode 100644
index 00000000000000..deefb7e7eb1cce
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicdecay.rsi/decay3.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicdecay.rsi/decay4.png b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicdecay.rsi/decay4.png
new file mode 100644
index 00000000000000..fe795d6d6aec35
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicdecay.rsi/decay4.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicdecay.rsi/decay5.png b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicdecay.rsi/decay5.png
new file mode 100644
index 00000000000000..5cdb8764ad4073
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicdecay.rsi/decay5.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicdecay.rsi/decay6.png b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicdecay.rsi/decay6.png
new file mode 100644
index 00000000000000..fe795d6d6aec35
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicdecay.rsi/decay6.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicdecay.rsi/decay7.png b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicdecay.rsi/decay7.png
new file mode 100644
index 00000000000000..5ef5034b3e2af8
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicdecay.rsi/decay7.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicdecay.rsi/full.png b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicdecay.rsi/full.png
new file mode 100644
index 00000000000000..1269b4ca107c97
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicdecay.rsi/full.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicdecay.rsi/meta.json b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicdecay.rsi/meta.json
new file mode 100644
index 00000000000000..3b13383ce70f02
--- /dev/null
+++ b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicdecay.rsi/meta.json
@@ -0,0 +1,54 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "A custom item by AftrLite (Github).",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "full"
+ },
+ {
+ "name": "decay0",
+ "directions": 4
+ },
+ {
+ "name": "decay1",
+ "directions": 4
+ },
+ {
+ "name": "decay2",
+ "directions": 4
+ },
+ {
+ "name": "decay3",
+ "directions": 4
+ },
+ {
+ "name": "decay4",
+ "directions": 4
+ },
+ {
+ "name": "decay5",
+ "directions": 4
+ },
+ {
+ "name": "decay6",
+ "directions": 4
+ },
+ {
+ "name": "decay7",
+ "directions": 4
+ },
+ {
+ "name": "decay",
+ "delays": [
+ [
+ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1
+ ]
+ ]
+ }
+ ]
+}
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicdoor.rsi/closed.png b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicdoor.rsi/closed.png
new file mode 100644
index 00000000000000..9c46079240378e
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicdoor.rsi/closed.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicdoor.rsi/closing.png b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicdoor.rsi/closing.png
new file mode 100644
index 00000000000000..05382292c4360b
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicdoor.rsi/closing.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicdoor.rsi/meta.json b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicdoor.rsi/meta.json
new file mode 100644
index 00000000000000..168063aaa17630
--- /dev/null
+++ b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicdoor.rsi/meta.json
@@ -0,0 +1,69 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "A custom item by AftrLite (Github).",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "closed",
+ "directions": 1,
+ "delays": [
+ [
+ 1.0
+ ]
+ ]
+ },
+ {
+ "name": "closing",
+ "directions": 1,
+ "delays": [
+ [
+ 0.1,
+ 0.1,
+ 0.1,
+ 0.1,
+ 0.1,
+ 0.1,
+ 0.1,
+ 0.1,
+ 0.1,
+ 0.1,
+ 0.1,
+ 0.1
+ ]
+ ]
+ },
+ {
+ "name": "open",
+ "directions": 1,
+ "delays": [
+ [
+ 1.0
+ ]
+ ]
+ },
+ {
+ "name": "opening",
+ "directions": 1,
+ "delays": [
+ [
+ 0.1,
+ 0.1,
+ 0.1,
+ 0.1,
+ 0.1,
+ 0.1,
+ 0.1,
+ 0.1,
+ 0.1,
+ 0.1,
+ 0.1,
+ 0.1
+ ]
+ ]
+ }
+ ]
+}
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicdoor.rsi/open.png b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicdoor.rsi/open.png
new file mode 100644
index 00000000000000..05f5ba9711f974
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicdoor.rsi/open.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicdoor.rsi/opening.png b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicdoor.rsi/opening.png
new file mode 100644
index 00000000000000..0ec525c1754309
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicdoor.rsi/opening.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicfloor/meta.json b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicfloor/meta.json
new file mode 100644
index 00000000000000..748826ca1936a7
--- /dev/null
+++ b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicfloor/meta.json
@@ -0,0 +1,26 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "A custom item by AftrLite (Github).",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "tile_glyph"
+ },
+ {
+ "name": "tile_smooth"
+ },
+ {
+ "name": "tile_half"
+ },
+ {
+ "name": "tile_split"
+ },
+ {
+ "name": "tile_notched"
+ }
+ ]
+}
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicfloor/tile_glyph.png b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicfloor/tile_glyph.png
new file mode 100644
index 00000000000000..2afc7ab0c39600
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicfloor/tile_glyph.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicfloor/tile_half.png b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicfloor/tile_half.png
new file mode 100644
index 00000000000000..702c2a688c88ce
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicfloor/tile_half.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicfloor/tile_notched.png b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicfloor/tile_notched.png
new file mode 100644
index 00000000000000..da482a5365e2e1
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicfloor/tile_notched.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicfloor/tile_smooth.png b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicfloor/tile_smooth.png
new file mode 100644
index 00000000000000..dae79bfaccc30f
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicfloor/tile_smooth.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicfloor/tile_split.png b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicfloor/tile_split.png
new file mode 100644
index 00000000000000..500aa03296a79a
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicfloor/tile_split.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmiclight.rsi/base.png b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmiclight.rsi/base.png
new file mode 100644
index 00000000000000..0a000f660f7a9c
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmiclight.rsi/base.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmiclight.rsi/glow.png b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmiclight.rsi/glow.png
new file mode 100644
index 00000000000000..af3e09a1063aa8
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmiclight.rsi/glow.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmiclight.rsi/meta.json b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmiclight.rsi/meta.json
new file mode 100644
index 00000000000000..dbfb36043cd155
--- /dev/null
+++ b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmiclight.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "A custom item by AftrLite (Github).",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "base",
+ "directions": 4
+ },
+ {
+ "name": "glow",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicpillar.rsi/icon.png b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicpillar.rsi/icon.png
new file mode 100644
index 00000000000000..c932dd8e955249
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicpillar.rsi/icon.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicpillar.rsi/meta.json b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicpillar.rsi/meta.json
new file mode 100644
index 00000000000000..a067b9fb83a582
--- /dev/null
+++ b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicpillar.rsi/meta.json
@@ -0,0 +1,12 @@
+{"version": 1,
+"size": {"x": 32, "y": 64},
+"license": "CC-BY-SA-3.0",
+"copyright": "A custom item by AftrLite (Github).",
+
+"states": [
+{
+ "name": "icon",
+ "directions": 4
+}
+]
+}
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicpylon.rsi/base.png b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicpylon.rsi/base.png
new file mode 100644
index 00000000000000..7b1dd0dbd7d2c8
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicpylon.rsi/base.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicpylon.rsi/meta.json b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicpylon.rsi/meta.json
new file mode 100644
index 00000000000000..699d22ae111340
--- /dev/null
+++ b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicpylon.rsi/meta.json
@@ -0,0 +1,41 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "A custom item by AftrLite (Github).",
+ "size": {
+ "x": 32,
+ "y": 64
+ },
+ "states": [
+ {
+ "name": "base"
+ },
+ {
+ "name": "overlay-enabled"
+ },
+ {
+ "name": "overlay-activate",
+ "delays": [
+ [
+ 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11
+ ]
+ ]
+ },
+ {
+ "name": "overlay-deactivate",
+ "delays": [
+ [
+ 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11, 0.11
+ ]
+ ]
+ },
+ {
+ "name": "overlay-orb",
+ "delays": [
+ [
+ 0.075, 0.075, 0.075, 0.075, 0.075, 0.075, 0.075, 0.075, 0.075, 0.075, 0.075, 0.075, 0.075, 0.075, 0.075, 0.075, 0.075, 0.075, 0.075, 0.075, 0.075, 0.075, 0.075, 0.075, 0.075, 0.075, 0.075
+ ]
+ ]
+ }
+ ]
+}
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicpylon.rsi/overlay-activate.png b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicpylon.rsi/overlay-activate.png
new file mode 100644
index 00000000000000..f17df8bccabed1
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicpylon.rsi/overlay-activate.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicpylon.rsi/overlay-deactivate.png b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicpylon.rsi/overlay-deactivate.png
new file mode 100644
index 00000000000000..c74358d18ff15a
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicpylon.rsi/overlay-deactivate.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicpylon.rsi/overlay-enabled.png b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicpylon.rsi/overlay-enabled.png
new file mode 100644
index 00000000000000..1191b32471f786
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicpylon.rsi/overlay-enabled.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicpylon.rsi/overlay-orb.png b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicpylon.rsi/overlay-orb.png
new file mode 100644
index 00000000000000..f3662151953a2f
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicpylon.rsi/overlay-orb.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicthruster.rsi/base.png b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicthruster.rsi/base.png
new file mode 100644
index 00000000000000..fee9f79513ccb6
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicthruster.rsi/base.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicthruster.rsi/meta.json b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicthruster.rsi/meta.json
new file mode 100644
index 00000000000000..ba973f18c2471d
--- /dev/null
+++ b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicthruster.rsi/meta.json
@@ -0,0 +1,50 @@
+{"version": 1,
+"size": {"x": 32, "y": 32},
+"license": "CC-BY-SA-3.0",
+"copyright": "A custom item by AftrLite (Github).",
+
+"states": [
+ {
+ "name": "base",
+ "directions": 4
+ },
+ {
+ "name": "thrust",
+ "directions": 4
+ },
+ {
+ "name": "thrust_burn_unshaded",
+ "directions": 4,
+ "delays": [
+ [
+ 0.08,
+ 0.08,
+ 0.08,
+ 0.08,
+ 0.08
+ ],
+ [
+ 0.08,
+ 0.08,
+ 0.08,
+ 0.08,
+ 0.08
+ ],
+ [
+ 0.08,
+ 0.08,
+ 0.08,
+ 0.08,
+ 0.08
+ ],
+ [
+ 0.08,
+ 0.08,
+ 0.08,
+ 0.08,
+ 0.08
+ ]
+ ]
+ }
+ ]
+ }
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicthruster.rsi/thrust.png b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicthruster.rsi/thrust.png
new file mode 100644
index 00000000000000..da9d7843fa26fe
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicthruster.rsi/thrust.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicthruster.rsi/thrust_burn_unshaded.png b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicthruster.rsi/thrust_burn_unshaded.png
new file mode 100644
index 00000000000000..75b93b6e73425d
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicthruster.rsi/thrust_burn_unshaded.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwall.rsi/cult0.png b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwall.rsi/cult0.png
new file mode 100644
index 00000000000000..532b408a63f101
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwall.rsi/cult0.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwall.rsi/cult1.png b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwall.rsi/cult1.png
new file mode 100644
index 00000000000000..4416efbd395182
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwall.rsi/cult1.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwall.rsi/cult2.png b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwall.rsi/cult2.png
new file mode 100644
index 00000000000000..64528a9520cb3d
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwall.rsi/cult2.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwall.rsi/cult3.png b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwall.rsi/cult3.png
new file mode 100644
index 00000000000000..4416efbd395182
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwall.rsi/cult3.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwall.rsi/cult4.png b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwall.rsi/cult4.png
new file mode 100644
index 00000000000000..d3dfe42469b2fb
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwall.rsi/cult4.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwall.rsi/cult5.png b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwall.rsi/cult5.png
new file mode 100644
index 00000000000000..a4397b07152db3
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwall.rsi/cult5.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwall.rsi/cult6.png b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwall.rsi/cult6.png
new file mode 100644
index 00000000000000..d3dfe42469b2fb
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwall.rsi/cult6.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwall.rsi/cult7.png b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwall.rsi/cult7.png
new file mode 100644
index 00000000000000..6edbe1491b5e5c
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwall.rsi/cult7.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwall.rsi/full.png b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwall.rsi/full.png
new file mode 100644
index 00000000000000..fd5383ea23b86f
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwall.rsi/full.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwall.rsi/meta.json b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwall.rsi/meta.json
new file mode 100644
index 00000000000000..cc2bdf21369ab3
--- /dev/null
+++ b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwall.rsi/meta.json
@@ -0,0 +1,63 @@
+{"version": 1,
+"size": {"x": 32, "y": 32},
+"license": "CC-BY-SA-3.0",
+"copyright": "A custom item by AftrLite (Github).",
+
+"states": [
+{
+ "name": "cult0",
+ "directions": 4
+},
+{
+ "name": "cult1",
+ "directions": 4
+},
+
+{
+ "name": "cult2",
+ "directions": 4
+},
+
+{
+ "name": "cult3",
+ "directions": 4
+},
+
+{
+ "name": "cult4",
+ "directions": 4
+},
+
+{
+ "name": "cult5",
+ "directions": 4
+},
+
+{
+ "name": "cult6",
+ "directions": 4
+},
+
+{
+ "name": "cult7",
+ "directions": 4
+},
+
+{
+ "name": "trim_south"
+},
+{
+ "name": "trim_north"
+},
+{
+ "name": "trim_east"
+},
+{
+ "name": "trim_west"
+},
+
+{
+ "name": "full"
+}
+]
+}
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwall.rsi/trim_east.png b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwall.rsi/trim_east.png
new file mode 100644
index 00000000000000..eee0e62381388a
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwall.rsi/trim_east.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwall.rsi/trim_north.png b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwall.rsi/trim_north.png
new file mode 100644
index 00000000000000..97ff5b5511e0f1
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwall.rsi/trim_north.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwall.rsi/trim_south.png b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwall.rsi/trim_south.png
new file mode 100644
index 00000000000000..e214fc8882137b
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwall.rsi/trim_south.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwall.rsi/trim_west.png b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwall.rsi/trim_west.png
new file mode 100644
index 00000000000000..227c20b4e6fdd9
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwall.rsi/trim_west.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwall_diagonal.rsi/cult0.png b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwall_diagonal.rsi/cult0.png
new file mode 100644
index 00000000000000..1b3f6f9d56c4b4
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwall_diagonal.rsi/cult0.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwall_diagonal.rsi/cult1.png b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwall_diagonal.rsi/cult1.png
new file mode 100644
index 00000000000000..20769347a8952c
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwall_diagonal.rsi/cult1.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwall_diagonal.rsi/meta.json b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwall_diagonal.rsi/meta.json
new file mode 100644
index 00000000000000..d5e232f8059812
--- /dev/null
+++ b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwall_diagonal.rsi/meta.json
@@ -0,0 +1,14 @@
+{"version": 1,
+"size": {"x": 32, "y": 32},
+"license": "CC-BY-SA-3.0",
+"copyright": "A custom item by AftrLite (Github).",
+
+"states": [
+{
+ "name": "cult0"
+},
+{
+ "name": "cult1"
+}
+]
+}
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwindow.rsi/coswindow0.png b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwindow.rsi/coswindow0.png
new file mode 100644
index 00000000000000..2e93121a5ecfd3
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwindow.rsi/coswindow0.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwindow.rsi/coswindow1.png b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwindow.rsi/coswindow1.png
new file mode 100644
index 00000000000000..afdfcd68f907e7
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwindow.rsi/coswindow1.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwindow.rsi/coswindow2.png b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwindow.rsi/coswindow2.png
new file mode 100644
index 00000000000000..2e93121a5ecfd3
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwindow.rsi/coswindow2.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwindow.rsi/coswindow3.png b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwindow.rsi/coswindow3.png
new file mode 100644
index 00000000000000..afdfcd68f907e7
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwindow.rsi/coswindow3.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwindow.rsi/coswindow4.png b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwindow.rsi/coswindow4.png
new file mode 100644
index 00000000000000..eece37361e853d
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwindow.rsi/coswindow4.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwindow.rsi/coswindow5.png b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwindow.rsi/coswindow5.png
new file mode 100644
index 00000000000000..7f224cb5360e5e
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwindow.rsi/coswindow5.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwindow.rsi/coswindow6.png b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwindow.rsi/coswindow6.png
new file mode 100644
index 00000000000000..eece37361e853d
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwindow.rsi/coswindow6.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwindow.rsi/coswindow7.png b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwindow.rsi/coswindow7.png
new file mode 100644
index 00000000000000..08bba5f83e3cbf
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwindow.rsi/coswindow7.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwindow.rsi/full.png b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwindow.rsi/full.png
new file mode 100644
index 00000000000000..9f45cd30540cbb
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwindow.rsi/full.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwindow.rsi/meta.json b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwindow.rsi/meta.json
new file mode 100644
index 00000000000000..c02323d7cecc5e
--- /dev/null
+++ b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwindow.rsi/meta.json
@@ -0,0 +1,50 @@
+{"version": 1,
+"size": {"x": 32, "y": 32},
+"license": "CC-BY-SA-3.0",
+"copyright": "A custom item by AftrLite (Github).",
+
+"states": [
+{
+ "name": "coswindow0",
+ "directions": 4
+},
+{
+ "name": "coswindow1",
+ "directions": 4
+},
+
+{
+ "name": "coswindow2",
+ "directions": 4
+},
+
+{
+ "name": "coswindow3",
+ "directions": 4
+},
+
+{
+ "name": "coswindow4",
+ "directions": 4
+},
+
+{
+ "name": "coswindow5",
+ "directions": 4
+},
+
+{
+ "name": "coswindow6",
+ "directions": 4
+},
+
+{
+ "name": "coswindow7",
+ "directions": 4
+},
+
+{
+ "name": "full"
+}
+]
+}
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwindow_dark.rsi/cosDwindow0.png b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwindow_dark.rsi/cosDwindow0.png
new file mode 100644
index 00000000000000..e64f76fb1ddae8
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwindow_dark.rsi/cosDwindow0.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwindow_dark.rsi/cosDwindow1.png b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwindow_dark.rsi/cosDwindow1.png
new file mode 100644
index 00000000000000..3dbab94fe8c4a9
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwindow_dark.rsi/cosDwindow1.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwindow_dark.rsi/cosDwindow2.png b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwindow_dark.rsi/cosDwindow2.png
new file mode 100644
index 00000000000000..e64f76fb1ddae8
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwindow_dark.rsi/cosDwindow2.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwindow_dark.rsi/cosDwindow3.png b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwindow_dark.rsi/cosDwindow3.png
new file mode 100644
index 00000000000000..3dbab94fe8c4a9
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwindow_dark.rsi/cosDwindow3.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwindow_dark.rsi/cosDwindow4.png b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwindow_dark.rsi/cosDwindow4.png
new file mode 100644
index 00000000000000..081fbd8eddec95
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwindow_dark.rsi/cosDwindow4.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwindow_dark.rsi/cosDwindow5.png b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwindow_dark.rsi/cosDwindow5.png
new file mode 100644
index 00000000000000..717264e920badd
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwindow_dark.rsi/cosDwindow5.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwindow_dark.rsi/cosDwindow6.png b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwindow_dark.rsi/cosDwindow6.png
new file mode 100644
index 00000000000000..081fbd8eddec95
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwindow_dark.rsi/cosDwindow6.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwindow_dark.rsi/cosDwindow7.png b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwindow_dark.rsi/cosDwindow7.png
new file mode 100644
index 00000000000000..892f8ed82b78d3
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwindow_dark.rsi/cosDwindow7.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwindow_dark.rsi/full.png b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwindow_dark.rsi/full.png
new file mode 100644
index 00000000000000..3ee32b5d62a275
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwindow_dark.rsi/full.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwindow_dark.rsi/meta.json b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwindow_dark.rsi/meta.json
new file mode 100644
index 00000000000000..fc3e45f1c5f8ce
--- /dev/null
+++ b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwindow_dark.rsi/meta.json
@@ -0,0 +1,50 @@
+{"version": 1,
+"size": {"x": 32, "y": 32},
+"license": "CC-BY-SA-3.0",
+"copyright": "A custom item by AftrLite (Github).",
+
+"states": [
+{
+ "name": "cosDwindow0",
+ "directions": 4
+},
+{
+ "name": "cosDwindow1",
+ "directions": 4
+},
+
+{
+ "name": "cosDwindow2",
+ "directions": 4
+},
+
+{
+ "name": "cosDwindow3",
+ "directions": 4
+},
+
+{
+ "name": "cosDwindow4",
+ "directions": 4
+},
+
+{
+ "name": "cosDwindow5",
+ "directions": 4
+},
+
+{
+ "name": "cosDwindow6",
+ "directions": 4
+},
+
+{
+ "name": "cosDwindow7",
+ "directions": 4
+},
+
+{
+ "name": "full"
+}
+]
+}
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwindow_dark_diagonal.rsi/cosDwindow0.png b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwindow_dark_diagonal.rsi/cosDwindow0.png
new file mode 100644
index 00000000000000..ec36b0c5ef2046
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwindow_dark_diagonal.rsi/cosDwindow0.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwindow_dark_diagonal.rsi/cosDwindow1.png b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwindow_dark_diagonal.rsi/cosDwindow1.png
new file mode 100644
index 00000000000000..47bee474bc8e82
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwindow_dark_diagonal.rsi/cosDwindow1.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwindow_dark_diagonal.rsi/meta.json b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwindow_dark_diagonal.rsi/meta.json
new file mode 100644
index 00000000000000..3734c9bae27f64
--- /dev/null
+++ b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwindow_dark_diagonal.rsi/meta.json
@@ -0,0 +1,14 @@
+{"version": 1,
+"size": {"x": 32, "y": 32},
+"license": "CC-BY-SA-3.0",
+"copyright": "A custom item by AftrLite (Github).",
+
+"states": [
+{
+ "name": "cosDwindow0"
+},
+{
+ "name": "cosDwindow1"
+}
+]
+}
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwindow_diagonal.rsi/coswindow0.png b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwindow_diagonal.rsi/coswindow0.png
new file mode 100644
index 00000000000000..6959ca9f0cde25
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwindow_diagonal.rsi/coswindow0.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwindow_diagonal.rsi/coswindow1.png b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwindow_diagonal.rsi/coswindow1.png
new file mode 100644
index 00000000000000..f0e2a0d959fe16
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwindow_diagonal.rsi/coswindow1.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwindow_diagonal.rsi/meta.json b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwindow_diagonal.rsi/meta.json
new file mode 100644
index 00000000000000..189da73dfdf550
--- /dev/null
+++ b/Resources/Textures/_Impstation/CosmicCult/Tileset/cosmicwindow_diagonal.rsi/meta.json
@@ -0,0 +1,14 @@
+{"version": 1,
+"size": {"x": 32, "y": 32},
+"license": "CC-BY-SA-3.0",
+"copyright": "A custom item by AftrLite (Github).",
+
+"states": [
+{
+ "name": "coswindow0"
+},
+{
+ "name": "coswindow1"
+}
+]
+}
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/monument.rsi/inserting1.png b/Resources/Textures/_Impstation/CosmicCult/Tileset/monument.rsi/inserting1.png
new file mode 100644
index 00000000000000..44b9379f15bf0f
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Tileset/monument.rsi/inserting1.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/monument.rsi/inserting2.png b/Resources/Textures/_Impstation/CosmicCult/Tileset/monument.rsi/inserting2.png
new file mode 100644
index 00000000000000..736c4d28348bb2
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Tileset/monument.rsi/inserting2.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/monument.rsi/inserting3.png b/Resources/Textures/_Impstation/CosmicCult/Tileset/monument.rsi/inserting3.png
new file mode 100644
index 00000000000000..4f7f538ad682ee
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Tileset/monument.rsi/inserting3.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/monument.rsi/meta.json b/Resources/Textures/_Impstation/CosmicCult/Tileset/monument.rsi/meta.json
new file mode 100644
index 00000000000000..cef70c50348d92
--- /dev/null
+++ b/Resources/Textures/_Impstation/CosmicCult/Tileset/monument.rsi/meta.json
@@ -0,0 +1,208 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "A custom item by AftrLite (Github).",
+ "size": {
+ "x": 96,
+ "y": 96
+ },
+ "states": [
+
+ {
+ "name": "stage1-spawnin",
+ "delays": [
+ [
+ 0.11,
+ 0.11,
+ 0.11,
+ 0.11,
+ 0.11,
+ 0.05,
+ 0.11,
+ 0.11,
+ 0.11,
+ 0.11,
+ 0.11,
+ 0.11,
+ 0.11,
+ 0.11,
+ 0.05,
+ 0.11,
+ 0.11,
+ 0.11,
+ 0.11,
+ 0.11,
+ 0.11,
+ 0.11,
+ 0.11,
+ 0.11,
+ 0.11,
+ 0.11,
+ 0.11,
+ 0.11,
+ 99
+ ]
+ ]
+ },
+ {
+ "name": "stage1-spawnin-overlay",
+ "delays": [
+ [
+ 0.11,
+ 0.11,
+ 0.11,
+ 0.11,
+ 0.11,
+ 0.05,
+ 0.11,
+ 0.11,
+ 0.11,
+ 0.11,
+ 0.11,
+ 0.11,
+ 0.11,
+ 0.11,
+ 0.05,
+ 0.11,
+ 0.11,
+ 0.11,
+ 0.11,
+ 0.11,
+ 0.11,
+ 0.11,
+ 0.11,
+ 0.11,
+ 0.11,
+ 0.11,
+ 0.11,
+ 0.11,
+ 99
+ ]
+ ]
+ },
+
+ {
+ "name": "stage1"
+ },
+ {
+ "name": "stage2"
+ },
+ {
+ "name": "stage3"
+ },
+
+ {
+ "name": "inserting1",
+ "delays": [
+ [
+ 0.06,
+ 0.06,
+ 0.06,
+ 0.06,
+ 0.06,
+ 0.06,
+ 0.06,
+ 0.06,
+ 0.12,
+ 0.06,
+ 0.06,
+ 0.06,
+ 0.06,
+ 0.06,
+ 0.06,
+ 0.06,
+ 0.06,
+ 0.06,
+ 0.36
+ ]
+ ]
+ },
+ {
+ "name": "inserting2",
+ "delays": [
+ [
+ 0.06,
+ 0.06,
+ 0.06,
+ 0.06,
+ 0.06,
+ 0.06,
+ 0.06,
+ 0.06,
+ 0.06,
+ 0.06,
+ 0.06,
+ 0.12,
+ 0.06,
+ 0.06,
+ 0.06,
+ 0.06,
+ 0.06,
+ 0.06,
+ 0.06,
+ 0.06,
+ 0.06,
+ 0.06,
+ 0.06,
+ 0.06,
+ 0.06,
+ 0.06,
+ 0.06,
+ 0.06,
+ 0.06,
+ 0.06,
+ 0.06,
+ 0.36
+ ]
+ ]
+ },
+ {
+ "name": "inserting3",
+ "delays": [
+ [
+ 0.06,
+ 0.06,
+ 0.06,
+ 0.06,
+ 0.06,
+ 0.06,
+ 0.06,
+ 0.06,
+ 0.06,
+ 0.06,
+ 0.06,
+ 0.12,
+ 0.06,
+ 0.06,
+ 0.06,
+ 0.06,
+ 0.06,
+ 0.06,
+ 0.06,
+ 0.06,
+ 0.06,
+ 0.06,
+ 0.06,
+ 0.06,
+ 0.06,
+ 0.06,
+ 0.06,
+ 0.06,
+ 0.06,
+ 0.06,
+ 0.06,
+ 0.36
+ ]
+ ]
+ },
+
+ {
+ "name": "stage4-overlay",
+ "delays": [
+ [
+ 0.11, 0.11, 0.11, 0.11, 0.11
+ ]
+ ]
+ }
+ ]
+}
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/monument.rsi/stage1-spawnin-overlay.png b/Resources/Textures/_Impstation/CosmicCult/Tileset/monument.rsi/stage1-spawnin-overlay.png
new file mode 100644
index 00000000000000..75a991593a5396
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Tileset/monument.rsi/stage1-spawnin-overlay.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/monument.rsi/stage1-spawnin.png b/Resources/Textures/_Impstation/CosmicCult/Tileset/monument.rsi/stage1-spawnin.png
new file mode 100644
index 00000000000000..3f8b891fa2a9ce
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Tileset/monument.rsi/stage1-spawnin.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/monument.rsi/stage1.png b/Resources/Textures/_Impstation/CosmicCult/Tileset/monument.rsi/stage1.png
new file mode 100644
index 00000000000000..d56734f6ca1609
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Tileset/monument.rsi/stage1.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/monument.rsi/stage2.png b/Resources/Textures/_Impstation/CosmicCult/Tileset/monument.rsi/stage2.png
new file mode 100644
index 00000000000000..73850240ef9fe2
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Tileset/monument.rsi/stage2.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/monument.rsi/stage3.png b/Resources/Textures/_Impstation/CosmicCult/Tileset/monument.rsi/stage3.png
new file mode 100644
index 00000000000000..79c7252ed6b28f
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Tileset/monument.rsi/stage3.png differ
diff --git a/Resources/Textures/_Impstation/CosmicCult/Tileset/monument.rsi/stage4-overlay.png b/Resources/Textures/_Impstation/CosmicCult/Tileset/monument.rsi/stage4-overlay.png
new file mode 100644
index 00000000000000..47f7d458ad213b
Binary files /dev/null and b/Resources/Textures/_Impstation/CosmicCult/Tileset/monument.rsi/stage4-overlay.png differ
diff --git a/Resources/Textures/_Impstation/LobbyScreens/PTAs-woe.webp b/Resources/Textures/_Impstation/LobbyScreens/PTAs-woe.webp
index 0616ebeaf0f7db..db0fd683848f11 100644
Binary files a/Resources/Textures/_Impstation/LobbyScreens/PTAs-woe.webp and b/Resources/Textures/_Impstation/LobbyScreens/PTAs-woe.webp differ
diff --git a/Resources/Textures/_Impstation/Objects/Consumable/Food/bowl.rsi/bowl.png b/Resources/Textures/_Impstation/Objects/Consumable/Food/bowl.rsi/bowl.png
new file mode 100644
index 00000000000000..9f91f21ff45290
Binary files /dev/null and b/Resources/Textures/_Impstation/Objects/Consumable/Food/bowl.rsi/bowl.png differ
diff --git a/Resources/Textures/_Impstation/Objects/Consumable/Food/bowl.rsi/camelsoup.png b/Resources/Textures/_Impstation/Objects/Consumable/Food/bowl.rsi/camelsoup.png
new file mode 100644
index 00000000000000..78a80621d93cc6
Binary files /dev/null and b/Resources/Textures/_Impstation/Objects/Consumable/Food/bowl.rsi/camelsoup.png differ
diff --git a/Resources/Textures/_Impstation/Objects/Consumable/Food/bowl.rsi/camelsouplit.png b/Resources/Textures/_Impstation/Objects/Consumable/Food/bowl.rsi/camelsouplit.png
new file mode 100644
index 00000000000000..f0fbf026156d0f
Binary files /dev/null and b/Resources/Textures/_Impstation/Objects/Consumable/Food/bowl.rsi/camelsouplit.png differ
diff --git a/Resources/Textures/_Impstation/Objects/Consumable/Food/bowl.rsi/meta.json b/Resources/Textures/_Impstation/Objects/Consumable/Food/bowl.rsi/meta.json
new file mode 100644
index 00000000000000..29cc962d8dcc2e
--- /dev/null
+++ b/Resources/Textures/_Impstation/Objects/Consumable/Food/bowl.rsi/meta.json
@@ -0,0 +1,29 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "camel soup by Carousel",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "camelsoup"
+ },
+ {
+ "name": "camelsouplit",
+ "delays": [
+ [
+ 0.2,
+ 0.2,
+ 0.2,
+ 0.2
+ ]
+ ]
+ },
+ {
+ "name": "bowl",
+ "directions": 1
+ }
+ ]
+ }
diff --git a/Resources/Textures/_Impstation/Objects/Misc/bureaucracy.rsi/folder-black.png b/Resources/Textures/_Impstation/Objects/Misc/bureaucracy.rsi/folder-black.png
new file mode 100644
index 00000000000000..e7d314da3891ee
Binary files /dev/null and b/Resources/Textures/_Impstation/Objects/Misc/bureaucracy.rsi/folder-black.png differ
diff --git a/Resources/Textures/_Impstation/Objects/Misc/bureaucracy.rsi/folder-hamster.png b/Resources/Textures/_Impstation/Objects/Misc/bureaucracy.rsi/folder-hamster.png
new file mode 100644
index 00000000000000..17faf2a9d41450
Binary files /dev/null and b/Resources/Textures/_Impstation/Objects/Misc/bureaucracy.rsi/folder-hamster.png differ
diff --git a/Resources/Textures/_Impstation/Objects/Misc/bureaucracy.rsi/folder-mime.png b/Resources/Textures/_Impstation/Objects/Misc/bureaucracy.rsi/folder-mime.png
new file mode 100644
index 00000000000000..6c16b26dc5f4c7
Binary files /dev/null and b/Resources/Textures/_Impstation/Objects/Misc/bureaucracy.rsi/folder-mime.png differ
diff --git a/Resources/Textures/_Impstation/Objects/Misc/bureaucracy.rsi/folder-overlay-paper.png b/Resources/Textures/_Impstation/Objects/Misc/bureaucracy.rsi/folder-overlay-paper.png
new file mode 100644
index 00000000000000..82f57cdd65389b
Binary files /dev/null and b/Resources/Textures/_Impstation/Objects/Misc/bureaucracy.rsi/folder-overlay-paper.png differ
diff --git a/Resources/Textures/_Impstation/Objects/Misc/bureaucracy.rsi/folder-pun.png b/Resources/Textures/_Impstation/Objects/Misc/bureaucracy.rsi/folder-pun.png
new file mode 100644
index 00000000000000..a257a9b6efd39c
Binary files /dev/null and b/Resources/Textures/_Impstation/Objects/Misc/bureaucracy.rsi/folder-pun.png differ
diff --git a/Resources/Textures/_Impstation/Objects/Misc/bureaucracy.rsi/meta.json b/Resources/Textures/_Impstation/Objects/Misc/bureaucracy.rsi/meta.json
index b6178b9f4c7f59..bce04e852897c3 100644
--- a/Resources/Textures/_Impstation/Objects/Misc/bureaucracy.rsi/meta.json
+++ b/Resources/Textures/_Impstation/Objects/Misc/bureaucracy.rsi/meta.json
@@ -1,12 +1,27 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
- "copyright": "Sprite by kipdotnet for Impstation",
+ "copyright": "Folder sprites by Carousel for Impstation, ticket book sprite by kipdotnet for Impstation",
"size": {
"x": 32,
"y": 32
},
"states": [
+ {
+ "name": "folder-black"
+ },
+ {
+ "name": "folder-hamster"
+ },
+ {
+ "name": "folder-mime"
+ },
+ {
+ "name": "folder-overlay-paper"
+ },
+ {
+ "name": "folder-pun"
+ },
{
"name": "ticket-book"
}
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/littletykescar.png b/Resources/Textures/_Impstation/Objects/Storage/littlecar.rsi/littletykescar.png
similarity index 100%
rename from Resources/Textures/Structures/Storage/closet.rsi/littletykescar.png
rename to Resources/Textures/_Impstation/Objects/Storage/littlecar.rsi/littletykescar.png
diff --git a/Resources/Textures/Structures/Storage/closet.rsi/littletykescar_open.png b/Resources/Textures/_Impstation/Objects/Storage/littlecar.rsi/littletykescar_open.png
similarity index 100%
rename from Resources/Textures/Structures/Storage/closet.rsi/littletykescar_open.png
rename to Resources/Textures/_Impstation/Objects/Storage/littlecar.rsi/littletykescar_open.png
diff --git a/Resources/Textures/_Impstation/Objects/Storage/littlecar.rsi/meta.json b/Resources/Textures/_Impstation/Objects/Storage/littlecar.rsi/meta.json
new file mode 100644
index 00000000000000..b284fb59e0a598
--- /dev/null
+++ b/Resources/Textures/_Impstation/Objects/Storage/littlecar.rsi/meta.json
@@ -0,0 +1,19 @@
+{
+ "version": 1,
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "copyright": "TODO, for Impstation.",
+ "license": "CC-BY-SA-3.0",
+ "states": [
+ {
+ "name": "littletykescar",
+ "directions": 4
+ },
+ {
+ "name": "littletykescar_open",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Impstation/Prospectors/desperado-hardsuit-helmet.rsi/icon-flash.png b/Resources/Textures/_Impstation/Prospectors/desperado-hardsuit-helmet.rsi/icon-flash.png
new file mode 100644
index 00000000000000..263c28e201e27b
Binary files /dev/null and b/Resources/Textures/_Impstation/Prospectors/desperado-hardsuit-helmet.rsi/icon-flash.png differ
diff --git a/Resources/Textures/_Impstation/Prospectors/desperado-hardsuit-helmet.rsi/icon.png b/Resources/Textures/_Impstation/Prospectors/desperado-hardsuit-helmet.rsi/icon.png
new file mode 100644
index 00000000000000..83335e893f8914
Binary files /dev/null and b/Resources/Textures/_Impstation/Prospectors/desperado-hardsuit-helmet.rsi/icon.png differ
diff --git a/Resources/Textures/_Impstation/Prospectors/desperado-hardsuit-helmet.rsi/meta.json b/Resources/Textures/_Impstation/Prospectors/desperado-hardsuit-helmet.rsi/meta.json
new file mode 100644
index 00000000000000..7afaa2292b71e8
--- /dev/null
+++ b/Resources/Textures/_Impstation/Prospectors/desperado-hardsuit-helmet.rsi/meta.json
@@ -0,0 +1,33 @@
+{
+ "version": 1,
+ "license": "CC-BY-SA-3.0",
+ "copyright": "Produced by user smpletan, made for Impstation https://github.com/impstation/imp-station-14",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "icon-flash"
+ },
+ {
+ "name": "off-equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "on-equipped-HELMET",
+ "directions": 4
+ },
+ {
+ "name": "off-equipped-HELMET-vox",
+ "directions": 4
+ },
+ {
+ "name": "on-equipped-HELMET-vox",
+ "directions": 4
+ }
+ ]
+}
diff --git a/Resources/Textures/_Impstation/Prospectors/desperado-hardsuit-helmet.rsi/off-equipped-HELMET-vox.png b/Resources/Textures/_Impstation/Prospectors/desperado-hardsuit-helmet.rsi/off-equipped-HELMET-vox.png
new file mode 100644
index 00000000000000..77be4296a31e25
Binary files /dev/null and b/Resources/Textures/_Impstation/Prospectors/desperado-hardsuit-helmet.rsi/off-equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/_Impstation/Prospectors/desperado-hardsuit-helmet.rsi/off-equipped-HELMET.png b/Resources/Textures/_Impstation/Prospectors/desperado-hardsuit-helmet.rsi/off-equipped-HELMET.png
new file mode 100644
index 00000000000000..230ab42ee2368f
Binary files /dev/null and b/Resources/Textures/_Impstation/Prospectors/desperado-hardsuit-helmet.rsi/off-equipped-HELMET.png differ
diff --git a/Resources/Textures/_Impstation/Prospectors/desperado-hardsuit-helmet.rsi/on-equipped-HELMET-vox.png b/Resources/Textures/_Impstation/Prospectors/desperado-hardsuit-helmet.rsi/on-equipped-HELMET-vox.png
new file mode 100644
index 00000000000000..3ac21bd765f7f5
Binary files /dev/null and b/Resources/Textures/_Impstation/Prospectors/desperado-hardsuit-helmet.rsi/on-equipped-HELMET-vox.png differ
diff --git a/Resources/Textures/_Impstation/Prospectors/desperado-hardsuit-helmet.rsi/on-equipped-HELMET.png b/Resources/Textures/_Impstation/Prospectors/desperado-hardsuit-helmet.rsi/on-equipped-HELMET.png
new file mode 100644
index 00000000000000..77ecd3d7b5c7c1
Binary files /dev/null and b/Resources/Textures/_Impstation/Prospectors/desperado-hardsuit-helmet.rsi/on-equipped-HELMET.png differ
diff --git a/Resources/Textures/_Impstation/Prospectors/desperado-hardsuit.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/_Impstation/Prospectors/desperado-hardsuit.rsi/equipped-OUTERCLOTHING-vox.png
new file mode 100644
index 00000000000000..9e5625d9a93930
Binary files /dev/null and b/Resources/Textures/_Impstation/Prospectors/desperado-hardsuit.rsi/equipped-OUTERCLOTHING-vox.png differ
diff --git a/Resources/Textures/_Impstation/Prospectors/desperado-hardsuit.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_Impstation/Prospectors/desperado-hardsuit.rsi/equipped-OUTERCLOTHING.png
new file mode 100644
index 00000000000000..a2cf5cef145a47
Binary files /dev/null and b/Resources/Textures/_Impstation/Prospectors/desperado-hardsuit.rsi/equipped-OUTERCLOTHING.png differ
diff --git a/Resources/Textures/_Impstation/Prospectors/desperado-hardsuit.rsi/icon.png b/Resources/Textures/_Impstation/Prospectors/desperado-hardsuit.rsi/icon.png
new file mode 100644
index 00000000000000..d4ffa855ebfd4e
Binary files /dev/null and b/Resources/Textures/_Impstation/Prospectors/desperado-hardsuit.rsi/icon.png differ
diff --git a/Resources/Textures/_Impstation/Prospectors/desperado-hardsuit.rsi/inhand-left.png b/Resources/Textures/_Impstation/Prospectors/desperado-hardsuit.rsi/inhand-left.png
new file mode 100644
index 00000000000000..af02d511aa0b7f
Binary files /dev/null and b/Resources/Textures/_Impstation/Prospectors/desperado-hardsuit.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Impstation/Prospectors/desperado-hardsuit.rsi/inhand-right.png b/Resources/Textures/_Impstation/Prospectors/desperado-hardsuit.rsi/inhand-right.png
new file mode 100644
index 00000000000000..82edb0a6516e30
Binary files /dev/null and b/Resources/Textures/_Impstation/Prospectors/desperado-hardsuit.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Impstation/Prospectors/desperado-hardsuit.rsi/meta.json b/Resources/Textures/_Impstation/Prospectors/desperado-hardsuit.rsi/meta.json
new file mode 100644
index 00000000000000..ed331598e77e26
--- /dev/null
+++ b/Resources/Textures/_Impstation/Prospectors/desperado-hardsuit.rsi/meta.json
@@ -0,0 +1,30 @@
+{
+ "version": 1,
+ "license": "CC-BY-NC-4.0",
+ "copyright": "Produced by user smpletan, made for Impstation https://github.com/impstation/imp-station-14",
+ "size": {
+ "x": 32,
+ "y": 32
+ },
+ "states": [
+ {
+ "name": "icon"
+ },
+ {
+ "name": "equipped-OUTERCLOTHING",
+ "directions": 4
+ },
+ {
+ "name": "equipped-OUTERCLOTHING-vox",
+ "directions": 4
+ },
+ {
+ "name": "inhand-left",
+ "directions": 4
+ },
+ {
+ "name": "inhand-right",
+ "directions": 4
+ }
+ ]
+}