Verb cleanup (#22224)

* Verb cleanup

* rest of the object verbs

* little more object cleanup

* more changes

* last of it

* this too

* tgui

* code review

* time to go

code/modules/assembly/infrared.dm

@@ -28,6 +28,7 @@
 /obj/item/assembly/infra/examine(mob/user)
 	. = ..()
 	. += "The assembly is [secured ? "secure" : "not secure"]. The infrared trigger is [on ? "on" : "off"]."
+	. += "<span class='info'><b>Alt-Click</b> to rotate it.</span>"
 
 /obj/item/assembly/infra/activate()
 	if(!..())
@@ -159,25 +160,24 @@
 		if(first)
 			first.vis_spread(visible)
 	if(href_list["rotate"])
-		rotate()
+		rotate(usr)
 	if(href_list["close"])
 		usr << browse(null, "window=infra")
 		return
 	if(usr)
 		attack_self(usr)
 
-/obj/item/assembly/infra/verb/rotate()//This could likely be better
-	set name = "Rotate Infrared Laser"
-	set category = "Object"
-	set src in usr
+/obj/item/assembly/infra/AltClick(mob/user)
+	rotate(user)
 
-	if(usr.stat || HAS_TRAIT(usr, TRAIT_HANDS_BLOCKED) || usr.restrained())
+/obj/item/assembly/infra/proc/rotate(mob/user)
+	if(user.stat || HAS_TRAIT(user, TRAIT_HANDS_BLOCKED) || !Adjacent(user))
 		return
 
 	dir = turn(dir, 90)
 
-	if(usr.machine == src)
-		interact(usr)
+	if(user.machine == src)
+		interact(user)
 
 	if(first)
 		qdel(first)

code/modules/assembly/mousetrap.dm

@@ -12,6 +12,7 @@
 	. = ..()
 	if(armed)
 		. += "It looks like it's armed."
+	. += "<span class='notice'><b>Alt-Click</b> to hide it.</span>"
 
 /obj/item/assembly/mousetrap/activate()
 	if(!..())
@@ -143,13 +144,9 @@
 	armed = TRUE
 
 
-/obj/item/assembly/mousetrap/verb/hide_under()
-	set src in oview(1)
-	set name = "Hide"
-	set category = "Object"
-
-	if(usr.stat)
+/obj/item/assembly/mousetrap/AltClick(mob/user)
+	if(user.stat || HAS_TRAIT(user, TRAIT_HANDS_BLOCKED) || !Adjacent(user))
 		return
 
 	layer = TURF_LAYER + 0.2
-	to_chat(usr, "<span class='notice'>You hide [src].</span>")
+	to_chat(user, "<span class='notice'>You hide [src].</span>")