Merge branch 'master' of https://github.com/PolarisSS13/Polaris into weapon_dulling

code/game/objects/effects/step_triggers.dm

@@ -95,10 +95,8 @@
 
 	Trigger(var/atom/movable/A)
 		if(teleport_x && teleport_y && teleport_z)
-
-			A.x = teleport_x
-			A.y = teleport_y
-			A.z = teleport_z
+			var/turf/T = locate(teleport_x, teleport_y, teleport_z)
+			A.forceMove(T)
 
 /* Random teleporter, teleports atoms to locations ranging from teleport_x - teleport_x_offset, etc */
 
@@ -110,8 +108,5 @@
 	Trigger(var/atom/movable/A)
 		if(teleport_x && teleport_y && teleport_z)
 			if(teleport_x_offset && teleport_y_offset && teleport_z_offset)
-
-				A.x = rand(teleport_x, teleport_x_offset)
-				A.y = rand(teleport_y, teleport_y_offset)
-				A.z = rand(teleport_z, teleport_z_offset)
-
+				var/turf/T = locate(rand(teleport_x, teleport_x_offset), rand(teleport_y, teleport_y_offset), rand(teleport_z, teleport_z_offset))
+				A.forceMove(T)

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

@@ -42,7 +42,8 @@
 
 /obj/item/weapon/handcuffs/proc/can_place(var/mob/target, var/mob/user)
 	if(istype(user, /mob/living/silicon/robot))
-		return 1
+		if(user.Adjacent(target))
+			return 1
 	else
 		for(var/obj/item/weapon/grab/G in target.grabbed_by)
 			if(G.loc == user && G.state >= GRAB_AGGRESSIVE)

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

@@ -136,7 +136,7 @@
 /obj/effect/energy_net/user_unbuckle_mob(mob/user)
 	user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
 	visible_message("<span class='danger'>[user] begins to tear at \the [src]!</span>")
-	if(do_after(usr, escape_time, incapacitation_flags = INCAPACITATION_DEFAULT & ~(INCAPACITATION_RESTRAINED | INCAPACITATION_BUCKLED_FULLY)))
+	if(do_after(usr, escape_time, src, incapacitation_flags = INCAPACITATION_DEFAULT & ~(INCAPACITATION_RESTRAINED | INCAPACITATION_BUCKLED_FULLY)))
 		if(!buckled_mob)
 			return
 		visible_message("<span class='danger'>[user] manages to tear \the [src] apart!</span>")