Cleans up Vars

code/modules/mob/mob.dm

@@ -6,6 +6,7 @@
 	hud_used = null
 	if(mind && mind.current == src)
 		spellremove(src)
+	mobspellremove(src)
 	for(var/infection in viruses)
 		qdel(infection)
 	ghostize()
@@ -158,8 +159,6 @@
 
 /mob/proc/Life()
 //	handle_typing_indicator()
-//	if(organStructure)
-//		organStructure.ProcessOrgans()
 	return
 
 
@@ -960,8 +959,8 @@ var/list/slot_equipment_priority = list( \
 	if(mind && mind.changeling)
 		add_stings_to_statpanel(mind.changeling.purchasedpowers)
 
-	if(spell_list && spell_list.len)
-		for(var/obj/effect/proc_holder/spell/S in spell_list)
+	if(mob_spell_list && mob_spell_list.len)
+		for(var/obj/effect/proc_holder/spell/S in mob_spell_list)
 			add_spell_to_statpanel(S)
 	if(mind && istype(src, /mob/living) && mind.spell_list && mind.spell_list.len)
 		for(var/obj/effect/proc_holder/spell/S in mind.spell_list)
@@ -994,6 +993,7 @@ var/list/slot_equipment_priority = list( \
 	for(var/obj/effect/proc_holder/changeling/S in stings)
 		if(S.chemical_cost >=0 && S.can_be_used_by(src))
 			statpanel("[S.panel]",((S.chemical_cost > 0) ? "[S.chemical_cost]" : ""),S)
+
 /mob/proc/add_spell_to_statpanel(var/obj/effect/proc_holder/spell/S)
 	switch(S.charge_type)
 		if("recharge")
@@ -1002,17 +1002,6 @@ var/list/slot_equipment_priority = list( \
 			statpanel(S.panel,"[S.charge_counter]/[S.charge_max]",S)
 		if("holdervar")
 			statpanel(S.panel,"[S.holder_var_type] [S.holder_var_amount]",S)
-	/* // Why have a duplicate set of turfs in the stat panel?
-	if(listed_turf)
-		if(get_dist(listed_turf,src) > 1)
-			listed_turf = null
-		else
-			statpanel(listed_turf.name,listed_turf.name,listed_turf)
-			for(var/atom/A in listed_turf)
-				if(A.invisibility > see_invisible)
-					continue
-				statpanel(listed_turf.name,A.name,A)
-	*/
 
 
 // facing verbs
@@ -1366,9 +1355,17 @@ mob/proc/yank_out_object()
 /mob/proc/setEarDamage()
 	return
 
-/mob/proc/AddSpell(var/obj/effect/proc_holder/spell/spell)
-	spell_list += spell
-	spell.action.Grant(src)
+/mob/proc/AddSpell(obj/effect/proc_holder/spell/S)
+	mob_spell_list += S
+	S.action.Grant(src)
+
+/mob/proc/RemoveSpell(obj/effect/proc_holder/spell/spell) //To remove a specific spell from a mind
+	if(!spell)
+		return
+	for(var/obj/effect/proc_holder/spell/S in mob_spell_list)
+		if(istype(S, spell))
+			qdel(S)
+			mob_spell_list -= S
 
 //override to avoid rotating pixel_xy on mobs
 /mob/shuttleRotate(rotation)