Merge pull request #7066 from tigercat2000/BumpRefactor

/tg/ Move refactor

code/game/objects/items/policetape.dm

@@ -151,7 +151,7 @@ var/list/tape_roll_applications = list()
 	if(!density) return 1
 	if(height==0) return 1
 
-	if((mover.pass_flags & PASSTABLE || istype(mover, /obj/effect/meteor) || mover.throwing == 1) )
+	if((mover.pass_flags & PASSTABLE || istype(mover, /obj/effect/meteor) || mover.throwing))
 		return 1
 	else if(ismob(mover) && allowed(mover))
 		return 1

code/game/objects/items/weapons/RCL.dm

@@ -115,7 +115,7 @@
 				last = C
 				break
 
-/obj/item/weapon/twohanded/rcl/moved(mob/user, turf/old_loc, direct)
+/obj/item/weapon/twohanded/rcl/on_mob_move(direct, mob/user)
 	if(active)
 		trigger(user)
 

code/game/objects/items/weapons/dice.dm

@@ -111,10 +111,10 @@
 /obj/item/weapon/dice/attack_self(mob/user as mob)
 	diceroll(user)
 
-/obj/item/weapon/dice/throw_at(atom/target, range, speed, mob/user as mob)
+/obj/item/weapon/dice/throw_at(atom/target, range, speed, mob/thrower, spin=1, diagonals_first = 0, datum/callback/callback)
 	if(!..())
 		return
-	diceroll(user)
+	diceroll(thrower)
 
 /obj/item/weapon/dice/proc/diceroll(mob/user)
 	result = rand(1, sides)
@@ -133,7 +133,7 @@
 		user.visible_message("<span class='notice'>[user] has thrown [src]. It lands on [result]. [comment]</span>", \
 							 "<span class='notice'>You throw [src]. It lands on [result]. [comment]</span>", \
 							 "<span class='italics'>You hear [src] rolling, it sounds like a [fake_result].</span>")
-	else if(src.throwing == 0) //Dice was thrown and is coming to rest
+	else if(!throwing) //Dice was thrown and is coming to rest
 		visible_message("<span class='notice'>[src] rolls to a stop, landing on [result]. [comment]</span>")
 
 /obj/item/weapon/dice/d20/e20/diceroll(mob/user as mob, thrown)