cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-27 07:08:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] First part of a span rework (#9120)

Browse Source 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
This commit is contained in:
CHOMPStation2
2024-10-02 16:25:48 +02:00
committed by GitHub
co-authored by Heroman3003 Kashargul
parent 07c3627fbf
commit 31407a0be3
241 changed files with 1108 additions and 1081 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_chomp/code/modules/maps/merge_conflict.dm
+1 -1
View File
@@ -13,5 +13,5 @@
/obj/merge_conflict_marker/Initialize(mapload)
. = ..()
var/msg = "HEY, LISTEN!!! Merge Conflict Marker detected at [COORD(src)]! Please manually address all potential merge conflicts!!!"
to_chat(world, SPAN_WARNING("[msg]"))
to_chat(world, span_warning("[msg]"))
CRASH(msg)