Skip to content

Commit

Permalink
my brain
Browse files Browse the repository at this point in the history
  • Loading branch information
harryob committed Nov 6, 2023
1 parent 70d95bf commit ccc780e
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions code/modules/mapping/merge_conflicts.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)

0 comments on commit ccc780e

Please sign in to comment.