From 42deb719282e0cbbd88eac2fb1a7f9702f46643d Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Tue, 24 Oct 2023 22:02:01 +0200 Subject: [PATCH] [MIRROR] Moves bitflag invokes of `(~0)` to the `ALL` macro [MDB IGNORE] (#24539) * Moves bitflag invokes of `(~0)` to the `ALL` macro * Update admin.dm * Update admin.dm --------- Co-authored-by: san7890 Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com> --- code/__DEFINES/{_globals.dm => __globals.dm} | 0 code/__DEFINES/{flags.dm => _flags.dm} | 3 --- code/__DEFINES/admin.dm | 4 ++-- code/__DEFINES/inventory.dm | 2 +- code/__DEFINES/modular_computer.dm | 2 +- code/__DEFINES/power.dm | 2 +- tgstation.dme | 4 ++-- 7 files changed, 7 insertions(+), 10 deletions(-) rename code/__DEFINES/{_globals.dm => __globals.dm} (100%) rename code/__DEFINES/{flags.dm => _flags.dm} (99%) diff --git a/code/__DEFINES/_globals.dm b/code/__DEFINES/__globals.dm similarity index 100% rename from code/__DEFINES/_globals.dm rename to code/__DEFINES/__globals.dm diff --git a/code/__DEFINES/flags.dm b/code/__DEFINES/_flags.dm similarity index 99% rename from code/__DEFINES/flags.dm rename to code/__DEFINES/_flags.dm index 81d21d10c18..e0b88066d7d 100644 --- a/code/__DEFINES/flags.dm +++ b/code/__DEFINES/_flags.dm @@ -1,6 +1,3 @@ -/* - These defines are specific to the atom/flags_1 bitmask -*/ #define ALL (~0) //For convenience. #define NONE 0 diff --git a/code/__DEFINES/admin.dm b/code/__DEFINES/admin.dm index 1c5e79377b8..ad497a4f718 100644 --- a/code/__DEFINES/admin.dm +++ b/code/__DEFINES/admin.dm @@ -10,7 +10,7 @@ // Skyrat Edit Addition - Mute LOOC #define MUTE_LOOC (1<<6) // Skyrat Edit End -#define MUTE_ALL (~0) +#define MUTE_ALL ALL //Some constants for DB_Ban #define BANTYPE_PERMA 1 @@ -137,7 +137,7 @@ #define BROWSE_ROOT_CURRENT_LOGS 2 // allowed ghost roles this round, starts as everything allowed -GLOBAL_VAR_INIT(ghost_role_flags, (~0)) +GLOBAL_VAR_INIT(ghost_role_flags, ALL) //Flags that control what ways ghosts can get back into the round //ie fugitives, space dragon, etc. also includes dynamic midrounds as it's the same deal diff --git a/code/__DEFINES/inventory.dm b/code/__DEFINES/inventory.dm index 542a909c2e9..5bf9fd6d807 100644 --- a/code/__DEFINES/inventory.dm +++ b/code/__DEFINES/inventory.dm @@ -118,7 +118,7 @@ #define HAND_RIGHT (1<<10) #define HANDS (HAND_LEFT | HAND_RIGHT) #define NECK (1<<11) -#define FULL_BODY (~0) +#define FULL_BODY ALL //defines for the index of hands #define LEFT_HANDS 1 diff --git a/code/__DEFINES/modular_computer.dm b/code/__DEFINES/modular_computer.dm index 001722eb2dd..1c9f3b59ecd 100644 --- a/code/__DEFINES/modular_computer.dm +++ b/code/__DEFINES/modular_computer.dm @@ -5,7 +5,7 @@ #define MIN_NTNET_LOGS 10 //Program bitflags -#define PROGRAM_ALL (~0) +#define PROGRAM_ALL ALL #define PROGRAM_CONSOLE (1<<0) #define PROGRAM_LAPTOP (1<<1) #define PROGRAM_TABLET (1<<2) diff --git a/code/__DEFINES/power.dm b/code/__DEFINES/power.dm index 804647b2eaf..65c83dd6545 100644 --- a/code/__DEFINES/power.dm +++ b/code/__DEFINES/power.dm @@ -1,4 +1,4 @@ -#define CABLE_LAYER_ALL (~0) +#define CABLE_LAYER_ALL ALL #define CABLE_LAYER_1 (1<<0) #define CABLE_LAYER_1_NAME "Red Power Line" #define CABLE_LAYER_2 (1<<1) diff --git a/tgstation.dme b/tgstation.dme index e41e7a7e8de..79aee0a56b4 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -17,10 +17,11 @@ #include "code\_compile_options.dm" #include "code\_experiments.dm" #include "code\world.dm" +#include "code\__DEFINES\__globals.dm" #include "code\__DEFINES\_atoms.dm" #include "code\__DEFINES\_bitfields.dm" #include "code\__DEFINES\_click.dm" -#include "code\__DEFINES\_globals.dm" +#include "code\__DEFINES\_flags.dm" #include "code\__DEFINES\_helpers.dm" #include "code\__DEFINES\_protect.dm" #include "code\__DEFINES\_tick.dm" @@ -92,7 +93,6 @@ #include "code\__DEFINES\fantasy_affixes.dm" #include "code\__DEFINES\firealarm.dm" #include "code\__DEFINES\fish.dm" -#include "code\__DEFINES\flags.dm" #include "code\__DEFINES\flora.dm" #include "code\__DEFINES\font_awesome_icons.dm" #include "code\__DEFINES\fonts.dm"