Replace all secondary flags with bitflags stored in the flags_2 var
This commit is contained in:
@@ -36,7 +36,7 @@ GLOBAL_LIST_INIT(duplicate_forbidden_vars,list("tag","area","type","loc","locs",
|
||||
M.power_change()
|
||||
|
||||
if(holoitem)
|
||||
SET_SECONDARY_FLAG(O, HOLOGRAM)
|
||||
O.flags_2 |= HOLOGRAM_2
|
||||
return O
|
||||
|
||||
|
||||
|
||||
@@ -247,9 +247,9 @@
|
||||
// this is an exercise left to others I'm afraid. -Sayu
|
||||
spawned = A.copy_contents_to(linked, 1, nerf_weapons = !emagged)
|
||||
for(var/obj/machinery/M in spawned)
|
||||
M.flags |= NODECONSTRUCT
|
||||
M.flags_1 |= NODECONSTRUCT_1
|
||||
for(var/obj/structure/S in spawned)
|
||||
S.flags |= NODECONSTRUCT
|
||||
S.flags_1 |= NODECONSTRUCT_1
|
||||
effects = list()
|
||||
|
||||
addtimer(CALLBACK(src, .proc/finish_spawn), 30)
|
||||
@@ -264,9 +264,9 @@
|
||||
spawned += x // holocarp are not forever
|
||||
added += x
|
||||
for(var/obj/machinery/M in added)
|
||||
M.flags |= NODECONSTRUCT
|
||||
M.flags_1 |= NODECONSTRUCT_1
|
||||
for(var/obj/structure/S in added)
|
||||
S.flags |= NODECONSTRUCT
|
||||
S.flags_1 |= NODECONSTRUCT_1
|
||||
|
||||
/obj/machinery/computer/holodeck/proc/derez(obj/O, silent = TRUE, forced = FALSE)
|
||||
// Emagging a machine creates an anomaly in the derez systems.
|
||||
|
||||
@@ -204,7 +204,7 @@
|
||||
eventstarted = TRUE
|
||||
|
||||
for(var/obj/structure/window/W in currentarea)
|
||||
if(W.flags&NODECONSTRUCT) // Just in case: only holo-windows
|
||||
if(W.flags_1&NODECONSTRUCT_1) // Just in case: only holo-windows
|
||||
qdel(W)
|
||||
|
||||
for(var/mob/M in currentarea)
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
thermal_conductivity = 0
|
||||
broken_states = list("engine")
|
||||
burnt_states = list("engine")
|
||||
flags = NONE
|
||||
flags_1 = NONE
|
||||
|
||||
/turf/open/floor/holofloor/attackby(obj/item/I, mob/living/user)
|
||||
return // HOLOFLOOR DOES NOT GIVE A FUCK
|
||||
|
||||
Reference in New Issue
Block a user