Merge remote-tracking branch 'remotes/upstream/dev' into atmosmerge
Atmos update tweaks

- Updated pump and volume pump icons
- Reverted air scrubber icon
- Fixed passive gate icon
- Updated pipe_item sprites
- Fixed an oversight in the pipe color check
- Cleaned up the map
Merge remote-tracking branch 'remotes/upstream/dev' into atmosmerge
Merge remote-tracking branch 'loganbacca/atmosmerge' into power-net