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

code/modules/assembly/assembly.dm

@@ -3,7 +3,7 @@
 	desc = "A small electronic device that should never exist."
 	icon = 'icons/obj/assemblies/new_assemblies.dmi'
 	icon_state = ""
-	flags_1 = CONDUCT_1
+	flags = CONDUCT
 	w_class = WEIGHT_CLASS_SMALL
 	materials = list(MAT_METAL=100)
 	throwforce = 2

code/modules/assembly/bomb.dm

@@ -8,7 +8,7 @@
 	w_class = WEIGHT_CLASS_NORMAL
 	throw_speed = 2
 	throw_range = 4
-	flags_1 = CONDUCT_1
+	flags = CONDUCT
 	var/status = FALSE   //0 - not readied //1 - bomb finished with welder
 	var/obj/item/device/assembly_holder/bombassembly = null   //The first part of the bomb is an assembly holder, holding an igniter+some device
 	var/obj/item/weapon/tank/bombtank = null //the second part of the bomb is a plasma tank

code/modules/assembly/bomb.dm.rej

@@ -1,10 +0,0 @@
-diff a/code/modules/assembly/bomb.dm b/code/modules/assembly/bomb.dm	(rejected hunks)
-@@ -8,7 +8,7 @@
- 	w_class = WEIGHT_CLASS_NORMAL
- 	throw_speed = 2
- 	throw_range = 4
--	flags = CONDUCT
-+	flags_1 = CONDUCT_1
- 	var/status = FALSE   //0 - not readied //1 - bomb finished with welder
- 	var/obj/item/device/assembly_holder/bombassembly = null   //The first part of the bomb is an assembly holder, holding an igniter+some device
- 	var/obj/item/tank/bombtank = null //the second part of the bomb is a plasma tank

code/modules/assembly/holder.dm

@@ -5,7 +5,7 @@
 	item_state = "assembly"
 	lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
-	flags_1 = CONDUCT_1
+	flags = CONDUCT
 	throwforce = 5
 	w_class = WEIGHT_CLASS_SMALL
 	throw_speed = 2

code/modules/assembly/shock_kit.dm

@@ -6,7 +6,7 @@
 	var/obj/item/clothing/head/helmet/part1 = null
 	var/obj/item/device/electropack/part2 = null
 	w_class = WEIGHT_CLASS_HUGE
-	flags_1 = CONDUCT_1
+	flags = CONDUCT
 
 /obj/item/assembly/shock_kit/Destroy()
 	qdel(part1)

code/modules/assembly/voice.dm

@@ -4,7 +4,7 @@
 	icon_state = "voice"
 	materials = list(MAT_METAL=500, MAT_GLASS=50)
 	origin_tech = "magnets=1;engineering=1"
-	flags_1 = HEAR_1
+	flags = HEAR
 	attachable = 1
 	verb_say = "beeps"
 	verb_ask = "beeps"