diff --git a/code/datums/antagonists/datum_clockcult.dm b/code/datums/antagonists/datum_clockcult.dm
index 76833dffb27..8bca420cb6a 100644
--- a/code/datums/antagonists/datum_clockcult.dm
+++ b/code/datums/antagonists/datum_clockcult.dm
@@ -128,7 +128,7 @@
ticker.mode.servants_of_ratvar -= owner.mind
ticker.mode.update_servant_icons_removed(owner.mind)
if(owner.mind)
- owner.mind.memory = "" //Not sure if there's a better way to do this
+ owner.mind.wipe_memory()
owner.mind.special_role = null
owner.attack_log += "\[[time_stamp()]\] Has renounced the cult of Ratvar!"
if(iscyborg(owner))
diff --git a/code/datums/antagonists/datum_cult.dm b/code/datums/antagonists/datum_cult.dm
index 5ceae624c7b..60dd293581b 100644
--- a/code/datums/antagonists/datum_cult.dm
+++ b/code/datums/antagonists/datum_cult.dm
@@ -38,11 +38,12 @@
..()
/datum/antagonist/cultist/on_remove()
- if(ticker && ticker.mode && owner.mind)
- ticker.mode.cult -= owner.mind
- ticker.mode.update_cult_icons_removed(owner.mind)
+ if(owner.mind)
+ owner.mind.wipe_memory()
+ if(ticker && ticker.mode)
+ ticker.mode.cult -= owner.mind
+ ticker.mode.update_cult_icons_removed(owner.mind)
owner << "An unfamiliar white light flashes through your mind, cleansing the taint of the Dark One and all your memories as its servant."
- owner.memory = ""
owner.attack_log += "\[[time_stamp()]\] Has renounced the cult of Nar'Sie!"
if(!silent_update)
owner.visible_message("[owner] looks like they just reverted to their old faith!")
diff --git a/code/datums/mind.dm b/code/datums/mind.dm
index 5ca6446a0a0..7d12dd05993 100644
--- a/code/datums/mind.dm
+++ b/code/datums/mind.dm
@@ -1364,9 +1364,7 @@
else
var/explanation = "Summon Nar-Sie via the use of the appropriate rune (Hell join self). It will only work if nine cultists stand on and around it."
current << "Objective #1: [explanation]"
- current.memory += "Objective #1: [explanation]
"
- current << "The convert rune is join blood self"
- current.memory += "The convert rune is join blood self
"
+ memory += "Objective #1: [explanation]
"
var/mob/living/carbon/human/H = current
if (!ticker.mode.equip_cultist(current))
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 16e9bd9ae77..e6a735b39a9 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -418,7 +418,7 @@ var/next_mob_id = 0
if(mind)
mind.show_memory(src)
else
- src << "The game appears to have misplaced your mind datum, so we can't show you your notes."
+ src << "You don't have a mind datum for some reason, so you can't look at your notes, if you had any."
/mob/verb/add_memory(msg as message)
set name = "Add Note"
@@ -430,21 +430,7 @@ var/next_mob_id = 0
if(mind)
mind.store_memory(msg)
else
- src << "The game appears to have misplaced your mind datum, so we can't show you your notes."
-
-/mob/proc/store_memory(msg as message, popup, sane = 1)
- msg = copytext(msg, 1, MAX_MESSAGE_LEN)
-
- if (sane)
- msg = sanitize(msg)
-
- if (length(memory) == 0)
- memory += msg
- else
- memory += "
[msg]"
-
- if (popup)
- memory()
+ src << "You don't have a mind datum for some reason, so you can't add a note to it."
/mob/verb/abandon_mob()
set name = "Respawn"
diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm
index ee73870dfd0..de84e2491a8 100644
--- a/code/modules/mob/mob_defines.dm
+++ b/code/modules/mob/mob_defines.dm
@@ -29,7 +29,6 @@
var/attack_log = list( )
var/obj/machinery/machine = null
var/other_mobs = null
- var/memory = ""
var/disabilities = 0 //Carbon
var/atom/movable/pulling = null