Switch to Barotrauma & too many misc changes to remember

Subsurface/Source/Items/Components/Machines/Controller.cs

@@ -5,7 +5,7 @@ using FarseerPhysics;
 using FarseerPhysics.Dynamics.Joints;
 using Microsoft.Xna.Framework;
 
-namespace Subsurface.Items.Components
+namespace Barotrauma.Items.Components
 {
     struct LimbPos
     {
@@ -163,15 +163,6 @@ namespace Subsurface.Items.Components
                     break;
                 }
             }
-
-            //foreach (MapEntity e in item.linkedTo)
-            //{
-            //    Item linkedItem = e as Item;
-            //    if (linkedItem == null) continue;
-            //    linkedItem.SecondaryUse(deltaTime, character);
-            //}
-
-
         }
 
         public override bool Pick(Character picker)

Subsurface/Source/Items/Components/Machines/Engine.cs

@@ -7,7 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Xml.Linq;
 
-namespace Subsurface.Items.Components
+namespace Barotrauma.Items.Components
 {
     class Engine : Powered
     {

Subsurface/Source/Items/Components/Machines/Fabricator.cs

@@ -6,7 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Xml.Linq;
 
-namespace Subsurface.Items.Components
+namespace Barotrauma.Items.Components
 {
     class FabricableItem
     {

Subsurface/Source/Items/Components/Machines/MiniMap.cs

@@ -3,7 +3,7 @@ using System.Xml.Linq;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 
-namespace Subsurface.Items.Components
+namespace Barotrauma.Items.Components
 {
     class MiniMap : Powered
     {

Subsurface/Source/Items/Components/Machines/OxygenGenerator.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Xml.Linq;
 
-namespace Subsurface.Items.Components
+namespace Barotrauma.Items.Components
 {
     class OxygenGenerator : Powered
     {
@@ -60,6 +60,8 @@ namespace Subsurface.Items.Components
                 powerDownTimer = 0.0f;
             }
 
+            ApplyStatusEffects(ActionType.OnActive, deltaTime, null);
+
             running = true;
 
             CurrFlow = Math.Min(voltage, 1.0f) * 50000.0f;

Subsurface/Source/Items/Components/Machines/Pump.cs

@@ -5,7 +5,7 @@ using System.Collections.Specialized;
 using System.Globalization;
 using System.Xml.Linq;
 
-namespace Subsurface.Items.Components
+namespace Barotrauma.Items.Components
 {
     class Pump : Powered
     {
@@ -78,6 +78,8 @@ namespace Subsurface.Items.Components
 
             if (voltage < minVoltage) return;
 
+            ApplyStatusEffects(ActionType.OnActive, deltaTime, null);
+
             if (hull2 == null && hull1 == null) return;
             
             float powerFactor = (currPowerConsumption==0.0f) ? 1.0f : voltage;

Subsurface/Source/Items/Components/Machines/Radar.cs

@@ -7,7 +7,7 @@ using System.Linq;
 using System.Text;
 using System.Xml.Linq;
 
-namespace Subsurface.Items.Components
+namespace Barotrauma.Items.Components
 {
     class Radar : Powered
     {

Subsurface/Source/Items/Components/Machines/Reactor.cs

@@ -4,9 +4,9 @@ using System.Xml.Linq;
 using Lidgren.Network;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
-using Subsurface.Networking;
+using Barotrauma.Networking;
 
-namespace Subsurface.Items.Components
+namespace Barotrauma.Items.Components
 {
     class Reactor : Powered
     {
@@ -106,6 +106,7 @@ namespace Subsurface.Items.Components
         public bool AutoTemp
         {
             get { return autoTemp; }
+            set { autoTemp = value; }
         }
 
         public float ExtraCooling { get; set; }
@@ -115,7 +116,7 @@ namespace Subsurface.Items.Components
         public float ShutDownTemp
         {
             get { return shutDownTemp; }
-            private set { shutDownTemp = MathHelper.Clamp(value, 0.0f, 10000.0f); }
+            set { shutDownTemp = MathHelper.Clamp(value, 0.0f, 10000.0f); }
         }
 
         public Reactor(Item item, XElement element)
@@ -137,7 +138,7 @@ namespace Subsurface.Items.Components
 
         public override void Update(float deltaTime, Camera cam) 
         {
-            //ApplyStatusEffects(ActionType.OnActive, deltaTime, null);
+            ApplyStatusEffects(ActionType.OnActive, deltaTime, null);
             
             fissionRate = Math.Min(fissionRate, AvailableFuel);
             

Subsurface/Source/Items/Components/Machines/Steering.cs

@@ -8,7 +8,7 @@ using System.Linq;
 using System.Text;
 using System.Xml.Linq;
 
-namespace Subsurface.Items.Components
+namespace Barotrauma.Items.Components
 {
     class Steering : Powered
     {

Subsurface/Source/Items/Components/Machines/Vent.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Xml.Linq;
 
-namespace Subsurface.Items.Components
+namespace Barotrauma.Items.Components
 {
     class Vent : ItemComponent
     {