mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-22 20:48:56 +01:00
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:
@@ -839,7 +839,7 @@
|
||||
/obj/item/modular_computer/deconstruct(disassembled = TRUE)
|
||||
remove_pai()
|
||||
eject_aicard()
|
||||
if(!(flags_1 & NODECONSTRUCT_1))
|
||||
if(!(obj_flags & NO_DECONSTRUCTION))
|
||||
if (disassembled)
|
||||
internal_cell?.forceMove(drop_location())
|
||||
computer_id_slot?.forceMove(drop_location())
|
||||
|
||||
@@ -134,7 +134,7 @@
|
||||
return ..()
|
||||
|
||||
/obj/machinery/modular_computer/attackby(obj/item/W as obj, mob/living/user)
|
||||
if (cpu && !user.combat_mode && !(flags_1 & NODECONSTRUCT_1))
|
||||
if (cpu && !user.combat_mode && !(obj_flags & NO_DECONSTRUCTION))
|
||||
return cpu.attackby(W, user)
|
||||
return ..()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user