shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #12079 from Ghommie/Ghommie-cit715

Browse Source 
Fixing several reported issues.
This commit is contained in:
kevinz000
2020-05-02 15:54:32 -07:00
committed by GitHub
parent ae695aeebd 52aa8fa1ec
commit fe938c500e
12 changed files with 18 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/elements/mob_holder.dm
+1 -1
View File
@@ -164,7 +164,7 @@
release()
/obj/item/clothing/head/mob_holder/mob_can_equip(mob/living/M, mob/living/equipper, slot, disable_warning = FALSE, bypass_equip_delay_self = FALSE)
if(!ishuman(M)) //monkeys holding monkeys holding monkeys...
if(M == held_mob || !ishuman(M)) //monkeys holding monkeys holding monkeys...
return FALSE
return ..()