Skip to content
Commit a7b9bae0 authored by DarkGod's avatar DarkGod
Browse files

Merge branch 'small_fixes' into 'master' 

Friendlyfire fixes

friendlyblock now works consistently with friendlyfire & alch bombs too.
parents ed1fd9b4 4d989487
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment