cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-29 16:18:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Makes dash actions and Bluespace Prophecy trauma utilise teleport code instead of forced movement code. (#62471)

Browse Source 
Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
This commit is contained in:
Timberpoes
2021-11-06 20:03:51 -07:00
committed by GitHub
co-authored by Mothblocks
parent 8d95232127
commit 479dcd295e
5 changed files with 28 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mining/lavaland/megafauna_loot.dm
+4 -4
View File
@@ -16,14 +16,14 @@
// It's a simple purple beam, works well enough for the purple hiero effects.
beam_effect = "plasmabeam"
/datum/action/innate/dash/hierophant/Teleport(mob/user, atom/target)
/datum/action/innate/dash/hierophant/teleport(mob/user, atom/target)
var/dist = get_dist(user, target)
if(dist > HIEROPHANT_BLINK_RANGE)
to_chat(user, span_hierophant_warning("Blink destination out of range."))
user.balloon_alert(user, "destination out of range!")
return
var/turf/target_turf = get_turf(target)
if(target_turf.is_blocked_turf_ignore_climbable())
to_chat(user, span_hierophant_warning("Blink destination blocked."))
user.balloon_alert(user, "destination blocked!")
return
. = ..()
if(!current_charges)
@@ -117,7 +117,7 @@
if((target == beacon) && target.Adjacent(src))
return
if(blink_activated)
blink.Teleport(user, target)
blink.teleport(user, target)
/obj/item/hierophant_club/update_icon_state()
icon_state = inhand_icon_state = "hierophant_club[blink_charged ? "_ready":""][(!QDELETED(beacon)) ? "":"_beacon"]"