Merge branch 'master' of https://github.com/tgstation/tgstation into xpokee-test-upstream-sync

code/modules/vehicles/mecha/equipment/weapons/weapons.dm

@@ -668,7 +668,6 @@
 		if(autocuff && iscarbon(target))
 			var/mob/living/carbon/carbontarget = target
 			carbontarget.set_handcuffed(new cuff_type(carbontarget))
-			carbontarget.update_handcuffed()
 		return
 
 	if(istype(target, /obj/machinery/door))

code/modules/vehicles/mecha/mecha_defense.dm

@@ -269,6 +269,8 @@
 		return part.try_attach_part(user, src, FALSE)
 
 	if(is_wire_tool(tool) && (mecha_flags & PANEL_OPEN))
+		if(user.combat_mode)
+			return
 		if(wires.interact(user))
 			return ITEM_INTERACT_SUCCESS