Merge pull request #3971 from Tastyfish/sa-fix

Fixes simple animal Destroy() & death alarm text

code/modules/clothing/under/accessories/accessory.dm

@@ -407,9 +407,9 @@
 	var/obj/item/device/radio/headset/a = new /obj/item/device/radio/headset(null)
 	if(istype(t, /area/syndicate_station) || istype(t, /area/syndicate_mothership) || istype(t, /area/shuttle/syndicate_elite) )
 		//give the syndicats a bit of stealth
-		a.autosay("[tagname] has been vandalized in Space!", "[tagname]'s Death Alarm")
+		a.autosay("[M] has been vandalized in Space!", "[M]'s Death Alarm")
 	else
-		a.autosay("[tagname] has been vandalized in [t.name]!", "[tagname]'s Death Alarm")
+		a.autosay("[M] has been vandalized in [t.name]!", "[M]'s Death Alarm")
 	qdel(a)
 	processing_objects -= src
 

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

@@ -92,6 +92,7 @@
 	if(collar)
 		collar.forceMove(loc)
 		collar = null
+	return ..()
 
 /mob/living/simple_animal/Login()
 	if(src && src.client)