[MIRROR] Birdshot Service Fixes (#3333)

* Birdshot Service Fixes

* Revert "Merge branch 'master' of https://github.com/NovaSector/NovaSector into upstream-merge-84387"

This reverts commit 4c83408ea0697cfb268597a78266cb0f0e02eb45, reversing
changes made to bb58c2ce74a7b13076b82fa2a828f97484dbaff5.

* Force pushing to Lint

* Reapply "Merge branch 'master' of https://github.com/NovaSector/NovaSector into upstream-merge-84387"

This reverts commit 8ed3af35df88c9b88cd3a83f495b5efa8657205a.

* Update birdshot.dmm

---------

Co-authored-by: GremlinSeeker <[email protected]>
Co-authored-by: Zergspower <[email protected]>