Merging everything back into main

Assets/ClickableShield.cs

@@ -0,0 +1,30 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class ClickableShield : MonoBehaviour
+{
+    private CombatController CC;
+    public Shield Shd;
+    public Player Owner;
+    public bool clickable;
+    // Start is called before the first frame update
+    void Start()
+    {
+        if (clickable) { CC = GameObject.Find("CombatController").GetComponent<CombatController>(); }
+    }
+
+    // Update is called once per frame
+    void Update()
+    {
+
+    }
+
+    private void OnMouseDown()
+    {
+        if (enabled && clickable && Owner.GetComponent<Combatant>().ChangeEquippedShield(Shd))
+        {
+            CC.NextTurn();
+        }
+    }
+}