shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes jump boots sleeper bug, adds return value to /atom/movable/throw_at (#30967)

Browse Source 
* Jump boots fix

* requested changes

* Requested changes, also whoops
This commit is contained in:
vuonojenmustaturska
2017-09-26 12:28:56 +03:00
committed by CitadelStationBot
parent 26f0af19e0
commit 1aef27a0f0
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/atoms_movable.dm
+5 -2
View File
@@ -317,7 +317,8 @@
step(src, AM.dir)
..()
/atom/movable/proc/throw_at(atom/target, range, speed, mob/thrower, spin=TRUE, diagonals_first = FALSE, var/datum/callback/callback)
/atom/movable/proc/throw_at(atom/target, range, speed, mob/thrower, spin=TRUE, diagonals_first = FALSE, var/datum/callback/callback) //If this returns FALSE then callback will not be called.
. = FALSE
if (!target || (flags_1 & NODROP_1) || speed <= 0)
return
@@ -346,7 +347,9 @@
//then lets add it to speed
speed += user_momentum
if (speed <= 0)
return //no throw speed, the user was moving too fast.
return//no throw speed, the user was moving too fast.
. = TRUE // No failure conditions past this point.
var/datum/thrownthing/TT = new()
TT.thrownthing = src