Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_updates

# Conflicts:
#	icons/mob/head.dmi
#	icons/mob/suit.dmi
#	icons/obj/clothing/hats.dmi
#	icons/obj/clothing/suits.dmi

code/game/objects/items/weapons/grenades/clowngrenade.dm

@@ -50,36 +50,28 @@
 */
 
 /obj/item/weapon/grown/bananapeel/traitorpeel
-	name = "banana peel"
-	desc = "A peel from a banana."
-	icon = 'icons/obj/items.dmi'
-	icon_state = "banana_peel"
-	item_state = "banana_peel"
-	w_class = 1
-	throwforce = 0
-	throw_speed = 4
-	throw_range = 20
 
-	Crossed(AM as mob|obj)
-		var/burned = rand(2,5)
-		if(istype(AM, /mob/living/carbon))
-			var/mob/living/carbon/M = AM
-			if(ishuman(M))
-				if(isobj(M:shoes))
-					if((M:shoes.flags&NOSLIP) || (M:species.bodyflags & FEET_NOSLIP))
-						return
-				else
-					to_chat(M, "\red Your feet feel like they're on fire!")
-					M.take_overall_damage(0, max(0, (burned - 2)))
 
-			if(!istype(M, /mob/living/carbon/slime) && !isrobot(M))
-				M.slip("banana peel!", 0, 7, 4)
-				M.take_organ_damage(2) // Was 5 -- TLE
-				M.take_overall_damage(0, burned)
+/obj/item/weapon/grown/bananapeel/traitorpeel/Crossed(AM as mob|obj)
+	var/burned = rand(2,5)
+	if(istype(AM, /mob/living/carbon))
+		var/mob/living/carbon/M = AM
+		if(ishuman(M))
+			if(isobj(M:shoes))
+				if((M:shoes.flags&NOSLIP) || (M:species.bodyflags & FEET_NOSLIP))
+					return
+			else
+				to_chat(M, "\red Your feet feel like they're on fire!")
+				M.take_overall_damage(0, max(0, (burned - 2)))
 
-	throw_impact(atom/hit_atom)
-		var/burned = rand(1,3)
-		if(istype(hit_atom ,/mob/living))
-			var/mob/living/M = hit_atom
-			M.take_organ_damage(0, burned)
-		return ..()
+		if(!istype(M, /mob/living/carbon/slime) && !isrobot(M))
+			M.slip("banana peel!", 0, 7, 4)
+			M.take_organ_damage(2) // Was 5 -- TLE
+			M.take_overall_damage(0, burned)
+
+/obj/item/weapon/grown/bananapeel/traitorpeel/throw_impact(atom/hit_atom)
+	var/burned = rand(1,3)
+	if(istype(hit_atom ,/mob/living))
+		var/mob/living/M = hit_atom
+		M.take_organ_damage(0, burned)
+	return ..()

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

@@ -29,11 +29,6 @@
 		bcell = null
 	return ..()
 
-/obj/item/weapon/melee/baton/CheckParts(list/parts_list)
-	..()
-	bcell = locate(/obj/item/weapon/stock_parts/cell) in contents
-	update_icon()
-
 /obj/item/weapon/melee/baton/loaded/New() //this one starts with a cell pre-installed.
 	..()
 	bcell = new(src)
@@ -200,8 +195,18 @@
 	desc = "An improvised stun baton."
 	icon_state = "stunprod_nocell"
 	item_state = "prod"
+	w_class = 3
 	force = 3
 	throwforce = 5
 	stunforce = 5
 	hitcost = 3750
-	slot_flags = null
+	slot_flags = SLOT_BACK
+	var/obj/item/device/assembly/igniter/sparkler = 0
+
+/obj/item/weapon/melee/baton/cattleprod/New()
+	..()
+	sparkler = new (src)
+
+/obj/item/weapon/melee/baton/cattleprod/baton_stun()
+	if(sparkler.activate())
+		..()

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

@@ -101,10 +101,10 @@ obj/item/weapon/wirerod
 	force = 9
 	throwforce = 10
 	w_class = 3
-	materials = list(MAT_METAL=1000)
+	materials = list(MAT_METAL=1150, MAT_GLASS=75)
 	attack_verb = list("hit", "bludgeoned", "whacked", "bonked")
 
-obj/item/weapon/wirerod/attackby(var/obj/item/I, mob/user as mob, params)
+obj/item/weapon/wirerod/attackby(obj/item/I, mob/user, params)
 	..()
 	if(istype(I, /obj/item/weapon/shard))
 		var/obj/item/weapon/twohanded/spear/S = new /obj/item/weapon/twohanded/spear
@@ -118,7 +118,7 @@ obj/item/weapon/wirerod/attackby(var/obj/item/I, mob/user as mob, params)
 		qdel(I)
 		qdel(src)
 
-	else if(istype(I, /obj/item/weapon/wirecutters))
+	else if(istype(I, /obj/item/device/assembly/igniter) && !(I.flags & NODROP))
 		var/obj/item/weapon/melee/baton/cattleprod/P = new /obj/item/weapon/melee/baton/cattleprod
 
 		if(!remove_item_from_storage(user))
@@ -126,7 +126,7 @@ obj/item/weapon/wirerod/attackby(var/obj/item/I, mob/user as mob, params)
 		user.unEquip(I)
 
 		user.put_in_hands(P)
-		to_chat(user, "<span class='notice'>You fasten the wirecutters to the top of the rod with the cable, prongs outward.</span>")
+		to_chat(user, "<span class='notice'>You fasten [I] to the top of the rod with the cable.</span>")
 		qdel(I)
 		qdel(src)