From 6614ab8a8c8b31aae6bc95a7129ab940d44e66be Mon Sep 17 00:00:00 2001
From: Fox-McCloud <Fox_P_McCloud@hotmail.com>
Date: Tue, 9 Jun 2015 18:14:15 -0400
Subject: [PATCH 1/3] Makes the Code Compile for 508.1287+Travis Update

---
 .travis.yml                                        | 4 ++--
 code/game/objects/items/weapons/swords_axes_etc.dm | 2 +-
 code/modules/mob/living/carbon/carbon.dm           | 2 +-
 code/modules/mob/mob_grab.dm                       | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c44d899ec30..15910cd810b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,8 +3,8 @@ language: c
 
 env:
     global:
-    - BYOND_MAJOR="503"
-    - BYOND_MINOR="1224"
+    - BYOND_MAJOR="508"
+    - BYOND_MINOR="1287"
     matrix:
     - DM_MAPFILE="cyberiad"
 
diff --git a/code/game/objects/items/weapons/swords_axes_etc.dm b/code/game/objects/items/weapons/swords_axes_etc.dm
index 7f634178b28..c2fa42bb2da 100644
--- a/code/game/objects/items/weapons/swords_axes_etc.dm
+++ b/code/game/objects/items/weapons/swords_axes_etc.dm
@@ -204,7 +204,7 @@
 	del(src)
 	return
 
-/obj/item/weapon/melee/energy/blade/proc/throw()
+/obj/item/weapon/melee/energy/blade/proc/toss()
 	del(src)
 	return
 
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 13514e21ebf..609c5afe269 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -428,7 +428,7 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/unary/vent_pump,
 
 	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.get_mob_if_throwable() //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 47e0740be4b..0527fa5d93e 100644
--- a/code/modules/mob/mob_grab.dm
+++ b/code/modules/mob/mob_grab.dm
@@ -55,7 +55,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/get_mob_if_throwable()
 	if(affecting && assailant.Adjacent(affecting))
 		if(affecting.buckled)
 			return null

From e2d0b4a38869e8ca52b4feb14a70cef34cebda9c Mon Sep 17 00:00:00 2001
From: Fox-McCloud <Fox_P_McCloud@hotmail.com>
Date: Wed, 10 Jun 2015 16:28:16 -0400
Subject: [PATCH 2/3] update

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 15910cd810b..f5853bd003d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ language: c
 env:
     global:
     - BYOND_MAJOR="508"
-    - BYOND_MINOR="1287"
+    - BYOND_MINOR="1288"
     matrix:
     - DM_MAPFILE="cyberiad"
 

From 0ee0cf38771bac4afc540e46f088f81bc6e5f0e1 Mon Sep 17 00:00:00 2001
From: Fox-McCloud <Fox_P_McCloud@hotmail.com>
Date: Wed, 10 Jun 2015 17:11:47 -0400
Subject: [PATCH 3/3] it's not time yet!

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index f5853bd003d..15910cd810b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ language: c
 env:
     global:
     - BYOND_MAJOR="508"
-    - BYOND_MINOR="1288"
+    - BYOND_MINOR="1287"
     matrix:
     - DM_MAPFILE="cyberiad"