Scopes NODECONSTRUCT_1 from flags_1 to obj_flags (#80104)

This flag only worked on the `/obj/structure` and `/obj/machinery`
level, so let's rescope it from `flags_1` and put it where it belongs -
`obj_flags`.
Bitflag operators should be scoped to their subtype specific bitfield,
not really useful to have this take up a spot on the `/atom` level if
absolutely nothing other than `/obj`s use it.
This commit is contained in:
san7890
2023-12-08 08:49:14 +00:00
committed by GitHub
parent bf94b4433b
commit 5ce9d5806d
116 changed files with 206 additions and 209 deletions
+1 -1
View File
@@ -38,7 +38,7 @@
I.forceMove(src)
/obj/structure/filingcabinet/deconstruct(disassembled = TRUE)
if(!(flags_1 & NODECONSTRUCT_1))
if(!(obj_flags & NO_DECONSTRUCTION))
new /obj/item/stack/sheet/iron(loc, 2)
for(var/obj/item/I in src)
I.forceMove(loc)
+1 -1
View File
@@ -40,7 +40,7 @@
return ..()
/obj/machinery/ticket_machine/deconstruct(disassembled = TRUE)
if(!(flags_1 & NODECONSTRUCT_1))
if(!(obj_flags & NO_DECONSTRUCTION))
new /obj/item/wallframe/ticket_machine(loc)
qdel(src)