Merge pull request #12389 from KorPhaeron/MEDIOCRE

Makeshift explosive lances

code/game/objects/items/weapons/twohanded.dm

@@ -303,8 +303,69 @@
 	hitsound = 'sound/weapons/bladeslice.ogg'
 	attack_verb = list("attacked", "poked", "jabbed", "torn", "gored")
 	sharpness = IS_SHARP
+	var/obj/item/weapon/grenade/explosive = null
+	var/war_cry = "AAAAARGH!!!"
 
 /obj/item/weapon/twohanded/spear/update_icon()
-	icon_state = "spearglass[wielded]"
-	return
+	if(explosive)
+		icon_state = "spearbomb[wielded]"
+	else
+		icon_state = "spearglass[wielded]"
 
+/obj/item/weapon/twohanded/spear/afterattack(atom/movable/AM, mob/user, proximity)
+	if(!proximity)
+		return
+	if(istype(AM, /turf/simulated/floor)) //So you can actually melee with it
+		return
+	if(istype(AM, /turf/space)) //So you can actually melee with it
+		return
+	if(explosive && wielded)
+		user.say("[war_cry]")
+		explosive.loc = AM
+		explosive.prime()
+		qdel(src)
+
+ //THIS MIGHT BE UNBALANCED SO I DUNNO
+/obj/item/weapon/twohanded/spear/throw_impact(atom/target)
+	. = ..()
+	if(explosive)
+		explosive.prime()
+		qdel(src)
+
+
+/obj/item/weapon/twohanded/spear/AltClick()
+	..()
+	if(!explosive)
+		return
+	if(ismob(loc))
+		var/mob/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)
+			src.war_cry = input
+
+//Placeholder C4 "grenade" for use on this spear
+/obj/item/weapon/grenade/C4
+	name = "C-4"
+	desc = "A brick of C-4."
+
+/obj/item/weapon/grenade/C4/prime()
+	update_mob()
+	explosion(src.loc,-1,1,3)
+	qdel(src)
+
+/obj/item/weapon/twohanded/spear/CheckParts()
+	if(explosive)
+		explosive.loc = get_turf(src.loc)
+		explosive = null
+	var/obj/item/weapon/grenade/G = locate() in contents
+	if(G)
+		explosive = G
+		name = "explosive lance"
+		desc = "A makeshift spear with [G] attached to it. Alt+click on the spear to set your war cry!"
+		return
+	var/obj/item/weapon/c4/C4 = locate() in contents
+	if(C4)
+		var /obj/item/weapon/grenade/C4/C42 = new /obj/item/weapon/grenade/C4(src)
+		qdel(C4)
+		explosive = C42
+		desc = "A makeshift spear with [C42] attached to it. Alt+click on the spear to set your war cry!"

code/modules/crafting/recipes.dm

@@ -27,9 +27,28 @@
 				/obj/item/device/assembly/igniter = 1,
 				/obj/item/weapon/reagent_containers/food/drinks/soda_cans = 1)
 	parts = list(/obj/item/weapon/reagent_containers/food/drinks/soda_cans = 1)
+	time = 30
+	category = CAT_WEAPON
+
+/datum/table_recipe/lance
+	name = "explosive lance (grenade)"
+	result = /obj/item/weapon/twohanded/spear
+	reqs = list(/obj/item/weapon/twohanded/spear = 1,
+				/obj/item/weapon/grenade = 1)
+	parts = list(/obj/item/weapon/grenade = 1)
+	time = 30
+	category = CAT_WEAPON
+
+/datum/table_recipe/lance2
+	name = "explosive lance (C4)"
+	result = /obj/item/weapon/twohanded/spear
+	reqs = list(/obj/item/weapon/twohanded/spear = 1,
+				/obj/item/weapon/c4 = 1)
+	parts = list(/obj/item/weapon/c4 = 1)
 	time = 80
 	category = CAT_WEAPON
 
+
 /datum/table_recipe/molotov
 	name = "Molotov"
 	result = /obj/item/weapon/reagent_containers/food/drinks/bottle/molotov

html/changelogs/Kor-spears.yml

@@ -0,0 +1,36 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes: 
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   spellcheck (typo fixes)
+#   experiment
+#   tgs (TG-ported fixes?)
+#################################
+
+# Your name.  
+author: Kor
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, this gets changed to [] after reading.  Just remove the brackets when you add new shit.
+# Please surround your changes in  double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
+changes: 
+  - rscadd: "You can now attach grenades and C4 to spears to create explosive lances. This is done via table crafting. Alt+click the spear to set a war cry."