Update code/modules/mapping/merge_conflicts.dm

Co-authored-by: Drathek <[email protected]>
cmss13-devs · Nov 6, 2023 · cb2e9d0 · cb2e9d0
1 parent ccc780e
commit cb2e9d0
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/code/modules/mapping/merge_conflicts.dm b/code/modules/mapping/merge_conflicts.dm
@@ -13,4 +13,4 @@
 	. = ..()
 	var/msg = "HEY, LISTEN!!! Merge Conflict Marker detected at [AREACOORD(src)]! Please manually address all potential merge conflicts!!!"
 	to_chat(world, SPAN_BOLDANNOUNCE("[msg]"))
-	warning(msg)
+	CRASH(msg)