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.

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

Tool name to object leave the s, change volume to string #37770

Merged
merged 2 commits into from
Feb 6, 2020
Merged

Tool name to object leave the s, change volume to string #37770

merged 2 commits into from
Feb 6, 2020

Conversation

snipercup
Copy link
Contributor

Summary

SUMMARY: none

Purpose of change

Contributes to #36610 and #36110

Describe the solution

Change name to object
remove name_plural
Don't add str_pl if it only adds an s
change volume to string and add 5 ml

Describe alternatives you've considered

Not changing

Testing

Some items don't stack because their ids are different
image
image
image
image
image
image

@snipercup
Copy link
Contributor Author

snipercup commented Feb 6, 2020

The combat knives don't turn out well (combat knife +1s) but I didnt touch their json so it will have to be fixed in another pr
image

The knives show up normally in master, I will look into this
Actually, the combat knives and trench knives also look like this in master and will have to be fixed in another pr

@snipercup snipercup changed the title Tool name to object leave the s, change volume to string [WIP] Tool name to object leave the s, change volume to string Feb 6, 2020
@snipercup snipercup changed the title [WIP] Tool name to object leave the s, change volume to string Tool name to object leave the s, change volume to string Feb 6, 2020
@ZhilkinSerg ZhilkinSerg added the [JSON] Changes (can be) made in JSON label Feb 6, 2020
@ZhilkinSerg ZhilkinSerg merged commit e201d28 into CleverRaven:master Feb 6, 2020
@snipercup snipercup deleted the Tool-name-to-object branch February 6, 2020 18:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
[JSON] Changes (can be) made in JSON
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants