Revert "[MIRROR] Replace all secondary flags with bitflags stored in the flags_2 var" (#2457)

ok you know what yeah i think i'll properly mirror https://github.com/Citadel-Station-13/Citadel-Station-13/pull/2411
2017-08-22 04:04:21 -07:00
parent 15b378ddf4
commit 6a309b5996
536 changed files with 1489 additions and 2474 deletions
@@ -38,7 +38,7 @@

 	var/choice = masks[randM]
 	var/obj/item/clothing/mask/magichead = new choice
-	magichead.flags_1 |= NODROP_1
+	magichead.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>")
@@ -90,7 +90,7 @@
 	if ((movedelay > world.time) || reappearing || !direction) return
 	var/turf/newLoc = get_step(src,direction)
 	setDir(direction)
-	if(!(newLoc.flags_1 & NOJAUNT_1))
+	if(!(newLoc.flags & NOJAUNT))
 		loc = newLoc
 	else
 		to_chat(user, "<span class='warning'>Some strange aura is blocking the way!</span>")
@@ -7,7 +7,7 @@
 	icon = 'icons/obj/weapons.dmi'
 	icon_state = "syndballoon"
 	item_state = null
-	flags_1 = ABSTRACT_1 | NODROP_1 | DROPDEL_1
+	flags = ABSTRACT | NODROP | DROPDEL
 	w_class = WEIGHT_CLASS_HUGE
 	force = 0
 	throwforce = 0
@@ -1,10 +0,0 @@
-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
@@ -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((item.flags_1 & ABSTRACT_1) || (item.flags_1 & NODROP_1) || (item.flags_2 & STATIONLOVING_2))
+			if(ABSTRACT in item.flags || NODROP in item.flags || HAS_SECONDARY_FLAG(item, STATIONLOVING))
 				continue
 			marked_item = item
 			to_chat(M, "<span class='warning'>You begin to focus your very being into [item]...</span>")
@@ -23,9 +23,9 @@
 		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)
+				if(ABSTRACT in item.flags)
 					continue
-				if(item.flags_1 & NODROP_1)
+				if(NODROP in item.flags)
 					message += "Though it feels redundant, "
 				marked_item = 		item
 				message += "You mark [item] for recall.</span>"