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
@@ -82,7 +82,7 @@
. = ..()
/obj/structure/destructible/clockwork/massive/celestial_gateway/deconstruct(disassembled = TRUE)
if(!(flags_1 & NODECONSTRUCT_1))
if(!(flags & NODECONSTRUCT))
if(!disassembled)
resistance_flags |= INDESTRUCTIBLE
countdown.stop()
@@ -126,7 +126,7 @@
desc = "A flickering ring preventing you from holding items."
icon = 'icons/effects/clockwork_effects.dmi'
icon_state = "geisbinding_full"
flags_1 = NODROP_1|ABSTRACT_1|DROPDEL_1
flags = NODROP|ABSTRACT|DROPDEL
/obj/item/geis_binding/pre_attackby(atom/target, mob/living/user, params)
return FALSE
@@ -70,6 +70,6 @@
return ..()
/obj/structure/destructible/clockwork/wall_gear/deconstruct(disassembled = TRUE)
if(!(flags_1 & NODECONSTRUCT_1) && disassembled)
if(!(flags & NODECONSTRUCT) && disassembled)
new /obj/item/stack/tile/brass(loc, 3)
return ..()