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
@@ -153,7 +153,7 @@
 	if(!locate(/obj/item/weapon) in held_items)
 		best_force = 0

-	if(restrained() || blacklistItems[pickupTarget] || (pickupTarget && (pickupTarget.flags_1 & NODROP_1)))
+	if(restrained() || blacklistItems[pickupTarget] || (pickupTarget && (pickupTarget.flags & NODROP)))
 		pickupTarget = null

 	if(!resisting && pickupTarget)
@@ -274,7 +274,7 @@
 					// check if target has a weapon
 					var/obj/item/weapon/W
 					for(var/obj/item/weapon/I in target.held_items)
-						if(!(I.flags_1 & ABSTRACT_1))
+						if(!(I.flags & ABSTRACT))
 							W = I
 							break

@@ -1,19 +0,0 @@
-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_1 & BLOCK_GAS_SMOKE_EFFECT_1)
+		if(wear_mask.flags & BLOCK_GAS_SMOKE_EFFECT)
 			return 1

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