/tg/ merge 2: electric boogaloo

Another merge, mainly to grab qdel fixes, Aran's click cooldown removal (FUCK YES), and fleure's dept sec access fix.