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
@@ -734,7 +734,7 @@
 	update_icon()

 /obj/machinery/airalarm/deconstruct(disassembled = TRUE)
-	if(!(flags_1 & NODECONSTRUCT_1))
+	if(!(flags & NODECONSTRUCT))
 		new /obj/item/stack/sheet/metal(loc, 2)
 		var/obj/item/I = new /obj/item/weapon/electronics/airalarm(loc)
 		if(!disassembled)
@@ -1,10 +0,0 @@
-diff a/code/modules/atmospherics/machinery/airalarm.dm b/code/modules/atmospherics/machinery/airalarm.dm	(rejected hunks)
-@@ -734,7 +734,7 @@
- 	update_icon()
- 
- /obj/machinery/airalarm/deconstruct(disassembled = TRUE)
-	if(!(flags & NODECONSTRUCT))
-+	if(!(flags_1 & NODECONSTRUCT_1))
- 		new /obj/item/stack/sheet/metal(loc, 2)
- 		var/obj/item/I = new /obj/item/electronics/airalarm(loc)
- 		if(!disassembled)
@@ -186,7 +186,7 @@ Pipelines + Other Objects -> Pipe network
 	user.throw_at(target, range, speed)

 /obj/machinery/atmospherics/deconstruct(disassembled = TRUE)
-	if(!(flags_1 & NODECONSTRUCT_1))
+	if(!(flags & NODECONSTRUCT))
 		if(can_unwrench)
 			var/obj/item/pipe/stored = new(loc, make_from=src)
 			if(!disassembled)
@@ -257,7 +257,7 @@
 	return 1


-//There is no easy way for an object to be notified of changes to atmos can pass flags_1
+//There is no easy way for an object to be notified of changes to atmos can pass flags
 //	So we check every machinery process (2 seconds)
 /obj/machinery/atmospherics/components/unary/vent_scrubber/process()
 	if (widenet)
@@ -247,7 +247,7 @@


 /obj/machinery/portable_atmospherics/canister/deconstruct(disassembled = TRUE)
-	if(!(flags_1 & NODECONSTRUCT_1))
+	if(!(flags & NODECONSTRUCT))
 		if(!(stat & BROKEN))
 			canister_break()
 		if(disassembled)
@@ -273,7 +273,7 @@
 		return ..()

 /obj/machinery/portable_atmospherics/canister/obj_break(damage_flag)
-	if((flags_1 & BROKEN) || (flags_1 & NODECONSTRUCT_1))
+	if((stat & BROKEN) || (flags & NODECONSTRUCT))
 		return
 	canister_break()