Skip to content

Refillable Peppermills #499

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
PhantomWolfa wants to merge 1 commit into
base: main
Choose a base branch
from
+20 −1
Open

Refillable Peppermills #499

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion code/modules/jobs/job_types/roguetown/burghers/innkeep.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,8 @@
/obj/item/bottle_kit,
/obj/item/storage/keyring/innkeep_rooms,
/obj/item/reagent_containers/glass/bucket/pot/kettle/tankard/silver,
/obj/item/mini_flagpole/innkeeper
/obj/item/mini_flagpole/innkeeper,
/obj/item/reagent_containers/peppermill/innkeeper
)
if(H.mind)
SStreasury.grant_savings(ECONOMIC_UPPER_CLASS, H)
18 changes: 18 additions & 0 deletions modular/Neu_Food/code/cookware/peppermill.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,21 @@
/obj/item/reagent_containers/peppermill/get_mechanics_examine(mob/user)
. = ..()
. += span_info("Left-clicking a variety of cooked meats, such as frysteaks and fillets of fish, will season them into higher-classed meals.")

/obj/item/reagent_containers/peppermill/attackby(obj/item/P, mob/living/user, params)
if(istype(P, /obj/item/reagent_containers/food/snacks/pepper))
if(do_after(src, 30))
src.reagents.add_reagent(/datum/reagent/consumable/blackpepper, 3)
user.visible_message("<span class='notice'>[user] fills the [src] with [P].</span>")
qdel(P)
return
else
to_chat(user, "<span class='warning'>I need to stand still to fill the peppermill!</span>")
else
return ..()

/obj/item/reagent_containers/peppermill/innkeeper
name = "overburderned pepper mill"
desc = "Let the lord have his snack; twist the head until it cracks. Specially commissioned by the crown from the local university specifically for any inkeeper. It can hold double the amount of a regular peppermill!"
volume = 60
list_reagents = list(/datum/reagent/consumable/blackpepper = 30)
Loading