diff options
author | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2022-06-08 11:45:04 -0700 |
---|---|---|
committer | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2022-06-08 11:45:04 -0700 |
commit | 5cd15985b0d2bc3fa0adf0c42dcd111db5280ae2 (patch) | |
tree | 8c0f0ec4914ab10a13858da6fea28c8c51b88b9e /vampirism.patch | |
parent | Updated to 2022-05-28-1540 (diff) | |
download | cataclysm-bn-5cd15985b0d2bc3fa0adf0c42dcd111db5280ae2.tar.xz |
Updated to 2022-06-08-1648
Fix revert generic night-vision patch for new update conflict.
Remove obsolete water-breathing section of vampire patch.
Diffstat (limited to 'vampirism.patch')
-rw-r--r-- | vampirism.patch | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/vampirism.patch b/vampirism.patch index 776d9a1..256903a 100644 --- a/vampirism.patch +++ b/vampirism.patch @@ -559,16 +559,6 @@ static const trait_id trait_VOMITOUS( "VOMITOUS" ); static const trait_id trait_WEB_SPINNER( "WEB_SPINNER" ); static const trait_id trait_WEB_WEAVER( "WEB_WEAVER" ); -@@ -251,7 +251,8 @@ - - void Character::suffer_while_underwater() - { -- if( !has_trait( trait_GILLS ) && !has_trait( trait_GILLS_CEPH ) ) { -+ if( !has_trait( trait_GILLS ) && !has_trait( trait_GILLS_CEPH ) && -+ !has_trait( trait_VAMP_SKIN ) ) { - oxygen--; - } - if( oxygen < 12 && worn_with_flag( "REBREATHER" ) ) { @@ -751,7 +751,8 @@ return; } |