Skip to content
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.

Sign up for GitHub

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

water rework part 1 #72252

Merged
merged 14 commits into from
Jun 4, 2024
Merged

water rework part 1 #72252

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
c50fd0a
water rework part 1
nornagon Mar 5, 2024
f17b42a
drop char_purifier for purifying murky water
nornagon Mar 8, 2024
c44389b
clang-tidy
nornagon Mar 9, 2024
2c82c64
astyle
nornagon Mar 9, 2024
f13d208
json style
nornagon Mar 9, 2024
45fd77e
double-space
nornagon Mar 12, 2024
399015a
add slow-sand filter and update murky water filtering to use it
nornagon Mar 12, 2024
b7aaa28
Merge remote-tracking branch 'upstream/master' into water-rework-1
nornagon Apr 12, 2024
ed00def
use bucket_5gal instead of jerrycan for water_filter_sand
nornagon Apr 12, 2024
19f181a
Apply suggestions from code review
nornagon May 1, 2024
1ec04f0
Update data/json/recipes/recipe_food.json
nornagon May 3, 2024
f2b207b
Update data/json/items/tool/cooking.json
nornagon May 14, 2024
c4f9fcd
Update data/json/items/comestibles/drink.json
nornagon May 30, 2024
640aa86
Merge branch 'master' into water-rework-1
nornagon May 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
clang-tidy
  • Loading branch information
@nornagon
nornagon committed Mar 9, 2024
commit c44389b1e0f901b5e62e5d80997e0d865566584e
2 changes: 0 additions & 2 deletions src/map.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,6 @@ static const ammotype ammo_battery( "battery" );

static const damage_type_id damage_bash( "bash" );

static const diseasetype_id disease_bad_food( "bad_food" );

static const efftype_id effect_boomered( "boomered" );
static const efftype_id effect_crushed( "crushed" );
static const efftype_id effect_fake_common_cold( "fake_common_cold" );
Expand Down