diff --git a/code/modules/mining/lavaland/mining_loot/equipment.dm b/code/modules/mining/lavaland/mining_loot/equipment.dm index e5c166ae916..98edc5700d2 100644 --- a/code/modules/mining/lavaland/mining_loot/equipment.dm +++ b/code/modules/mining/lavaland/mining_loot/equipment.dm @@ -62,7 +62,7 @@ activated() /obj/item/rod_of_asclepius/proc/activated() - item_flags = DROPDEL + item_flags = DROPDEL | ABSTRACT ADD_TRAIT(src, TRAIT_NODROP, CURSED_ITEM_TRAIT(type)) activated = TRUE update_appearance() diff --git a/code/modules/vehicles/mecha/mecha_mob_interaction.dm b/code/modules/vehicles/mecha/mecha_mob_interaction.dm index 53ad199cc0b..46f6e8c9e1e 100644 --- a/code/modules/vehicles/mecha/mecha_mob_interaction.dm +++ b/code/modules/vehicles/mecha/mecha_mob_interaction.dm @@ -33,6 +33,12 @@ to_chat(M, span_warning("You can't enter the exosuit with other creatures attached to you!")) log_message("Permission denied (Attached mobs).", LOG_MECHA) return FALSE + + for(var/obj/item/thing in M.held_items) + if(!(thing.item_flags & (ABSTRACT|HAND_ITEM))) + to_chat(M, span_warning("You can't enter the exosuit while your hands are occupied!")) + return FALSE + return ..() ///proc called when a new non-mmi mob enters this mech