From d14970a350175afef430d21a062159d913dac1d0 Mon Sep 17 00:00:00 2001 From: Charlie Nolan Date: Tue, 19 Mar 2024 05:16:23 -0700 Subject: [PATCH] More bitflag cleanup (#24531) * Convert a few more bitflags that weren't bit-shifting. * Update a few comments around bitflags. * Add some parentheses around bitflag combination defines. * Fix some whitespace consistency issues, mostly with bitflags. --- code/__DEFINES/MC.dm | 14 ++-- code/__DEFINES/admin_defines.dm | 3 +- code/__DEFINES/clothing_defines.dm | 2 +- code/__DEFINES/combat_defines.dm | 12 ++-- code/__DEFINES/flags.dm | 72 +++++++++---------- code/__DEFINES/machines.dm | 18 ++--- code/__DEFINES/misc_defines.dm | 18 ++--- code/__DEFINES/reagents_defines.dm | 12 ++-- code/__DEFINES/subsystems.dm | 16 ++--- code/datums/diseases/_disease.dm | 14 ++-- .../machinery/computer/atmos_controllers.dm | 14 ++-- code/modules/power/apc/apc_overlay.dm | 42 +++++------ .../procedural_mapping/mapGenerator.dm | 1 - 13 files changed, 118 insertions(+), 120 deletions(-) diff --git a/code/__DEFINES/MC.dm b/code/__DEFINES/MC.dm index d790cd095d9..05d92a11ee1 100644 --- a/code/__DEFINES/MC.dm +++ b/code/__DEFINES/MC.dm @@ -34,34 +34,34 @@ //SubSystem flags (Please design any new flags so that the default is off, to make adding flags to subsystems easier) //subsystem does not initialize. -#define SS_NO_INIT 1 +#define SS_NO_INIT (1<<0) //subsystem does not fire. // (like can_fire = 0, but keeps it from getting added to the processing subsystems list) // (Requires a MC restart to change) -#define SS_NO_FIRE 2 +#define SS_NO_FIRE (1<<1) /** Subsystem only runs on spare cpu (after all non-background subsystems have ran that tick) */ /// SS_BACKGROUND has its own priority bracket, this overrides SS_TICKER's priority bump -#define SS_BACKGROUND 4 +#define SS_BACKGROUND (1<<2) //subsystem does not tick check, and should not run unless there is enough time (or its running behind (unless background)) -#define SS_NO_TICK_CHECK 8 +#define SS_NO_TICK_CHECK (1<<3) //Treat wait as a tick count, not DS, run every wait ticks. /// (also forces it to run first in the tick (unless SS_BACKGROUND)) // (implies all runlevels because of how it works) // This is designed for basically anything that works as a mini-mc (like SStimer) -#define SS_TICKER 16 +#define SS_TICKER (1<<4) //keep the subsystem's timing on point by firing early if it fired late last fire because of lag // ie: if a 20ds subsystem fires say 5 ds late due to lag or what not, its next fire would be in 15ds, not 20ds. -#define SS_KEEP_TIMING 32 +#define SS_KEEP_TIMING (1<<5) //Calculate its next fire after its fired. // (IE: if a 5ds wait SS takes 2ds to run, its next fire should be 5ds away, not 3ds like it normally would be) // This flag overrides SS_KEEP_TIMING -#define SS_POST_FIRE_TIMING 64 +#define SS_POST_FIRE_TIMING (1<<6) //SUBSYSTEM STATES #define SS_IDLE 0 //aint doing shit. diff --git a/code/__DEFINES/admin_defines.dm b/code/__DEFINES/admin_defines.dm index 77c7d732d66..86805b43bc5 100644 --- a/code/__DEFINES/admin_defines.dm +++ b/code/__DEFINES/admin_defines.dm @@ -1,6 +1,4 @@ //A set of constants used to determine which type of mute an admin wishes to apply: -//Please read and understand the muting/automuting stuff before changing these. MUTE_IC_AUTO etc = (MUTE_IC << 1) -//Therefore there needs to be a gap between the flags for the automute flags #define MUTE_IC (1<<0) #define MUTE_OOC (1<<1) #define MUTE_PRAY (1<<2) @@ -42,6 +40,7 @@ #define R_PROCCALL (1<<15) #define R_VIEWRUNTIMES (1<<16) #define R_MAINTAINER (1<<17) +// Update the following two defines if you add more #define R_MAXPERMISSION (1<<17) //This holds the maximum value for a permission. It is used in iteration, so keep it updated. diff --git a/code/__DEFINES/clothing_defines.dm b/code/__DEFINES/clothing_defines.dm index 44b80437836..ed5a97ea16c 100644 --- a/code/__DEFINES/clothing_defines.dm +++ b/code/__DEFINES/clothing_defines.dm @@ -64,7 +64,7 @@ #define HANDS (HAND_LEFT | HAND_RIGHT) #define FULL_BODY ((1<<11)-1) //10 bit bitmask, update me if we ever add more clothing parts. -// bitflags for the percentual amount of protection a piece of clothing which covers the body part offers. +// the percentual amount of protection a piece of clothing which covers the body part offers. // Used with human/proc/get_heat_protection() and human/proc/get_cold_protection() // The values here should add up to 1. // Hands and feet have 2.5%, arms and legs 7.5%, each of the torso parts has 15% and the head has 30% diff --git a/code/__DEFINES/combat_defines.dm b/code/__DEFINES/combat_defines.dm index 2a39c4bb769..514698f62d8 100644 --- a/code/__DEFINES/combat_defines.dm +++ b/code/__DEFINES/combat_defines.dm @@ -36,12 +36,12 @@ #define SECONDS_TO_JITTER SECONDS_TO_LIFE_CYCLES*3 //I hate adding defines like this but I'd much rather deal with bitflags than lists and string searches -#define BRUTELOSS (1<<0) -#define FIRELOSS (1<<1) -#define TOXLOSS (1<<2) -#define OXYLOSS (1<<3) -#define SHAME (1<<4) -#define OBLITERATION (1<<5) +#define BRUTELOSS (1<<0) +#define FIRELOSS (1<<1) +#define TOXLOSS (1<<2) +#define OXYLOSS (1<<3) +#define SHAME (1<<4) +#define OBLITERATION (1<<5) //Bitflags defining which status effects could be or are inflicted on a mob #define CANSTUN (1<<0) diff --git a/code/__DEFINES/flags.dm b/code/__DEFINES/flags.dm index 0949d268070..a55038cc56c 100644 --- a/code/__DEFINES/flags.dm +++ b/code/__DEFINES/flags.dm @@ -25,26 +25,26 @@ // Update flags for [/atom/proc/update_appearance] /// Update the atom's name -#define UPDATE_NAME (1<<0) +#define UPDATE_NAME (1<<0) /// Update the atom's desc -#define UPDATE_DESC (1<<1) +#define UPDATE_DESC (1<<1) /// Update the atom's icon state -#define UPDATE_ICON_STATE (1<<2) +#define UPDATE_ICON_STATE (1<<2) /// Update the atom's overlays -#define UPDATE_OVERLAYS (1<<3) +#define UPDATE_OVERLAYS (1<<3) /// Update the atom's icon -#define UPDATE_ICON (UPDATE_ICON_STATE|UPDATE_OVERLAYS) +#define UPDATE_ICON (UPDATE_ICON_STATE|UPDATE_OVERLAYS) /* Secondary atom flags, for the flags_2 var, denoted with a _2 */ -#define SLOWS_WHILE_IN_HAND_2 (1<<0) -#define NO_EMP_WIRES_2 (1<<1) -#define HOLOGRAM_2 (1<<2) -#define FROZEN_2 (1<<3) -#define STATIONLOVING_2 (1<<4) +#define SLOWS_WHILE_IN_HAND_2 (1<<0) +#define NO_EMP_WIRES_2 (1<<1) +#define HOLOGRAM_2 (1<<2) +#define FROZEN_2 (1<<3) +#define STATIONLOVING_2 (1<<4) #define INFORM_ADMINS_ON_RELOCATE_2 (1<<5) -#define BANG_PROTECT_2 (1<<6) -#define BLOCKS_LIGHT_2 (1<<7) // Light sources placed in anything with that flag will not emit light through them. +#define BANG_PROTECT_2 (1<<6) +#define BLOCKS_LIGHT_2 (1<<7) // Light sources placed in anything with that flag will not emit light through them. // A mob with OMNITONGUE has no restriction in the ability to speak // languages that they know. So even if they wouldn't normally be able to @@ -53,7 +53,7 @@ #define OMNITONGUE_2 (1<<8) /// Prevents mobs from getting chainshocked by teslas and the supermatter -#define SHOCKED_2 (1<<9) +#define SHOCKED_2 (1<<9) // Stops you from putting things like an RCD or other items into an ORM or protolathe for materials. #define NO_MAT_REDEMPTION_2 (1<<10) @@ -70,13 +70,13 @@ /// should this object be allowed to be contaminated #define RAD_NO_CONTAMINATE_2 (1<<15) /// Prevents shuttles from deleting the item -#define IMMUNE_TO_SHUTTLECRUSH_2 (1<<16) +#define IMMUNE_TO_SHUTTLECRUSH_2 (1<<16) /// Prevents malf AI animate + overload ability -#define NO_MALF_EFFECT_2 (1<<17) +#define NO_MALF_EFFECT_2 (1<<17) /// Use when this shouldn't be obscured by large icons. -#define CRITICAL_ATOM_2 (1<<18) +#define CRITICAL_ATOM_2 (1<<18) /// Use this flag for items that can block randomly -#define RANDOM_BLOCKER_2 (1<<19) +#define RANDOM_BLOCKER_2 (1<<19) /// This flag allows for wearing of a belt item, even if you're not wearing a jumpsuit #define ALLOW_BELT_NO_JUMPSUIT_2 (1<<20) @@ -84,8 +84,8 @@ #define REAGENT_NOREACT 1 //Species clothing flags -#define HAS_UNDERWEAR (1<<0) -#define HAS_UNDERSHIRT (1<<1) +#define HAS_UNDERWEAR (1<<0) +#define HAS_UNDERSHIRT (1<<1) #define HAS_SOCKS (1<<2) //Species Body Flags @@ -108,8 +108,8 @@ #define SHAVED (1<<16) //Pre-baked combinations of the above body flags -#define HAS_BODY_ACCESSORY HAS_TAIL|HAS_WING -#define HAS_MARKINGS HAS_HEAD_MARKINGS|HAS_BODY_MARKINGS|HAS_TAIL_MARKINGS +#define HAS_BODY_ACCESSORY (HAS_TAIL | HAS_WING) +#define HAS_MARKINGS (HAS_HEAD_MARKINGS | HAS_BODY_MARKINGS | HAS_TAIL_MARKINGS) //Species Diet Flags #define DIET_CARN (1<<0) @@ -160,7 +160,7 @@ //ORGAN TYPE FLAGS #define AFFECT_ROBOTIC_ORGAN 1 #define AFFECT_ORGANIC_ORGAN 2 -#define AFFECT_ALL_ORGANS 3 +#define AFFECT_ALL_ORGANS 3 //Fire and Acid stuff, for resistance_flags #define LAVA_PROOF (1<<0) @@ -173,29 +173,29 @@ #define FREEZE_PROOF (1<<7) //can't be frozen //tesla_zap -#define ZAP_MACHINE_EXPLOSIVE (1<<0) -#define ZAP_ALLOW_DUPLICATES (1<<1) -#define ZAP_OBJ_DAMAGE (1<<2) -#define ZAP_MOB_DAMAGE (1<<3) -#define ZAP_MOB_STUN (1<<4) -#define ZAP_GENERATES_POWER (1<<5) +#define ZAP_MACHINE_EXPLOSIVE (1<<0) +#define ZAP_ALLOW_DUPLICATES (1<<1) +#define ZAP_OBJ_DAMAGE (1<<2) +#define ZAP_MOB_DAMAGE (1<<3) +#define ZAP_MOB_STUN (1<<4) +#define ZAP_GENERATES_POWER (1<<5) -#define ZAP_DEFAULT_FLAGS ZAP_MOB_STUN | ZAP_MOB_DAMAGE | ZAP_OBJ_DAMAGE -#define ZAP_FUSION_FLAGS ZAP_OBJ_DAMAGE | ZAP_MOB_DAMAGE | ZAP_MOB_STUN -#define ZAP_SUPERMATTER_FLAGS ZAP_GENERATES_POWER +#define ZAP_DEFAULT_FLAGS (ZAP_MOB_STUN | ZAP_MOB_DAMAGE | ZAP_OBJ_DAMAGE) +#define ZAP_FUSION_FLAGS (ZAP_OBJ_DAMAGE | ZAP_MOB_DAMAGE | ZAP_MOB_STUN) +#define ZAP_SUPERMATTER_FLAGS (ZAP_GENERATES_POWER) GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)) //Mob mobility var flags /// can move -#define MOBILITY_MOVE (1<<0) +#define MOBILITY_MOVE (1<<0) /// can, and is, standing up -#define MOBILITY_STAND (1<<1) +#define MOBILITY_STAND (1<<1) /// can pickup items -#define MOBILITY_PICKUP (1<<2) +#define MOBILITY_PICKUP (1<<2) /// can hold and use items -#define MOBILITY_USE (1<<3) +#define MOBILITY_USE (1<<3) /// can pull things -#define MOBILITY_PULL (1<<4) +#define MOBILITY_PULL (1<<4) #define MOBILITY_FLAGS_DEFAULT (MOBILITY_MOVE | MOBILITY_STAND | MOBILITY_PICKUP | MOBILITY_USE | MOBILITY_PULL) diff --git a/code/__DEFINES/machines.dm b/code/__DEFINES/machines.dm index 7641e7a2440..8df2fa3ab50 100644 --- a/code/__DEFINES/machines.dm +++ b/code/__DEFINES/machines.dm @@ -1,13 +1,13 @@ -#define IMPRINTER 1 //For circuits. Uses glass/chemicals. -#define PROTOLATHE 2 //New stuff. Uses glass/metal/chemicals -#define AUTOLATHE 4 //Uses glass/metal only. -#define CRAFTLATHE 8 //Uses fuck if I know. For use eventually. -#define MECHFAB 16 //Remember, objects utilising this flag should have construction_time and construction_cost vars. -// #define PODFAB 32 //Used by the spacepod part fabricator. Same idea as the mechfab // AA 2021-10-02 - Removed. Kept for flag consistency. -#define BIOGENERATOR 64 //Uses biomass -#define SMELTER 128 //uses various minerals +#define IMPRINTER (1<<0) //For circuits. Uses glass/chemicals. +#define PROTOLATHE (1<<1) //New stuff. Uses glass/metal/chemicals +#define AUTOLATHE (1<<2) //Uses glass/metal only. +#define CRAFTLATHE (1<<3) //Uses fuck if I know. For use eventually. +#define MECHFAB (1<<4) //Remember, objects utilising this flag should have construction_time and construction_cost vars. +// #define PODFAB (1<<5) //Used by the spacepod part fabricator. Same idea as the mechfab // AA 2021-10-02 - Removed. Kept for flag consistency. +#define BIOGENERATOR (1<<6) //Uses biomass +#define SMELTER (1<<7) //uses various minerals /// Used for gamma armoury lathe designs -#define GAMMALATHE 256 +#define GAMMALATHE (1<<8) //Note: More then one of these can be added to a design but imprinter and lathe designs are incompatable. diff --git a/code/__DEFINES/misc_defines.dm b/code/__DEFINES/misc_defines.dm index 2571f23b611..2d0e6525127 100644 --- a/code/__DEFINES/misc_defines.dm +++ b/code/__DEFINES/misc_defines.dm @@ -633,19 +633,19 @@ do { \ //Individual defines #define MAP_GENERATOR_CLUSTER_CHECK_NONE 0 //No checks are done, cluster as much as possible -#define MAP_GENERATOR_CLUSTER_CHECK_DIFFERENT_TURFS 2 //Don't let turfs of DIFFERENT types cluster -#define MAP_GENERATOR_CLUSTER_CHECK_DIFFERENT_ATOMS 4 //Don't let atoms of DIFFERENT types cluster -#define MAP_GENERATOR_CLUSTER_CHECK_SAME_TURFS 8 //Don't let turfs of the SAME type cluster -#define MAP_GENERATOR_CLUSTER_CHECK_SAME_ATOMS 16 //Don't let atoms of the SAME type cluster +#define MAP_GENERATOR_CLUSTER_CHECK_DIFFERENT_TURFS (1<<1) //Don't let turfs of DIFFERENT types cluster +#define MAP_GENERATOR_CLUSTER_CHECK_DIFFERENT_ATOMS (1<<2) //Don't let atoms of DIFFERENT types cluster +#define MAP_GENERATOR_CLUSTER_CHECK_SAME_TURFS (1<<3) //Don't let turfs of the SAME type cluster +#define MAP_GENERATOR_CLUSTER_CHECK_SAME_ATOMS (1<<4) //Don't let atoms of the SAME type cluster //Combined defines -#define MAP_GENERATOR_CLUSTER_CHECK_SAMES 24 //Don't let any of the same type cluster -#define MAP_GENERATOR_CLUSTER_CHECK_DIFFERENTS 6 //Don't let any of different types cluster -#define MAP_GENERATOR_CLUSTER_CHECK_ALL_TURFS 10 //Don't let ANY turfs cluster same and different types -#define MAP_GENERATOR_CLUSTER_CHECK_ALL_ATOMS 20 //Don't let ANY atoms cluster same and different types +#define MAP_GENERATOR_CLUSTER_CHECK_SAMES (MAP_GENERATOR_CLUSTER_CHECK_SAME_TURFS | MAP_GENERATOR_CLUSTER_CHECK_SAME_ATOMS) //Don't let any of the same type cluster +#define MAP_GENERATOR_CLUSTER_CHECK_DIFFERENTS (MAP_GENERATOR_CLUSTER_CHECK_DIFFERENT_TURFS | MAP_GENERATOR_CLUSTER_CHECK_DIFFERENT_ATOMS) //Don't let any of different types cluster +#define MAP_GENERATOR_CLUSTER_CHECK_ALL_TURFS (MAP_GENERATOR_CLUSTER_CHECK_DIFFERENT_TURFS | MAP_GENERATOR_CLUSTER_CHECK_SAME_TURFS) //Don't let ANY turfs cluster same and different types +#define MAP_GENERATOR_CLUSTER_CHECK_ALL_ATOMS (MAP_GENERATOR_CLUSTER_CHECK_DIFFERENT_ATOMS | MAP_GENERATOR_CLUSTER_CHECK_SAME_ATOMS) //Don't let ANY atoms cluster same and different types //All -#define MAP_GENERATOR_CLUSTER_CHECK_ALL 30 //Don't let anything cluster, like, at all +#define MAP_GENERATOR_CLUSTER_CHECK_ALL ((1<<4) - 2) //Don't let anything cluster, like, at all. -2 because we skipped <<1 for some odd reason. // Buffer datatype flags. #define DNA2_BUF_UI (1<<0) diff --git a/code/__DEFINES/reagents_defines.dm b/code/__DEFINES/reagents_defines.dm index 7dfe52837b1..3b31509b4c7 100644 --- a/code/__DEFINES/reagents_defines.dm +++ b/code/__DEFINES/reagents_defines.dm @@ -5,14 +5,14 @@ #define REAGENT_OVERDOSE_EFFECT 1 #define REAGENT_OVERDOSE_FLAGS 2 // container_type defines -#define INJECTABLE 1 // Makes it possible to add reagents through droppers and syringes. -#define DRAWABLE 2 // Makes it possible to remove reagents through syringes. +#define INJECTABLE (1<<0) // Makes it possible to add reagents through droppers and syringes. +#define DRAWABLE (1<<1) // Makes it possible to remove reagents through syringes. -#define REFILLABLE 4 // Makes it possible to add reagents through any reagent container. -#define DRAINABLE 8 // Makes it possible to remove reagents through any reagent container. +#define REFILLABLE (1<<2) // Makes it possible to add reagents through any reagent container. +#define DRAINABLE (1<<3) // Makes it possible to remove reagents through any reagent container. -#define TRANSPARENT 16 // Used on containers which you want to be able to see the reagents off. -#define AMOUNT_VISIBLE 32 // For non-transparent containers that still have the general amount of reagents in them visible. +#define TRANSPARENT (1<<4) // Used on containers which you want to be able to see the reagents off. +#define AMOUNT_VISIBLE (1<<5) // For non-transparent containers that still have the general amount of reagents in them visible. // Is an open container for all intents and purposes. #define OPENCONTAINER (REFILLABLE | DRAINABLE | TRANSPARENT) diff --git a/code/__DEFINES/subsystems.dm b/code/__DEFINES/subsystems.dm index 1e75064d8f0..335ac141fc8 100644 --- a/code/__DEFINES/subsystems.dm +++ b/code/__DEFINES/subsystems.dm @@ -12,7 +12,7 @@ #define TIMER_STOPPABLE (1<<3) //To be used with TIMER_UNIQUE //prevents distinguishing identical timers with the wait variable -#define TIMER_NO_HASH_WAIT (1<<4) +#define TIMER_NO_HASH_WAIT (1<<4) //Loops the timer repeatedly until qdeleted //In most cases you want a subsystem instead @@ -91,7 +91,7 @@ // If the subsystem isn't listed here it's either DEFAULT or PROCESS (if it's a processing subsystem child) #define FIRE_PRIORITY_PING 10 -#define FIRE_PRIORITY_NANOMOB 10 +#define FIRE_PRIORITY_NANOMOB 10 #define FIRE_PRIORITY_NIGHTSHIFT 10 #define FIRE_PRIORITY_IDLE_NPC 10 #define FIRE_PRIORITY_CLEANUP 10 @@ -119,17 +119,17 @@ #define FIRE_PRIORITY_CHAT 400 #define FIRE_PRIORITY_RUNECHAT 410 // I hate how high the fire priority on this is -aa #define FIRE_PRIORITY_OVERLAYS 500 -#define FIRE_PRIORITY_DELAYED_VERBS 950 +#define FIRE_PRIORITY_DELAYED_VERBS 950 #define FIRE_PRIORITY_INPUT 1000 // This must always always be the max highest priority. Player input must never be lost. // SS runlevels -#define RUNLEVEL_INIT 0 -#define RUNLEVEL_LOBBY (1<<0) -#define RUNLEVEL_SETUP (1<<1) -#define RUNLEVEL_GAME (1<<2) -#define RUNLEVEL_POSTGAME (1<<3) +#define RUNLEVEL_INIT 0 +#define RUNLEVEL_LOBBY (1<<0) +#define RUNLEVEL_SETUP (1<<1) +#define RUNLEVEL_GAME (1<<2) +#define RUNLEVEL_POSTGAME (1<<3) #define RUNLEVELS_DEFAULT (RUNLEVEL_SETUP | RUNLEVEL_GAME | RUNLEVEL_POSTGAME) diff --git a/code/datums/diseases/_disease.dm b/code/datums/diseases/_disease.dm index ba2a3613825..8a97ca442a3 100644 --- a/code/datums/diseases/_disease.dm +++ b/code/datums/diseases/_disease.dm @@ -11,13 +11,13 @@ #define CAN_RESIST (1<<2) //Spread Flags -#define SPECIAL (1<<0) -#define NON_CONTAGIOUS (1<<1) -#define BLOOD (1<<2) -#define CONTACT_FEET (1<<3) -#define CONTACT_HANDS (1<<4) -#define CONTACT_GENERAL (1<<5) -#define AIRBORNE (1<<6) +#define SPECIAL (1<<0) +#define NON_CONTAGIOUS (1<<1) +#define BLOOD (1<<2) +#define CONTACT_FEET (1<<3) +#define CONTACT_HANDS (1<<4) +#define CONTACT_GENERAL (1<<5) +#define AIRBORNE (1<<6) //Severity Defines diff --git a/code/game/machinery/computer/atmos_controllers.dm b/code/game/machinery/computer/atmos_controllers.dm index a0b337cccb5..07b678b54e7 100644 --- a/code/game/machinery/computer/atmos_controllers.dm +++ b/code/game/machinery/computer/atmos_controllers.dm @@ -1,12 +1,12 @@ GLOBAL_LIST_EMPTY(gas_sensors) -#define SENSOR_PRESSURE (1<<0) -#define SENSOR_TEMPERATURE (1<<1) -#define SENSOR_O2 (1<<2) -#define SENSOR_PLASMA (1<<3) -#define SENSOR_N2 (1<<4) -#define SENSOR_CO2 (1<<5) -#define SENSOR_N2O (1<<6) +#define SENSOR_PRESSURE (1<<0) +#define SENSOR_TEMPERATURE (1<<1) +#define SENSOR_O2 (1<<2) +#define SENSOR_PLASMA (1<<3) +#define SENSOR_N2 (1<<4) +#define SENSOR_CO2 (1<<5) +#define SENSOR_N2O (1<<6) /obj/machinery/atmospherics/air_sensor icon = 'icons/obj/stationobjs.dmi' diff --git a/code/modules/power/apc/apc_overlay.dm b/code/modules/power/apc/apc_overlay.dm index 6451bd53bcd..15b62f33cf2 100644 --- a/code/modules/power/apc/apc_overlay.dm +++ b/code/modules/power/apc/apc_overlay.dm @@ -1,31 +1,31 @@ //update_state -#define UPSTATE_CELL_IN (1<<0) -#define UPSTATE_OPENED1 (1<<1) -#define UPSTATE_OPENED2 (1<<2) -#define UPSTATE_MAINT (1<<3) -#define UPSTATE_BROKE (1<<4) -#define UPSTATE_BLUESCREEN (1<<5) -#define UPSTATE_WIREEXP (1<<6) -#define UPSTATE_ALLGOOD (1<<7) +#define UPSTATE_CELL_IN (1<<0) +#define UPSTATE_OPENED1 (1<<1) +#define UPSTATE_OPENED2 (1<<2) +#define UPSTATE_MAINT (1<<3) +#define UPSTATE_BROKE (1<<4) +#define UPSTATE_BLUESCREEN (1<<5) +#define UPSTATE_WIREEXP (1<<6) +#define UPSTATE_ALLGOOD (1<<7) //update_overlay -#define APC_UPOVERLAY_CHARGEING0 (1<<0) -#define APC_UPOVERLAY_CHARGEING1 (1<<1) -#define APC_UPOVERLAY_CHARGEING2 (1<<2) -#define APC_UPOVERLAY_EQUIPMENT0 (1<<3) -#define APC_UPOVERLAY_EQUIPMENT1 (1<<4) -#define APC_UPOVERLAY_EQUIPMENT2 (1<<5) -#define APC_UPOVERLAY_LIGHTING0 (1<<6) -#define APC_UPOVERLAY_LIGHTING1 (1<<7) -#define APC_UPOVERLAY_LIGHTING2 (1<<8) -#define APC_UPOVERLAY_ENVIRON0 (1<<9) -#define APC_UPOVERLAY_ENVIRON1 (1<<10) -#define APC_UPOVERLAY_ENVIRON2 (1<<11) -#define APC_UPOVERLAY_LOCKED (1<<12) +#define APC_UPOVERLAY_CHARGEING0 (1<<0) +#define APC_UPOVERLAY_CHARGEING1 (1<<1) +#define APC_UPOVERLAY_CHARGEING2 (1<<2) +#define APC_UPOVERLAY_EQUIPMENT0 (1<<3) +#define APC_UPOVERLAY_EQUIPMENT1 (1<<4) +#define APC_UPOVERLAY_EQUIPMENT2 (1<<5) +#define APC_UPOVERLAY_LIGHTING0 (1<<6) +#define APC_UPOVERLAY_LIGHTING1 (1<<7) +#define APC_UPOVERLAY_LIGHTING2 (1<<8) +#define APC_UPOVERLAY_ENVIRON0 (1<<9) +#define APC_UPOVERLAY_ENVIRON1 (1<<10) +#define APC_UPOVERLAY_ENVIRON2 (1<<11) +#define APC_UPOVERLAY_LOCKED (1<<12) #define APC_UPDATE_ICON_COOLDOWN 20 SECONDS // 20 seconds diff --git a/code/modules/procedural_mapping/mapGenerator.dm b/code/modules/procedural_mapping/mapGenerator.dm index 8de9755d36e..ecb9698fee1 100644 --- a/code/modules/procedural_mapping/mapGenerator.dm +++ b/code/modules/procedural_mapping/mapGenerator.dm @@ -1,4 +1,3 @@ - /datum/mapGenerator //Map information