diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm index 868f46a47e0..32fe65e03ed 100644 --- a/code/game/objects/items/weapons/twohanded.dm +++ b/code/game/objects/items/weapons/twohanded.dm @@ -315,7 +315,9 @@ /obj/item/weapon/twohanded/spear/afterattack(atom/movable/AM, mob/user, proximity) if(!proximity) return - if(explosive) + if(istype(AM, /turf/simulated/floor)) //So you can actually melee with it + return + if(explosive && wielded) user.say("[war_cry]") explosive.loc = AM explosive.prime() @@ -347,7 +349,7 @@ //THIS MIGHT BE UNBALANCED SO I DUNNO /obj/item/weapon/twohanded/spear/throw_impact(atom/target) . = ..() - if(explosive && wielded) + if(explosive) explosive.prime() qdel(src) diff --git a/icons/mob/back.dmi b/icons/mob/back.dmi index 2ee2ec8d082..c745f3a0925 100644 Binary files a/icons/mob/back.dmi and b/icons/mob/back.dmi differ