From cefd802dc8f4763ddb97d7aca796a89db59081ff Mon Sep 17 00:00:00 2001 From: MrDoomBringer Date: Sat, 17 Nov 2018 14:47:41 -0500 Subject: [PATCH] Fix explosive lances not being explosive (#41466) --- code/game/objects/items/twohanded.dm | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/code/game/objects/items/twohanded.dm b/code/game/objects/items/twohanded.dm index 1c816597b3c..c8c6890c1ab 100644 --- a/code/game/objects/items/twohanded.dm +++ b/code/game/objects/items/twohanded.dm @@ -490,13 +490,6 @@ /obj/item/twohanded/spear/update_icon() icon_state = "[icon_prefix][wielded]" -/obj/item/twohanded/spear/afterattack(atom/movable/AM, mob/user, proximity) - . = ..() - if(!proximity) - return - if(isopenturf(AM)) //So you can actually melee with it - return - /obj/item/twohanded/spear/CheckParts(list/parts_list) var/obj/item/shard/tip = locate() in parts_list if (istype(tip, /obj/item/shard/plasma)) @@ -506,13 +499,6 @@ icon_prefix = "spearplasma" update_icon() qdel(tip) - var/obj/item/twohanded/spear/S = locate() in parts_list - if(S) - if (istype(S, /obj/item/twohanded/spear/explosive)) - var/obj/item/twohanded/spear/explosive/lance = S - lance.explosive.forceMove(get_turf(src)) //Sanity check. This shouldn't really happen, as explosive lances are blacklisted from spear construction. - parts_list -= S - qdel(S) var/obj/item/grenade/G = locate() in parts_list if(G) var/obj/item/twohanded/spear/explosive/lance = new /obj/item/twohanded/spear/explosive(src.loc, G) @@ -520,6 +506,7 @@ lance.force_unwielded = force_unwielded lance.throwforce = throwforce lance.icon_prefix = icon_prefix + parts_list -= G qdel(src) ..() @@ -531,7 +518,7 @@ /obj/item/twohanded/spear/explosive/Initialize(mapload, obj/item/grenade/G) . = ..() if (!G) - G = new() //For admin-spawned explosive lances + G = new /obj/item/grenade/iedcasing() //For admin-spawned explosive lances G.forceMove(src) explosive = G @@ -558,6 +545,7 @@ /obj/item/twohanded/spear/explosive/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum) . = ..() if(!.) //not caught + explosive.forceMove(get_turf(src)) explosive.prime() qdel(src)