-
Notifications
You must be signed in to change notification settings - Fork 4.2k
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
Ice content #3456
Closed
Closed
Ice content #3456
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
Conflicts: field.cpp
Yunatan
added a commit
to Yunatan/Cataclysm-DDA
that referenced
this pull request
Apr 24, 2019
# |<-- 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
matskuman5
added a commit
to matskuman5/Cataclysm-DDA
that referenced
this pull request
Jun 5, 2019
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
kevingranade
pushed a commit
that referenced
this pull request
Jun 5, 2019
EddiTheBambi
added a commit
to EddiTheBambi/Cataclysm-DDA
that referenced
this pull request
Jul 31, 2019
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
Kiktamo
added a commit
to Kiktamo/Cataclysm-DDA
that referenced
this pull request
Jul 11, 2020
# |<-- 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
misterprimus
added a commit
to misterprimus/Cataclysm-DDA
that referenced
this pull request
Jan 1, 2021
# |<-- 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
redrosedialtone
added a commit
to redrosedialtone/Cataclysm-DDA
that referenced
this pull request
Mar 20, 2022
# 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
redrosedialtone
added a commit
to redrosedialtone/Cataclysm-DDA
that referenced
this pull request
Mar 20, 2022
# |<-- 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
redrosedialtone
added a commit
to redrosedialtone/Cataclysm-DDA
that referenced
this pull request
Mar 22, 2022
# |<-- 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
redrosedialtone
added a commit
to redrosedialtone/Cataclysm-DDA
that referenced
this pull request
Mar 27, 2022
# |<-- 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
OldFriendEr
added a commit
to OldFriendEr/Cataclysm-DDA
that referenced
this pull request
Apr 9, 2022
# |<-- 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
I-am-Erk
pushed a commit
that referenced
this pull request
Apr 16, 2022
* 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]>
dseguin
pushed a commit
that referenced
this pull request
Apr 18, 2022
* 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]>
OldFriendEr
added a commit
to OldFriendEr/Cataclysm-DDA
that referenced
this pull request
Jun 8, 2022
# |<-- 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
bombasticSlacks
pushed a commit
that referenced
this pull request
Jun 8, 2022
# |<-- 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
bombasticSlacks
pushed a commit
to bombasticSlacks/Cataclysm-DDA
that referenced
this pull request
Jun 10, 2022
# |<-- 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
kebkaldanil
added a commit
to kebkaldanil/Cataclysm-DDA
that referenced
this pull request
Oct 13, 2022
# 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
Demivan
added a commit
to Demivan/Cataclysm-DDA
that referenced
this pull request
May 30, 2023
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
OldFriendEr
added a commit
to OldFriendEr/Cataclysm-DDA
that referenced
this pull request
Dec 7, 2023
# |<-- 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
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.
edit : I see that the merge is failing, but I am too tired to find out why. I will look into this tomorrow.
Content mod aiming to add more content relating to low temperatures. Science labs were only a beginning.
This mod will be a long term project, but there have been some infrastructure changes that I want to get rolled into the main game to avoid code duplication. The only gameplay impact this PR should have is that monsters are slowed by the in game temperature. No items should spawn nor should any new tiles be visible.