Merge pull request #2636 from Citadel-Station-13/upstream-merge-30396

Browse Source

[MIRROR] Fixes brains counting towards highlander killstreaks

...

This commit is contained in:

LetterJay

2017-09-11 15:22:02 -05:00

committed by GitHub

parent c46c442896 447937477e

commit ecdb35bb1a

1 changed files with 586 additions and 586 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

1172

code/game/objects/items/weaponry.dm

File diff suppressed because it is too large Load Diff