Быстрофикс 2 (BlueMoon-Labs#676)

Выявлена и исправлена доп. ошибка.
Kush1Push1 · Jan 6, 2024 · 60ab9c6 · 60ab9c6
1 parent fba90d1
commit 60ab9c6
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/code/game/atoms.dm b/code/game/atoms.dm
@@ -1585,8 +1585,10 @@
 
 	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(istype(H.wear_neck, /obj/item/clothing/neck/petcollar))
+			var/obj/item/clothing/neck/petcollar/collar = H.wear_neck
+			if(collar.tagname)
+				auxiliary_name = "\[[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()

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