From 49cf32f3b09e0a489ba88dbc2d27bf4d66066e31 Mon Sep 17 00:00:00 2001 From: Anewbe Date: Thu, 24 May 2018 17:08:45 -0500 Subject: [PATCH] Fixes examine bugs --- code/modules/clothing/clothing_accessories.dm | 3 +-- code/modules/mob/living/carbon/human/examine.dm | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/code/modules/clothing/clothing_accessories.dm b/code/modules/clothing/clothing_accessories.dm index 83a11469f0..b87450c266 100644 --- a/code/modules/clothing/clothing_accessories.dm +++ b/code/modules/clothing/clothing_accessories.dm @@ -15,7 +15,7 @@ //Mask to just consumed restricted var/consumed_restricted = restricted_accessory_slots & consumed_slots - + //They share at least one bit with the restricted slots if(consumed_restricted & A.slot) return FALSE @@ -123,7 +123,6 @@ set src in usr if(!istype(usr, /mob/living)) return if(usr.stat) return - if(!accessories.len) return var/obj/item/clothing/accessory/A if(LAZYLEN(accessories)) A = input("Select an accessory to remove from [src]") as null|anything in accessories diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index d3ef59bc49..658b4b87ea 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -124,7 +124,7 @@ var/tie_msg if(istype(w_uniform,/obj/item/clothing/under) && !(skip_gear & EXAMINE_SKIPTIE)) var/obj/item/clothing/under/U = w_uniform - if(U.accessories.len) + if(LAZYLEN(U.accessories)) var/list/accessories_visible = list() //please let this fix the stupid fucking runtimes if(skip_gear & EXAMINE_SKIPHOLSTER) for(var/obj/item/clothing/accessory/A in U.accessories) @@ -155,7 +155,7 @@ var/tie_msg if(istype(wear_suit,/obj/item/clothing/suit)) var/obj/item/clothing/suit/U = wear_suit - if(U.accessories.len) + if(LAZYLEN(U.accessories)) tie_msg += " Attached to it is [english_list(U.accessories)]." if(wear_suit.blood_DNA)