diff --git a/code/game/objects/items/toys/toys_vr.dm b/code/game/objects/items/toys/toys_vr.dm index 15065248c7..9a28678ed6 100644 --- a/code/game/objects/items/toys/toys_vr.dm +++ b/code/game/objects/items/toys/toys_vr.dm @@ -1155,3 +1155,36 @@ return user.visible_message(span_danger("\The [user] waves \the [src] in front of the [M]!")) M.PounceTarget(user,100) + +/// Fluff item for digitalsquirrel + +/obj/item/toy/acorn_branch + name = "oak staff" + desc = "A branch of oak wood bearing a collection of still living leaves, and many acorns hanging among them." + icon = 'icons/obj/items.dmi' + icon_state = "acorn_branch" + w_class = ITEMSIZE_SMALL + var/next_use = 0 + var/registered_mob //On request, only one person is able to use it at a time. + +/obj/item/toy/acorn_branch/attack_self(mob/user) + if(user.stat || !ishuman(user)) + return + if(world.time < next_use) + to_chat(user, span_notice("You need to wait a bit longer before you can pull out another acorn!")) + return + var/mob/living/carbon/human/H = user + if(registered_mob) + if(registered_mob != H) + to_chat(user, span_notice("It's a lovely branch!")) + return + else + registered_mob = H + if(H.get_inactive_hand()) + to_chat(user, span_notice("You need to have a free hand to pick an acorn out!")) + return + var/spawnloc = get_turf(H) + var/obj/item/I = new /obj/item/reagent_containers/food/snacks/acorn(spawnloc) + H.put_in_inactive_hand(I) + next_use = (world.time + 30 SECONDS) + H.visible_message(span_notice("\The [H] pulls an acorn from \the [src]!")) diff --git a/code/modules/client/preference_setup/loadout/loadout_fluffitems.dm b/code/modules/client/preference_setup/loadout/loadout_fluffitems.dm index f6d13270cc..a3228659f6 100644 --- a/code/modules/client/preference_setup/loadout/loadout_fluffitems.dm +++ b/code/modules/client/preference_setup/loadout/loadout_fluffitems.dm @@ -363,6 +363,12 @@ ckeywhitelist = list("dickfreedomjohnson") character_name = list("Elliot Richards") +/datum/gear/fluff/acorn_branch + path = /obj/item/toy/acorn_branch + display_name = "Oak Staff" + ckeywhitelist = list("digitalsquirrel95") + character_name = list("Tilly Reed") + /datum/gear/fluff/donald_medal path = /obj/item/clothing/accessory/medal/conduct display_name = "Donald's Conduct Medal" diff --git a/code/modules/food/food/snacks_vr.dm b/code/modules/food/food/snacks_vr.dm index 77d6c5625f..d37bb4e7e6 100644 --- a/code/modules/food/food/snacks_vr.dm +++ b/code/modules/food/food/snacks_vr.dm @@ -1221,3 +1221,17 @@ /obj/item/reagent_containers/food/snacks/packaged/porkpie/Initialize(mapload) . = ..() reagents.add_reagent(REAGENT_ID_PROTEIN, 2) + +/obj/item/reagent_containers/food/snacks/acorn + name = "acorn" + desc = "A small nut that could potentially grow into a beautiful oak tree! Or, just get eaten by squirrels." + icon = 'icons/obj/food_snacks.dmi' + icon_state = "acorn" + w_class = ITEMSIZE_TINY + nutriment_amt = 1 + bitesize = 2 + nutriment_desc = list("earthy goodness" = 6) + +/obj/item/reagent_containers/food/snacks/acorn/Initialize(mapload) + . = ..() + reagents.add_reagent(REAGENT_ID_PEANUTBUTTER, 2) //Just to make it so people can be allergic to it without making a new reagent diff --git a/icons/obj/food_snacks.dmi b/icons/obj/food_snacks.dmi index 3761135206..50a540d9ea 100644 Binary files a/icons/obj/food_snacks.dmi and b/icons/obj/food_snacks.dmi differ diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi index a7e0199f9d..91db5af2d1 100644 Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ