From 0b8dfae30be5fe8f00f5942daa653eb298663b9e Mon Sep 17 00:00:00 2001 From: Anewbe Date: Sat, 24 Feb 2018 22:22:30 -0600 Subject: [PATCH] Null checks and tears --- code/modules/clothing/clothing_accessories.dm | 8 +++----- code/modules/mob/living/carbon/human/inventory.dm | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/code/modules/clothing/clothing_accessories.dm b/code/modules/clothing/clothing_accessories.dm index de4556036b..57c292f1e3 100644 --- a/code/modules/clothing/clothing_accessories.dm +++ b/code/modules/clothing/clothing_accessories.dm @@ -1,11 +1,9 @@ /obj/item/clothing/proc/can_attach_accessory(obj/item/clothing/accessory/A) - var/obj/item/clothing/accessory/attach = A - if(src.valid_accessory_slots && (attach.slot in src.valid_accessory_slots)) - if(accessories.len && restricted_accessory_slots && (attach.slot in restricted_accessory_slots)) + if(src.valid_accessory_slots && (A.slot in src.valid_accessory_slots)) + if(accessories.len && restricted_accessory_slots && (A.slot in restricted_accessory_slots)) for(var/obj/item/clothing/accessory/AC in accessories) - if (AC.slot == attach.slot) + if (AC.slot == A.slot) return FALSE - return TRUE return TRUE else return FALSE diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm index f60a5d6708..947b844ad2 100644 --- a/code/modules/mob/living/carbon/human/inventory.dm +++ b/code/modules/mob/living/carbon/human/inventory.dm @@ -319,7 +319,7 @@ This saves us from having to call add_fingerprint() any time something is put in for(var/obj/item/clothing/C in worn_clothing) if(istype(W, /obj/item/clothing/accessory)) var/obj/item/clothing/accessory/A = W - if(C.attempt_attach_accessory(A)) + if(C.attempt_attach_accessory(A, src)) return else src << "You are trying to equip this item to an unsupported inventory slot. How the heck did you manage that? Stop it..."