mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-25 14:08:31 +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:
@@ -5,7 +5,7 @@
|
||||
icon_state = "beacon_active"
|
||||
base_icon_state = "beacon"
|
||||
density = TRUE
|
||||
flags_1 = NODECONSTRUCT_1
|
||||
obj_flags = NO_DECONSTRUCTION
|
||||
|
||||
/// Locked beacons cannot be jumped to by ships.
|
||||
var/locked = FALSE
|
||||
|
||||
@@ -79,7 +79,7 @@
|
||||
var/obj/machinery/power/emitter/energycannon/magical/our_statue
|
||||
var/list/mob/living/sleepers = list()
|
||||
var/never_spoken = TRUE
|
||||
flags_1 = NODECONSTRUCT_1
|
||||
obj_flags = NO_DECONSTRUCTION
|
||||
|
||||
/obj/structure/table/abductor/wabbajack/Initialize(mapload)
|
||||
. = ..()
|
||||
@@ -201,7 +201,7 @@
|
||||
|
||||
/obj/structure/table/wood/shuttle_bar
|
||||
resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF
|
||||
flags_1 = NODECONSTRUCT_1
|
||||
obj_flags = NO_DECONSTRUCTION
|
||||
max_integrity = 1000
|
||||
var/boot_dir = 1
|
||||
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
shuttleId = "syndicate"
|
||||
possible_destinations = "syndicate_away;syndicate_z5;syndicate_ne;syndicate_nw;syndicate_n;syndicate_se;syndicate_sw;syndicate_s;syndicate_custom"
|
||||
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
|
||||
flags_1 = NODECONSTRUCT_1
|
||||
obj_flags = NO_DECONSTRUCTION
|
||||
|
||||
/obj/machinery/computer/shuttle/syndicate/launch_check(mob/user)
|
||||
. = ..()
|
||||
|
||||
Reference in New Issue
Block a user