mirror of
https://github.com/Skyrat-SS13/Skyrat-tg.git
synced 2026-08-27 06:48:24 +01:00
[MIRROR] Scopes NODECONSTRUCT_1 from flags_1 to obj_flags [MDB IGNORE] (#25496)
* Scopes `NODECONSTRUCT_1` from `flags_1` to `obj_flags` * Update bitfields.dm * Modular * Update rack.dm --------- Co-authored-by: san7890 <the@san7890.com> Co-authored-by: Giz <13398309+vinylspiders@users.noreply.github.com>
This commit is contained in:
@@ -294,12 +294,12 @@ GLOBAL_LIST_INIT(typecache_holodeck_linked_floorcheck_ok, typecacheof(list(/turf
|
||||
holo_object.resistance_flags = LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
|
||||
|
||||
if(isstructure(holo_object))
|
||||
holo_object.flags_1 |= NODECONSTRUCT_1
|
||||
holo_object.obj_flags |= NO_DECONSTRUCTION
|
||||
return
|
||||
|
||||
if(ismachinery(holo_object))
|
||||
var/obj/machinery/holo_machine = holo_object
|
||||
holo_machine.flags_1 |= NODECONSTRUCT_1
|
||||
holo_machine.obj_flags |= NO_DECONSTRUCTION
|
||||
holo_machine.power_change()
|
||||
|
||||
if(istype(holo_machine, /obj/machinery/button))
|
||||
|
||||
@@ -49,7 +49,8 @@
|
||||
var/static/banned_books = list(/obj/item/book/manual/random, /obj/item/book/manual/nuclear, /obj/item/book/manual/wiki)
|
||||
var/newtype = pick(subtypesof(/obj/item/book/manual) - banned_books)
|
||||
var/obj/item/book/manual/to_spawn = new newtype(loc)
|
||||
to_spawn.flags_1 |= (HOLOGRAM_1 | NODECONSTRUCT_1)
|
||||
to_spawn.flags_1 |= HOLOGRAM_1
|
||||
to_spawn.obj_flags |= NO_DECONSTRUCTION
|
||||
return to_spawn
|
||||
|
||||
/obj/effect/holodeck_effect/mobspawner
|
||||
|
||||
@@ -135,7 +135,7 @@
|
||||
eventstarted = TRUE
|
||||
|
||||
for(var/obj/structure/window/W in currentarea)
|
||||
if(W.flags_1&NODECONSTRUCT_1) // Just in case: only holo-windows
|
||||
if(W.obj_flags & NO_DECONSTRUCTION) // Just in case: only holo-windows
|
||||
qdel(W)
|
||||
|
||||
for(var/mob/M in currentarea)
|
||||
|
||||
Reference in New Issue
Block a user