Merge pull request #2561 from yogstation13/upstream-merge-39556

[MIRROR] Adds move force and move resist, movement/pushing/pulling tweaks
This commit is contained in:
1fbff5f83b23d39d38b1dfcb4cac8d9b
2018-09-16 02:51:58 +02:00
committed by GitHub
52 changed files with 211 additions and 108 deletions

View File

@@ -54,6 +54,7 @@ SUBSYSTEM_DEF(throwing)
var/dist_y
var/dx
var/dy
var/force = MOVE_FORCE_DEFAULT
var/pure_diagonal
var/diagonal_error
var/datum/callback/callback
@@ -116,7 +117,7 @@ SUBSYSTEM_DEF(throwing)
return
dist_travelled++
if (dist_travelled > MAX_THROWING_DIST)
finalize()
return