diff --git a/code/_globalvars/bitfields/declarations.dm b/code/_globalvars/bitfields/declarations.dm index 2f56a6cb1816..c035da59e1da 100644 --- a/code/_globalvars/bitfields/declarations.dm +++ b/code/_globalvars/bitfields/declarations.dm @@ -30,39 +30,29 @@ DEFINE_BITFIELD(datum_flags, list( "DF_USE_TAG" = DF_USE_TAG, )) -DEFINE_BITFIELD(pass_flags, list( - "PASSTABLE" = PASSTABLE, - "PASSGLASS" = PASSGLASS, - "PASSGRILLE" = PASSGRILLE, - "PASSBLOB" = PASSBLOB, - "PASSMOB" = PASSMOB, - "LETPASSTHROW" = LETPASSTHROW, - "PASSMACHINE" = PASSMACHINE, - "PASSSTRUCTURE" = PASSSTRUCTURE, - "PASSFLAPS" = PASSFLAPS, - "PASSFENCE" = PASSFENCE, - "PASSDOOR" = PASSDOOR, - "PASSVEHICLE" = PASSVEHICLE, - "PASSITEM" = PASSITEM, - "LETPASSCLICKS" = LETPASSCLICKS, -)) +#define PASS_FLAGS_LIST list( \ + "PASSTABLE" = PASSTABLE, \ + "PASSGLASS" = PASSGLASS, \ + "PASSGRILLE" = PASSGRILLE, \ + "PASSBLOB" = PASSBLOB, \ + "PASSMOB" = PASSMOB, \ + "LETPASSTHROW" = LETPASSTHROW, \ + "PASSMACHINE" = PASSMACHINE, \ + "PASSSTRUCTURE" = PASSSTRUCTURE, \ + "PASSFLAPS" = PASSFLAPS, \ + "PASSFENCE" = PASSFENCE, \ + "PASSDOOR" = PASSDOOR, \ + "PASSVEHICLE" = PASSVEHICLE, \ + "PASSITEM" = PASSITEM, \ + "PASSPROJECTILE" = PASSPROJECTILE, \ + "LETPASSCLICKS" = LETPASSCLICKS, \ +) -DEFINE_BITFIELD(pass_flags_self, list( - "PASSTABLE" = PASSTABLE, - "PASSGLASS" = PASSGLASS, - "PASSGRILLE" = PASSGRILLE, - "PASSBLOB" = PASSBLOB, - "PASSMOB" = PASSMOB, - "LETPASSTHROW" = LETPASSTHROW, - "PASSMACHINE" = PASSMACHINE, - "PASSSTRUCTURE" = PASSSTRUCTURE, - "PASSFLAPS" = PASSFLAPS, - "PASSFENCE" = PASSFENCE, - "PASSDOOR" = PASSDOOR, - "PASSVEHICLE" = PASSVEHICLE, - "PASSITEM" = PASSITEM, - "LETPASSCLICKS" = LETPASSCLICKS, -)) +DEFINE_BITFIELD(pass_flags, PASS_FLAGS_LIST) + +DEFINE_BITFIELD(pass_flags_self, PASS_FLAGS_LIST) + +#undef PASS_FLAGS_LIST DEFINE_BITFIELD(gas_type, list( "LINDA_SPAWN_HEAT" = LINDA_SPAWN_HEAT,