From d210b7cd909da1db2bd3ab93cac8d7e4b7123e57 Mon Sep 17 00:00:00 2001 From: Casey Date: Wed, 10 Nov 2021 20:30:38 -0500 Subject: [PATCH 1/2] webedit graffiti examine . = ..() --- code/modules/persistence/graffiti.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/modules/persistence/graffiti.dm b/code/modules/persistence/graffiti.dm index fefc73c199..b4913e56a8 100644 --- a/code/modules/persistence/graffiti.dm +++ b/code/modules/persistence/graffiti.dm @@ -40,7 +40,11 @@ /obj/effect/decal/writing/examine(mob/user) . = ..() +<<<<<<< HEAD to_chat(user, "It reads \"[message]\".") +======= + . += "\n It reads \"[message]\"." +>>>>>>> c04b817bbe... Merge pull request #11809 from Hatterhat/patch-3 /obj/effect/decal/writing/attackby(var/obj/item/thing, var/mob/user) if(istype(thing, /obj/item/weapon/weldingtool)) From 308bffe8d3535257a3c06a040c36d13f44c85e54 Mon Sep 17 00:00:00 2001 From: Razgriz Date: Fri, 10 Dec 2021 00:57:47 -0700 Subject: [PATCH 2/2] Update graffiti.dm --- code/modules/persistence/graffiti.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/modules/persistence/graffiti.dm b/code/modules/persistence/graffiti.dm index b4913e56a8..cbd2fe01a9 100644 --- a/code/modules/persistence/graffiti.dm +++ b/code/modules/persistence/graffiti.dm @@ -40,11 +40,7 @@ /obj/effect/decal/writing/examine(mob/user) . = ..() -<<<<<<< HEAD - to_chat(user, "It reads \"[message]\".") -======= . += "\n It reads \"[message]\"." ->>>>>>> c04b817bbe... Merge pull request #11809 from Hatterhat/patch-3 /obj/effect/decal/writing/attackby(var/obj/item/thing, var/mob/user) if(istype(thing, /obj/item/weapon/weldingtool))