From b16ec5429a1adb83569b02db7aecefad446c84d4 Mon Sep 17 00:00:00 2001 From: Iamgoofball Date: Sat, 21 May 2022 16:18:16 -0700 Subject: [PATCH] Explosive lances now move you onto the same tile as the person you're lancing, or explodes in your hands if this isn't possible. (#67060) * Explosive lances now move you onto the same tile as the person you're lancing, or explodes in your hands if this isn't possible. * Update spear.dm --- code/game/objects/items/spear.dm | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/spear.dm b/code/game/objects/items/spear.dm index aeef95363b2..b317717f627 100644 --- a/code/game/objects/items/spear.dm +++ b/code/game/objects/items/spear.dm @@ -153,8 +153,14 @@ if(iseffect(AM)) //and no accidentally wasting your moment of glory on graffiti return user.say("[war_cry]", forced="spear warcry") - explosive.forceMove(AM) - explosive.detonate(lanced_by=user) + if(isliving(user)) + var/mob/living/living_user = user + living_user.set_resting(new_resting = TRUE, silent = TRUE, instant = TRUE) + living_user.Move(get_turf(AM)) + explosive.forceMove(get_turf(living_user)) + explosive.detonate(lanced_by=user) + if(!QDELETED(living_user)) + living_user.set_resting(new_resting = FALSE, silent = TRUE, instant = TRUE) qdel(src) //GREY TIDE