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

Merge pull request #2942 from Citadel-Station-13/upstream-merge-30967

Browse Source 
[MIRROR] Fixes jump boots sleeper bug, adds return value to /atom/movable/throw_at
This commit is contained in:
LetterJay
2017-09-26 14:59:20 -04:00
committed by GitHub
parent 14916124b5 0d85494123
commit 8b37c32a17
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
code/modules/clothing/shoes/miscellaneous.dm
+9 -7
View File
@@ -195,22 +195,24 @@
var/jumping = FALSE //are we mid-jump?
/obj/item/clothing/shoes/bhop/ui_action_click(mob/user, action)
if(!isliving(usr))
if(!isliving(user))
return
if(jumping)
return
if(recharging_time > world.time)
to_chat(usr, "<span class='warning'>The boot's internal propulsion needs to recharge still!</span>")
to_chat(user, "<span class='warning'>The boot's internal propulsion needs to recharge still!</span>")
return
var/atom/target = get_edge_target_turf(usr, usr.dir) //gets the user's direction
var/atom/target = get_edge_target_turf(user, user.dir) //gets the user's direction
jumping = TRUE
playsound(src.loc, 'sound/effects/stealthoff.ogg', 50, 1, 1)
usr.visible_message("<span class='warning'>[usr] dashes forward into the air!</span>")
usr.throw_at(target, jumpdistance, jumpspeed, spin=0, diagonals_first = 1, callback = CALLBACK(src, .proc/hop_end))
if (user.throw_at(target, jumpdistance, jumpspeed, spin = FALSE, diagonals_first = TRUE, callback = CALLBACK(src, .proc/hop_end)))
jumping = TRUE
playsound(src, 'sound/effects/stealthoff.ogg', 50, 1, 1)
user.visible_message("<span class='warning'>[usr] dashes forward into the air!</span>")
else
to_chat(user, "<span class='warning'>Something prevents you from dashing forward!</span>")
/obj/item/clothing/shoes/bhop/proc/hop_end()
jumping = FALSE