(db8417634) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

Barotrauma/BarotraumaShared/Source/Items/Components/ItemComponent.cs

@@ -189,8 +189,7 @@ namespace Barotrauma.Items.Components
         {
             get { return name; }
         }
-
-        //TODO: this shouldn't be saved as-is, causes tags ("ItemMsgPressSelect" etc) to be converted into actual texts when saving the subs
+        
         [Editable, Serialize("", true)]
         public string Msg
         {
@@ -204,12 +203,6 @@ namespace Barotrauma.Items.Components
             set;
         }
 
-        public AITarget AITarget
-        {
-            get;
-            private set;
-        }
-
         public AITarget AITarget
         {
             get;
@@ -254,7 +247,7 @@ namespace Barotrauma.Items.Components
             {
                 DebugConsole.ThrowError("Invalid pick key in " + element + "!", e);
             }
-            
+
             SerializableProperties = SerializableProperty.DeserializeProperties(this, element);
             ParseMsg();