One thing I really appreciated about that fight scene at the warehouse. It was fun watching the two kick ass and obviously enjoying it, but while watching you knew Chloe and Maz were on their way over. Once she showed Lucifer would suddenly become vulnerable (we still have no idea or what range that takes place or if he has to be aware of her nearby for that to happen). This added an undercurrent to the whole fight because it could suddenly go bad for him, when the last gunman stood before them I figured "Aw Crap, now he gets shot." Instead the gun jams.
It was just a very nice touch, adding some doubt to the scene which brought it above the gratuitous violence level with an undercurrent of tension.