From 27857ae90db8810c726e3622383c9644babddda3 Mon Sep 17 00:00:00 2001
From: Incoming <Mewchu11@cox.net>
Date: Thu, 8 Jan 2015 04:47:35 -0500
Subject: [PATCH 1/2] Allows player slimes to use the slime faces that npc
 slimes can uses.

Fixes #6882

Priority: Critical
---
 .../modules/mob/living/carbon/slime/powers.dm | 32 ++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/code/modules/mob/living/carbon/slime/powers.dm b/code/modules/mob/living/carbon/slime/powers.dm
index ef91582c3ec..3264c6ce137 100644
--- a/code/modules/mob/living/carbon/slime/powers.dm
+++ b/code/modules/mob/living/carbon/slime/powers.dm
@@ -226,4 +226,34 @@
 		else
 			src << "<i>I am not ready to reproduce yet...</i>"
 	else
-		src << "<i>I am not old enough to reproduce yet...</i>"
\ No newline at end of file
+		src << "<i>I am not old enough to reproduce yet...</i>"
+
+/mob/living/carbon/slime/verb/Emote()
+	set category = "Slime"
+	set desc = "This lets you show the world your emotions."
+
+	if(stat)
+		src << "<i>I must be conscious to do this...</i>" //there's no reason to smile about being dead
+		return
+
+	var/selection = input(src,"Select a feeling.", "Emotions") in list("cancel",":>",":3",":<",":(",">:(","none")
+
+	switch(selection)
+		if("cancel")
+			return
+		if("none")
+			mood = null
+		if(":>")
+			mood = "mischevous"
+		if(":3")
+			mood = ":33"
+		if(":<")
+			mood = "pout"
+		if(":(")
+			mood = "sad"
+		if(">:(")
+			mood = "angry"
+		else
+			return
+
+	regenerate_icons()

From 819add5c0c1a54566996d8d16e6d7c09d783d171 Mon Sep 17 00:00:00 2001
From: Incoming <Mewchu11@cox.net>
Date: Thu, 8 Jan 2015 17:12:14 -0500
Subject: [PATCH 2/2] *merges the slime face emotes into the generic emote list
 so there's no new VERB *makes a changelog so no one misses out on this
 important news

---
 code/modules/mob/living/carbon/slime/emote.dm | 31 +++++++++++++++++-
 .../modules/mob/living/carbon/slime/powers.dm | 32 +------------------
 html/changelogs/INCOMING5643-PR-6887.yml      |  6 ++++
 3 files changed, 37 insertions(+), 32 deletions(-)
 create mode 100644 html/changelogs/INCOMING5643-PR-6887.yml

diff --git a/code/modules/mob/living/carbon/slime/emote.dm b/code/modules/mob/living/carbon/slime/emote.dm
index 0693aaba88f..60d22ffb6db 100644
--- a/code/modules/mob/living/carbon/slime/emote.dm
+++ b/code/modules/mob/living/carbon/slime/emote.dm
@@ -10,6 +10,7 @@
 		act = copytext(act,1,length(act))
 
 	var/m_type = 1
+	var/regenerate_icons
 	var/message
 
 	switch(act) //Alphabetical please
@@ -45,11 +46,36 @@
 			message = "<B>The [src.name]</B> vibrates!"
 			m_type = 1
 
+		if("noface") //mfw I have no face
+			mood = null
+			regenerate_icons = 1
+
+		if("smile")
+			mood = "mischevous"
+			regenerate_icons = 1
+
+		if(":3")
+			mood = ":33"
+			regenerate_icons = 1
+
+		if("pout")
+			mood = "pout"
+			regenerate_icons = 1
+
+		if("frown")
+			mood = "sad"
+			regenerate_icons = 1
+
+		if("scowl")
+			mood = "angry"
+			regenerate_icons = 1
+
 		if ("help") //This is an exception
-			src << "Help for slime emotes. You can use these emotes with say \"*emote\":\n\nbounce, jiggle, light, moan, shiver, sway, twitch, vibrate"
+			src << "Help for slime emotes. You can use these emotes with say \"*emote\":\n\nbounce, jiggle, light, moan, shiver, sway, twitch, vibrate. \n\nYou may also change your face with: \n\nsmile, :3, pout, frown, scowl, noface"
 
 		else
 			src << "<span class='notice'>Unusable emote '[act]'. Say *help for a list.</span>"
+
 	if ((message && src.stat == 0))
 		if(client)
 			log_emote("[name]/[key] : [message]")
@@ -58,4 +84,7 @@
 		else
 			src.loc.audible_message(message)
 
+	if (regenerate_icons)
+		regenerate_icons()
+
 	return
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/slime/powers.dm b/code/modules/mob/living/carbon/slime/powers.dm
index 3264c6ce137..ef91582c3ec 100644
--- a/code/modules/mob/living/carbon/slime/powers.dm
+++ b/code/modules/mob/living/carbon/slime/powers.dm
@@ -226,34 +226,4 @@
 		else
 			src << "<i>I am not ready to reproduce yet...</i>"
 	else
-		src << "<i>I am not old enough to reproduce yet...</i>"
-
-/mob/living/carbon/slime/verb/Emote()
-	set category = "Slime"
-	set desc = "This lets you show the world your emotions."
-
-	if(stat)
-		src << "<i>I must be conscious to do this...</i>" //there's no reason to smile about being dead
-		return
-
-	var/selection = input(src,"Select a feeling.", "Emotions") in list("cancel",":>",":3",":<",":(",">:(","none")
-
-	switch(selection)
-		if("cancel")
-			return
-		if("none")
-			mood = null
-		if(":>")
-			mood = "mischevous"
-		if(":3")
-			mood = ":33"
-		if(":<")
-			mood = "pout"
-		if(":(")
-			mood = "sad"
-		if(">:(")
-			mood = "angry"
-		else
-			return
-
-	regenerate_icons()
+		src << "<i>I am not old enough to reproduce yet...</i>"
\ No newline at end of file
diff --git a/html/changelogs/INCOMING5643-PR-6887.yml b/html/changelogs/INCOMING5643-PR-6887.yml
new file mode 100644
index 00000000000..6794b5124f2
--- /dev/null
+++ b/html/changelogs/INCOMING5643-PR-6887.yml
@@ -0,0 +1,6 @@
+author: Incoming5643
+
+delete-after: True
+
+changes: 
+  - bugfix: "Player controlled slimes can now change their face to match AI controlled slimes in kawaiiness. use *help as a slime to find the commands."
\ No newline at end of file