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


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

@@ -445,8 +445,8 @@
 	name = "turret controls"
 	icon_state = "offhand"
 	w_class = WEIGHT_CLASS_HUGE
-	flags_1 = ABSTRACT_1 | NODROP_1
-	resistance_flags = FIRE_PROOF | UNACIDABLE | ACID_PROOF | NOBLUDGEON_1
+	flags = ABSTRACT | NODROP
+	resistance_flags = FIRE_PROOF | UNACIDABLE | ACID_PROOF | NOBLUDGEON
 	var/delay = 0

 /obj/item/weapon/turret_control/afterattack(atom/targeted_atom, mob/user)
@@ -1,12 +0,0 @@
-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_1 & NODECONSTRUCT_1))
+	if(!(flags & NODECONSTRUCT))
 		new /obj/item/stack/sheet/metal (loc, 5)
 	qdel(src)