diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index cae11b583df..c30604dbb36 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -727,10 +727,18 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \
/mob/proc/update_flavor_text()
set src in usr
if(usr != src)
- to_chat(usr, "No.")
+ to_chat(usr, "You can't change the flavor text of this mob")
+ return
+ if(stat)
+ to_chat(usr, "You have to be conscious to change your flavor text")
+ return
+
var/msg = input(usr,"Set the flavor text in your 'examine' verb. The flavor text should be a physical descriptor of your character at a glance.","Flavor Text",html_decode(flavor_text)) as message|null
if(msg != null)
+ if(stat)
+ to_chat(usr, "You have to be conscious to change your flavor text")
+ return
msg = copytext(msg, 1, MAX_MESSAGE_LEN)
msg = html_encode(msg)