Staging -> Master (#41929)

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>

diff --cc Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
Simple merge