cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Mirror: Tooling Update and Maplint Port (#10462)

Browse Source
This commit is contained in:
Drathek
2025-03-19 16:34:42 -05:00
committed by GitHub
parent 0bdb83226e
commit 885731f044
190 changed files with 72981 additions and 75028 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
modular_chomp/code/modules/maps/merge_conflict.dm
View File

@@ -1,17 +0,0 @@
/**
* Used by mapmerge2 to denote the existence of a merge conflict (or when it has to complete a "best intent" merge where it dumps the movable contents of an old key and a new key on the same tile).
* We define it explicitly here to ensure that it shows up on the highest possible plane (while giving off a verbose icon) to aide mappers in resolving these conflicts.
* DO NOT USE THIS IN NORMAL MAPPING!!! Linters WILL fail.
*/
/obj/merge_conflict_marker
name = "Merge Conflict Marker - DO NOT USE"
icon = 'icons/turf/floors.dmi'
icon_state = ""
desc = "If you are seeing this in-game: Yell at whoever made this mistake."
///We REALLY do not want un-addressed merge conflicts in maps for an inexhaustible list of reasons. This should help ensure that this will not be missed in case linters fail to catch it for any reason what-so-ever.
/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]"))
CRASH(msg)