Revert "Revert "Имя на ошейнике (BlueMoon-Labs#674)""

This reverts commit 7cf6ba6.
Kush1Push1 · Jan 6, 2024 · 179d151 · 179d151
1 parent 7cf6ba6
commit 179d151
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/code/game/atoms.dm b/code/game/atoms.dm
@@ -1581,6 +1581,12 @@
 	var/shift_lmb_ctrl_shift_lmb_line = ""
 	var/extra_lines = 0
 	var/extra_context = ""
+	var/auxiliary_name = ""
+
+	if(ishuman(src))
+		var/mob/living/carbon/human/H = src
+		var/obj/item/clothing/neck/petcollar/collar = H.wear_neck
+		auxiliary_name = (collar && collar.tagname) ? "\[[collar.tagname]\]" : ""
 
 	if ((isliving(user) || isovermind(user) || isaicamera(user)) && (user.client.prefs.screentip_pref != SCREENTIP_PREFERENCE_NO_CONTEXT))
 		var/obj/item/held_item = user.get_active_held_item()
@@ -1651,7 +1657,7 @@
 		active_hud.screentip_text.maptext = ""
 	else
 		//We inline a MAPTEXT() here, because there's no good way to statically add to a string like this
-		active_hud.screentip_text.maptext = "<span class='context' style='text-align: center; color: [user.client.prefs.screentip_color]'>[name][extra_context]</span>"
+		active_hud.screentip_text.maptext = "<span class='context' style='text-align: center; color: [user.client.prefs.screentip_color]'>[name] [auxiliary_name][extra_context]</span>"
 
 /**
  * Recursive getter method to return a list of all ghosts orbitting this atom

diff --git a/code/modules/clothing/neck/_neck.dm b/code/modules/clothing/neck/_neck.dm
@@ -200,7 +200,7 @@
 
 /obj/item/clothing/neck/petcollar/attack_self(mob/user)
 	tagname = stripped_input(user, "Would you like to change the name on the tag?", "Name your new pet", "Spot", MAX_NAME_LEN)
-	name = "[initial(name)] - [tagname]"
+	name = tagname ? "[initial(name)] - [tagname]" : initial(name)
 
 /obj/item/clothing/neck/petcollar/Entered(atom/movable/AM)
 	. = ..()

diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm
@@ -18,7 +18,9 @@
 		var/mob/living/L = user
 		if(HAS_TRAIT(L, TRAIT_PROSOPAGNOSIA) || HAS_TRAIT(L, TRAIT_INVISIBLE_MAN))
 			obscure_name = TRUE
-	. = list("<span class='info'>Это - <EM>[!obscure_name ? name : "Неизвестный"]</EM>!")
+	var/obj/item/clothing/neck/petcollar/collar = wear_neck
+	var/collar_tagname = (collar && collar.tagname) ? " \[[collar.tagname]\]" : ""
+	. = list("<span class='info'>Это - <EM>[!obscure_name ? name : "Неизвестный"][collar_tagname]</EM>!")
 	if(skipface || get_visible_name() == "Unknown")
 		. += "Вы не можете разобрать, к какому виду относится находящееся перед вами существо."
 	else