heh

code/modules/mob/living/carbon/carbon_defines.dm

@@ -24,7 +24,6 @@
 	var/wetlevel = 0 //how wet the mob is
 
 	var/failed_last_breath = FALSE //This is used to determine if the mob failed a breath. If they did fail a brath, they will attempt to breathe each tick, otherwise just once per 4 ticks.
-	var/list/active_effect = list()
 	var/co2overloadtime = null
 
 	blood_volume = BLOOD_VOLUME_NORMAL

code/modules/mob/living/carbon/human/emote.dm

@@ -840,14 +840,13 @@
 		if("highfive")
 			if(restrained())
 				return
-			if(EFFECT_HIGHFIVE in active_effect)
-				to_chat(src, "You give up on the high-five.")
-				active_effect -= EFFECT_HIGHFIVE
-				return
-			active_effect |= EFFECT_HIGHFIVE
-			for(var/mob/living/carbon/C in orange(1))
-				if(EFFECT_HIGHFIVE in C.active_effect)
-					if((C.mind.special_role == SPECIAL_ROLE_WIZARD) && (mind.special_role == SPECIAL_ROLE_WIZARD))
+			visible_message("<b>[name]</b> requests a highfive.", "You request a highfive.")
+			if(!has_status_effect(STATUS_EFFECT_HIGHFIVE))
+				apply_status_effect(STATUS_EFFECT_HIGHFIVE)
+
+			if(has_status_effect(STATUS_EFFECT_HIGHFIVE))
+				for(var/mob/living/carbon/C in orange(1))
+					if((mind.special_role == SPECIAL_ROLE_WIZARD) && (C.mind && (C.mind.special_role == SPECIAL_ROLE_WIZARD)))
 						visible_message("<span class='danger'><b>[name]</b> and <b>[C.name]</b> high-five EPICALLY!</span>")
 						status_flags |= GODMODE
 						C.status_flags |= GODMODE
@@ -855,16 +854,9 @@
 						status_flags &= ~GODMODE
 						C.status_flags &= ~GODMODE
 						break
-				visible_message("<b>[name]</b> and <b>[C.name]</b> high-five!")
-				C.active_effect -= EFFECT_HIGHFIVE
-				active_effect -= EFFECT_HIGHFIVE
-				playsound('sound/effects/snap.ogg', 50)
-				break
-			if(EFFECT_HIGHFIVE in active_effect)
-				visible_message("<b>[name]</b> requests a highfive.", "You request a highfive.")
-				if(do_after(src, 25, target = src))
-					visible_message("[name] was left hanging. Embarrassing.", "You are left hanging. How embarrassing!")
-					active_effect -= EFFECT_HIGHFIVE
+					visible_message("<b>[name]</b> and <b>[C.name]</b> high-five!")
+					playsound('sound/effects/snap.ogg', 50)
+					break
 
 		if("help")
 			var/emotelist = "aflap(s), airguitar, blink(s), blink(s)_r, blush(es), bow(s)-(none)/mob, burp(s), choke(s), chuckle(s), clap(s), collapse(s), cough(s),cry, cries, custom, dance, dap(s)(none)/mob," \

code/modules/mob/living/living.dm

@@ -2,6 +2,13 @@
 /mob/living/Destroy()
 	if(ranged_ability)
 		ranged_ability.remove_ranged_ability(src)
+	if(LAZYLEN(status_effects))
+		for(var/s in status_effects)
+			var/datum/status_effect/S = s
+			if(S.on_remove_on_mob_delete) //the status effect calls on_remove when its mob is deleted
+				qdel(S)
+			else
+				S.be_replaced()
 	return ..()
 
 /mob/living/ghostize(can_reenter_corpse = 1)

code/modules/mob/living/living_defines.dm

@@ -64,3 +64,6 @@
 
 	var/list/recent_tastes = list()
 	var/blood_volume = 0 //how much blood the mob has
+
+	var/list/status_effects //a list of all status effects the mob has
+