diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm index 360e8a01c30..c8eccc283d1 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -136,14 +136,18 @@ flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH dog_fashion = null - - sprite_sheets = list( - "Grey" = 'icons/mob/clothing/species/grey/head.dmi' - ) - + light_color = "#fff2bf" armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 0, ACID = 0) brightness_on = 2 //luminosity when on +/obj/item/clothing/head/hardhat/pumpkinhead/blumpkin + name = "carved blumpkin" + desc = "A very blue jack o' lantern! Believed to ward off vengeful chemists." + icon_state = "hardhat0_blumpkin" + item_state = "hardhat0_blumpkin" + item_color = "blumpkin" + light_color = "#76ff8e" + /obj/item/clothing/head/hardhat/reindeer name = "novelty reindeer hat" diff --git a/code/modules/hydroponics/grown/pumpkin.dm b/code/modules/hydroponics/grown/pumpkin.dm index aa7030bc6db..718b16c6b1f 100644 --- a/code/modules/hydroponics/grown/pumpkin.dm +++ b/code/modules/hydroponics/grown/pumpkin.dm @@ -16,6 +16,7 @@ mutatelist = list(/obj/item/seeds/pumpkin/blumpkin) reagents_add = list("vitamin" = 0.04, "plantmatter" = 0.2) + /obj/item/reagent_containers/food/snacks/grown/pumpkin seed = /obj/item/seeds/pumpkin name = "pumpkin" @@ -25,11 +26,12 @@ bitesize_mod = 2 tastes = list("pumpkin" = 1) wine_power = 0.2 + var/carved_type = /obj/item/clothing/head/hardhat/pumpkinhead /obj/item/reagent_containers/food/snacks/grown/pumpkin/attackby(obj/item/W as obj, mob/user as mob, params) if(is_sharp(W)) user.show_message("You carve a face into [src]!", 1) - new /obj/item/clothing/head/hardhat/pumpkinhead(user.loc) + new carved_type(user.loc) qdel(src) return else @@ -42,12 +44,13 @@ icon_state = "seed-blumpkin" species = "blumpkin" plantname = "Blumpkin Vines" - product = /obj/item/reagent_containers/food/snacks/grown/blumpkin + product = /obj/item/reagent_containers/food/snacks/grown/pumpkin/blumpkin mutatelist = list() reagents_add = list("ammonia" = 0.2, "chlorine" = 0.1, "plasma" = 0.1, "plantmatter" = 0.2) rarity = 20 -/obj/item/reagent_containers/food/snacks/grown/blumpkin + +/obj/item/reagent_containers/food/snacks/grown/pumpkin/blumpkin seed = /obj/item/seeds/pumpkin/blumpkin name = "blumpkin" desc = "The pumpkin's toxic sibling." @@ -56,3 +59,4 @@ bitesize_mod = 2 tastes = list("blumpkin" = 1) wine_power = 0.5 + carved_type = /obj/item/clothing/head/hardhat/pumpkinhead/blumpkin diff --git a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm index 41517ba6ab2..19f41fa4d32 100644 --- a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm +++ b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm @@ -72,7 +72,7 @@ /obj/item/reagent_containers/food/snacks/watermelonslice = list("watermelonjuice" = 0), /obj/item/reagent_containers/food/snacks/grown/berries/poison = list("poisonberryjuice" = 0), /obj/item/reagent_containers/food/snacks/grown/pumpkin = list("pumpkinjuice" = 0), - /obj/item/reagent_containers/food/snacks/grown/blumpkin = list("blumpkinjuice" = 0), + /obj/item/reagent_containers/food/snacks/grown/pumpkin/blumpkin = list("blumpkinjuice" = 0), /obj/item/reagent_containers/food/snacks/grown/apple = list("applejuice" = 0), /obj/item/reagent_containers/food/snacks/grown/grapes = list("grapejuice" = 0), /obj/item/reagent_containers/food/snacks/grown/grapes/green = list("grapejuice" = 0), diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi index aebc584dfdc..8dc853ff81a 100644 Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ diff --git a/icons/mob/clothing/species/grey/head.dmi b/icons/mob/clothing/species/grey/head.dmi index 3ab756e62e8..d2f607ae293 100644 Binary files a/icons/mob/clothing/species/grey/head.dmi and b/icons/mob/clothing/species/grey/head.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 360842911e0..de2a4ecf43a 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ