moves some stuff around

cmss13-devs · Nov 6, 2023 · 70d95bf · 70d95bf
1 parent bf3eb9c
commit 70d95bf
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/code/modules/mapping/merge_conflicts.dm b/code/modules/mapping/merge_conflicts.dm
@@ -4,10 +4,9 @@
 
 /obj/merge_conflict_marker
 	name = "Merge Conflict Marker - DO NOT USE"
-	icon = 'icons/effects/mapping_helpers.dmi'
+	icon = 'icons/landmarks.dmi'
 	icon_state = "merge_conflict_marker"
 	desc = "If you are seeing this in-game: someone REALLY, REALLY, REALLY fucked up. They physically mapped in a fucking Merge Conflict Marker. What the shit."
-	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)

diff --git a/icons/landmarks.dmi b/icons/landmarks.dmi