Skip to content

Commit

Permalink
Merge pull request tgstation#54714 from Timberpoes/borgo-hat-fix
Browse files Browse the repository at this point in the history
You can once again place hats on cyborgs without having to treat it as a party game.
  • Loading branch information
ShizCalev authored Nov 2, 2020
2 parents 09ba581 + 5c8b3ba commit bb83d9e
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion code/modules/mob/living/silicon/robot/robot_defense.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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, "<span class='warn'>You can't seem to remove [src]'s existing headwear!</span>")
return
to_chat(user, "<span class='notice'>You begin to place [W] on [src]'s head...</span>")
Expand Down

0 comments on commit bb83d9e

Please sign in to comment.