Crude weapons 2020 #39711
Merged
Crude weapons 2020 #39711
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Wait, these are my own PRs
SUS Bathroom Dec 31st
SUS Bathroom Jan 4
SUS Bathroom Jan 4-1
SUS Bathroom 3.5
Freeze Catchup Feb 19 2020
Freeze Catchup March 1
0.E Catchup March 2020
post 0.E freeze catchup
0.E Catchup April 17
0.E April 18th
0.E April 19
a few weapons which were missing so far...
had to have the damn thing spawn somewhere.
ymber
reviewed
Apr 19, 2020
ghost
suggested changes
Apr 19, 2020
|
Is that a mod or is it for the game itself? |
some suggested edits
realized what was missing
hasty!
mlangsdorf
reviewed
Apr 20, 2020
knives updated to match 0.E standards
never half-ass it.
forgot something
linters only detect fatal crashes, not nonsense that technically still runs.
dangit
oops.
it was genuinely just spelled wrong.
more errors, hopefully the last
also bad speiling
I must have branched RIGHT before the plurals were updated.
Sorry about the pikes, I worked around them
perhaps I should have just copied the master
why is Science even in here
mlangsdorf
approved these changes
Apr 27, 2020
ZhilkinSerg
pushed a commit
to ZhilkinSerg/Cataclysm-DDA
that referenced
this pull request
Apr 27, 2020
Drewscriver
pushed a commit
to Drewscriver/Cataclysm-DDA
that referenced
this pull request
Apr 30, 2020
This was referenced May 3, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
SUMMARY: Content "four new tools, one renamed tool, and four crafting recipes."Purpose of change
The recent SUS bathroom updates added some items which were otherwise junk. This PR started as an effort to give them an immediate purpose, but grew beyond that.
Describe the solution
The Sharpened Toothbrush was changed into the more general Plastic Shank, which is now craftable. Bones may be fashioned into a Bone Shiv. A new, somewhat stronger whip has been added (the Scourge), along with a mid-range medieval dagger (the Baselard); both may be crafted. The Machete Multitool was added, with all its real-life pros and cons.
Describe alternatives you've considered
The Machete Multitool was the last item I thought of. Yes, it is the Camillus Carnivore. Yes, it is that fragile in real life. I decided against adding a crafting recipe for it; a survivor already has better options by the time they could plausibly forge one.
The Baselard was added to prepare for a future PR, it could have easily been delayed.
Testing
No fatal errors!
Additional context
turns out the Sharpened Toothbrush still sucks, who knew?