From d83fe433319b12f3fd3248777e3dfecf43d572f8 Mon Sep 17 00:00:00 2001
From: Fox-McCloud <Fox_P_McCloud@hotmail.com>
Date: Fri, 22 Jul 2016 19:25:07 -0400
Subject: [PATCH] tweak

---
 .../game/objects/structures/stool_bed_chair_nest/chairs.dm | 5 ++---
 code/game/objects/structures/windoor_assembly.dm           | 7 +++----
 code/game/objects/structures/window.dm                     | 5 ++---
 code/modules/pda/PDA.dm                                    | 7 ++++---
 code/modules/power/singularity/emitter.dm                  | 5 ++---
 .../particle_accelerator/particle_accelerator.dm           | 5 ++---
 code/modules/recycling/disposal-construction.dm            | 5 ++---
 7 files changed, 17 insertions(+), 22 deletions(-)

diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm
index ab2317c3db2..f816320f067 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm
@@ -71,10 +71,9 @@
 	if(user.incapacitated())
 		to_chat(user, "<span class='warning'>You can't do that right now!</span>")
 		return
-	if(!in_range(src, user))
+	if(!Adjacent(user))
 		return
-	else
-		rotate()
+	rotate()
 
 // Chair types
 /obj/structure/stool/bed/chair/wood
diff --git a/code/game/objects/structures/windoor_assembly.dm b/code/game/objects/structures/windoor_assembly.dm
index d4dd11e8684..7d2aa13f5be 100644
--- a/code/game/objects/structures/windoor_assembly.dm
+++ b/code/game/objects/structures/windoor_assembly.dm
@@ -325,12 +325,11 @@ obj/structure/windoor_assembly/Destroy()
 /obj/structure/windoor_assembly/AltClick(mob/user)
 	..()
 	if(user.incapacitated())
-		user << "<span class='warning'>You can't do that right now!</span>"
+		to_chat(user, "<span class='warning'>You can't do that right now!</span>")
 		return
-	if(!in_range(src, user))
+	if(!Adjacent(user))
 		return
-	else
-		revrotate()
+	revrotate()
 
 //Flips the windoor assembly, determines whather the door opens to the left or the right
 /obj/structure/windoor_assembly/verb/flip()
diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm
index 40a54ee954f..07e9b7ab970 100644
--- a/code/game/objects/structures/window.dm
+++ b/code/game/objects/structures/window.dm
@@ -323,10 +323,9 @@ var/global/wcCommon = pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8f
 	if(user.incapacitated())
 		to_chat(user, "<span class='warning'>You can't do that right now!</span>")
 		return
-	if(!in_range(src, user))
+	if(!Adjacent(user))
 		return
-	else
-		revrotate()
+	revrotate()
 
 /*
 /obj/structure/window/proc/updateSilicate()
diff --git a/code/modules/pda/PDA.dm b/code/modules/pda/PDA.dm
index 4dfd8575a22..76731807e77 100755
--- a/code/modules/pda/PDA.dm
+++ b/code/modules/pda/PDA.dm
@@ -300,15 +300,16 @@ var/global/list/obj/item/device/pda/PDAs = list()
 	else
 		to_chat(usr, "<span class='notice'>You cannot do this while restrained.</span>")
 
-/obj/item/device/pda/AltClick()
+/obj/item/device/pda/AltClick(mob/user)
+	..()
 	if(issilicon(usr))
 		return
 
-	if(can_use(usr))
+	if(can_use(user))
 		if(id)
 			remove_id()
 		else
-			usr << "<span class='warning'>This PDA does not have an ID in it!</span>"
+			to_chat(user, "<span class='warning'>This PDA does not have an ID in it!</span>")
 
 /obj/item/device/pda/proc/remove_id()
 	if(id)
diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm
index 16bf56ec4a6..b50b4813ae4 100644
--- a/code/modules/power/singularity/emitter.dm
+++ b/code/modules/power/singularity/emitter.dm
@@ -75,10 +75,9 @@
 	if(user.incapacitated())
 		to_chat(user, "<span class='warning'>You can't do that right now!</span>")
 		return
-	if(!in_range(src, user))
+	if(!Adjacent(user))
 		return
-	else
-		rotate()
+	rotate()
 
 /obj/machinery/power/emitter/initialize()
 	..()
diff --git a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm
index 3e8294dc267..8bf3741f9e1 100644
--- a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm
+++ b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm
@@ -106,10 +106,9 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin
 	if(user.incapacitated())
 		to_chat(user, "<span class='warning'>You can't do that right now!</span>")
 		return
-	if(!in_range(src, user))
+	if(!Adjacent(user))
 		return
-	else
-		rotate()
+	rotate()
 
 /obj/structure/particle_accelerator/verb/rotateccw()
 	set name = "Rotate Counter Clockwise"
diff --git a/code/modules/recycling/disposal-construction.dm b/code/modules/recycling/disposal-construction.dm
index 604a97db46b..a88762702a8 100644
--- a/code/modules/recycling/disposal-construction.dm
+++ b/code/modules/recycling/disposal-construction.dm
@@ -101,10 +101,9 @@
 	if(user.incapacitated())
 		to_chat(user << "<span class='warning'>You can't do that right now!</span>")
 		return
-	if(!in_range(src, user))
+	if(!Adjacent(user))
 		return
-	else
-		rotate()
+	rotate()
 
 /obj/structure/disposalconstruct/verb/flip()
 	set name = "Flip Pipe"