diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm index a4932e54b66..93a62e81354 100644 --- a/code/__DEFINES/is_helpers.dm +++ b/code/__DEFINES/is_helpers.dm @@ -203,6 +203,8 @@ GLOBAL_LIST_INIT(turfs_openspace, typecacheof(list( #define isclothing(A) (istype(A, /obj/item/clothing)) +#define ispickedupmob(A) (istype(A, /obj/item/clothing/head/mob_holder)) // Checks if clothing item is actually a held mob + #define iscash(A) (istype(A, /obj/item/coin) || istype(A, /obj/item/stack/spacecash) || istype(A, /obj/item/holochip)) #define isbodypart(A) (istype(A, /obj/item/bodypart)) diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 1a84714a8bd..9b205fb79c3 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -111,7 +111,7 @@ qdel(src) /obj/item/clothing/attack(mob/living/M, mob/living/user, params) - if(user.combat_mode || !ismoth(M)) + if(user.combat_mode || !ismoth(M) || ispickedupmob(src)) return ..() if(isnull(moth_snack)) moth_snack = new