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/Ghost/SharedGhostComponent.cs
+++ b/Content.Shared/Ghost/SharedGhostComponent.cs
@@ -34,13 +34,6 @@ namespace Content.Shared.Ghost
        ///     Changed by <see cref="SharedGhostSystem.SetCanReturnToBody"/>
        /// </summary>
        // TODO MIRROR change this to use friend classes when thats merged
-<<<<<<< HEAD
-<<<<<<< refs/remotes/origin/master
-=======
-=======
->>>>>>> refactor-damageablecomponent
-        [DataField("canReturnToBody")]
->>>>>>> Bring refactor-damageablecomponent branch up-to-date with master (#4510)
        [ViewVariables(VVAccess.ReadWrite)]
        public bool CanReturnToBody
        {