Merge branch 'master' of https://bitbucket.org/Regalis11/subsurface-private

Conflicts: Subsurface/Source/Characters/AI/Objectives/AIObjectiveManager.cs
2016-01-18 21:48:40 +02:00
parent 1a5b3fa66a 19ec05c70e
commit 9405df006a
7 changed files with 87 additions and 9 deletions
@@ -19,5 +19,9 @@

  <Order name="Operate Railgun" doingtext="Operating Railgun" targetitemtype="Turret" usecontroller="true" options="Fire at will, Hold fire" color="1.0,0.0,0.0,1.0">
    <Sprite texture="Content/UI/orderSymbols.png" sourcerect="0,64,64,64"/>
-  </Order> 
+  </Order>
+
+  <Order name="Fix Leaks" doingtext="Fixing Leaks" color="0.6,0.85,1.0,1.0">
+    <Sprite texture="Content/UI/orderSymbols.png" sourcerect="64,64,64,64"/>    
+  </Order>
 </Orders>