cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-16 10:35:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] You can once again place hats on cyborgs without having to treat it as a party game. (#1545)

Browse Source 
* 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 <ShizCalev@users.noreply.github.com>
This commit is contained in:
SkyratBot
2020-11-02 18:46:16 +01:00
committed by GitHub
parent 8dc84154f4
commit f18fcccc5f
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/silicon/robot/robot_defense.dm
+1 -1
View File
@@ -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>")