Merge pull request #17839 from optimumtact/watisgoinon

Fix an antipattern when using canUseTopic

code/game/objects/structures/crates_lockers/closets.dm

@@ -381,10 +381,10 @@
 
 /obj/structure/closet/AltClick(mob/user)
 	..()
-	if(!user.canUseTopic(user))
+	if(!user.canUseTopic(src, be_close=TRUE))
 		user << "<span class='warning'>You can't do that right now!</span>"
 		return
-	if(opened || !secure || !in_range(src, user))
+	if(opened || !secure)
 		return
 	else
 		togglelock(user)

code/game/objects/structures/reflector.dm

@@ -124,11 +124,9 @@
 
 /obj/structure/reflector/AltClick(mob/user)
 	..()
-	if(!user.canUseTopic(user))
+	if(!user.canUseTopic(src, be_close=TRUE))
 		user << "<span class='warning'>You can't do that right now!</span>"
 		return
-	if(!in_range(src, user))
-		return
 	else
 		rotate()
 

code/modules/assembly/health.dm

@@ -91,7 +91,7 @@
 
 	var/mob/user = usr
 
-	if(!user.canUseTopic(user))
+	if(!user.canUseTopic(src))
 		usr << browse(null, "window=hscan")
 		onclose(usr, "hscan")
 		return
@@ -104,4 +104,4 @@
 		return
 
 	attack_self(user)
-	return
+	return

code/modules/clothing/clothing.dm

@@ -460,11 +460,9 @@ BLIND     // can't see anything
 
 /obj/item/clothing/under/AltClick(mob/user)
 	..()
-	if(!user.canUseTopic(user))
+	if(!user.canUseTopic(src, be_close=TRUE))
 		user << "<span class='warning'>You can't do that right now!</span>"
 		return
-	if(!in_range(src, user))
-		return
 	else
 		rolldown()
 

code/modules/clothing/head/soft_caps.dm

@@ -23,11 +23,9 @@
 
 /obj/item/clothing/head/soft/AltClick(mob/user)
 	..()
-	if(!user.canUseTopic(user))
+	if(!user.canUseTopic(src, be_close=TRUE))
 		user << "<span class='warning'>You can't do that right now!</span>"
 		return
-	if(!in_range(src, user))
-		return
 	else
 		flip(user)
 

code/modules/clothing/masks/breath.dm

@@ -18,11 +18,9 @@
 
 /obj/item/clothing/mask/breath/AltClick(mob/user)
 	..()
-	if(!user.canUseTopic(user))
+	if(!user.canUseTopic(src, be_close=TRUE))
 		user << "<span class='warning'>You can't do that right now!</span>"
 		return
-	if(!in_range(src, user))
-		return
 	else
 		adjustmask(user)
 

code/modules/clothing/suits/toggles.dm

@@ -70,11 +70,9 @@
 
 /obj/item/clothing/suit/toggle/AltClick(mob/user)
 	..()
-	if(!user.canUseTopic(user))
+	if(!user.canUseTopic(src, be_close=TRUE))
 		user << "<span class='warning'>You can't do that right now!</span>"
 		return
-	if(!in_range(src, user))
-		return
 	else
 		suit_toggle(user)