From aad4d3cdd313d148beb9d1b2822696b0afff4820 Mon Sep 17 00:00:00 2001
From: Sniblet <36427443+Sniblet@users.noreply.github.com>
Date: Fri, 3 Feb 2023 17:41:21 -0500
Subject: [PATCH] emotion manipulators now use SPAN_GOOD, adds punctuation to
 "feeling" artifact effects (#15689)

---
 code/modules/organs/subtypes/augment.dm                   | 4 ++--
 .../artifact/effects/unknown_effect_mental.dm             | 8 ++++----
 html/changelogs/Sniblet-PR-15689.yml                      | 7 +++++++
 3 files changed, 13 insertions(+), 6 deletions(-)
 create mode 100644 html/changelogs/Sniblet-PR-15689.yml

diff --git a/code/modules/organs/subtypes/augment.dm b/code/modules/organs/subtypes/augment.dm
index ca43b7c5372..f0012ad5254 100644
--- a/code/modules/organs/subtypes/augment.dm
+++ b/code/modules/organs/subtypes/augment.dm
@@ -607,9 +607,9 @@
 	if(world.time > (last_emotion + 5 MINUTES))
 		switch(set_emotion)
 			if("happiness")
-				to_chat(owner, SPAN_NOTICE("You feel happy."))
+				to_chat(owner, SPAN_GOOD("You feel happy."))
 			if("calmness")
-				to_chat(owner, SPAN_NOTICE("You feel calm."))
+				to_chat(owner, SPAN_GOOD("You feel calm."))
 		last_emotion = world.time
 
 		if(is_broken())
diff --git a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_mental.dm b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_mental.dm
index 99a3d7e3aa4..3cf4440d32e 100644
--- a/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_mental.dm
+++ b/code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_mental.dm
@@ -18,7 +18,7 @@
 		"The light seems to flicker.",\
 		"The shadows seem to lengthen.",\
 		"The walls are getting closer.",\
-		"Something is wrong")
+		"Something is wrong.")
 
 	var/list/drastic_messages = list("You've got to get out of here!",\
 		"Someone's trying to kill you!",\
@@ -76,8 +76,8 @@
 	effecttype = "goodfeeling"
 	effect_type = 2
 	var/list/messages = list("You feel good.",\
-		"Everything seems to be going alright",\
-		"You've got a good feeling about this",\
+		"Everything seems to be going alright.",\
+		"You've got a good feeling about this.",\
 		"Your instincts tell you everything is going to be getting better.",\
 		"There's a good feeling in the air.",\
 		"Something smells... good.",\
@@ -186,4 +186,4 @@
 				if(prob(20))
 					C.dizziness += rand(50,75)
 
-		return TRUE
\ No newline at end of file
+		return TRUE
diff --git a/html/changelogs/Sniblet-PR-15689.yml b/html/changelogs/Sniblet-PR-15689.yml
new file mode 100644
index 00000000000..f1249d0fc6b
--- /dev/null
+++ b/html/changelogs/Sniblet-PR-15689.yml
@@ -0,0 +1,7 @@
+author: Sniblet
+
+delete-after: True
+
+changes:
+  - tweak: "Zeng-Hu Emotion Manipulators now give you SPAN_GOOD instead of SPAN_NOTICE messages. This means they are green."
+  - spellcheck: "Added punctuation to 'feeling' artifact effects."