pumpkin fix and sprite improvement

code/modules/clothing/head/hardhat.dm

@@ -1,7 +1,7 @@
 /obj/item/clothing/head/hardhat
 	name = "hard hat"
 	desc = "A piece of headgear used in dangerous working conditions to protect the head. Comes with a built-in flashlight."
-	icon_state = "hardhat0_yellow"
+	icon_state = "hardhat_yellow"
 	action_button_name = "Toggle Headlamp"
 	brightness_on = 4 //luminosity when on
 	light_overlay = "hardhat_light"
@@ -12,23 +12,23 @@
 	drop_sound = 'sound/items/drop/helm.ogg'
 
 /obj/item/clothing/head/hardhat/orange
-	icon_state = "hardhat0_orange"
+	icon_state = "hardhat_orange"
 
 /obj/item/clothing/head/hardhat/red
-	icon_state = "hardhat0_red"
 	name = "firefighter helmet"
+	icon_state = "hardhat_red"
 	heat_protection = HEAD
 	max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECTION_TEMPERATURE
 
 /obj/item/clothing/head/hardhat/white
-	icon_state = "hardhat0_white"
 	desc = "A piece of headgear used in dangerous working conditions to protect the head. Comes with a built-in flashlight. This one looks heat-resistant."
+	icon_state = "hardhat_white"
 	heat_protection = HEAD
 	max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECTION_TEMPERATURE
 
 /obj/item/clothing/head/hardhat/dblue
-	icon_state = "hardhat0_dblue"
-	item_state = "hardhat0_dblue"
+	icon_state = "hardhat_dblue"
+	item_state = "hardhat_dblue"
 
 /obj/item/clothing/head/hardhat/red/atmos
 	name = "atmospheric firefighter helmet"

code/modules/clothing/head/misc_special.dm

@@ -139,16 +139,96 @@
 /*
  * Pumpkin head
  */
-/obj/item/clothing/head/pumpkinhead
+
+/obj/item/clothing/head/pumpkin
 	name = "carved pumpkin"
-	desc = "A jack o' lantern! Believed to ward off evil spirits."
-	icon_state = "hardhat0_pumpkin"//Could stand to be renamed
+	desc = "A pumpkin with a spooky face carved on it. Looks like it needs a candle."
+	icon_state = "pumpkin_carved"
 	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|BLOCKHAIR
 	body_parts_covered = HEAD|FACE|EYES
-	brightness_on = 2
-	light_overlay = "helmet_light"
-	w_class = 3
 	drop_sound = 'sound/items/drop/herb.ogg'
+	w_class = 3
+	throwforce = 1
+	throw_speed = 0.5
+
+/obj/item/clothing/head/pumpkin/attackby(var/obj/O, mob/user as mob)
+    if(istype(O, /obj/item/weapon/flame/candle))
+        var/obj/item/weapon/flame/candle/c = O
+        var/candle_wax = c.wax
+        to_chat(user, "You add [O] to [src].")
+        playsound(src.loc, 'sound/items/drop/gloves.ogg', 50, 1)
+        qdel(O)
+        var/obj/item/clothing/head/pumpkin/lantern/L = new /obj/item/clothing/head/pumpkin/lantern(user.loc)
+        L.wax = candle_wax
+        user.put_in_hands(L)
+        qdel(src)
+        return
+
+/obj/item/clothing/head/pumpkin/lantern
+	name = "jack o' lantern"
+	desc = "A pumpkin with a spooky face carved on it, with a candle inside. Believed to ward off evil spirits."
+	light_color = "#E09D37"
+	var/wax = 900
+	var/lit = FALSE
+
+/obj/item/clothing/head/pumpkin/lantern/update_icon()
+	icon_state = "pumpkin_carved[lit ? "_lit" : ""]"
+	if(ismob(loc))
+		var/mob/living/M = loc
+		M.update_inv_head(0)
+		M.update_inv_l_hand(0)
+		M.update_inv_r_hand(1)
+
+/obj/item/clothing/head/pumpkin/lantern/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	..()
+	if(W.iswelder())
+		var/obj/item/weapon/weldingtool/WT = W
+		if(WT.isOn()) //Badasses dont get blinded by lighting their candle with a welding tool
+			light("<span class='notice'>\The [user] casually lights the [name] with [W].</span>")
+	else if(isflamesource(W))
+		light()
+	else if(istype(W, /obj/item/weapon/flame/candle))
+		var/obj/item/weapon/flame/candle/C = W
+		if(C.lit)
+			light()
+
+/obj/item/clothing/head/pumpkin/lantern/proc/light(var/flavor_text = "<span class='notice'>\The [usr] lights the [name].</span>")
+	if(!src.lit)
+		src.lit = TRUE
+		playsound(src.loc, 'sound/items/cigs_lighters/cig_light.ogg', 50, 1)
+		//src.damtype = "fire"
+		for(var/mob/O in viewers(usr, null))
+			O.show_message(flavor_text, 1)
+		set_light(CANDLE_LUM)
+		update_icon()
+		update_clothing_icon()
+		START_PROCESSING(SSprocessing, src)
+
+/obj/item/clothing/head/pumpkin/lantern/process(mob/user as mob)
+	if(!lit)
+		return
+	wax--
+	if(!wax)
+		new /obj/item/clothing/head/pumpkin(src.loc)
+		new /obj/item/trash/candle(src.loc)
+		if(istype(src.loc, /mob))
+			src.dropped()
+		to_chat(user, span("notice", "The candle burns out."))
+		playsound(src.loc, 'sound/items/cigs_lighters/cig_snuff.ogg', 50, 1)
+		STOP_PROCESSING(SSprocessing, src)
+		qdel(src)
+	update_icon()
+	if(istype(loc, /turf)) //start a fire if possible
+		var/turf/T = loc
+		T.hotspot_expose(700, 5)
+
+/obj/item/clothing/head/pumpkin/lantern/attack_self(mob/user as mob)
+	if(lit)
+		lit = FALSE
+		to_chat(user, span("notice", "You snuff out the flame."))
+		playsound(src.loc, 'sound/items/cigs_lighters/cig_snuff.ogg', 50, 1)
+		update_icon()
+		set_light(0)
 
 /*
  * Kitty ears

code/modules/hydroponics/grown.dm

@@ -189,7 +189,7 @@
 		else if(W.sharp && !W.noslice)
 			if(seed.kitchen_tag == "pumpkin") // Ugggh these checks are awful.
 				user.show_message("<span class='notice'>You carve a face into [src]!</span>", 1)
-				new /obj/item/clothing/head/pumpkinhead (user.loc)
+				user.put_in_hands(new /obj/item/clothing/head/pumpkin)
 				qdel(src)
 				return
 			else if(seed.chems)