Skip to content

/Cataclysm-DDA

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

More Survival Tools Series 9 #12647

Merged
merged 5 commits into from Jun 15, 2015

Conversation

Reviewers
No reviews
Assignees

@Coolthulhu Coolthulhu

Labels
None yet
Projects
None yet
Milestone
No milestone
5 participants
@chaosvolt @DavidKeaton @Coolthulhu @Rivet-the-Zombie @Zireael07
@chaosvolt
Copy link
Contributor

commented Jun 13, 2015

  1. Added makeshift sunglasses, basically the Inuit snow goggles. owo

Chaosvolt added some commits Jun 13, 2015

Chaosvolt
More Survival Tools Series 9 
1. Added makeshift sunglasses, basically the Inuit snow goggles. owo
Loading status checks…
0dcd641
chaosvolt
Update 2 
1. Allowed autolearning of black powder recipe. Seriously, how does a
survivor know how to make smokeless gunpowder, but not original
old-school stuff?
2. Added black powder to recipes for explosive bolt/arrows, blunderbuss
shells, paper cartridges, and the cap-and-ball revolver ammo. All of
these are at a rate of twice as much blackpowder as normal gunpowder.
Loading status checks…
9dec3b2
@DavidKeaton

This comment has been minimized.

Sign in to view
Copy link
Contributor

commented Jun 13, 2015

nice!
@chaosvolt

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

commented Jun 13, 2015

I would also note that a few of the cartridges available historically originated in the blackpowder era. I didn't add the option to them because it would be a bit odd to run blackpowder cartridges through autoloading guns. o3o
data/mods/More_Survival_Tools/armor.json Outdated
"warmth" : 10,
"phase" : "solid",
"environmental_protection" : 0,
"encumbrance" : 15,

This comment has been minimized.

Sign in to view
Copy link
@Coolthulhu

Coolthulhu Jun 13, 2015

Contributor

For something that leaves just a thin slit to see through, this sounds way too low.
data/mods/More_Survival_Tools/recipes.json Outdated
[
[ "charcoal", 15 ]
]
]

This comment has been minimized.

Sign in to view
Copy link
@Coolthulhu

Coolthulhu Jun 13, 2015

Contributor

Looks like your formatting got nuked here for some reason
@Coolthulhu

This comment has been minimized.

Sign in to view
Copy link
Contributor

commented Jun 13, 2015

Since gunpowder is going to become uncraftable, you could push gunpowder as a separate PR into mainline.

@Coolthulhu Coolthulhu self-assigned this Jun 13, 2015

@Rivet-the-Zombie

This comment has been minimized.

Sign in to view
Copy link
Member

commented Jun 13, 2015

Continually adding all these things into a mod is only going to make it into a longer process when we pull them into the mainline. Why not just PR your stuff for the mainline in the first place?
@Zireael07

This comment has been minimized.

Sign in to view
Copy link
Contributor

commented Jun 13, 2015

Good point.
@chaosvolt

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

commented Jun 13, 2015

Meep. Maybe should PR the blackpowder idea then. =w=

Also, I should note I copy-pasted the blackpowder recipe from the recipe file, so if the formatting is FUBAR it wasn't my mistake. :V
Chaosvolt
Update 3 
1. Removed the blackpowder tweaks, I'll mainline that in a bit.
2. Bumped iggaak's encumbrance up to 20.
Loading status checks…
82bbcc9

@Coolthulhu Coolthulhu removed their assignment Jun 13, 2015

@chaosvolt

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

commented Jun 13, 2015

Swiggity swooty: #12656

Chaosvolt added some commits Jun 13, 2015

Chaosvolt
Update 3 
1. Added paper wrappers to list of tinder options, since apparently they can't be dismantled.
Loading status checks…
3bd0a6b
Chaosvolt
Update 5 
See what happens when you don't pay attention? You lose track of update numbers.

1. More encumbrance for work gloves, one thing discussed for the eventual mainlining of assorted things ( #12430 ).
Loading status checks…
8ce3d8d

@Coolthulhu Coolthulhu self-assigned this Jun 15, 2015

Coolthulhu added a commit that referenced this pull request Jun 15, 2015

@Coolthulhu
Merge pull request #12647 from chaosvolt/more-survival-tools-series-9 
More Survival Tools Series 9
c963912

@Coolthulhu Coolthulhu merged commit c963912 into CleverRaven:master Jun 15, 2015
1 check passed

1 check passed

default This has been rescheduled for testing as the 'master' branch has been updated.
@chaosvolt

This comment has been minimized.

Sign in to view
Copy link
Contributor Author

commented Jun 15, 2015

Meep. And thank you for the merge. ^^

@chaosvolt chaosvolt deleted the chaosvolt:more-survival-tools-series-9 branch Jun 15, 2015

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.