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 = "The [src.name] 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 << "Unusable emote '[act]'. Say *help for a list." + 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/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