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

This reverts commit 20bf5739a9.
2021-08-24 00:50:39 -06:00
parent 20bf5739a9
commit e708091518
121 changed files with 711 additions and 10237 deletions
--- a/Content.Shared/Throwing/ThrownItemSystem.cs
+++ b/Content.Shared/Throwing/ThrownItemSystem.cs
@@ -15,14 +15,8 @@ namespace Content.Shared.Throwing
    /// </summary>
    public class ThrownItemSystem : EntitySystem
    {
-<<<<<<< HEAD
-<<<<<<< refs/remotes/origin/master
        [Dependency] private readonly SharedBroadphaseSystem _broadphaseSystem = default!;

-=======
->>>>>>> Bring refactor-damageablecomponent branch up-to-date with master (#4510)
-=======
->>>>>>> refactor-damageablecomponent
        private const string ThrowingFixture = "throw-fixture";

        public override void Initialize()