Patch 5 #3
Merged
Patch 5 #3
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
…ds acid crafting possible (cataclysmbnteam#4466) * Update chemicals.json * Update chemicals.json
…smbnteam#4471) * Fixed some stuff to use sewing_standard changed the json to use the sewing_standard tag and also made waterskins use leather only and not fur * Update containers.json changed so uses changes of sewing standard instead of filament * Update legs.json * Update containers.json fixed square brackets * fixed recipe for bow sling and bundles bow sling uses sewing standard bundles don't use sewing tools anymore * Update storage.json * a lot of files were missing, so here we go. * style(autofix.ci): automated formatting * Fix syntax error * syntax fix 2: electric boogaloo * Update storage.json --------- Co-authored-by: Viss Valdyr <33199510+Lamandus@users.noreply.github.com> Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com> Co-authored-by: Chaosvolt <chaosvolt@users.noreply.github.com>
…team#4447) * initial commit https: //github.com/CleverRaven/Cataclysm-DDA/pull/51516 https: //github.com/CleverRaven/Cataclysm-DDA/pull/51476 https: //github.com/CleverRaven/Cataclysm-DDA/pull/63534 Co-Authored-By: John Bytheway <52664+jbytheway@users.noreply.github.com> Co-Authored-By: Eric Pierce <238395+wapcaplet@users.noreply.github.com> * style(autofix.ci): automated formatting * Update wind_turbine.json * Update wind_turbine.json * Update wind_turbine.json * style(autofix.ci): automated formatting * Update furniture-industrial.json adding electrical grid support * Update deconstruction.json add in a way to deconstruct new furniture * style(autofix.ci): automated formatting * Update overmap_terrain.json because i am cruel * style(autofix.ci): automated formatting * Update specials.json * Update data/json/overmap/overmap_special/specials.json Co-authored-by: Chaosvolt <chaosvolt@users.noreply.github.com> --------- Co-authored-by: John Bytheway <52664+jbytheway@users.noreply.github.com> Co-authored-by: Eric Pierce <238395+wapcaplet@users.noreply.github.com> Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com> Co-authored-by: Chaosvolt <chaosvolt@users.noreply.github.com>
…e in encumbrance. (cataclysmbnteam#4477) * fix(balance): add "COMPACT" to ammo satchel * lowering encumbrance * fixing my errors
…cataclysmbnteam#4478) fix(balance): balancing encumbrance for sling based weapon holders
…mod recipes (cataclysmbnteam#4481) Add American Flag Recipe, balance pride flag mod recipes 40 rags to the flag.
* initial commit Co-Authored-By: Kanexan <51104434+kanexan@users.noreply.github.com> * style(autofix.ci): automated formatting * Update data/json/harvest.json Co-authored-by: Chaosvolt <chaosvolt@users.noreply.github.com> * Update data/json/harvest.json Co-authored-by: Chaosvolt <chaosvolt@users.noreply.github.com> * Update data/json/harvest.json Co-authored-by: Chaosvolt <chaosvolt@users.noreply.github.com> * Update data/json/harvest.json Co-authored-by: Chaosvolt <chaosvolt@users.noreply.github.com> * Update data/json/harvest.json Co-authored-by: Chaosvolt <chaosvolt@users.noreply.github.com> --------- Co-authored-by: Kanexan <51104434+kanexan@users.noreply.github.com> Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com> Co-authored-by: Chaosvolt <chaosvolt@users.noreply.github.com>
Format both flavors of RetroDays The line count on the original Retrodays reformatting will be immense, I can already predict it
…lysmbnteam#4484) * feat: revamp brewing.json file to use copy-from using abstract * more optimation
… general (cataclysmbnteam#4475) * initial commit Co-Authored-By: NetSysFire <59517351+netsysfire@users.noreply.github.com> * style(autofix.ci): automated formatting * Update mutant_animal.json no liquid cat yet because it needs a good animation * Update mutant_animal.json * style(autofix.ci): automated formatting * add graphics for black cat and void cat --------- Co-authored-by: NetSysFire <59517351+netsysfire@users.noreply.github.com> Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
Fix typo in README.md Fixes a typo in the README
* initial commit Co-Authored-By: John Bytheway <52664+jbytheway@users.noreply.github.com> * style(autofix.ci): automated formatting --------- Co-authored-by: John Bytheway <52664+jbytheway@users.noreply.github.com> Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
…nteam#4496) * Stuffed animals, wool pillows & mattresses Added in stuffed animal, a homemade equivalent of the teddy bear, and crafting recipe. Crafted pillows, body pillows, and down mattresses can now be made with yarn instead of cotton balls or down feathers, since wool-stuffed pillows and mattresses are a thing IRL. Renamed down mattress to 'cushiony mattress' to represent its now possible materials, with description adjusted to match. * Removed stuffed animal Stuffed animal is removed, teddy bear is now craftable and has a changed description. * Reverted down mattress, added wool mattress Down mattress is made with down feathers again, now wool mattress is its own thing. * Fixed wool mattress name plural * Reverted pillow recipe, added wool pillow Pillows have a specific uncraft, so instead of using pillows to turn cotton balls into yarn, wool pillows are now a thing. Also added wool pillows to appropriate construction recipes. * Wool mattress spawning Added wool mattresses to spawn in locations with the same chance as down mattresses. * style(autofix.ci): automated formatting --------- Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
…mbnteam#4493) * Refactor turret code Turret code via vehicle controls now routes through `can_fire_turret()` in `avatar_actions.cpp` Added ability to override and fire all turrets, not just the automatics. * Remove leftover code * Update ranged_aiming_test.cpp To account for my changes.
* Added thermoblade Added in thermoblade, a utility knife that heats itself using an atomic battery. It can show up almost anywhere a hunting knife can (at a lower chance), except on police since it's legally questionable. It can be crafted yourself using a knife, electronics supplies, and a plutonium cell if you have 6 electronics and a lab recipe book or 8 electronics otherwise. * Removed durable flag The thermoblade is no longer durable, since this version is a handmade grey-market variety while the Subnautica one is 3D printed. * style(autofix.ci): automated formatting * Removed technique, added FLAMING Removed the thermal stab technique and the bonus damage and gave the thermoblade the FLAMING flag instead. * Fixed recipebook learn level * style(autofix.ci): automated formatting --------- Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
…oogaloo (cataclysmbnteam#4499) * Replaced My Sweet Cataclysm * style(autofix.ci): automated formatting * smolfix * smolfix --------- Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com> Co-authored-by: Chaosvolt <chaosvolt@users.noreply.github.com>
* Whips The bullwhip and scourge have been resized and reweighted to be closer to an IRL whip of that size, allowing them to serve as lightweight but relatively low damage and low durability long-range melee weapons. The bullwhip also now has the belt-clip flag, since you could easily just loosely tie one into a slipknot to keep it in place. The crafting time is also lowered to be in-line with BN's generally reduced crafting times. * Removed rope requirement Bullwhips are almost always entirely leather, with multi-layered whips just using more leather on the inside; I'm not even sure why the crafting recipe required rope to begin with.
Add BIOPROOF to Json Flags Documentation
Fix sauce sandwich containing dairy and meat technically it can have butter as an ingredient, but every other sauce is non-dairy. Democracy of ingredients.
* Initial commit * Update data/mods/pride_flags/flags.json Co-authored-by: RobbieNeko <30732426+RobbieNeko@users.noreply.github.com> * Update data/mods/pride_flags/flags.json --------- Co-authored-by: Chaosvolt <chaosvolt@users.noreply.github.com> Co-authored-by: RobbieNeko <30732426+RobbieNeko@users.noreply.github.com>
* Toolbox No Mechanics The toolbox no longer needs mechanics to build, since it is literally just storing a bunch of tools inside of a metal box held together with nails and wire. It now instead requires a level 2 hammering tool. * No hammering The hammer is already a tool in the recipe, no need to require another one.
* Update panels.cpp Co-Authored-By: Kelenius <6681708+kelenius@users.noreply.github.com> * Update panels.cpp Co-Authored-By: Kelenius <6681708+kelenius@users.noreply.github.com> * refactor: remove unused lines why it's error instead of warning? --------- Co-authored-by: Kelenius <6681708+kelenius@users.noreply.github.com> Co-authored-by: scarf <greenscarf005@gmail.com>
…taclysmbnteam#4674) feat(balance): more sun, bit less humidity in summer
* Update occupied_lumber_mill.json * Update lumbermill_missions.json * Update specials.json * style(autofix.ci): automated formatting --------- Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
* Add some ceramic uncraft Adds uncraft for four items: coffee mug, casserole, ceramic armor plate and crucible. Used ceramic shard's volume to choose amount of shards recovered. * Used weight instead of volume to determine amount of shard per disassemble for items which gave more then one shard.
* fix(content): lowering minimum speed again to 1 * Update vehicle_autodrive.cpp * Update vehicle_autodrive.cpp * maybe fix --------- Co-authored-by: Chaosvolt <chaosvolt@users.noreply.github.com>
…bnteam#4684) * feat(content): maximum auto-drive speed option * style(autofix.ci): automated formatting * Update options.cpp * Minimum speed setable, too * fixes * style(autofix.ci): automated formatting * Update src/options.cpp Co-authored-by: scarf <greenscarf005@gmail.com> * Min speed also defined * nitpicky * style(autofix.ci): automated formatting --------- Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com> Co-authored-by: scarf <greenscarf005@gmail.com>
…ysmbnteam#4683) * fix: less crashing while auto-driving * Update vehicle_autodrive.cpp
Update occupied_lumber_mill.json
added some glass uncraft in generic.json
* fix: `magic_light` throwing `wind_resist` error via adding new `concentrated_mana` material Adds a new material `contentrated_mana`. Adds a material field on `magic_light` entry containing `concentrated_mana`. * style(autofix.ci): automated formatting --------- Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>
* add some clay uncrafts in generic.json Put clay pot in generic.json since it also has the uncraft for canning pot. File is missing uncraft for makeshift pot despite it being disassemble-able so I'm wondering if I put the clay pot in the right file. * add bricks uncraft generic.json Made it require tools since bricks are much harder to break then pots.
… autolearned (cataclysmbnteam#4693) feat(balance): makeshift steam, 1cylinder and 2 cylinder engines are autolearned
* Added light wooden wheel mount Co-Authored-By: VissValdyr <167661460+VissValdyr@users.noreply.github.com> * style(autofix.ci): automated formatting * Update data/json/items/vehicle/wheel.json Co-authored-by: Viss Valdyr <33199510+Lamandus@users.noreply.github.com> * style(autofix.ci): automated formatting * style(autofix.ci): automated formatting Co-Authored-By: Viss Valdyr <33199510+Lamandus@users.noreply.github.com> --------- Co-authored-by: VissValdyr <167661460+VissValdyr@users.noreply.github.com> Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com> Co-authored-by: Chaosvolt <chaosvolt@users.noreply.github.com> Co-authored-by: Viss Valdyr <33199510+Lamandus@users.noreply.github.com>
* Create scenarios.json * Update startlocations.json * rm desert island and river starts * rm predator nest * [Insert "I'll do it myself" Thanos meme here] goofy ahhh `extend` implementation --------- Co-authored-by: Chaosvolt <chaosvolt@users.noreply.github.com>
* Misc Repair Kit Knives Made the misc repair kit able to be made with any number of civilian-grade knives with fine cutting. * style(autofix.ci): automated formatting * Update data/json/recipes/other/tools.json Co-authored-by: Chaosvolt <chaosvolt@users.noreply.github.com> * Bump Made the misc repair kit use scissors instead of an xacto knife, removed fine cutting from misc repair kit --------- Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com> Co-authored-by: Chaosvolt <chaosvolt@users.noreply.github.com>
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.
Purpose of change
Describe the solution
Describe alternatives you've considered
Testing
Additional context
Checklist