Merge pull request #4757 from Citadel-Station-13/upstream-merge-34177

[MIRROR] Prevents renaming uniquely named pets.

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

@@ -60,6 +60,7 @@
 	icon_state = "original"
 	icon_living = "original"
 	icon_dead = "original_dead"
+	unique_pet = TRUE
 
 /mob/living/simple_animal/pet/cat/kitten
 	name = "kitten"
@@ -80,6 +81,7 @@
 	icon_dead = "cat_dead"
 	gender = FEMALE
 	gold_core_spawnable = NO_SPAWN
+	unique_pet = TRUE
 	var/list/family = list()//var restored from savefile, has count of each child type
 	var/list/children = list()//Actual mob instances of children
 	var/cats_deployed = 0
@@ -153,6 +155,7 @@
 	name = "Proc"
 	gender = MALE
 	gold_core_spawnable = NO_SPAWN
+	unique_pet = TRUE
 
 /mob/living/simple_animal/pet/cat/Life()
 	if(!stat && !buckled && !client)

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

@@ -74,4 +74,5 @@
 	real_name = "Evil Kreb"
 	icon_state = "evilkreb"
 	icon_living = "evilkreb"
-	icon_dead = "evilkreb_dead"
+	icon_dead = "evilkreb_dead"
+	gold_core_spawnable = NO_SPAWN

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

@@ -295,6 +295,7 @@
 	response_disarm = "bops"
 	response_harm   = "kicks"
 	gold_core_spawnable = NO_SPAWN
+	unique_pet = TRUE
 	var/age = 0
 	var/record_age = 1
 	var/memory_saved = FALSE
@@ -444,6 +445,7 @@
 	faction = list("dog", "cult")
 	gold_core_spawnable = NO_SPAWN
 	nofur = TRUE
+	unique_pet = TRUE
 
 /mob/living/simple_animal/pet/dog/corgi/narsie/Life()
 	..()
@@ -556,6 +558,8 @@
 	real_name = "Lisa"
 	gender = FEMALE
 	desc = "It's a corgi with a cute pink bow."
+	gold_core_spawnable = NO_SPAWN
+	unique_pet = TRUE
 	icon_state = "lisa"
 	icon_living = "lisa"
 	icon_dead = "lisa_dead"
@@ -564,7 +568,6 @@
 	response_harm   = "kicks"
 	var/turns_since_scan = 0
 	var/puppies = 0
-	gold_core_spawnable = NO_SPAWN
 
 //Lisa already has a cute bow!
 /mob/living/simple_animal/pet/dog/corgi/Lisa/Topic(href, href_list)

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

@@ -25,3 +25,4 @@
 	desc = "Renault, the Captain's trustworthy fox."
 	gender = FEMALE
 	gold_core_spawnable = NO_SPAWN
+	unique_pet = TRUE

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

@@ -29,6 +29,8 @@
 	desc = "Shameful of all he surveys."
 	icon_state = "penguin_shamebrero"
 	icon_living = "penguin_shamebrero"
+	gold_core_spawnable = NO_SPAWN
+	unique_pet = TRUE
 
 /mob/living/simple_animal/pet/penguin/baby
 	speak = list("gah", "noot noot", "noot!", "noot", "squeee!", "noo!")

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

@@ -4,6 +4,7 @@
 	var/obj/item/clothing/neck/petcollar/pcollar = null
 	var/collar = ""
 	var/pettag = ""
+	var/unique_pet = FALSE
 	blood_volume = BLOOD_VOLUME_NORMAL
 
 /mob/living/simple_animal/pet/attackby(obj/item/O, mob/user, params)
@@ -16,7 +17,7 @@
 			pettag = "[icon_state]tag"
 			regenerate_icons()
 			to_chat(user, "<span class='notice'>You put the [P] around [src]'s neck.</span>")
-			if(P.tagname)
+			if(P.tagname && !unique_pet)
 				real_name = "\proper [P.tagname]"
 				name = real_name
 			qdel(P)