From 70d95bff043e2306e58f5cc5c6ea78c11159fc55 Mon Sep 17 00:00:00 2001 From: harryob <55142896+harryob@users.noreply.github.com> Date: Mon, 6 Nov 2023 13:11:28 +0000 Subject: [PATCH] moves some stuff around --- code/modules/mapping/merge_conflicts.dm | 3 +-- icons/landmarks.dmi | Bin 36857 -> 37518 bytes 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/code/modules/mapping/merge_conflicts.dm b/code/modules/mapping/merge_conflicts.dm index 4a7ffb36f50e..f81b0a71dcd8 100644 --- 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 index 8ebeaef1648b76d79f7f029055305f306518c3bb..08b23758beaa03c94cec15ae137a2fe1d1c482c2 100644 GIT binary patch delta 10511 zcmb7pcT^MK);7IJZwexW-b9)R3Ybs@qzTfCAVmQwBE2Mo^d1l;6d@o83J6l9OF-$p zBOst49i)Vokc2P#{_cD4yVm{Z%UYA!=h-up%$(W#+0Q;0Bw5N^vQ#0`z%*f5KuB9y zT>1AjqWVfsh0|WC@~xW|P3RHVB3o%#3oZ<5qjDaSTiHuJ=(P{s-`jZvo?BO{+vvv6 zhfTfkn!QP&F}`y*)&gXKw)z0o>8?l5jOpnu@253f6+F=rs{35lJME$Sl%q$qFkQ2{ zZq~r0W6mw;mSJZroshbyBICz%KrKbPA+9dOfDhX&`i!sHmpOE;hux~*OUq`jV=Q#x z%KO+#aX~xJxAwH%H#mla)#((DG^5j6vqE02`;U{n#hD1lpxmc%B_U!%nr=#CUhYXF z{+1rrJpCn)Mo%XIl6qmM1KviO5DANHEf;LH@{YjBhVospucRu4A5FIwfQUVlj59Z( z$T6+466
8*|yeY1f>Z?4)rd?uYPkP%gylPT4)zyY2o_H3P-79Kd2o#w=77gr(
z)~)3)E#P bAFH=>%)qt7-LXO<{vrcjY$R$
z-W?h7-dNmVe%`F$B>F2Xc3F4v=evD}=SQwgUoxmK9w~o(XH|)y`c?rjig^ST8TSh^
zJif`WUM%hHd@Jd3$ne*h1@uQu%F7G~r`?C&ae1+WyTRYWW+PKStoAHTX 15&
z`TA%M_A0I_s