Merge pull request #143 from FoeFear/Other-Asset-Update

Finalizing Additions

Assets/DefaultResources.asset

@@ -585,8 +585,6 @@ MonoBehaviour:
     obj: {fileID: 21300000, guid: 8c3d94cd3d268c945be89684d8251b11, type: 3}
   - ID: heavy_air_station_sprite
     obj: {fileID: 21300000, guid: 93e0f4546f8bc8948b92394655629dd8, type: 3}
-  - ID: ion_air_station_sprite
-    obj: {fileID: 21300000, guid: ebdfa798c1e47d84aaf1780401b87d39, type: 3}
   - ID: beam_station_shooter
     obj: {fileID: 21300000, guid: c6b2271502041fa47801adef6a95f273, type: 3}
   - ID: AbilitySprite22
@@ -601,3 +599,13 @@ MonoBehaviour:
     obj: {fileID: 21300000, guid: d16f7c6d3a314b545b7a26440206dc71, type: 3}
   - ID: clip_unload
     obj: {fileID: 8300000, guid: 17cd4ce7340f46211a59e832aff0d698, type: 3}
+  - ID: AbilitySprite16
+    obj: {fileID: 21300000, guid: 61dd13f7f3dcc4140952bb98f976a1b2, type: 3}
+  - ID: clip_disrupt
+    obj: {fileID: 8300000, guid: 9e174542003196242a98b3159bcdfa60, type: 3}
+  - ID: AbilitySprite14
+    obj: {fileID: 21300000, guid: 2d48a9f898d4c35418709ea694fa896a, type: 3}
+  - ID: AbilitySprite15
+    obj: {fileID: 21300000, guid: 8ce480eac5b7fe143aa157b1cb4b2b23, type: 3}
+  - ID: AbilitySprite39
+    obj: {fileID: 21300000, guid: 2d48a9f898d4c35418709ea694fa896a, type: 3}

Assets/Scripts/Functional Definitions/Abilities/AbilityUtilities.cs

@@ -428,6 +428,8 @@ public static string GetAbilityNameByID(int ID, string secondaryData)
                 return "Ion";
             case 38:
                 return "Flak";
+            case 39:
+                return "Rocket";
             case 40:
                 return "Yard Warp";
             case 41:

Assets/Scripts/Functional Definitions/Abilities/Disrupt.cs

@@ -26,6 +26,7 @@ protected override void Awake()
     /// </summary>
     protected override void Execute()
     {
+        AudioManager.PlayClipByID("clip_disrupt", transform.position);
         for (int i = 0; i < AIData.entities.Count; i++)
         {
             if (AIData.entities[i] is Craft && !AIData.entities[i].GetIsDead() && !FactionManager.IsAllied(AIData.entities[i].faction, Core.faction) && !AIData.entities[i].IsInvisible)

Assets/Scripts/HUD Scripts/PlayerViewScript.cs

@@ -49,6 +49,7 @@ void Awake()
 
         paused = false;
         Time.timeScale = 1;
+        AudioListener.pause = false;
     }
 
     void Update()
@@ -76,6 +77,7 @@ void Update()
                 if (escapeMenu && escapeMenu.activeSelf && !transform.Find("Settings").gameObject.activeSelf)
                 {
                     Time.timeScale = 1;
+                    AudioListener.pause = false;
                     escapeMenu.SetActive(false);
                     return;
                 }
@@ -107,10 +109,12 @@ void Update()
                 if (escapeMenu.activeSelf)
                 {
                     Time.timeScale = 0;
+                    AudioListener.pause = true;
                 }
                 else
                 {
                     Time.timeScale = 1;
+                    AudioListener.pause = false;
                 }
             }
         }