Merge pull request #7038 from Fox-McCloud/the-qdelening

More qdel and Destroy Fixes

code/modules/mob/living/simple_animal/simple_animal.dm

@@ -96,6 +96,7 @@
 	if(collar)
 		collar.forceMove(loc)
 		collar = null
+	master_commander = null
 	simple_animal_list -= src
 	return ..()
 
@@ -303,7 +304,7 @@
 
 /mob/living/simple_animal/proc/attacked_by(obj/item/I, mob/living/user) // Handled in _onclick/click.dm
 	return
-	
+
 /mob/living/simple_animal/bullet_act(var/obj/item/projectile/Proj)
 	if(!Proj)
 		return
@@ -662,15 +663,15 @@
 	. = ..()
 
 /mob/living/simple_animal/can_equip(obj/item/I, slot, disable_warning = 0)
-	// . = ..() // Do not call parent. We do not want animals using their hand slots.
-	switch(slot)
-		if(slot_collar)
-			if(collar)
-				return 0
-			if(!can_collar)
-				return 0
-			if(!istype(I, /obj/item/clothing/accessory/petcollar))
-				return 0
+	// . = ..() // Do not call parent. We do not want animals using their hand slots.
+	switch(slot)
+		if(slot_collar)
+			if(collar)
+				return 0
+			if(!can_collar)
+				return 0
+			if(!istype(I, /obj/item/clothing/accessory/petcollar))
+				return 0
 			return 1
 
 /mob/living/simple_animal/equip_to_slot(obj/item/W, slot)
@@ -692,13 +693,13 @@
 				name = collar.tagname
 				real_name = collar.tagname
 			regenerate_icons()
-
-/mob/living/simple_animal/unEquip(obj/item/I, force)
-	. = ..()
-	if(!. || !I)
-		return
-
-	if(I == collar)
+
+/mob/living/simple_animal/unEquip(obj/item/I, force)
+	. = ..()
+	if(!. || !I)
+		return
+
+	if(I == collar)
 		collar = null
 		regenerate_icons()