diff --git a/code/modules/mapping/merge_conflicts.dm b/code/modules/mapping/merge_conflicts.dm index f81b0a71dcd8..ad1a3ba6730e 100644 --- a/code/modules/mapping/merge_conflicts.dm +++ b/code/modules/mapping/merge_conflicts.dm @@ -12,6 +12,5 @@ /obj/merge_conflict_marker/Initialize(mapload) . = ..() var/msg = "HEY, LISTEN!!! Merge Conflict Marker detected at [AREACOORD(src)]! Please manually address all potential merge conflicts!!!" - log_mapping(msg) - to_chat(world, span_boldannounce("[msg]")) + to_chat(world, SPAN_BOLDANNOUNCE("[msg]")) warning(msg)