From d71b2bf4d29dea9a619ae9c59075350358e5f801 Mon Sep 17 00:00:00 2001 From: Tastyfish Date: Wed, 23 Mar 2016 06:30:17 -0400 Subject: [PATCH] Fixes simple animal destroy / death alarm --- code/modules/clothing/under/accessories/accessory.dm | 4 ++-- code/modules/mob/living/simple_animal/simple_animal.dm | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index 59483364760..8328726487b 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/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 diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index 3a6333a3d00..62a73504c40 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/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)