diff --git a/code/game/atoms.dm b/code/game/atoms.dm
index e843fcf6a3c..9a9da5fb52d 100644
--- a/code/game/atoms.dm
+++ b/code/game/atoms.dm
@@ -226,11 +226,6 @@
 /atom/proc/relaymove()
 	return
 
-//called to set the atom's dir and used to add behaviour to dir-changes - Not fully used (yet)
-/atom/proc/set_dir(new_dir)
-	. = new_dir != dir
-	dir = new_dir
-
 /atom/proc/ex_act()
 	return
 
diff --git a/code/modules/admin/buildmode.dm b/code/modules/admin/buildmode.dm
index 3acc106b907..32bdfa135b5 100644
--- a/code/modules/admin/buildmode.dm
+++ b/code/modules/admin/buildmode.dm
@@ -447,7 +447,7 @@
 				new/obj/machinery/door/airlock(get_turf(object))
 			else if(istype(object,/turf) && ctrl_click && left_click)
 				var/obj/structure/window/reinforced/WIN = new/obj/structure/window/reinforced(get_turf(object))
-				WIN.set_dir(build_dir)
+				WIN.setDir(build_dir)
 				log_admin("Build Mode: [key_name(user)] built a window at ([object.x],[object.y],[object.z])")
 
 		if(ADV_BUILDMODE)
@@ -458,7 +458,7 @@
 					T.ChangeTurf(objholder)
 				else
 					var/obj/A = new objholder (get_turf(object))
-					A.set_dir(build_dir)
+					A.setDir(build_dir)
 					log_admin("Build Mode: [key_name(user)] modified [A]'s ([A.x],[A.y],[A.z]) dir to [build_dir]")
 			else if(right_click)
 				if(isobj(object))
@@ -547,7 +547,7 @@
 									T.ChangeTurf(objholder)
 								else
 									var/obj/A = new objholder(T)
-									A.set_dir(build_dir)
+									A.setDir(build_dir)
 						deselect_region()
 					return
 
diff --git a/code/modules/mining/lavaland/loot/tendril_loot.dm b/code/modules/mining/lavaland/loot/tendril_loot.dm
index 8657a2529f2..5ed3000752b 100644
--- a/code/modules/mining/lavaland/loot/tendril_loot.dm
+++ b/code/modules/mining/lavaland/loot/tendril_loot.dm
@@ -216,7 +216,7 @@
 			qdel(wisp)
 		else
 			wisp.visible_message("<span class='notice'>[wisp] has a sad feeling for a moment, then it passes.</span>")
-	..()
+	return ..()
 
 /obj/effect/wisp
 	name = "friendly wisp"
diff --git a/code/modules/mob/mob_grab.dm b/code/modules/mob/mob_grab.dm
index b03062f6e4a..446ec797a76 100644
--- a/code/modules/mob/mob_grab.dm
+++ b/code/modules/mob/mob_grab.dm
@@ -194,7 +194,7 @@
 		animate(affecting, pixel_x = 0, pixel_y = 0, 5, 1, LINEAR_EASING)
 		return //KJK
 	/*	if(force_down) //THIS GOES ABOVE THE RETURN LABELED KJK
-			affecting.set_dir(SOUTH)*///This shows how you can apply special directions based on a variable. //face up
+			affecting.setDir(SOUTH)*///This shows how you can apply special directions based on a variable. //face up
 
 	var/shift = 0
 	var/adir = get_dir(assailant, affecting)
@@ -204,18 +204,18 @@
 			shift = 8
 			if(dancing) //look at partner
 				shift = 10
-				assailant.set_dir(get_dir(assailant, affecting))
+				assailant.setDir(get_dir(assailant, affecting))
 		if(GRAB_AGGRESSIVE)
 			shift = 12
 		if(GRAB_NECK, GRAB_UPGRADING)
 			shift = -10
 			adir = assailant.dir
-			affecting.set_dir(assailant.dir)
+			affecting.setDir(assailant.dir)
 			affecting.loc = assailant.loc
 		if(GRAB_KILL)
 			shift = 0
 			adir = 1
-			affecting.set_dir(SOUTH)//face up
+			affecting.setDir(SOUTH)//face up
 			affecting.loc = assailant.loc
 
 	switch(adir)
@@ -254,8 +254,8 @@
 			force_down = 1
 			affecting.Weaken(3)
 			step_to(assailant, affecting)
-			assailant.set_dir(EAST) //face the victim
-			affecting.set_dir(SOUTH) //face up  //This is an example of a new feature based on the context of the location of the victim.
+			assailant.setDir(EAST) //face the victim
+			affecting.setDir(SOUTH) //face up  //This is an example of a new feature based on the context of the location of the victim.
 			*/									//It means that upgrading while someone is lying on the ground would cause you to go into pin mode.
 		state = GRAB_AGGRESSIVE
 		icon_state = "grabbed1"
@@ -268,7 +268,7 @@
 		assailant.visible_message("<span class='warning'>[assailant] has reinforced \his grip on [affecting] (now neck)!</span>")
 		state = GRAB_NECK
 		icon_state = "grabbed+1"
-		assailant.set_dir(get_dir(assailant, affecting))
+		assailant.setDir(get_dir(assailant, affecting))
 		affecting.create_attack_log("<font color='orange'>Has had their neck grabbed by [assailant.name] ([assailant.ckey])</font>")
 		assailant.create_attack_log("<font color='red'>Grabbed the neck of [affecting.name] ([affecting.ckey])</font>")
 		log_attack("<font color='red'>[assailant.name] ([assailant.ckey]) grabbed the neck of [affecting.name] ([affecting.ckey])</font>")
@@ -291,7 +291,7 @@
 
 		assailant.next_move = world.time + 10
 		affecting.AdjustLoseBreath(1)
-		affecting.set_dir(WEST)
+		affecting.setDir(WEST)
 	adjust_position()
 
 //This is used to make sure the victim hasn't managed to yackety sax away before using the grab.
@@ -378,8 +378,8 @@
 						affecting.Weaken(3)
 						affecting.lying = 1
 						step_to(assailant, affecting)
-						assailant.set_dir(EAST) //face the victim
-						affecting.set_dir(SOUTH) //face up
+						assailant.setDir(EAST) //face the victim
+						affecting.setDir(SOUTH) //face up
 						return
 					else
 						to_chat(assailant, "<span class='warning'>You are already pinning [affecting] to the ground.</span>")
diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm
index 74c9528071c..8b8fafd32b7 100644
--- a/code/modules/mob/mob_movement.dm
+++ b/code/modules/mob/mob_movement.dm
@@ -276,7 +276,7 @@
 
 		for(var/obj/item/weapon/grab/G in mob)
 			if(G.state == GRAB_NECK)
-				mob.set_dir(reverse_dir[direct])
+				mob.setDir(reverse_dir[direct])
 			G.adjust_position()
 		for(var/obj/item/weapon/grab/G in mob.grabbed_by)
 			G.adjust_position()
diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm
index 2785683e378..3d57f950995 100644
--- a/code/modules/recycling/conveyor2.dm
+++ b/code/modules/recycling/conveyor2.dm
@@ -50,7 +50,7 @@
 		dir = newdir
 	update_move_direction()
 
-/obj/machinery/conveyor/set_dir(newdir)
+/obj/machinery/conveyor/setDir(newdir)
 	. = ..()
 	update_move_direction()