Replace all secondary flags with bitflags stored in the flags_2 var

2017-08-17 09:19:14 -05:00
parent 2b144561e1
commit 87b3df3069
367 changed files with 1887 additions and 880 deletions
@@ -0,0 +1,19 @@
+diff a/code/modules/mob/living/carbon/monkey/combat.dm b/code/modules/mob/living/carbon/monkey/combat.dm	(rejected hunks)
+@@ -153,7 +153,7 @@
+ 	if(!locate(/obj/item) in held_items)
+ 		best_force = 0
+ 
+-	if(restrained() || blacklistItems[pickupTarget] || (pickupTarget && (pickupTarget.flags & NODROP)))
+	if(restrained() || blacklistItems[pickupTarget] || (pickupTarget && (pickupTarget.flags_1 & NODROP_1)))
+ 		pickupTarget = null
+ 
+ 	if(!resisting && pickupTarget)
+@@ -274,7 +274,7 @@
+ 					// check if target has a weapon
+ 					var/obj/item/W
+ 					for(var/obj/item/I in target.held_items)
+-						if(!(I.flags & ABSTRACT))
+						if(!(I.flags_1 & ABSTRACT_1))
+ 							W = I
+ 							break
+ 
@@ -138,7 +138,7 @@

 /mob/living/carbon/monkey/has_smoke_protection()
 	if(wear_mask)
-		if(wear_mask.flags & BLOCK_GAS_SMOKE_EFFECT)
+		if(wear_mask.flags_1 & BLOCK_GAS_SMOKE_EFFECT_1)
 			return 1

 /mob/living/carbon/monkey/handle_fire()