diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm
index 3f155fa8031..5792aff1725 100644
--- a/code/controllers/configuration.dm
+++ b/code/controllers/configuration.dm
@@ -72,6 +72,11 @@
 	var/assistantlimit = 0 //enables assistant limiting
 	var/assistantratio = 2 //how many assistants to security members
 
+	// The AFK subsystem will not be activated if any of the below config values are equal or less than 0
+	var/warn_afk_minimum = 0 // How long till you get a warning while being AFK
+	var/auto_cryo_afk = 0 // How long till you get put into cryo when you're AFK
+	var/auto_despawn_afk = 0 // How long till you actually despawn in cryo when you're AFK (Not ssd so not automatic)
+
 	var/auto_cryo_ssd_mins = 0
 	var/ssd_warning = 0
 
@@ -314,6 +319,13 @@
 				if("shadowling_max_age")
 					config.shadowling_max_age = text2num(value)
 
+				if("warn_afk_minimum")
+					config.warn_afk_minimum = text2num(value)
+				if("auto_cryo_afk")
+					config.auto_cryo_afk = text2num(value)
+				if("auto_despawn_afk")
+					config.auto_despawn_afk = text2num(value)
+
 				if("auto_cryo_ssd_mins")
 					config.auto_cryo_ssd_mins = text2num(value)
 				if("ssd_warning")
diff --git a/code/controllers/subsystem/afk.dm b/code/controllers/subsystem/afk.dm
new file mode 100644
index 00000000000..58562e344af
--- /dev/null
+++ b/code/controllers/subsystem/afk.dm
@@ -0,0 +1,59 @@
+#define AFK_WARNED       1
+#define AFK_CRYOD    	 2
+
+SUBSYSTEM_DEF(afk)
+	name = "AFK Watcher"
+	wait = 300
+	flags = SS_BACKGROUND
+	var/list/afk_players = list() // Associative list. client as key and AFK state as value
+
+
+/datum/controller/subsystem/afk/Initialize()
+    if(config.warn_afk_minimum <= 0 || config.auto_cryo_afk <= 0 || config.auto_despawn_afk <= 0)
+        flags |= SS_NO_FIRE
+
+/datum/controller/subsystem/afk/fire()
+	var/list/toRemove = list()
+	for(var/mob/living/carbon/human/H in GLOB.living_mob_list)
+		if(H.client == null)
+			continue
+		if(H.stat == DEAD && H.job) // No clientless or dead
+			if(afk_players[H.client])
+				toRemove += H.client
+			continue
+		var/mins_afk = round(H.client.inactivity / 600)
+		if(mins_afk < config.warn_afk_minimum)
+			if(afk_players[H.client])
+				toRemove += H.client
+			continue
+		if(!afk_players[H.client])
+			afk_players[H.client] = AFK_WARNED
+			warn(H, "<span class='danger'>You are AFK for [mins_afk] minutes. You will be cryod after [config.auto_cryo_afk] total minutes and fully despawned after [config.auto_despawn_afk] total minutes. Please move or click in game if you want to avoid being despawned.</span>")
+		else if(afk_players[H.client] == AFK_WARNED)
+			if(mins_afk >= config.auto_cryo_afk && cryo_ssd(H))
+				afk_players[H.client] = AFK_CRYOD
+				warn(H, "<span class='danger'>You are AFK for [mins_afk] minutes and have been moved to cryostorage. After being AFK for [config.auto_despawn_afk] total minutes you will be fully despawned. Please move out of cryostorage if you want to avoid being despawned.</span>")
+		else
+			if(mins_afk >= config.auto_despawn_afk)
+				var/obj/machinery/cryopod/P = H.loc
+				warn(H, "<span class='danger'>You are have been despawned after being AFK for [mins_afk] minutes.</span>")
+				P.despawn_occupant()
+				toRemove += H.client
+	
+	removeFromWatchList(toRemove)
+
+/datum/controller/subsystem/afk/proc/warn(mob/living/carbon/human/H, text)
+	to_chat(H, text)
+	SEND_SOUND(H, 'sound/effects/adminhelp.ogg')
+	if(H.client)
+		window_flash(H.client)
+
+/datum/controller/subsystem/afk/proc/removeFromWatchList(list/toRemove)
+	for(var/C in toRemove)
+		for(var/i in 1 to afk_players.len)
+			if(afk_players[i] == C)
+				afk_players.Cut(i, i + 1)
+				break
+
+#undef AFK_WARNED
+#undef AFK_CRYOD
\ No newline at end of file
diff --git a/config/example/config.txt b/config/example/config.txt
index 87ed0ce5cf1..89b8767feab 100644
--- a/config/example/config.txt
+++ b/config/example/config.txt
@@ -85,6 +85,16 @@ LOG_WORLD_OUTPUT
 ## log admin warning messages
 LOG_ADMINWARN
 
+
+## Amount of minutes that a person has to be AFK before he will be warned by the AFK subsystem. Leave this 0 to prevent the subsystem from activating
+WARN_AFK_MINIMUM 0
+
+## Amount of minutes that a person has to be AFK before he will be cryod by the AFK subsystem. Leave this 0 to prevent the subsystem from activating
+AUTO_CRYO_AFK 0
+
+## Amount of minutes that a person has to be AFK before he will be despawned by the AFK subsystem. Leave this 0 to prevent the subsystem from activating
+AUTO_DESPAWN_AFK 0
+
 ## probablities for game modes chosen in "secret" and "random" modes
 ##
 ## default probablity is 1, increase to make that mode more likely to be picked
diff --git a/paradise.dme b/paradise.dme
index c49361b8e20..a060313e7eb 100644
--- a/paradise.dme
+++ b/paradise.dme
@@ -197,6 +197,7 @@
 #include "code\controllers\master.dm"
 #include "code\controllers\subsystem.dm"
 #include "code\controllers\verbs.dm"
+#include "code\controllers\subsystem\afk.dm"
 #include "code\controllers\subsystem\air.dm"
 #include "code\controllers\subsystem\alarm.dm"
 #include "code\controllers\subsystem\assets.dm"