Replace all secondary flags with bitflags stored in the flags_2 var

code/modules/spells/spell_types/barnyard.dm

@@ -38,7 +38,7 @@
 
 	var/choice = masks[randM]
 	var/obj/item/clothing/mask/magichead = new choice
-	magichead.flags |=NODROP
+	magichead.flags_1 |= NODROP_1
 	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/ethereal_jaunt.dm

@@ -90,7 +90,7 @@
 	if ((movedelay > world.time) || reappearing || !direction) return
 	var/turf/newLoc = get_step(src,direction)
 	setDir(direction)
-	if(!(newLoc.flags & NOJAUNT))
+	if(!(newLoc.flags_1 & NOJAUNT_1))
 		loc = newLoc
 	else
 		to_chat(user, "<span class='warning'>Some strange aura is blocking the way!</span>")

code/modules/spells/spell_types/godhand.dm.rej

@@ -0,0 +1,10 @@
+diff a/code/modules/spells/spell_types/godhand.dm b/code/modules/spells/spell_types/godhand.dm	(rejected hunks)
+@@ -7,7 +7,7 @@
+ 	icon = 'icons/obj/items_and_weapons.dmi'
+ 	icon_state = "syndballoon"
+ 	item_state = null
+-	flags = ABSTRACT | NODROP | DROPDEL
++	flags_1 = ABSTRACT_1 | NODROP_1 | DROPDEL_1
+ 	w_class = WEIGHT_CLASS_HUGE
+ 	force = 0
+ 	throwforce = 0

code/modules/spells/spell_types/lichdom.dm

@@ -34,7 +34,7 @@
 		for(var/obj/item in hand_items)
 			// I ensouled the nuke disk once. But it's probably a really
 			// mean tactic, so probably should discourage it.
-			if(ABSTRACT in item.flags || NODROP in item.flags || HAS_SECONDARY_FLAG(item, STATIONLOVING))
+			if((item.flags_1 & ABSTRACT_1) || (item.flags_1 & NODROP_1) || (item.flags_2 & STATIONLOVING_2))
 				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/summonitem.dm

@@ -23,9 +23,9 @@
 		if(!marked_item) //linking item to the spell
 			message = "<span class='notice'>"
 			for(var/obj/item in hand_items)
-				if(ABSTRACT in item.flags)
+				if(item.flags_1 & ABSTRACT_1)
 					continue
-				if(NODROP in item.flags)
+				if(item.flags_1 & NODROP_1)
 					message += "Though it feels redundant, "
 				marked_item = 		item
 				message += "You mark [item] for recall.</span>"