From 6defd9673f5fe4cc8fdf010173e37dad8b4e3097 Mon Sep 17 00:00:00 2001 From: kevinz000 <2003111+kevinz000@users.noreply.github.com> Date: Sat, 29 Sep 2018 20:14:57 -0700 Subject: [PATCH] Fixes repulse spell throwing ghosts (and other stuff with infinite move resist) (#40509) --- code/modules/spells/spell_types/wizard.dm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/code/modules/spells/spell_types/wizard.dm b/code/modules/spells/spell_types/wizard.dm index 92673a6d13f..731f040ffac 100644 --- a/code/modules/spells/spell_types/wizard.dm +++ b/code/modules/spells/spell_types/wizard.dm @@ -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, "You're thrown back by [user]!") - 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"