From 3591bd559977f68af34014e0f41ea69cbbc45e4f Mon Sep 17 00:00:00 2001
From: PsiOmega <git@psiomega.se>
Date: Tue, 9 Jun 2015 15:36:27 +0200
Subject: [PATCH] Travis now builds using version 508.1287

throw is now a keyword. Updates usages where necessary to allow compilation.
---
 .travis.yml                              | 4 ++--
 code/modules/mob/living/carbon/carbon.dm | 2 +-
 code/modules/mob/mob_grab.dm             | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 81b8487f48..1c6b3ecedc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,8 +2,8 @@
 language: c
 
 env:
-  BYOND_MAJOR="507"
-  BYOND_MINOR="1282"
+  BYOND_MAJOR="508"
+  BYOND_MINOR="1287"
 
 before_install:
   - sudo apt-get update -qq
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 7c3599e726..5b29fa5130 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -285,7 +285,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)
diff --git a/code/modules/mob/mob_grab.dm b/code/modules/mob/mob_grab.dm
index 2d26f3b605..f984274cad 100644
--- a/code/modules/mob/mob_grab.dm
+++ b/code/modules/mob/mob_grab.dm
@@ -41,7 +41,7 @@
 	..()
 
 //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