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/paperwork/contract.dm b/code/modules/paperwork/contract.dm	(rejected hunks)
+@@ -5,7 +5,7 @@
+ 	throw_speed = 3
+ 	var/signed = FALSE
+ 	var/datum/mind/target
+-	flags = NOBLUDGEON
+	flags_1 = NOBLUDGEON_1
+ 
+ /obj/item/paper/contract/proc/update_text()
+ 	return
@@ -39,7 +39,7 @@
 				I.loc = src

 /obj/structure/filingcabinet/deconstruct(disassembled = TRUE)
-	if(!(flags & NODECONSTRUCT))
+	if(!(flags_1 & NODECONSTRUCT_1))
 		new /obj/item/stack/sheet/metal(loc, 2)
 		for(var/obj/item/I in src)
 			I.forceMove(loc)
@@ -18,7 +18,7 @@
 	pixel_x = rand(-9, 9)
 	if(newPaper)
 		internalPaper = newPaper
-		flags = newPaper.flags
+		flags_1 = newPaper.flags_1
 		color = newPaper.color
 		newPaper.forceMove(src)
 	else
@@ -0,0 +1,10 @@
+diff a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm	(rejected hunks)
+@@ -168,7 +168,7 @@
+  */
+ /obj/item/pen/sleepy
+ 	origin_tech = "engineering=4;syndicate=2"
+-	container_type = OPENCONTAINER
+	container_type = OPENCONTAINER_1
+ 
+ 
+ /obj/item/pen/sleepy/attack(mob/living/M, mob/user)
@@ -314,7 +314,7 @@
 		return ..()

 /obj/machinery/photocopier/obj_break(damage_flag)
-	if(!(flags & NODECONSTRUCT))
+	if(!(flags_1 & NODECONSTRUCT_1))
 		if(toner > 0)
 			new /obj/effect/decal/cleanable/oil(get_turf(src))
 			toner = 0
@@ -111,7 +111,7 @@
 	lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
 	w_class = WEIGHT_CLASS_SMALL
-	flags = CONDUCT
+	flags_1 = CONDUCT_1
 	slot_flags = SLOT_BELT
 	materials = list(MAT_METAL=2000)
 	var/pictures_max = 10
@@ -602,7 +602,7 @@
 		add_overlay(getFlatIcon(framed))

 /obj/structure/sign/picture_frame/deconstruct(disassembled = TRUE)
-	if(!(flags & NODECONSTRUCT))
+	if(!(flags_1 & NODECONSTRUCT_1))
 		var/obj/item/wallframe/picture/F = new /obj/item/wallframe/picture(loc)
 		if(framed)
 			F.displayed = framed
@@ -0,0 +1,10 @@
+diff a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm	(rejected hunks)
+@@ -497,7 +497,7 @@
+ 	desc = "The perfect showcase for your favorite deathtrap memories."
+ 	icon = 'icons/obj/decals.dmi'
+ 	materials = list()
+-	flags = 0
+	flags_1 = 0
+ 	icon_state = "frame-empty"
+ 	result_path = /obj/structure/sign/picture_frame
+ 	var/obj/item/photo/displayed