mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-01-03 14:04:41 +00:00
Travis now builds using version 508.1287
throw is now a keyword. Updates usages where necessary to allow compilation.
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user