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
@@ -8,7 +8,7 @@
 	icon_state = null
 	lefthand_file = 'icons/mob/inhands/misc/food_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/misc/food_righthand.dmi'
-	container_type = OPENCONTAINER
+	container_type = OPENCONTAINER_1
 	var/gulp_size = 5 //This is now officially broken ... need to think of a nice way to fix it.
 	possible_transfer_amounts = list(5,10,15,20,25,30,50)
 	volume = 50
@@ -119,8 +119,8 @@
 	materials = list(MAT_METAL=100)
 	possible_transfer_amounts = list()
 	volume = 5
-	flags = CONDUCT
-	container_type = OPENCONTAINER
+	flags_1 = CONDUCT_1
+	container_type = OPENCONTAINER_1
 	spillable = 1
 	resistance_flags = FIRE_PROOF

@@ -0,0 +1,10 @@
+diff a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm	(rejected hunks)
+@@ -357,7 +357,7 @@
+ /obj/item/reagent_containers/food/drinks/soda_cans/attack_self(mob/user)
+ 	if(!is_open_container())
+ 		to_chat(user, "You pull back the tab of \the [src] with a satisfying pop.") //Ahhhhhhhh
+-		container_type = OPENCONTAINER
+		container_type = OPENCONTAINER_1
+ 		playsound(src, "can_open", 50, 1)
+ 		spillable = TRUE
+ 		return
@@ -0,0 +1,10 @@
+diff a/code/modules/food_and_drinks/food.dm b/code/modules/food_and_drinks/food.dm	(rejected hunks)
+@@ -4,7 +4,7 @@
+ /obj/item/reagent_containers/food
+ 	possible_transfer_amounts = list()
+ 	volume = 50	//Sets the default container amount for all food items.
+-	container_type = INJECTABLE
+	container_type = INJECTABLE_1
+ 	resistance_flags = FLAMMABLE
+ 	var/foodtype = NONE
+ 	var/last_check_time
@@ -10,7 +10,7 @@
 	desc = "Just your average condiment container."
 	icon = 'icons/obj/food/containers.dmi'
 	icon_state = "emptycondiment"
-	container_type = OPENCONTAINER
+	container_type = OPENCONTAINER_1
 	possible_transfer_amounts = list(1, 5, 10, 15, 20, 25, 30, 50)
 	volume = 50
 	//Possible_states has the reagent id as key and a list of, in order, the icon_state, the name and the desc as values. Used in the on_reagent_change() to change names, descs and sprites.
@@ -283,7 +283,7 @@
 	desc = "A simple bowl, used for soups and salads."
 	icon = 'icons/obj/food/soupsalad.dmi'
 	icon_state = "bowl"
-	container_type = OPENCONTAINER
+	container_type = OPENCONTAINER_1
 	materials = list(MAT_GLASS = 500)
 	w_class = WEIGHT_CLASS_NORMAL

@@ -0,0 +1,10 @@
+diff a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm	(rejected hunks)
+@@ -15,7 +15,7 @@ insert ascii eagle on american flag background here
+ 	anchored = TRUE
+ 	use_power = IDLE_POWER_USE
+ 	idle_power_usage = 5
+-	container_type = OPENCONTAINER
+	container_type = OPENCONTAINER_1
+ 	var/obj/item/frying = null	//What's being fried RIGHT NOW?
+ 	var/cook_time = 0
+ 	var/static/list/deepfry_blacklisted_items = typecacheof(list(
@@ -157,7 +157,7 @@
 	return

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

@@ -0,0 +1,10 @@
+diff a/code/modules/food_and_drinks/kitchen_machinery/food_cart.dm b/code/modules/food_and_drinks/kitchen_machinery/food_cart.dm	(rejected hunks)
+@@ -15,7 +15,7 @@
+ 	var/portion = 10
+ 	var/selected_drink
+ 	var/list/stored_food = list()
+-	container_type = OPENCONTAINER
+	container_type = OPENCONTAINER_1
+ 	var/obj/item/reagent_containers/mixer
+ 
+ /obj/machinery/food_cart/Initialize()
@@ -220,7 +220,7 @@
 	name = "[M.name] icecream"

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

@@ -0,0 +1,10 @@
+diff a/code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm b/code/modules/food_and_drinks/kitchen_machinery/icecream_vat.dm	(rejected hunks)
+@@ -14,7 +14,7 @@
+ 	anchored = FALSE
+ 	use_power = NO_POWER_USE
+ 	layer = BELOW_OBJ_LAYER
+-	container_type = OPENCONTAINER
+	container_type = OPENCONTAINER_1
+ 	max_integrity = 300
+ 	var/list/product_types = list()
+ 	var/dispense_flavour = ICECREAM_VANILLA
@@ -91,7 +91,7 @@
 				src.icon_state = "mw"
 				src.broken = 0 // Fix it!
 				src.dirty = 0 // just to be sure
-				src.container_type = OPENCONTAINER
+				src.container_type = OPENCONTAINER_1
 				return 0 //to use some fuel
 		else
 			to_chat(user, "<span class='warning'>It's broken!</span>")
@@ -108,7 +108,7 @@
 			src.dirty = 0 // It's clean!
 			src.broken = 0 // just to be sure
 			src.icon_state = "mw"
-			src.container_type = OPENCONTAINER
+			src.container_type = OPENCONTAINER_1
 			src.updateUsrDialog()
 			return 1 // Disables the after-attack so we don't spray the floor/user.
 		else
@@ -129,7 +129,7 @@
 			src.dirty = 0 // It's clean!
 			src.broken = 0 // just to be sure
 			src.icon_state = "mw"
-			src.container_type = OPENCONTAINER
+			src.container_type = OPENCONTAINER_1

 	else if(src.dirty==100) // The microwave is all dirty so can't be used!
 		to_chat(user, "<span class='warning'>It's dirty!</span>")
@@ -321,7 +321,7 @@
 	icon_state = "mwb" // Make it look all busted up and shit
 	visible_message("<span class='warning'>The microwave breaks!</span>") //Let them know they're stupid
 	broken = 2 // Make it broken so it can't be used util fixed
-	flags = null //So you can't add condiments
+	flags_1 = null //So you can't add condiments
 	operating = FALSE // Turn it off again aferwards
 	updateUsrDialog()