From d226b77b16e7ca149d8c0a954882c9730675d60a Mon Sep 17 00:00:00 2001 From: Repede Date: Sat, 29 Feb 2020 22:37:40 -0500 Subject: [PATCH] fixes clipping not working for Teshari collar --- .../clothing/under/accessories/accessory_vr.dm | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/code/modules/clothing/under/accessories/accessory_vr.dm b/code/modules/clothing/under/accessories/accessory_vr.dm index c6f5f2932c..0e8a7cbf93 100644 --- a/code/modules/clothing/under/accessories/accessory_vr.dm +++ b/code/modules/clothing/under/accessories/accessory_vr.dm @@ -16,12 +16,25 @@ /obj/item/clothing/accessory/collar/equipped() //Solution for race-specific sprites for an accessory which is also a suit. Suit icons break if you don't use icon override which then also overrides race-specific sprites. ..() + setUniqueSpeciesSprite() + +/obj/item/clothing/accessory/collar/proc/setUniqueSpeciesSprite() var/mob/living/carbon/human/H = loc - if(istype(H) && H.wear_suit == src) + if(!istype(H)) + if(istype(has_suit) && ishuman(has_suit.loc)) + H = has_suit.loc + if(istype(H)) if(H.species.name == SPECIES_TESHARI) icon_override = 'icons/obj/clothing/collars_seromi_yw.dmi' update_clothing_icon() +/obj/item/clothing/accessory/collar/on_attached(var/obj/item/clothing/S, var/mob/user) + if(!istype(S)) + return + has_suit = S + setUniqueSpeciesSprite() + ..(S, user) + /obj/item/clothing/accessory/collar/dropped() icon_override = icon_previous_override //ywedit end