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

mapmerge: Separate DMM conflicts for distinct atom root types. (#22609)

Browse Source 
* Separate DMM conflicts for distinct atom root types.

* clarify order of operations
This commit is contained in:
warriorstar-orion
2023-11-01 16:37:18 -04:00
committed by GitHub
parent ab4a8cb554
commit 349eca230c
3 changed files with 69 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mapping/merge_conflicts.dm
+47 -10
View File
@@ -2,16 +2,53 @@
// 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
#define MERGE_CONFLICT_MARKER_NAME "Merge Conflict Marker - DO NOT USE"
#define MERGE_CONFLICT_MARKER_ICON 'icons/effects/mapping_helpers.dmi'
#define MERGE_CONFLICT_MARKER_ICON_STATE "merge_conflict_marker"
#define MERGE_CONFLICT_MARKER_DESC "If you are seeing this in-game, please make an issue report on GitHub or contact a coder immediately."
///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!!!"
/// 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.
/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>")
/obj/merge_conflict_marker
name = MERGE_CONFLICT_MARKER_NAME
icon = MERGE_CONFLICT_MARKER_ICON
icon_state = MERGE_CONFLICT_MARKER_ICON_STATE
desc = MERGE_CONFLICT_MARKER_DESC
plane = POINT_PLANE
/obj/merge_conflict_marker/Initialize(mapload)
. = ..()
announce_merge_conflict_marker(src)
/area/merge_conflict_marker
name = MERGE_CONFLICT_MARKER_NAME
icon = MERGE_CONFLICT_MARKER_ICON
icon_state = MERGE_CONFLICT_MARKER_ICON_STATE
desc = MERGE_CONFLICT_MARKER_DESC
plane = POINT_PLANE
/area/merge_conflict_marker/Initialize(mapload)
. = ..()
announce_merge_conflict_marker(src)
/turf/merge_conflict_marker
name = MERGE_CONFLICT_MARKER_NAME
icon = MERGE_CONFLICT_MARKER_ICON
icon_state = MERGE_CONFLICT_MARKER_ICON_STATE
desc = MERGE_CONFLICT_MARKER_DESC
plane = POINT_PLANE
/turf/merge_conflict_marker/Initialize(mapload)
. = ..()
announce_merge_conflict_marker(src)
#undef MERGE_CONFLICT_MARKER_NAME
#undef MERGE_CONFLICT_MARKER_ICON
#undef MERGE_CONFLICT_MARKER_ICON_STATE
#undef MERGE_CONFLICT_MARKER_DESC