Skip to content
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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

craftable wooden mugs (port) #8970

Merged
merged 3 commits into from
Jun 22, 2020
Merged

craftable wooden mugs (port) #8970

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c678759
Update recipes.dm
boodaliboo Jun 20, 2020
2e11279
Update bottle.dm
boodaliboo Jun 20, 2020
9f52b13
Add files via upload
boodaliboo Jun 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 8 additions & 0 deletions code/datums/components/crafting/recipes.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -805,5 +805,13 @@
tools = list(TOOL_CROWBAR)
category = CAT_MISC
time = 30

/datum/crafting_recipe/woodenmug
name = "Wooden Mug"
result = /obj/item/reagent_containers/glass/woodmug
reqs = list(/obj/item/stack/sheet/mineral/wood = 2)
time = 20
category = CAT_PRIMAL



7 changes: 7 additions & 0 deletions code/modules/reagents/reagent_containers/bottle.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,3 +415,10 @@
/obj/item/reagent_containers/glass/bottle/bromine
name = "bromine bottle"
list_reagents = list(/datum/reagent/bromine = 30)

/obj/item/reagent_containers/glass/woodmug
name = "wooden mug"
desc = "Style is everything, whether it be an ashtray or a keychain or a kitchen timer, we鈥檙e living in an age of design, where the physical contours of an object are paramount. Look at this wooden mug, for instance, and see how much it deviates, in its conception, from the ordinary mug. Not much. It is round, tallish, has a handle just like any coffee mug. But it鈥檚 not an ordinary coffee mug. First of all its form is totally different; it鈥檚 made of wood, not ceramic or plastic. It鈥檚 an object that cannot be used casually and put it away, you would love to possess it."
icon_state = "woodenmug"
icon = 'icons/obj/drinks.dmi'
volume = 30
Binary file modified icons/obj/drinks.dmi
View file
Open in desktop
Binary file not shown.