Revert "Refactor Damage to use Protoypes (#4262)"

This reverts commit 20bf5739a9.

Content.Server/Projectiles/Components/ProjectileComponent.cs

@@ -13,8 +13,6 @@ namespace Content.Server.Projectiles.Components
     [ComponentReference(typeof(SharedProjectileComponent))]
     public class ProjectileComponent : SharedProjectileComponent
     {
-<<<<<<< HEAD
-<<<<<<< refs/remotes/origin/master
         [DataField("damages")] private Dictionary<DamageType, int> _damages = new();
 
         [ViewVariables]
@@ -23,33 +21,12 @@ namespace Content.Server.Projectiles.Components
             get => _damages;
             set => _damages = value;
         }
-=======
-=======
->>>>>>> refactor-damageablecomponent
-        // TODO PROTOTYPE Replace this datafield variable with prototype references, once they are supported.
-        // This also requires changing the dictionary type and modifying ProjectileSystem.cs, which uses it.
-        // While thats being done, also replace "damages" -> "damageTypes" For consistency.
-        [DataField("damages")]
-        [ViewVariables(VVAccess.ReadWrite)]
-        public Dictionary<string, int> Damages { get; set; } = new();
-<<<<<<< HEAD
->>>>>>> Refactor damageablecomponent update (#4406)
-=======
->>>>>>> refactor-damageablecomponent
 
         [DataField("deleteOnCollide")]
         public bool DeleteOnCollide { get; } = true;
 
         // Get that juicy FPS hit sound
-<<<<<<< HEAD
-<<<<<<< refs/remotes/origin/master
         [DataField("soundHit", required: true)] public SoundSpecifier? SoundHit = default!;
-=======
-        [DataField("soundHit", required: true)] public SoundSpecifier SoundHit = default!;
->>>>>>> Bring refactor-damageablecomponent branch up-to-date with master (#4510)
-=======
-        [DataField("soundHit", required: true)] public SoundSpecifier SoundHit = default!;
->>>>>>> refactor-damageablecomponent
         [DataField("soundHitSpecies")] public SoundSpecifier? SoundHitSpecies = null;
 
         public bool DamagedEntity;