Merge pull request #1283 from Fox-McCloud/Throw-BYOND-Instead

Makes the Code Compile for 508.1287+Travis Update
This commit is contained in:
ZomgPonies
2015-06-10 21:19:46 -04:00
4 changed files with 5 additions and 5 deletions
@@ -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
+1 -1
View File
@@ -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)
+1 -1
View File
@@ -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