Merge branch 'ToolsForGateDungeon' of https://github.com/21Melkuu/spa…

…ce-station-14 into ToolsForGateDungeon
SerbiaStrong-220 · Feb 5, 2025 · 4839b18 · 4839b18
2 parents fe70136 + 4bc5992
commit 4839b18
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/Content.Server/SS220/GateDungeon/GateDungeonSystem.cs b/Content.Server/SS220/GateDungeon/GateDungeonSystem.cs
@@ -30,8 +30,8 @@ public sealed class GateDungeonSystem : EntitySystem
     [Dependency] private readonly LinkedEntitySystem _linked = default!;
     [Dependency] private readonly SharedAppearanceSystem _appearance = default!;
     [Dependency] private readonly MetaDataSystem _meta = default!;
-    private Dictionary<GateType, List<EntityUid>> _gateList = new();
 
+    private Dictionary<GateType, List<EntityUid>> _gateList = new();
 
     /// <inheritdoc/>
     public override void Initialize()

diff --git a/Content.Shared/SS220/GateGunDungeon/GateGunDungeonSystem.cs b/Content.Shared/SS220/GateGunDungeon/GateGunDungeonSystem.cs
@@ -20,7 +20,7 @@ private void OnShoot(Entity<GateGunDungeonComponent> ent, ref ShotAttemptedEvent
     {
        var gridUid = _transform.GetGrid(ent.Owner);
 
-       if(gridUid == null)
+       if (gridUid == null)
            args.Cancel();
 
        if (!HasComp<GateDungeonMapComponent>(gridUid))

diff --git a/Resources/Textures/SS220/Structures/Machines/gate_dungeon.rsi/meta.json b/Resources/Textures/SS220/Structures/Machines/gate_dungeon.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "EULA/CLA with a hosting restriction, full text: https://raw.githubusercontent.com/SerbiaStrong-220/space-station-14/master/CLA.txt",
-    "copyright": "by vimenant2(discord) for SS220",
+    "copyright": "sprited by vimenant2(discord) for SS220",
     "size": {
       "x": 96,
       "y": 96