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.

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

Blazemod fix rock override #35486

Merged
merged 19 commits into from
Nov 12, 2019
Merged
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
d6941e7
Merge branch 'master' of https://github.com/cleverraven/Cataclysm-DDA
snipercup Oct 24, 2019
c74dd17
Merge branch 'master' of https://github.com/cleverraven/Cataclysm-DDA
snipercup Oct 25, 2019
8f7710e
Merge branch 'master' of https://github.com/cleverraven/Cataclysm-DDA
snipercup Oct 28, 2019
adf523b
Merge branch 'master' of https://github.com/cleverraven/Cataclysm-DDA
snipercup Oct 29, 2019
dbe3e9b
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA
snipercup Oct 30, 2019
a2958bd
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA
snipercup Oct 30, 2019
8e4280a
Merge branch 'master' of https://github.com/cleverraven/Cataclysm-DDA
snipercup Oct 30, 2019
8d518d8
Merge branch 'master' of https://github.com/cleverraven/Cataclysm-DDA
snipercup Oct 31, 2019
f57c82c
Merge branch 'master' of https://github.com/cleverraven/Cataclysm-DDA
snipercup Nov 1, 2019
1ce3ca0
Merge branch 'master' of https://github.com/cleverraven/Cataclysm-DDA
snipercup Nov 3, 2019
6fded34
Merge branch 'master' of https://github.com/cleverraven/Cataclysm-DDA
snipercup Nov 4, 2019
7b88e44
Merge branch 'master' of https://github.com/cleverraven/Cataclysm-DDA
snipercup Nov 4, 2019
c747d0f
Merge branch 'master' of https://github.com/cleverraven/Cataclysm-DDA
snipercup Nov 5, 2019
0d4beeb
Merge branch 'master' of https://github.com/cleverraven/Cataclysm-DDA
snipercup Nov 6, 2019
1d3345e
Merge branch 'master' of https://github.com/cleverraven/Cataclysm-DDA
snipercup Nov 8, 2019
1b087c1
Merge branch 'master' of https://github.com/cleverraven/Cataclysm-DDA
snipercup Nov 9, 2019
d219126
Merge branch 'master' of https://github.com/cleverraven/Cataclysm-DDA
snipercup Nov 9, 2019
e80f492
Merge branch 'master' of https://github.com/cleverraven/Cataclysm-DDA
snipercup Nov 12, 2019
ba4b400
Blazemod fix rock override
snipercup Nov 12, 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
1 change: 0 additions & 1 deletion data/mods/blazemod/blaze_override.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
"type": "AMMO",
"name": "rock",
"count": 1,
"ammo_type": "h_projectile",
"damage": 15,
"dispersion": 45,
"effects": [ "RECOVER_10", "BEANBAG" ]
Expand Down