Skip to content

Commit 9aacf9f

Browse files
New pumpkinhat and blumpkin hat sprites (#19429)
1 parent e26b0da commit 9aacf9f

File tree

6 files changed

+17
-9
lines changed

6 files changed

+17
-9
lines changed

code/modules/clothing/head/misc_special.dm

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -136,14 +136,18 @@
136136
flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
137137
flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
138138
dog_fashion = null
139-
140-
sprite_sheets = list(
141-
"Grey" = 'icons/mob/clothing/species/grey/head.dmi'
142-
)
143-
139+
light_color = "#fff2bf"
144140
armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 0, ACID = 0)
145141
brightness_on = 2 //luminosity when on
146142

143+
/obj/item/clothing/head/hardhat/pumpkinhead/blumpkin
144+
name = "carved blumpkin"
145+
desc = "A very blue jack o' lantern! Believed to ward off vengeful chemists."
146+
icon_state = "hardhat0_blumpkin"
147+
item_state = "hardhat0_blumpkin"
148+
item_color = "blumpkin"
149+
light_color = "#76ff8e"
150+
147151

148152
/obj/item/clothing/head/hardhat/reindeer
149153
name = "novelty reindeer hat"

code/modules/hydroponics/grown/pumpkin.dm

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
mutatelist = list(/obj/item/seeds/pumpkin/blumpkin)
1717
reagents_add = list("vitamin" = 0.04, "plantmatter" = 0.2)
1818

19+
1920
/obj/item/reagent_containers/food/snacks/grown/pumpkin
2021
seed = /obj/item/seeds/pumpkin
2122
name = "pumpkin"
@@ -25,11 +26,12 @@
2526
bitesize_mod = 2
2627
tastes = list("pumpkin" = 1)
2728
wine_power = 0.2
29+
var/carved_type = /obj/item/clothing/head/hardhat/pumpkinhead
2830

2931
/obj/item/reagent_containers/food/snacks/grown/pumpkin/attackby(obj/item/W as obj, mob/user as mob, params)
3032
if(is_sharp(W))
3133
user.show_message("<span class='notice'>You carve a face into [src]!</span>", 1)
32-
new /obj/item/clothing/head/hardhat/pumpkinhead(user.loc)
34+
new carved_type(user.loc)
3335
qdel(src)
3436
return
3537
else
@@ -42,12 +44,13 @@
4244
icon_state = "seed-blumpkin"
4345
species = "blumpkin"
4446
plantname = "Blumpkin Vines"
45-
product = /obj/item/reagent_containers/food/snacks/grown/blumpkin
47+
product = /obj/item/reagent_containers/food/snacks/grown/pumpkin/blumpkin
4648
mutatelist = list()
4749
reagents_add = list("ammonia" = 0.2, "chlorine" = 0.1, "plasma" = 0.1, "plantmatter" = 0.2)
4850
rarity = 20
4951

50-
/obj/item/reagent_containers/food/snacks/grown/blumpkin
52+
53+
/obj/item/reagent_containers/food/snacks/grown/pumpkin/blumpkin
5154
seed = /obj/item/seeds/pumpkin/blumpkin
5255
name = "blumpkin"
5356
desc = "The pumpkin's toxic sibling."
@@ -56,3 +59,4 @@
5659
bitesize_mod = 2
5760
tastes = list("blumpkin" = 1)
5861
wine_power = 0.5
62+
carved_type = /obj/item/clothing/head/hardhat/pumpkinhead/blumpkin

code/modules/reagents/chemistry/machinery/reagentgrinder.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
/obj/item/reagent_containers/food/snacks/watermelonslice = list("watermelonjuice" = 0),
7373
/obj/item/reagent_containers/food/snacks/grown/berries/poison = list("poisonberryjuice" = 0),
7474
/obj/item/reagent_containers/food/snacks/grown/pumpkin = list("pumpkinjuice" = 0),
75-
/obj/item/reagent_containers/food/snacks/grown/blumpkin = list("blumpkinjuice" = 0),
75+
/obj/item/reagent_containers/food/snacks/grown/pumpkin/blumpkin = list("blumpkinjuice" = 0),
7676
/obj/item/reagent_containers/food/snacks/grown/apple = list("applejuice" = 0),
7777
/obj/item/reagent_containers/food/snacks/grown/grapes = list("grapejuice" = 0),
7878
/obj/item/reagent_containers/food/snacks/grown/grapes/green = list("grapejuice" = 0),

icons/mob/clothing/head.dmi

4.12 KB
Binary file not shown.
-122 Bytes
Binary file not shown.

icons/obj/clothing/hats.dmi

175 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)