# Conflicts: # .github/CONTRIBUTING.md # .travis.yml # code/modules/awaymissions/zlevel.dm # code/modules/ventcrawl/ventcrawl.dm # guides/Guide to Map Folders.md # maps/submaps/engine_submaps_vr/tether/_engine_submaps.dm # maps/submaps/space_submaps/debrisfield/debrisfield.dm # maps/tether/submaps/_tether_submaps.dm Co-authored-by: ShadowLarkens <shadowlarkens@gmail.com>
Port of https://github.com/Baystation12/Baystation12/pull/11808 and several others Fixes three overlapping cables ([192 / 158 / 1], [214 / 161 / 1], [122 / 197 / 1]) Fixes drill and mech drill having the same ID.