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

Convert most spans to defines (#31080)

Browse Source 
* spanish?

* aaaagain

* keep maptext

* Update robot_items.dm

* Update span_defines.dm

* compiles

* Update silicon_mob.dm

* compile
This commit is contained in:
kyunkyunkyun
2025-12-13 23:55:48 +00:00
committed by GitHub
parent e5f0a6fffb
commit b0463d3c83
1624 changed files with 15737 additions and 15581 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='boldannounceooc'>[msg]</span>")
to_chat(world, SPAN_BOLDANNOUNCEOOC("[msg]"))
/obj/merge_conflict_marker
name = MERGE_CONFLICT_MARKER_NAME