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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds pickaxes to the autolathe. #3037

Merged
merged 5 commits into from
Jun 10, 2024
Merged

Adds pickaxes to the autolathe. #3037

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c662feb
pick. axe.
Sadhorizon May 29, 2024
7431de9
Merge remote-tracking branch 'upstream/master' into pickaxe
Sadhorizon May 30, 2024
c9f287f
Wild.
Sadhorizon May 30, 2024
605cd2c
test your PRs + makeshift to emergency
Sadhorizon May 31, 2024
5057c89
reverts all of the goof
Sadhorizon Jun 5, 2024
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
9 changes: 0 additions & 9 deletions code/datums/components/crafting/recipes/misc.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,15 +137,6 @@
category = CAT_MISC
tools = list(TOOL_WELDER)

/datum/crafting_recipe/ipickaxe
name = "Improvised Pickaxe"
reqs = list(
/obj/item/crowbar = 1,
/obj/item/kitchen/knife = 1,
/obj/item/stack/tape = 1)
result = /obj/item/pickaxe/improvised
category = CAT_MISC

Sadhorizon marked this conversation as resolved.
Show resolved Hide resolved
/datum/crafting_recipe/chem_scanner
name = "Reagent Scanner"
time = 30
Expand Down
4 changes: 2 additions & 2 deletions code/modules/mining/equipment/mining_tools.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,8 @@
user.changeNext_move(CLICK_CD_MELEE * 0.7)

/obj/item/pickaxe/improvised
name = "improvised pickaxe"
desc = "A pickaxe made with a knife and crowbar taped together, how does it not break?"
name = "makeshift pickaxe"
desc = "A cheap pickaxe made from sheet metal. Don’t expect it to last very long."
icon_state = "ipickaxe"
item_state = "ipickaxe"
force = 10
Expand Down
8 changes: 8 additions & 0 deletions code/modules/research/designs/autolathe_designs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -491,6 +491,14 @@
build_path = /obj/item/shovel
category = list("initial","Misc", "Tool Designs")

/datum/design/pickaxe
name = "Pickaxe"
id = "pickaxe"
build_type = AUTOLATHE | PROTOLATHE
materials = list(/datum/material/iron = 100)
Sadhorizon marked this conversation as resolved.
Show resolved Hide resolved
build_path = /obj/item/pickaxe
Sadhorizon marked this conversation as resolved.
Show resolved Hide resolved
category = list("initial","Misc", "Tool Designs")

/datum/design/spade
name = "Spade"
id = "spade"
Expand Down
Loading