Merge branch 'master' of ssh://git.breab.org:2222/gamejam-gpn15/dyingIsMainstream

Assets/Scripts/ShieldScript.cs

@@ -30,6 +30,7 @@ public class ShieldScript : MonoBehaviour {
 
     void stopShielding()
     {
+        if (parentHealth != null) parentHealth.setShield(false);
         Destroy(gameObject);
     }
 }