From 12f64e463752994de0d7670390f95065bc3c3be3 Mon Sep 17 00:00:00 2001 From: AnturK Date: Sun, 1 Jul 2018 00:04:21 +0200 Subject: [PATCH] Adds missing armor to accessories (#38800) --- code/modules/clothing/under/accessories.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/clothing/under/accessories.dm b/code/modules/clothing/under/accessories.dm index 41ac34b4697..8d250ab766b 100755 --- a/code/modules/clothing/under/accessories.dm +++ b/code/modules/clothing/under/accessories.dm @@ -28,10 +28,10 @@ pixel_y -= 8 U.add_overlay(src) - if (islist(U.armor)) // This proc can run before /obj/Initialize has run for U and src, + if (islist(U.armor) || isnull(U.armor)) // This proc can run before /obj/Initialize has run for U and src, U.armor = getArmor(arglist(U.armor)) // we have to check that the armor list has been transformed into a datum before we try to call a proc on it // This is safe to do as /obj/Initialize only handles setting up the datum if actually needed. - if (islist(armor)) + if (islist(armor) || isnull(armor)) armor = getArmor(arglist(armor)) U.armor = U.armor.attachArmor(armor)