Fix incorrect reference to "solder" instead of "solder_wire" #4567

freezerbunny · 2013-11-22T09:20:01Z

No description provided.

Fix incorrect reference to "solder" instead of "solder_wire"

# |<-- Using around 50, Maximum 72 Characters -->| Allow character to see an opaque tile while standing on another adjacent opaque tile. # Explain why this change is being made # |<---- Limit Each Line to a Maximum Of 72 Characters ---->| # Provide links or keys to any relevant tickets, articles or other resources # Example: fixes CleverRaven#1234, closes CleverRaven#2345, resolves CleverRaven#3456, references CleverRaven#4567 Fixes CleverRaven#28694

fix some monster description typos # Explain why this change is being made grammatical reasons # Provide links or keys to any relevant tickets, articles or other resources # Example: fixes CleverRaven#1234, closes CleverRaven#2345, resolves CleverRaven#3456, references CleverRaven#4567

fix some monster description typos # Explain why this change is being made grammatical reasons # Provide links or keys to any relevant tickets, articles or other resources # Example: fixes #1234, closes #2345, resolves #3456, references #4567

Hammering 1 requirement for picking up frozen liquids # Explain why this change is being made Player can't scoop up solid ice with their hands, need something to chip off chunks with # Provide links or keys to any relevant tickets, articles or other resources # Example: fixes CleverRaven#1234, closes CleverRaven#2345, resolves CleverRaven#3456, references CleverRaven#4567

# |<-- Using around 50, Maximum 72 Characters -->| Adds freeze dryer. Adds dehydrated royal jelly. Spoilage for Royal Jelly # Explain why this change is being made # |<---- Limit Each Line to a Maximum Of 72 Characters ---->| Works toward resolving CleverRaven#41361 # Provide links or keys to any relevant tickets, articles or other resources # Example: fixes CleverRaven#1234, closes CleverRaven#2345, resolves CleverRaven#3456, references CleverRaven#4567

# |<-- Using around 50, Maximum 72 Characters -->| # Explain why this change is being made # |<---- Limit Each Line to a Maximum Of 72 Characters ---->| # Provide links or keys to any relevant tickets, articles or other resources # Example: fixes CleverRaven#1234, closes CleverRaven#2345, resolves CleverRaven#3456, references CleverRaven#4567

# Explain why this change is being made # |<---- Limit Each Line to a Maximum Of 72 Characters ---->| # Provide links or keys to any relevant tickets, articles or other resources # Example: fixes CleverRaven#1234, closes CleverRaven#2345, resolves CleverRaven#3456, references CleverRaven#4567

# |<-- Using around 50, Maximum 72 Characters -->| # Explain why this change is being made # |<---- Limit Each Line to a Maximum Of 72 Characters ---->| # Provide links or keys to any relevant tickets, articles or other resources # Example: fixes CleverRaven#1234, closes CleverRaven#2345, resolves CleverRaven#3456, references CleverRaven#4567

# |<-- Using around 50, Maximum 72 Characters -->| armor part breathability will be calculated if override has invalid value set # |<---- Limit Each Line to a Maximum Of 72 Characters ---->| # Provide links or keys to any relevant tickets, articles or other resources # Example: fixes CleverRaven#1234, closes CleverRaven#2345, resolves CleverRaven#3456, references CleverRaven#4567

* Flight gear * Update data/json/items/tool_armor.json Co-authored-by: Binrui Dong <[email protected]> * Update data/json/items/tool_armor.json Co-authored-by: Anton Burmistrov <[email protected]> * Update data/json/items/tool_armor.json Co-authored-by: chaohedgehogs <[email protected]> * Update data/json/items/tool_armor.json Co-authored-by: chaohedgehogs <[email protected]> * Update data/json/items/tool_armor.json Co-authored-by: Binrui Dong <[email protected]> * Update tool_armor.json Added Two-Way Radio to the helmet when on, in-built radio was a common functionality with the helmets I researched. * Update 9mm.json 9x19mm +P+ is about double the price of 9x19mm +P as per my cursory research. * Update suits_protection.json * Update tool_armor.json * Update 9mm.json * Revert "9x19mm +P and + prices" (#49155) * enable to override armor breathability using JSON The breathability currently is being calculated by the least breathable material, in some cases it contradicts the item description in this case the nomad_bodyglove_1, witch is breathable, but has breathability 0 due to some rubber in it. Now it can be set from JSON file. I also adjusted the nomad_bodyglove_1 breathability values by using material breathability of lycra and cotton. * Update src/itype.h Co-authored-by: haveric <[email protected]> * will handle breathability override invalid values # |<-- Using around 50, Maximum 72 Characters -->| armor part breathability will be calculated if override has invalid value set # |<---- Limit Each Line to a Maximum Of 72 Characters ---->| # Provide links or keys to any relevant tickets, articles or other resources # Example: fixes #1234, closes #2345, resolves #3456, references #4567 * breathability override no uses enum # |<-- Using around 50, Maximum 72 Characters -->| had a suggestion not to use arbitrary values but use defined enums # |<---- Limit Each Line to a Maximum Of 72 Characters ---->| * Update src/material.h Co-authored-by: Dillon Matchett <[email protected]> * linted JSON custom_underwear.json was not linted, now its good Co-authored-by: faefux <[email protected]> Co-authored-by: fae <[email protected]> Co-authored-by: Binrui Dong <[email protected]> Co-authored-by: Anton Burmistrov <[email protected]> Co-authored-by: chaohedgehogs <[email protected]> Co-authored-by: Angela Graves <[email protected]> Co-authored-by: eso <[email protected]> Co-authored-by: haveric <[email protected]> Co-authored-by: Dillon Matchett <[email protected]>

* Medical Menu Implementation Implements the initial steps for the Medical Menu, changes including; ~keybindings.json - Adds 'View Medical' hotkey under 'N' ~action.cpp / ~action.h / ~avatar.h / handle_action.cpp / game.cpp - Adds the corresponding action to 'View Medical' +medical_ui.cpp - Menu implementation ~display.h / display.cpp - Exposes bodypart_status_colors * [Medical Menu] Basic Build and Test (GCC 9, Curses, LTO) Styling Removal of a couple variables left behind from previous implementation, correct character casting. * [Medical Menu] Extended Implementation -Access from Player Info ('@') Menu -Info Menu -Scrolling Text -Formatting -Astyle & Clang Tidy * [Medical Menu] Removal of widget dependency Removed temporarily until the widget implementation is less in-progress; Code cleanup. * Update data/raw/keybindings.json * Refactoring # Explain why this change is being made # |<---- Limit Each Line to a Maximum Of 72 Characters ---->| # Provide links or keys to any relevant tickets, articles or other resources # Example: fixes #1234, closes #2345, resolves #3456, references #4567 * [Medical Menu] Code Clarity # |<-- Using around 50, Maximum 72 Characters -->| # Explain why this change is being made # |<---- Limit Each Line to a Maximum Of 72 Characters ---->| # Provide links or keys to any relevant tickets, articles or other resources # Example: fixes #1234, closes #2345, resolves #3456, references #4567 * [Medical Menu] C++ Analysis # |<-- Using around 50, Maximum 72 Characters -->| # Explain why this change is being made # |<---- Limit Each Line to a Maximum Of 72 Characters ---->| # Provide links or keys to any relevant tickets, articles or other resources # Example: fixes #1234, closes #2345, resolves #3456, references #4567 * Update src/medical_ui.cpp * [Medical Menu] Static efftype_id # |<-- Using around 50, Maximum 72 Characters -->| # Explain why this change is being made # |<---- Limit Each Line to a Maximum Of 72 Characters ---->| # Provide links or keys to any relevant tickets, articles or other resources # Example: fixes #1234, closes #2345, resolves #3456, references #4567 Co-authored-by: Maleclypse <[email protected]> Co-authored-by: Kevin Granade <[email protected]>

# |<-- Using around 50, Maximum 72 Characters -->| those two particular samples were missing in the loot-table # |<---- Limit Each Line to a Maximum Of 72 Characters ---->| closes CleverRaven#58255 # Provide links or keys to any relevant tickets, articles or other resources # Example: fixes CleverRaven#1234, closes CleverRaven#2345, resolves CleverRaven#3456, references CleverRaven#4567

# |<-- Using around 50, Maximum 72 Characters -->| those two particular samples were missing in the loot-table # |<---- Limit Each Line to a Maximum Of 72 Characters ---->| closes #58255 # Provide links or keys to any relevant tickets, articles or other resources # Example: fixes #1234, closes #2345, resolves #3456, references #4567

# |<-- Using around 50, Maximum 72 Characters -->| those two particular samples were missing in the loot-table # |<---- Limit Each Line to a Maximum Of 72 Characters ---->| closes CleverRaven#58255 # Provide links or keys to any relevant tickets, articles or other resources # Example: fixes CleverRaven#1234, closes CleverRaven#2345, resolves CleverRaven#3456, references CleverRaven#4567

# Explain why this change is being made # |<---- Limit Each Line to a Maximum Of 72 Characters ---->| There was some clang compilation errors and misspeling in previous commits # Provide links or keys to any relevant tickets, articles or other resources # Example: fixes CleverRaven#1234, closes CleverRaven#2345, resolves CleverRaven#3456, references CleverRaven#4567

Don't allow to scan books that are owned by other character # Explain why this change is being made # |<---- Limit Each Line to a Maximum Of 72 Characters ---->| It was possible to scan books from merchant inventory without buying them. # Provide links or keys to any relevant tickets, articles or other resources # Example: fixes CleverRaven#1234, closes CleverRaven#2345, resolves CleverRaven#3456, references CleverRaven#4567 fixes CleverRaven#65840

# |<-- Using around 50, Maximum 72 Characters -->| due to a bug the bar only shows up when steadiness is full, problem was that the calculated steadiness was stored in an int while the value was a double resulting in either empty or full bar. # |<---- Limit Each Line to a Maximum Of 72 Characters ---->| # Provide links or keys to any relevant tickets, articles or other resources # Example: fixes CleverRaven#1234, closes CleverRaven#2345, resolves CleverRaven#3456, references CleverRaven#4567 fixes CleverRaven#69954

Fix incorrect reference to "solder" instead of "solder_wire"

e16d2bd

Rivet-the-Zombie added a commit that referenced this pull request Nov 22, 2013

Merge pull request #4567 from freezerbunny/patch-1

de9bdf9

Fix incorrect reference to "solder" instead of "solder_wire"

Rivet-the-Zombie merged commit de9bdf9 into CleverRaven:master Nov 22, 2013

BevapDin mentioned this pull request Nov 25, 2013

Check json item definitions consistency #4687

Merged

freezerbunny deleted the patch-1 branch December 2, 2013 07:44

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix incorrect reference to "solder" instead of "solder_wire" #4567

Fix incorrect reference to "solder" instead of "solder_wire" #4567

freezerbunny commented Nov 22, 2013

Fix incorrect reference to "solder" instead of "solder_wire" #4567

Fix incorrect reference to "solder" instead of "solder_wire" #4567

Conversation

freezerbunny commented Nov 22, 2013