and finally, the modules folder. Now I can publish and take a break

code/modules/spells/spell.dm

@@ -373,7 +373,7 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for th
 		if("unconscious")
 			target.AdjustUnconscious(amount)
 		else
-			target.vars[type] += amount //I bear no responsibility for the runtimes that'll happen if you try to adjust non-numeric or even non-existant vars
+			target.vars[type] += amount //I bear no responsibility for the runtimes that'll happen if you try to adjust non-numeric or even non-existent vars
 
 /obj/effect/proc_holder/spell/targeted //can mean aoe for mobs (limited/unlimited number) or one target mob
 	var/max_targets = 1 //leave 0 for unlimited targets in range, 1 for one selectable target in range, more for limited number of casts (can all target one guy, depends on target_ignore_prev) in range

code/modules/spells/spell_types/barnyard.dm

@@ -44,7 +44,7 @@
 
 	var/choice = masks[randM]
 	var/obj/item/clothing/mask/magichead = new choice
-	magichead.flags_1 |= NODROP_1
+	magichead.item_flags |= NODROP
 	magichead.flags_inv = null
 	target.visible_message("<span class='danger'>[target]'s face bursts into flames, and a barnyard animal's head takes its place!</span>", \
 						   "<span class='danger'>Your face burns up, and shortly after the fire you realise you have the face of a barnyard animal!</span>")

code/modules/spells/spell_types/construct_spells.dm

@@ -220,7 +220,7 @@
 
 /obj/effect/proc_holder/spell/targeted/dominate
 	name = "Dominate"
-	desc = "This spell dominates the mind of a lesser creature, causing it to see you as an ally."
+	desc = "This spell dominates the mind of a lesser creature to the will of Nar'sie, allying it only to her direct followers."
 
 	charge_max = 600
 	range = 7

code/modules/spells/spell_types/godhand.dm

@@ -7,7 +7,7 @@
 	icon = 'icons/obj/items_and_weapons.dmi'
 	icon_state = "syndballoon"
 	item_state = null
-	flags_1 = ABSTRACT_1 | NODROP_1 | DROPDEL_1
+	item_flags = NEEDS_PERMIT | ABSTRACT | NODROP | DROPDEL
 	w_class = WEIGHT_CLASS_HUGE
 	force = 0
 	throwforce = 0
@@ -60,10 +60,7 @@
 			target.visible_message("<span class='warning'>[target]'s [A] glows brightly as it wards off the spell!</span>")
 		user.visible_message("<span class='warning'>The feedback blows [user]'s arm off!</span>","<span class='userdanger'>The spell bounces from [M]'s skin back into your arm!</span>")
 		user.flash_act()
-		var/obj/item/bodypart/part
-		var/index = user.get_held_index_of_item(src)
-		if(index)
-			part = user.hand_bodyparts[index]
+		var/obj/item/bodypart/part = user.get_holding_bodypart_of_item(src)
 		if(part)
 			part.dismember()
 		..()

code/modules/spells/spell_types/lichdom.dm

@@ -31,10 +31,10 @@
 
 		var/obj/item/marked_item
 
-		for(var/obj/item in hand_items)
+		for(var/obj/item/item in hand_items)
 			// I ensouled the nuke disk once. But it's probably a really
 			// mean tactic, so probably should discourage it.
-			if((item.flags_1 & ABSTRACT_1) || (item.flags_1 & NODROP_1) || item.SendSignal(COMSIG_ITEM_IMBUE_SOUL, user))
+			if((item.item_flags & ABSTRACT) || (item.item_flags & NODROP) || SEND_SIGNAL(item, COMSIG_ITEM_IMBUE_SOUL, user))
 				continue
 			marked_item = item
 			to_chat(M, "<span class='warning'>You begin to focus your very being into [item]...</span>")

code/modules/spells/spell_types/mime.dm

@@ -58,9 +58,9 @@
 		H.mind.miming=!H.mind.miming
 		if(H.mind.miming)
 			to_chat(H, "<span class='notice'>You make a vow of silence.</span>")
-			H.SendSignal(COMSIG_CLEAR_MOOD_EVENT, "vow")
+			SEND_SIGNAL(H, COMSIG_CLEAR_MOOD_EVENT, "vow")
 		else
-			H.SendSignal(COMSIG_ADD_MOOD_EVENT, "vow", /datum/mood_event/broken_vow)
+			SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "vow", /datum/mood_event/broken_vow)
 			to_chat(H, "<span class='notice'>You break your vow of silence.</span>")
 
 // These spells can only be gotten from the "Guide for Advanced Mimery series" for Mime Traitors.
@@ -131,17 +131,26 @@
 
 /obj/item/book/granter/spell/mimery_blockade
 	spell = /obj/effect/proc_holder/spell/targeted/forcewall/mime
-	spellname = ""
+	spellname = "Invisible Blockade"
 	name = "Guide to Advanced Mimery Vol 1"
 	desc = "The pages don't make any sound when turned."
 	icon_state ="bookmime"
 	remarks = list("...")
 
+/obj/item/book/granter/spell/mimery_blockade/attack_self(mob/user)
+	..()
+	if(!locate(/obj/effect/proc_holder/spell/targeted/mime/speak) in user.mind.spell_list)
+		user.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/mime/speak)
 
 /obj/item/book/granter/spell/mimery_guns
 	spell = /obj/effect/proc_holder/spell/aimed/finger_guns
-	spellname = ""
+	spellname = "Finger Guns"
 	name = "Guide to Advanced Mimery Vol 2"
 	desc = "There aren't any words written..."
 	icon_state ="bookmime"
 	remarks = list("...")
+
+/obj/item/book/granter/spell/mimery_guns/attack_self(mob/user)
+	..()
+	if(!locate(/obj/effect/proc_holder/spell/targeted/mime/speak) in user.mind.spell_list)
+		user.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/mime/speak)

code/modules/spells/spell_types/summonitem.dm

@@ -22,10 +22,10 @@
 
 		if(!marked_item) //linking item to the spell
 			message = "<span class='notice'>"
-			for(var/obj/item in hand_items)
-				if(item.flags_1 & ABSTRACT_1)
+			for(var/obj/item/item in hand_items)
+				if(item.item_flags & ABSTRACT)
 					continue
-				if(item.flags_1 & NODROP_1)
+				if(item.item_flags & NODROP)
 					message += "Though it feels redundant, "
 				marked_item = 		item
 				message += "You mark [item] for recall.</span>"
@@ -83,7 +83,7 @@
 									to_chat(C, "<span class='warning'>The [item_to_retrieve] that was embedded in your [L] has mysteriously vanished. How fortunate!</span>")
 									if(!C.has_embedded_objects())
 										C.clear_alert("embeddedobject")
-										C.SendSignal(COMSIG_CLEAR_MOOD_EVENT, "embedded")
+										SEND_SIGNAL(C, COMSIG_CLEAR_MOOD_EVENT, "embedded")
 									break
 
 					else