From a40b29fe7a816ecc3a70af0e60eb509356d54d09 Mon Sep 17 00:00:00 2001 From: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com> Date: Sun, 25 Jan 2026 18:47:29 -0500 Subject: [PATCH] [S] Fixes an exploit with mecha ranges (#31508) * mecha melee attacks respect adjacency * use chassis instead of loc --- code/game/mecha/equipment/mecha_equipment.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/game/mecha/equipment/mecha_equipment.dm b/code/game/mecha/equipment/mecha_equipment.dm index c078a91435c..b11de6f7381 100644 --- a/code/game/mecha/equipment/mecha_equipment.dm +++ b/code/game/mecha/equipment/mecha_equipment.dm @@ -64,6 +64,8 @@ return FALSE if(!chassis) return FALSE + if(!is_ranged() && !chassis.Adjacent(target)) + return FALSE if(!equip_ready) return FALSE if(energy_drain && !chassis.has_charge(energy_drain))