Merge pull request #9779 from Baystation12/master

Dev-freeze.

code/modules/mob/living/carbon/carbon.dm

@@ -341,7 +341,7 @@
 
 	if (istype(item, /obj/item/weapon/grab))
 		var/obj/item/weapon/grab/G = item
-		item = G.throw() //throw the person instead of the grab
+		item = G.throw_held() //throw the person instead of the grab
 		if(ismob(item))
 			var/turf/start_T = get_turf(loc) //Get the start and target tile for the descriptors
 			var/turf/end_T = get_turf(target)

code/modules/mob/mob_grab.dm

@@ -51,7 +51,7 @@
 	adjust_position()
 
 //Used by throw code to hand over the mob, instead of throwing the grab. The grab is then deleted by the throw code.
-/obj/item/weapon/grab/proc/throw()
+/obj/item/weapon/grab/proc/throw_held()
 	if(affecting)
 		if(affecting.buckled)
 			return null