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
@@ -120,7 +120,7 @@ GLOBAL_LIST_EMPTY(rad_collectors)


 /obj/machinery/power/rad_collector/obj_break(damage_flag)
-	if(!(stat & BROKEN) && !(flags & NODECONSTRUCT))
+	if(!(stat & BROKEN) && !(flags_1 & NODECONSTRUCT_1))
 		eject()
 		stat |= BROKEN

@@ -0,0 +1,12 @@
+diff a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm	(rejected hunks)
+@@ -445,8 +445,8 @@
+ 	name = "turret controls"
+ 	icon_state = "offhand"
+ 	w_class = WEIGHT_CLASS_HUGE
+-	flags = ABSTRACT | NODROP
+-	resistance_flags = FIRE_PROOF | UNACIDABLE | ACID_PROOF | NOBLUDGEON
+	flags_1 = ABSTRACT_1 | NODROP_1
+	resistance_flags = FIRE_PROOF | UNACIDABLE | ACID_PROOF | NOBLUDGEON_1
+ 	var/delay = 0
+ 
+ /obj/item/turret_control/afterattack(atom/targeted_atom, mob/user)
@@ -147,7 +147,7 @@


 /obj/structure/particle_accelerator/deconstruct(disassembled = TRUE)
-	if(!(flags & NODECONSTRUCT))
+	if(!(flags_1 & NODECONSTRUCT_1))
 		new /obj/item/stack/sheet/metal (loc, 5)
 	qdel(src)