Merge pull request #10961 from Citadel-Station-13/Ghommie-patch-2-1

Fixes an issue with the nearsighted prescription glasses taking over worn eyewear
2020-02-10 20:28:57 +00:00
parent 2d9e1d2ea3 8365fec82e
commit 4797b5edc8
1 changed files with 2 additions and 3 deletions
@@ -144,9 +144,8 @@ GLOBAL_LIST_EMPTY(family_heirlooms)
 /datum/quirk/nearsighted/on_spawn()
 	var/mob/living/carbon/human/H = quirk_holder
 	var/obj/item/clothing/glasses/regular/glasses = new(get_turf(H))
-	H.put_in_hands(glasses)
-	H.equip_to_slot(glasses, SLOT_GLASSES)
-	H.regenerate_icons() //this is to remove the inhand icon, which persists even if it's not in their hands
+	if(!H.equip_to_slot_if_possible(glasses, SLOT_GLASSES))
+		H.put_in_hands(glasses)

 /datum/quirk/nyctophobia
 	name = "Nyctophobia"