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

Update Spike and Makeshift Knife recipe to be more reasonable. #38033

Merged
merged 13 commits into from Feb 22, 2020
Merged

Update Spike and Makeshift Knife recipe to be more reasonable. #38033

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
fb33d48
Merge pull request #8 from CleverRaven/master
Nov 21, 2019
5f7ee95
Merge pull request #9 from CleverRaven/master
Feb 15, 2020
06cac98
Halved spike weight: will change recipe soon.
Feb 15, 2020
9ab579a
Update spike recipe.
Feb 15, 2020
83e8e25
Actually change Makeshift Knife volume.
Feb 15, 2020
573d60b
Revert dumb spike mistake.
Feb 15, 2020
16fabe4
Linting recipe file
Feb 20, 2020
e8a280b
Linting resources/metal.json
Feb 20, 2020
0551976
Linting - this time in the correct branch!
Feb 20, 2020
f2ad6f1
Update data/json/items/melee/swords_and_blades.json
Feb 21, 2020
cffb16e
Update data/json/recipes/recipe_others.json
Feb 21, 2020
5ceb2f2
Update data/json/recipes/recipe_others.json
Feb 21, 2020
baea45c
Update data/json/recipes/recipe_others.json
kevingranade Feb 22, 2020
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
4 changes: 2 additions & 2 deletions data/json/items/melee/swords_and_blades.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[

This conversation was marked as resolved.
Show resolved Hide resolved
{
"type": "GENERIC",
"id": "sword_wood",
Expand Down Expand Up @@ -223,7 +223,7 @@
"name": { "str": "makeshift knife", "str_pl": "makeshift knives" },
"description": "A knife consisting of a long, somewhat sharpened, spike and a tightly wrapped rag as a handle. It makes a good melee weapon.",
"weight": "550 g",
"volume": "500 ml",
"volume": "251 ml",
"price": 0,
"to_hit": -1,
"bashing": 2,
Expand Down
5 changes: 3 additions & 2 deletions data/json/recipes/recipe_others.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
[

This conversation was marked as resolved.
Show resolved Hide resolved

This conversation was marked as resolved.
Show resolved Hide resolved
{
"type": "recipe",
"result": "caltrops",
Expand Down Expand Up @@ -1369,7 +1370,7 @@
"reversible": true,
"autolearn": true,
"qualities": [ { "id": "HAMMER", "level": 1 } ],
"components": [ [ [ "steel_chunk", 2 ], [ "scrap", 5 ] ] ]
"components": [ [ "steel_chunk", 1 ] ]
kevingranade marked this conversation as resolved.
Show resolved Hide resolved
},
{
"type": "recipe",
Expand Down