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

Smoke field "body_part_env_resistance" changed from 12 to 7 #35637

Merged
merged 2 commits into from
Nov 22, 2019
Merged

Smoke field "body_part_env_resistance" changed from 12 to 7 #35637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
caaaa26
Smoke field "body_part_env_resistance" changed from 12 to 7
Nov 21, 2019
975567f
remove unused var
Nov 21, 2019
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
2 changes: 1 addition & 1 deletion data/json/field_type.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@
"dirty_transparency_cache": true,
"percent_spread": 10,
"outdoor_age_speedup": "0 turns",
"immunity_data": { "body_part_env_resistance": [ [ "MOUTH", 12 ] ] },
"immunity_data": { "body_part_env_resistance": [ [ "MOUTH", 7 ] ] },
"priority": 8,
"half_life": "2 minutes",
"phase": "gas",
Expand Down
1 change: 0 additions & 1 deletion src/map_field.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ const efftype_id effect_onfire( "onfire" );
const efftype_id effect_poison( "poison" );
const efftype_id effect_relax_gas( "relax_gas" );
const efftype_id effect_sap( "sap" );
const efftype_id effect_smoke( "smoke" );
const efftype_id effect_stung( "stung" );
const efftype_id effect_stunned( "stunned" );
const efftype_id effect_teargas( "teargas" );
Expand Down