Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MIRROR] Moves bitflag invokes of (~0) to the ALL macro #264

Merged
merged 1 commit into from
Oct 25, 2023
Merged

[MIRROR] Moves bitflag invokes of (~0) to the ALL macro #264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 code/__DEFINES/_globals.dm → code/__DEFINES/__globals.dm
View file
Open in desktop
File renamed without changes.
3 changes: 0 additions & 3 deletions code/__DEFINES/flags.dm → code/__DEFINES/_flags.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
/*
These defines are specific to the atom/flags_1 bitmask
*/
#define ALL (~0) //For convenience.
#define NONE 0

Expand Down
4 changes: 2 additions & 2 deletions code/__DEFINES/admin.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion code/__DEFINES/inventory.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion code/__DEFINES/modular_computer.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion code/__DEFINES/power.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
4 changes: 2 additions & 2 deletions tgstation.dme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
Loading