diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 23177ee41d4..0a41894b374 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -121,6 +121,19 @@
 		else
 			to_chat(src, span_blue("You are not injured enough to succumb to death!"))
 
+/mob/living/verb/toggle_afk()
+	set name = "Toggle AFK"
+	set category = "IC"
+	set desc = "Mark yourself as Away From Keyboard, or clear that status!"
+	if(away_from_keyboard)
+		remove_status_indicator("afk")
+		to_chat(src, "<span class='notice'>You are no longer marked as AFK.</span>")
+		away_from_keyboard = FALSE
+	else
+		add_status_indicator("afk")
+		to_chat(src, "<span class='notice'>You are now marked as AFK.</span>")
+		away_from_keyboard = TRUE
+
 /mob/living/proc/updatehealth()
 	if(status_flags & GODMODE)
 		health = 100
diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm
index e2deb6d7a78..c56a369ded6 100644
--- a/code/modules/mob/mob_defines.dm
+++ b/code/modules/mob/mob_defines.dm
@@ -156,6 +156,7 @@
 	var/faction = "neutral" //Used for checking whether hostile simple animals will attack you, possibly more stuff later
 
 	var/can_be_antagged = FALSE // To prevent pAIs/mice/etc from getting antag in autotraitor and future auto- modes. Uses inheritance instead of a bunch of typechecks.
+	var/away_from_keyboard = FALSE	//are we at, or away, from our keyboard?
 
 //Generic list for proc holders. Only way I can see to enable certain verbs/procs. Should be modified if needed.
 	var/proc_holder_list[] = list()//Right now unused.
diff --git a/icons/mob/status_indicators.dmi b/icons/mob/status_indicators.dmi
index 64103b82ff4..6dd81546893 100644
Binary files a/icons/mob/status_indicators.dmi and b/icons/mob/status_indicators.dmi differ