cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-29 06:57:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

tgchat day zero changes (#23872)

Browse Source 
* tgchat day zero changes

* Update code/game/verbs/ooc.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
This commit is contained in:
GDN
2024-01-21 22:07:57 +00:00
committed by GitHub
co-authored by Henri215
parent 54a144301d
commit 0b8c196f67
67 changed files with 141 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mapping/merge_conflicts.dm
+1 -1
View File
@@ -13,7 +13,7 @@
/proc/announce_merge_conflict_marker(atom/origin)
var/msg = "HEY, LISTEN!!! Merge Conflict Marker detected at [AREACOORD(origin)]! Please manually address all potential merge conflicts!!!"
warning(msg)
to_chat(world, "<span class='boldannounce'>[msg]</span>")
to_chat(world, "<span class='boldannounceooc'>[msg]</span>")
/obj/merge_conflict_marker
name = MERGE_CONFLICT_MARKER_NAME