From 319a6cd500131478983d8c4c0f05387c11045342 Mon Sep 17 00:00:00 2001
From: Fox McCloud <Fox-McCloud@users.noreply.github.com>
Date: Tue, 3 Jul 2018 18:13:51 -0400
Subject: [PATCH] Removes Explosive Lances

---
 code/game/objects/items/weapons/twohanded.dm | 26 --------------------
 code/modules/crafting/recipes.dm             |  9 -------
 2 files changed, 35 deletions(-)

diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm
index 8de83f6344a..abe546d25b1 100644
--- a/code/game/objects/items/weapons/twohanded.dm
+++ b/code/game/objects/items/weapons/twohanded.dm
@@ -313,7 +313,6 @@
 	sharp = TRUE
 	no_spin_thrown = TRUE
 	var/obj/item/grenade/explosive = null
-	var/war_cry = "AAAAARGH!!!"
 
 /obj/item/twohanded/spear/update_icon()
 	if(explosive)
@@ -327,7 +326,6 @@
 	if(isturf(AM)) //So you can actually melee with it
 		return
 	if(explosive && wielded)
-		user.say("[war_cry]")
 		explosive.forceMove(AM)
 		explosive.prime()
 		qdel(src)
@@ -338,30 +336,6 @@
 		explosive.prime()
 		qdel(src)
 
-/obj/item/twohanded/spear/AltClick(mob/user)
-	..()
-	if(!explosive)
-		return
-	if(ishuman(loc))
-		var/mob/living/carbon/human/M = loc
-		var/input = stripped_input(M, "What do you want your war cry to be? You will shout it when you hit someone in melee.", ,"", 50)
-		if(input)
-			war_cry = input
-
-/obj/item/twohanded/spear/CheckParts(list/parts_list)
-	..()
-	if(explosive)
-		explosive.forceMove(get_turf(loc))
-		explosive = null
-		update_icon()
-	var/obj/item/grenade/G = locate() in contents
-	if(G)
-		explosive = G
-		name = "explosive lance"
-		embed_chance = 0
-		desc = "A makeshift spear with [G] attached to it. Alt+click on the spear to set your war cry!"
-		update_icon()
-
 //GREY TIDE
 /obj/item/twohanded/spear/grey_tide
 	icon_state = "spearglass0"
diff --git a/code/modules/crafting/recipes.dm b/code/modules/crafting/recipes.dm
index f1739750a0a..012c79bab06 100644
--- a/code/modules/crafting/recipes.dm
+++ b/code/modules/crafting/recipes.dm
@@ -25,15 +25,6 @@
 	time = 15
 	category = CAT_WEAPON
 
-/datum/crafting_recipe/lance
-	name = "explosive lance (grenade)"
-	result = /obj/item/twohanded/spear
-	reqs = list(/obj/item/twohanded/spear = 1,
-				/obj/item/grenade = 1)
-	parts = list(/obj/item/grenade = 1)
-	time = 15
-	category = CAT_WEAPON
-
 /datum/crafting_recipe/molotov
 	name = "Molotov"
 	result = /obj/item/reagent_containers/food/drinks/bottle/molotov