From ec7ef43e16c9ffbd0b266f12a4cb20ea381e0226 Mon Sep 17 00:00:00 2001 From: necromanceranne <40847847+necromanceranne@users.noreply.github.com> Date: Tue, 13 May 2025 22:09:22 +1000 Subject: [PATCH] Stops you getting into a mech if you have stuff in your hands at all. (#91046) ## About The Pull Request Makes it so that it is impossible to enter a mech if your hands are full. ## Why It's Good For The Game This can result in some...very unintended behavior should somehow you cannot be forced to drop items in your hands. ## Changelog :cl: fix: You must have both your hands empty before entering a mech. (But items which replace your hand, like the light later or the hand of god, won't prevent you from getting in) /:cl: --- code/modules/mining/lavaland/mining_loot/equipment.dm | 2 +- code/modules/vehicles/mecha/mecha_mob_interaction.dm | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) 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