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,10 @@
+diff a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm	(rejected hunks)
+@@ -178,7 +178,7 @@
+ 	if(default_unfasten_wrench(user, I))
+ 		return
+ 
+-	if(istype(I, /obj/item/reagent_containers) && (I.container_type & OPENCONTAINER))
+	if(istype(I, /obj/item/reagent_containers) && (I.container_type & OPENCONTAINER_1))
+ 		var/obj/item/reagent_containers/B = I
+ 		. = 1 //no afterattack
+ 		if(beaker)
@@ -0,0 +1,10 @@
+diff a/code/modules/reagents/chemistry/machinery/chem_heater.dm b/code/modules/reagents/chemistry/machinery/chem_heater.dm	(rejected hunks)
+@@ -42,7 +42,7 @@
+ 	if(default_deconstruction_crowbar(I))
+ 		return
+ 
+-	if(istype(I, /obj/item/reagent_containers) && (I.container_type & OPENCONTAINER))
+	if(istype(I, /obj/item/reagent_containers) && (I.container_type & OPENCONTAINER_1))
+ 		. = 1 //no afterattack
+ 		if(beaker)
+ 			to_chat(user, "<span class='warning'>A beaker is already loaded into the machine!</span>")
@@ -0,0 +1,10 @@
+diff a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm	(rejected hunks)
+@@ -79,7 +79,7 @@
+ 	if(default_unfasten_wrench(user, I))
+ 		return
+ 
+-	if(istype(I, /obj/item/reagent_containers) && (I.container_type & OPENCONTAINER))
+	if(istype(I, /obj/item/reagent_containers) && (I.container_type & OPENCONTAINER_1))
+ 		. = 1 // no afterattack
+ 		if(panel_open)
+ 			to_chat(user, "<span class='warning'>You can't use the [src.name] while its panel is opened!</span>")
@@ -0,0 +1,10 @@
+diff a/code/modules/reagents/chemistry/machinery/pandemic.dm b/code/modules/reagents/chemistry/machinery/pandemic.dm	(rejected hunks)
+@@ -177,7 +177,7 @@
+ 			. = TRUE
+ 
+ /obj/machinery/computer/pandemic/attackby(obj/item/I, mob/user, params)
+-	if(istype(I, /obj/item/reagent_containers) && (I.container_type & OPENCONTAINER))
+	if(istype(I, /obj/item/reagent_containers) && (I.container_type & OPENCONTAINER_1))
+ 		. = TRUE //no afterattack
+ 		if(stat & (NOPOWER|BROKEN))
+ 			return
@@ -0,0 +1,10 @@
+diff a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm	(rejected hunks)
+@@ -116,7 +116,7 @@
+ 		if(default_unfasten_wrench(user, I))
+ 				return
+ 
+-		if (istype(I, /obj/item/reagent_containers) && (I.container_type & OPENCONTAINER) )
+		if (istype(I, /obj/item/reagent_containers) && (I.container_type & OPENCONTAINER_1) )
+ 				if (!beaker)
+ 						if(!user.drop_item())
+ 								return 1
@@ -0,0 +1,10 @@
+diff a/code/modules/reagents/reagent_containers/dropper.dm b/code/modules/reagents/reagent_containers/dropper.dm	(rejected hunks)
+@@ -6,7 +6,7 @@
+ 	amount_per_transfer_from_this = 5
+ 	possible_transfer_amounts = list(1, 2, 3, 4, 5)
+ 	volume = 5
+-	container_type = TRANSPARENT
+	container_type = TRANSPARENT_1
+ 
+ /obj/item/reagent_containers/dropper/afterattack(obj/target, mob/user , proximity)
+ 	if(!proximity) return
@@ -3,7 +3,7 @@
 	amount_per_transfer_from_this = 10
 	possible_transfer_amounts = list(5, 10, 15, 20, 25, 30, 50)
 	volume = 50
-	container_type = OPENCONTAINER
+	container_type = OPENCONTAINER_1
 	spillable = 1
 	resistance_flags = ACID_PROOF

@@ -240,7 +240,7 @@
 	amount_per_transfer_from_this = 20
 	possible_transfer_amounts = list(10,15,20,25,30,50,70)
 	volume = 70
-	flags = OPENCONTAINER
+	flags_1 = OPENCONTAINER_1
 	flags_inv = HIDEHAIR
 	slot_flags = SLOT_HEAD
 	resistance_flags = 0
@@ -0,0 +1,28 @@
+diff a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm	(rejected hunks)
+@@ -169,7 +169,7 @@
+ 	volume = 100
+ 	amount_per_transfer_from_this = 10
+ 	possible_transfer_amounts = list(5,10,15,20,25,30,50,100)
+-	flags = OPENCONTAINER
+	flags_1 = OPENCONTAINER_1
+ 
+ /obj/item/reagent_containers/glass/beaker/noreact
+ 	name = "cryostasis beaker"
+@@ -180,7 +180,7 @@
+ 	volume = 50
+ 	amount_per_transfer_from_this = 10
+ 	origin_tech = "materials=2;engineering=3;plasmatech=3"
+-	flags = OPENCONTAINER
+	flags_1 = OPENCONTAINER_1
+ 
+ /obj/item/reagent_containers/glass/beaker/noreact/Initialize()
+ 	. = ..()
+@@ -196,7 +196,7 @@
+ 	volume = 300
+ 	amount_per_transfer_from_this = 10
+ 	possible_transfer_amounts = list(5,10,15,20,25,30,50,100,300)
+-	flags = OPENCONTAINER
+	flags_1 = OPENCONTAINER_1
+ 	origin_tech = "bluespace=5;materials=4;plasmatech=4"
+ 
+ /obj/item/reagent_containers/glass/beaker/cryoxadone
@@ -10,7 +10,7 @@
 	volume = 30
 	possible_transfer_amounts = list()
 	resistance_flags = ACID_PROOF
-	container_type = OPENCONTAINER
+	container_type = OPENCONTAINER_1
 	slot_flags = SLOT_BELT
 	var/ignore_flags = 0
 	var/infinite = FALSE
@@ -0,0 +1,12 @@
+diff a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm	(rejected hunks)
+@@ -77,8 +77,8 @@
+ 	amount_per_transfer_from_this = 10
+ 	volume = 10
+ 	ignore_flags = 1 //so you can medipen through hardsuits
+-	container_type = DRAWABLE
+-	flags = null
+	container_type = DRAWABLE_1
+	flags_1 = null
+ 	list_reagents = list("epinephrine" = 10)
+ 
+ /obj/item/reagent_containers/hypospray/medipen/attack(mob/M, mob/user)
@@ -6,8 +6,8 @@
 	item_state = "cleaner"
 	lefthand_file = 'icons/mob/inhands/equipment/custodial_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/equipment/custodial_righthand.dmi'
-	flags = NOBLUDGEON
-	container_type = OPENCONTAINER
+	flags_1 = NOBLUDGEON_1
+	container_type = OPENCONTAINER_1
 	slot_flags = SLOT_BELT
 	throwforce = 0
 	w_class = WEIGHT_CLASS_SMALL
@@ -0,0 +1,10 @@
+diff a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm	(rejected hunks)
+@@ -16,7 +16,7 @@
+ 	var/busy = FALSE		// needed for delayed drawing of blood
+ 	var/proj_piercing = 0 //does it pierce through thick clothes when shot with syringe gun
+ 	materials = list(MAT_METAL=10, MAT_GLASS=20)
+-	container_type = TRANSPARENT
+	container_type = TRANSPARENT_1
+ 
+ /obj/item/reagent_containers/syringe/Initialize()
+ 	. = ..()
@@ -5,7 +5,7 @@
 	icon_state = "water"
 	density = TRUE
 	anchored = FALSE
-	container_type = DRAWABLE
+	container_type = DRAWABLE_1
 	pressure_resistance = 2*ONE_ATMOSPHERE
 	max_integrity = 300
 	var/tank_volume = 1000 //In units, how much the dispenser can hold
@@ -42,7 +42,7 @@
 	qdel(src)

 /obj/structure/reagent_dispensers/deconstruct(disassembled = TRUE)
-	if(!(flags & NODECONSTRUCT))
+	if(!(flags_1 & NODECONSTRUCT_1))
 		if(!disassembled)
 			boom()
 	else