diff --git a/code/__DEFINES/traits/sources.dm b/code/__DEFINES/traits/sources.dm
index 0648dd4dd37..e3d1f9f065b 100644
--- a/code/__DEFINES/traits/sources.dm
+++ b/code/__DEFINES/traits/sources.dm
@@ -301,3 +301,6 @@
 
 /// Trait added by style component
 #define STYLE_TRAIT "style"
+
+/// Trait from an engraving
+#define ENGRAVED_TRAIT "engraved"
diff --git a/code/datums/components/engraved.dm b/code/datums/components/engraved.dm
index 60bfa5f6177..5db43b8076c 100644
--- a/code/datums/components/engraved.dm
+++ b/code/datums/components/engraved.dm
@@ -67,13 +67,13 @@
 	RegisterSignal(parent, COMSIG_ATOM_EXAMINE, PROC_REF(on_examine))
 	//supporting component transfer means putting these here instead of initialize
 	SSpersistence.wall_engravings += src
-	ADD_TRAIT(parent, TRAIT_NOT_ENGRAVABLE, TRAIT_GENERIC)
+	ADD_TRAIT(parent, TRAIT_NOT_ENGRAVABLE, ENGRAVED_TRAIT)
 
 /datum/component/engraved/UnregisterFromParent()
 	UnregisterSignal(parent, COMSIG_ATOM_EXAMINE)
 	//supporting component transfer means putting these here instead of destroy
 	SSpersistence.wall_engravings -= src
-	REMOVE_TRAIT(parent, TRAIT_NOT_ENGRAVABLE, TRAIT_GENERIC)
+	REMOVE_TRAIT(parent, TRAIT_NOT_ENGRAVABLE, ENGRAVED_TRAIT)
 
 /// Used to maintain the acid overlay on the parent [/atom].
 /datum/component/engraved/proc/on_update_overlays(atom/parent_atom, list/overlays)
diff --git a/code/datums/elements/wall_engraver.dm b/code/datums/elements/wall_engraver.dm
index 7204d8cacef..2b319b0609a 100644
--- a/code/datums/elements/wall_engraver.dm
+++ b/code/datums/elements/wall_engraver.dm
@@ -31,12 +31,12 @@
 /datum/element/wall_engraver/proc/try_chisel(obj/item/item, turf/closed/wall, mob/living/user)
 	if(!istype(wall) || !user.mind)
 		return
-	if(HAS_TRAIT_FROM(wall, TRAIT_NOT_ENGRAVABLE, INNATE_TRAIT))
-		user.balloon_alert(user, "wall cannot be engraved!")
-		return
-	if(HAS_TRAIT_FROM(wall, TRAIT_NOT_ENGRAVABLE, TRAIT_GENERIC))
+	if(HAS_TRAIT_FROM(wall, TRAIT_NOT_ENGRAVABLE, ENGRAVED_TRAIT))
 		user.balloon_alert(user, "wall has already been engraved!")
 		return
+	if(HAS_TRAIT(wall, TRAIT_NOT_ENGRAVABLE))
+		user.balloon_alert(user, "wall cannot be engraved!")
+		return
 	if(!length(user.mind?.memories))
 		user.balloon_alert(user, "nothing memorable to engrave!")
 		return
diff --git a/code/datums/memory/tattoo_kit.dm b/code/datums/memory/tattoo_kit.dm
index 98d47eaa285..62b4d73be28 100644
--- a/code/datums/memory/tattoo_kit.dm
+++ b/code/datums/memory/tattoo_kit.dm
@@ -46,11 +46,11 @@
 	if(!tattoo_target)
 		balloon_alert(tattoo_artist, "no limb to tattoo!")
 		return
-	if(HAS_TRAIT_FROM(tattoo_target, TRAIT_NOT_ENGRAVABLE, INNATE_TRAIT))
-		balloon_alert(tattoo_artist, "bodypart cannot be engraved!")
+	if(HAS_TRAIT_FROM(tattoo_target, TRAIT_NOT_ENGRAVABLE, ENGRAVED_TRAIT))
+		balloon_alert(tattoo_artist, "bodypart already tattooed!")
 		return
-	if(HAS_TRAIT_FROM(tattoo_target, TRAIT_NOT_ENGRAVABLE, TRAIT_GENERIC))
-		balloon_alert(tattoo_artist, "bodypart has already been engraved!")
+	if(HAS_TRAIT(tattoo_target, TRAIT_NOT_ENGRAVABLE))
+		balloon_alert(tattoo_artist, "bodypart cannot be tattooed!")
 		return
 	var/datum/memory/memory_to_tattoo = tattoo_artist.mind.select_memory("tattoo")
 	if(!memory_to_tattoo || !tattoo_artist.Adjacent(tattoo_holder) || !tattoo_holder.get_bodypart(selected_zone))