CleverRaven / Cataclysm-DDA / 490

33%

cron

travis-ci

Merge remote-tracking branches 'origin/pr/21171', 'origin/pr/21198', 'origin/pr/21201', 'origin/pr/21229' and 'origin/pr/21234'

* origin/pr/21171:
  correct typo / restore gun skill to targeting_npc
  incorporate more suggestions
  getter for vehicle_part::base
  changed vehicle_part::base from private to public
  corrected get_targeting_npc with suggestions
  performance improvement for mega vehicles with many turrets #21141

* origin/pr/21198:
  Fix items cannot be (un)selected in filtered pickup menu

* origin/pr/21201:
  Restore original filter when canceled
  Fix backspace not working in AIM

* origin/pr/21229:
  Fixed .32 ACP deconstruction recipe By changing the erroneous .38 Special casing entry to .32 ACP casing.

* origin/pr/21234:
  Astyle
  Fix issues in #21173

1 of 1 new or added line in 1 file covered. (100.0%)

8576 of 53341 relevant lines covered (16.08%)

2632.52 hits per line