diff options
| author | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2022-06-08 22:13:54 -0700 |
|---|---|---|
| committer | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2022-06-08 22:13:54 -0700 |
| commit | 3cb5a3412319a4c27997498034777daa018cd128 (patch) | |
| tree | aca57beccbd8dc9c5d8bb724bd21845d748fc5d9 | |
| parent | Updated to 2022-06-08-1648 (diff) | |
| download | cataclysm-bn-3cb5a3412319a4c27997498034777daa018cd128.tar.xz | |
Revert changes to vampirism patch.
Update tileset.
| -rw-r--r-- | PKGBUILD | 4 | ||||
| -rw-r--r-- | vampirism.patch | 10 |
2 files changed, 12 insertions, 2 deletions
@@ -199,8 +199,8 @@ b2sums=('3ac8f39e979c38d5445788753ea2b86a7bdc7a77f2907712fcbe19c817dc59ad2629c5d 'e3302d903d053f25aa666d572f74a8bbd3b65dde40eedcbf46e537ceb2294ac22b3772087fce04c4a780c2f18e855179c6ddc8af12d72a89b82957ce09deb52f' '4bd44cbe85c53902b8a360509703e3d38e8a5da75dd2c534a77f03ce6440632f6c83c92939069c60473c88ffb3abab0fbf11e39271f44f813b9f6432ea5f9a6b' 'f115314dd2bb1da07bba7a90fec5c3acb7ccb5145efaea03d6806942e24d402c9a144a2fd07b82e727a0b79dedd4bdd87de0bbaf0944236563164fb6f117965e' - '630bfb1f942304febe63035674d1044725aab48d4db4c0b15c7152fda210b8fca61b60020a7b4909ddd1e9971fb3cd92c3d1add3f10f19e91d0d63935f35977c' - 'e8edef84346ec74a39225665d65f404aeb5db3be12572fc9539f27aec06c54d208a5fdab67c881237866c4e9795b06445d426baf32d9b3a223a0e661de13be0c' + 'd05c48c376f23dd7fda2b5249b5985665de8344774f420a95151f7484ab33c38fb78b2ff279cedf762877dca3abd91c4d9e4900547e9c31e7636e1d90cc13d2b' + '2d22e3a85df0854a93aebc49b4031c71bb87bd5344e99bb25bb5e599d77876cddcb7915ed03f3842a096b9ab6d08828daad29ec18dbeb95cfb8c5137c8d6983a' 'a56efdaae0344726debf5b74846edce8df7aa2357fbc7a05a3d369d1f457b02934a0d0ce2330072e03f1ac901e06e333c9393f795c761f8440307e7649ed5596' 'ce10e7d8457ad71d7bad75c68b32c60f4ea12ddf52407816f27ff05677bc789f6af33dabb734d17fbb5037d58c6041673752f332d2bf676604565f8d60e8078c' 'b9309da09b165fb57e83f84e3584d2479bd3336ed86e181e5df2d27daa92bd55d03d7f3fc226f03696af5f0f32d8e0e7ecd26ae7e50eed0200d0b0feaad07efb') diff --git a/vampirism.patch b/vampirism.patch index 256903a..776d9a1 100644 --- a/vampirism.patch +++ b/vampirism.patch @@ -559,6 +559,16 @@ 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; } |