From bab326a9e2ef9dcbade4d411813b3a5f3a073e20 Mon Sep 17 00:00:00 2001
From: GlassEclipse <32942106+GlassEclipse@users.noreply.github.com>
Date: Wed, 18 Nov 2020 01:16:01 -0600
Subject: [PATCH] Fixes some map-saved weapons not properly loading in (#2567)

* Fix

* formatting xd
---
 .../Weapon/Ranged/Barrels/ServerBatteryBarrelComponent.cs    | 5 ++++-
 .../Weapon/Ranged/Barrels/ServerMagazineBarrelComponent.cs   | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerBatteryBarrelComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerBatteryBarrelComponent.cs
index d0ef16c060..418c1bf93f 100644
--- a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerBatteryBarrelComponent.cs
+++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerBatteryBarrelComponent.cs
@@ -121,8 +121,11 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Barrels
             {
                 _appearanceComponent = appearanceComponent;
             }
-
             Dirty();
+        }
+
+        protected override void Startup()
+        {
             UpdateAppearance();
         }
 
diff --git a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerMagazineBarrelComponent.cs b/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerMagazineBarrelComponent.cs
index 8ef315d292..9d77992065 100644
--- a/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerMagazineBarrelComponent.cs
+++ b/Content.Server/GameObjects/Components/Weapon/Ranged/Barrels/ServerMagazineBarrelComponent.cs
@@ -200,8 +200,11 @@ namespace Content.Server.GameObjects.Components.Weapon.Ranged.Barrels
                 var magEntity = Owner.EntityManager.SpawnEntity(_magFillPrototype, Owner.Transform.Coordinates);
                 _magazineContainer.Insert(magEntity);
             }
-
             Dirty();
+        }
+
+        protected override void Startup()
+        {
             UpdateAppearance();
         }