(af16ecdfa) Merge branch 'dev' into human-ai

2019-05-16 05:14:00 +03:00
parent 8be0b0676e
commit bec7aadfa9
65 changed files with 1579 additions and 1449 deletions
@@ -11,7 +11,16 @@ namespace Barotrauma.Items.Components
 {
    partial class Reactor : Powered, IServerSerializable, IClientSerializable
    {
+        public GUIScrollBar AutoTempSlider
+        {
+            get { return autoTempSlider; }
+        }
        private GUIScrollBar autoTempSlider;
+
+        public GUIScrollBar OnOffSwitch
+        {
+            get { return onOffSwitch; }
+        }
        private GUIScrollBar onOffSwitch;

        private const int GraphSize = 25;
@@ -27,7 +36,16 @@ namespace Barotrauma.Items.Components

        private Sprite graphLine;

+        public GUIScrollBar FissionRateScrollBar
+        {
+            get { return fissionRateScrollBar; }
+        }
        private GUIScrollBar fissionRateScrollBar;
+
+        public GUIScrollBar TurbineOutputScrollBar
+        {
+            get { return turbineOutputScrollBar; }
+        }
        private GUIScrollBar turbineOutputScrollBar;

        private float[] outputGraph = new float[GraphSize];