Space Station 13 - Modules - Types

code/modules/mapping/merge_conflicts.dm

/proc/announce_merge_conflict_marker We REALLY do not want un-addressed merge conflicts in maps for an inexhaustible list of reasons. This should help ensure that this will not be missed in case linters fail to catch it for any reason what-so-ever.