From fc6ec4982f1487675e0257bf7e00a09fbd742f78 Mon Sep 17 00:00:00 2001 From: Robertha89 Date: Wed, 24 Jun 2015 03:20:32 +0200 Subject: [PATCH] Pet Collar Bug Fix If you had Ian with a pet collar name like spot, and you gave him say a wizard name, then he would deafault to his real_name over his name, and making it impossible to restore the name on the collar. --- code/modules/mob/living/simple_animal/friendly/pet.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/friendly/pet.dm b/code/modules/mob/living/simple_animal/friendly/pet.dm index 20a8765921a..3cecd09c4d6 100644 --- a/code/modules/mob/living/simple_animal/friendly/pet.dm +++ b/code/modules/mob/living/simple_animal/friendly/pet.dm @@ -14,6 +14,7 @@ user << "You put the [P] around [src]'s neck." if(P.tagname) name = P.tagname + real_name = P.tagname qdel(P) return if(istype(O, /obj/item/weapon/newspaper)) @@ -43,4 +44,4 @@ /mob/living/simple_animal/pet/regenerate_icons() overlays.Cut() overlays += collar - overlays += pettag \ No newline at end of file + overlays += pettag