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
This commit is contained in:
kevinz000
2017-08-22 04:04:21 -07:00
committed by GitHub
parent 15b378ddf4
commit 6a309b5996
536 changed files with 1489 additions and 2474 deletions
+2 -2
View File
@@ -83,7 +83,7 @@
update_icon()
/obj/structure/fireaxecabinet/obj_break(damage_flag)
if(!broken && !(flags_1 & NODECONSTRUCT_1))
if(!broken && !(flags & NODECONSTRUCT))
update_icon()
broken = TRUE
playsound(src, 'sound/effects/glassbr3.ogg', 100, 1)
@@ -91,7 +91,7 @@
new /obj/item/weapon/shard(loc)
/obj/structure/fireaxecabinet/deconstruct(disassembled = TRUE)
if(!(flags_1 & NODECONSTRUCT_1))
if(!(flags & NODECONSTRUCT))
if(fireaxe && loc)
fireaxe.forceMove(loc)
fireaxe = null