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:
@@ -100,7 +100,7 @@ GLOBAL_LIST_INIT(marker_beacon_colors, sort_list(list(
|
||||
update_appearance()
|
||||
|
||||
/obj/structure/marker_beacon/deconstruct(disassembled = TRUE)
|
||||
if(!(flags_1 & NODECONSTRUCT_1))
|
||||
if(!(obj_flags & NO_DECONSTRUCTION))
|
||||
var/obj/item/stack/marker_beacon/M = new(loc)
|
||||
M.picked_color = picked_color
|
||||
M.update_appearance()
|
||||
|
||||
@@ -164,7 +164,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/window/reinforced/survival_pod/spawne
|
||||
|
||||
/obj/item/gps/computer/wrench_act(mob/living/user, obj/item/I)
|
||||
..()
|
||||
if(flags_1 & NODECONSTRUCT_1)
|
||||
if(obj_flags & NO_DECONSTRUCTION)
|
||||
return TRUE
|
||||
|
||||
user.visible_message(span_warning("[user] disassembles [src]."),
|
||||
@@ -201,7 +201,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/window/reinforced/survival_pod/spawne
|
||||
light_color = COLOR_VERY_PALE_LIME_GREEN
|
||||
max_n_of_items = 10
|
||||
pixel_y = -4
|
||||
flags_1 = NODECONSTRUCT_1
|
||||
obj_flags = NO_DECONSTRUCTION
|
||||
|
||||
/obj/machinery/smartfridge/survival_pod/Initialize(mapload)
|
||||
AddElement(/datum/element/update_icon_blocker)
|
||||
|
||||
Reference in New Issue
Block a user