From f18fcccc5f2b45126e896992e877d2190ef83315 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Mon, 2 Nov 2020 18:46:16 +0100 Subject: [PATCH] [MIRROR] You can once again place hats on cyborgs without having to treat it as a party game. (#1545) * Merge pull request #54714 from Timberpoes/borgo-hat-fix You can once again place hats on cyborgs without having to treat it as a party game. * You can once again place hats on cyborgs without having to treat it as a party game. Co-authored-by: ShizCalev --- code/modules/mob/living/silicon/robot/robot_defense.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/silicon/robot/robot_defense.dm b/code/modules/mob/living/silicon/robot/robot_defense.dm index d9e841d5f69..5196b095945 100644 --- a/code/modules/mob/living/silicon/robot/robot_defense.dm +++ b/code/modules/mob/living/silicon/robot/robot_defense.dm @@ -100,7 +100,7 @@ GLOBAL_LIST_INIT(blacklisted_borg_hats, typecacheof(list( //Hats that don't real return if(W.slot_flags & ITEM_SLOT_HEAD && hat_offset != INFINITY && user.a_intent == INTENT_HELP && !is_type_in_typecache(W, GLOB.blacklisted_borg_hats)) - if(HAS_TRAIT(hat, TRAIT_NODROP)) + if(hat && HAS_TRAIT(hat, TRAIT_NODROP)) to_chat(user, "You can't seem to remove [src]'s existing headwear!") return to_chat(user, "You begin to place [W] on [src]'s head...")