Skip to content

Commit

Permalink
Resprites a bunch of candy, adds gummy worms (#8295)
Browse files Browse the repository at this point in the history
  • Loading branch information
WALPVRGIS committed Apr 21, 2022
1 parent b7e53e4 commit d7ac7c8
Show file tree
Hide file tree
Showing 3 changed files with 41 additions and 1 deletion.
3 changes: 2 additions & 1 deletion code/modules/economy/supply_packs.dm
Expand Up @@ -1122,7 +1122,8 @@ ABSTRACT_TYPE(/datum/supply_packs)
contains = list(/obj/item/item_box/heartcandy,
/obj/item/storage/goodybag,
/obj/item/item_box/swedish_bag,
/obj/item/kitchen/peach_rings)
/obj/item/kitchen/peach_rings,
/obj/item/kitchen/gummy_worms_bag)
cost = 500
containertype = /obj/storage/crate
containername = "Candy Crate"
Expand Down
39 changes: 39 additions & 0 deletions code/modules/food_and_drink/candy.dm
Expand Up @@ -398,6 +398,45 @@ ABSTRACT_TYPE(/obj/item/reagent_containers/food/snacks/candy/jellybean)
..()
reagents.add_reagent("juice_peach",5)

/obj/item/kitchen/gummy_worms_bag
amount = 6
icon = 'icons/obj/foodNdrink/food_candy.dmi'
icon_state = "gummyw-full"
name = "bag of gummy worms"
desc = "A bag of sour gummy worms. Still a little wriggly."

attack_hand(mob/user as mob, unused, flag)
if (flag)
return ..()
if (user.r_hand == src || user.l_hand == src)
if(src.amount == 0)
boutput(user, "<span class='alert'>You're out of gummy worms. The world is a little bleaker.</span>")
return
else
var/obj/item/reagent_containers/food/snacks/candy/gummy_worm/B = new(user)
user.put_in_hand_or_drop(B)
src.amount--
if(src.amount == 0)
src.icon_state = "gummyw-empty"
src.name = "empty gummy worms bag"
src.desc = "A crumpled bag that was once full of sour gummy worms."
else
return ..()
return

/obj/item/reagent_containers/food/snacks/candy/gummy_worm
name = "gummy worm"
desc = "A sour gummy worm sprinkled in sugar. Comes in several flavours."
icon_state = "gummyworm-1"
amount = 1
sugar_content = 5

New()
..()
src.icon_state = "gummyworm-[rand(1,3)]"
src.reagents.add_reagent(pick("juice_cherry", "juice_orange", "lemonade", "juice_strawberry", "juice_blueberry", "juice_apple", "juice_blueraspberry", "juice_watermelon", "juice_peach", "cocktail_citrus"), 5)
src.heal_amt = 1

/obj/item/reagent_containers/food/snacks/candy/candyheart
name = "candy heart"
desc = "Can you find the perfect phrase for that special someone?"
Expand Down
Binary file modified icons/obj/foodNdrink/food_candy.dmi
Binary file not shown.

0 comments on commit d7ac7c8

Please sign in to comment.