Fixes repulse spell throwing ghosts (and other stuff with infinite move resist) (#40509)

This commit is contained in:
kevinz000
2018-09-29 23:14:57 -04:00
committed by Emmett Gaines
parent 018a09cb47
commit 6defd9673f
+3 -2
View File
@@ -259,6 +259,7 @@
var/maxthrow = 5
var/sparkle_path = /obj/effect/temp_visual/gravpush
var/anti_magic_check = TRUE
var/repulse_force = MOVE_FORCE_EXTREMELY_STRONG
action_icon_state = "repulse"
@@ -275,7 +276,7 @@
var/atom/movable/AM = am
if(AM == user || AM.anchored)
continue
if(ismob(AM))
var/mob/M = AM
if(M.anti_magic_check(anti_magic_check, FALSE))
@@ -295,7 +296,7 @@
var/mob/living/M = AM
M.Knockdown(stun_amt)
to_chat(M, "<span class='userdanger'>You're thrown back by [user]!</span>")
AM.throw_at(throwtarget, ((CLAMP((maxthrow - (CLAMP(distfromcaster - 2, 0, distfromcaster))), 3, maxthrow))), 1,user)//So stuff gets tossed around at the same time.
AM.safe_throw_at(throwtarget, ((CLAMP((maxthrow - (CLAMP(distfromcaster - 2, 0, distfromcaster))), 3, maxthrow))), 1,user, force = repulse_force)//So stuff gets tossed around at the same time.
/obj/effect/proc_holder/spell/aoe_turf/repulse/xeno //i fixed conflicts only to find out that this is in the WIZARD file instead of the xeno file?!
name = "Tail Sweep"