mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2025-12-20 07:12:55 +00:00
274ef027dc
* Update merge_driver script. * Actually tick and compile new files. * Improve marker description.
18 lines
1.2 KiB
Plaintext
18 lines
1.2 KiB
Plaintext
// 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/effects/mapping_helpers.dmi'
|
|
icon_state = "merge_conflict_marker"
|
|
desc = "If you are seeing this in-game: someone REALLY, REALLY, REALLY fucked up. Please make an issue report on GitHub or contact a coder as soon as possible."
|
|
plane = POINT_PLANE
|
|
|
|
///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 [AREACOORD(src)]! Please manually address all potential merge conflicts!!!"
|
|
warning(msg)
|
|
to_chat(world, "<span class='boldannounce'>[msg]</span>")
|