Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements

2019-07-31 19:09:35 -05:00
parent fe148a9f7b 3d597ea508
commit 218cbe2dbc
91 changed files with 1656 additions and 568 deletions
@@ -130,7 +130,8 @@
 			L.update_arousal_hud() //Removes the old icon

 /datum/mind/proc/store_memory(new_text)
-	memory += "[new_text]<BR>"
+	if((length(memory) + length(new_text)) <= MAX_MESSAGE_LEN)
+		memory += "[new_text]<BR>"

 /datum/mind/proc/wipe_memory()
 	memory = null