Merge branch 'master' of https://github.com/PolarisSS13/Polaris into is_tool

This commit is contained in:
Anewbe
2018-08-03 19:53:06 -05:00
23 changed files with 732 additions and 44 deletions

View File

@@ -323,6 +323,7 @@
before_move()
Move(location.return_turf())
after_move()
if(!bumped && !isturf(original))
if(loc == get_turf(original))
@@ -348,6 +349,9 @@
/obj/item/projectile/proc/before_move()
return
/obj/item/projectile/proc/after_move()
return
/obj/item/projectile/proc/setup_trajectory(turf/startloc, turf/targloc, var/x_offset = 0, var/y_offset = 0)
// setup projectile state
starting = startloc