From 9dab26371cf83e5963721b2e6c8188607f757d1b Mon Sep 17 00:00:00 2001 From: ShizCalev Date: Mon, 21 Nov 2022 23:53:06 -0500 Subject: [PATCH] Throws a bunch of parenthesis around to ensure dear Aunt Sally is always properly excused. (#71281) Similar vein to #37116 This is supposed to be standard, yet here we are. SHOULDN'T change anything, but there's likely something out there that's bound to behave different because of it. These were done manually, regex to find things that MIGHT need to be corrected; `^#define.+\+((?!\)).)*$` `^#define.+-((?!\)).)*$` `^#define.+\*((?!\)).)*$` `^#define.+\/((?!\)).)*$` (yeah that's a lot of stuff.) `^#define.+%((?!\)).)*$` `^#define.+SECONDS((?!\)).)*$` `^#define.+MINUTES((?!\)).)*$` --- code/__DEFINES/DNA.dm | 4 ++-- code/__DEFINES/admin.dm | 2 +- code/__DEFINES/ai.dm | 12 ++++++------ code/__DEFINES/aquarium.dm | 2 +- code/__DEFINES/atmospherics/atmos_core.dm | 2 +- code/__DEFINES/blob_defines.dm | 14 +++++++------- code/__DEFINES/inventory.dm | 2 +- code/__DEFINES/lights.dm | 2 +- code/__DEFINES/mobs.dm | 16 ++++++++-------- code/__DEFINES/mod.dm | 2 +- code/__DEFINES/monkeys.dm | 2 +- code/__DEFINES/qdel.dm | 6 +++--- code/__DEFINES/reactions.dm | 2 +- code/__DEFINES/reagents.dm | 2 +- code/__DEFINES/supermatter.dm | 8 ++++---- code/__DEFINES/tgui.dm | 4 ++-- code/__DEFINES/turfs.dm | 2 +- code/__DEFINES/vehicles.dm | 2 +- code/__DEFINES/wiremod.dm | 2 +- code/__DEFINES/wounds.dm | 2 +- code/__HELPERS/game.dm | 2 +- .../subsystem/persistent_paintings.dm | 14 +++++++------- code/datums/chatmessage.dm | 6 +++--- code/datums/components/food/decomposition.dm | 6 +++--- code/datums/components/food/edible.dm | 2 +- code/datums/components/gunpoint.dm | 4 ++-- code/datums/components/shy.dm | 2 +- code/datums/station_traits/positive_traits.dm | 4 ++-- code/datums/voice_of_god_command.dm | 8 ++++---- code/game/machinery/computer/crew.dm | 2 +- code/game/machinery/computer/mechlaunchpad.dm | 2 +- code/game/machinery/doors/brigdoors.dm | 8 ++++---- code/game/machinery/doors/firedoor.dm | 2 +- code/game/machinery/launch_pad.dm | 2 +- .../machinery/newscaster/newscaster_machine.dm | 2 +- code/game/machinery/prisongate.dm | 2 +- code/game/objects/items/cards_ids.dm | 2 +- .../objects/items/devices/reverse_bear_trap.dm | 2 +- .../game/objects/items/grenades/clusterbuster.dm | 4 ++-- code/game/objects/items/robot/items/tools.dm | 2 +- code/game/objects/items/toys.dm | 6 +++--- code/game/objects/items/v8_engine.dm | 4 ++-- code/game/objects/structures/maintenance.dm | 2 +- code/game/objects/structures/mystery_box.dm | 8 ++++---- code/modules/admin/smites/bsa.dm | 4 ++-- .../modules/antagonists/changeling/changeling.dm | 2 +- code/modules/antagonists/cult/cult_items.dm | 4 ++-- code/modules/antagonists/disease/disease_mob.dm | 2 +- .../antagonists/heretic/knowledge/blade_lore.dm | 2 +- .../sacrifice_knowledge/sacrifice_knowledge.dm | 4 ++-- .../machinery/components/fusion/hfr_defines.dm | 4 ++-- .../machinery/components/unary_devices/cryo.dm | 2 +- .../components/unary_devices/vent_scrubber.dm | 2 +- code/modules/clothing/head/tophat.dm | 2 +- code/modules/explorer_drone/scanner_array.dm | 4 ++-- code/modules/holodeck/computer.dm | 4 ++-- code/modules/library/lib_machines.dm | 2 +- .../library/skill_learning/skill_station.dm | 4 ++-- code/modules/mining/lavaland/megafauna_loot.dm | 2 +- code/modules/mob/emote.dm | 8 ++++---- code/modules/mob/living/carbon/human/emote.dm | 2 +- code/modules/mob/living/emote.dm | 2 +- .../mob/living/simple_animal/hostile/headcrab.dm | 2 +- code/modules/mod/mod_ai.dm | 4 ++-- code/modules/mod/modules/modules_maint.dm | 2 +- code/modules/research/bepis.dm | 8 ++++---- code/modules/shuttle/syndicate.dm | 2 +- code/modules/tgui_panel/telemetry.dm | 4 ++-- .../vehicles/mecha/combat/savannah_ivanov.dm | 4 ++-- code/modules/vehicles/mecha/working/clarke.dm | 2 +- 70 files changed, 136 insertions(+), 136 deletions(-) diff --git a/code/__DEFINES/DNA.dm b/code/__DEFINES/DNA.dm index 0691654a50d..46e8f863398 100644 --- a/code/__DEFINES/DNA.dm +++ b/code/__DEFINES/DNA.dm @@ -144,9 +144,9 @@ //organ defines #define STANDARD_ORGAN_THRESHOLD 100 -#define STANDARD_ORGAN_HEALING 50 / 100000 +#define STANDARD_ORGAN_HEALING (50 / 100000) /// designed to fail organs when left to decay for ~15 minutes -#define STANDARD_ORGAN_DECAY 111 / 100000 +#define STANDARD_ORGAN_DECAY (111 / 100000) //used for the can_chromosome var on mutations #define CHROMOSOME_NEVER 0 diff --git a/code/__DEFINES/admin.dm b/code/__DEFINES/admin.dm index bd9ac554882..cd0f1d6c34a 100644 --- a/code/__DEFINES/admin.dm +++ b/code/__DEFINES/admin.dm @@ -110,7 +110,7 @@ ///Length of held key buffer #define HELD_KEY_BUFFER_LENGTH 15 -#define STICKYBAN_DB_CACHE_TIME 10 SECONDS +#define STICKYBAN_DB_CACHE_TIME (10 SECONDS) #define STICKYBAN_ROGUE_CHECK_TIME 5 /// Reference index for policy.json to locate any policy text applicable to polymorphed/staff of changed mobs. diff --git a/code/__DEFINES/ai.dm b/code/__DEFINES/ai.dm index d088294bfff..fcb595cdbd3 100644 --- a/code/__DEFINES/ai.dm +++ b/code/__DEFINES/ai.dm @@ -9,7 +9,7 @@ ///Cooldown on planning if planning failed last time -#define AI_FAILED_PLANNING_COOLDOWN 1.5 SECONDS +#define AI_FAILED_PLANNING_COOLDOWN (1.5 SECONDS) ///Flags for ai_behavior new() #define AI_CONTROLLER_INCOMPATIBLE (1<<0) @@ -142,7 +142,7 @@ /// Basically, what is our vision/hearing range. #define BB_HOSTILE_VISION_RANGE 10 /// After either being given a verbal order or a pointing order, ignore further of each for this duration -#define AI_HOSTILE_COMMAND_COOLDOWN 2 SECONDS +#define AI_HOSTILE_COMMAND_COOLDOWN (2 SECONDS) // hostile command modes (what pointing at something/someone does depending on the last order the carp heard) /// Don't do anything (will still react to stuff around them though) @@ -169,13 +169,13 @@ /// What are the odds someone petting us will become our friend? #define AI_DOG_PET_FRIEND_PROB 15 /// After this long without having fetched something, we clear our ignore list -#define AI_FETCH_IGNORE_DURATION 30 SECONDS +#define AI_FETCH_IGNORE_DURATION (30 SECONDS) /// After being ordered to heel, we spend this long chilling out -#define AI_DOG_HEEL_DURATION 20 SECONDS +#define AI_DOG_HEEL_DURATION (20 SECONDS) /// After either being given a verbal order or a pointing order, ignore further of each for this duration -#define AI_DOG_COMMAND_COOLDOWN 2 SECONDS +#define AI_DOG_COMMAND_COOLDOWN (2 SECONDS) /// If the dog is set to harass someone but doesn't bite them for this long, give up -#define AI_DOG_HARASS_FRUSTRATE_TIME 50 SECONDS +#define AI_DOG_HARASS_FRUSTRATE_TIME (50 SECONDS) // dog command modes (what pointing at something/someone does depending on the last order the dog heard) /// Don't do anything (will still react to stuff around them though) diff --git a/code/__DEFINES/aquarium.dm b/code/__DEFINES/aquarium.dm index 02db02fca6e..5e60e2a7a64 100644 --- a/code/__DEFINES/aquarium.dm +++ b/code/__DEFINES/aquarium.dm @@ -14,7 +14,7 @@ #define FISH_DEAD "dead" #define MIN_AQUARIUM_TEMP T0C -#define MAX_AQUARIUM_TEMP T0C + 100 +#define MAX_AQUARIUM_TEMP (T0C + 100) #define DEFAULT_AQUARIUM_TEMP 300 #define FISH_RARITY_BASIC 1000 diff --git a/code/__DEFINES/atmospherics/atmos_core.dm b/code/__DEFINES/atmospherics/atmos_core.dm index 201bfc807df..be8bae4cc11 100644 --- a/code/__DEFINES/atmospherics/atmos_core.dm +++ b/code/__DEFINES/atmospherics/atmos_core.dm @@ -96,7 +96,7 @@ /// number of FULL air controller ticks before an excited group breaks down (averages gas contents across turfs) #define EXCITED_GROUP_BREAKDOWN_CYCLES 5 /// number of FULL air controller ticks before an excited group dismantles and removes its turfs from active -#define EXCITED_GROUP_DISMANTLE_CYCLES (EXCITED_GROUP_BREAKDOWN_CYCLES * 2) + 1 //Reset after 2 breakdowns +#define EXCITED_GROUP_DISMANTLE_CYCLES ((EXCITED_GROUP_BREAKDOWN_CYCLES * 2) + 1) //Reset after 2 breakdowns /// Ratio of air that must move to/from a tile to reset group processing #define MINIMUM_AIR_RATIO_TO_SUSPEND 0.1 /// Minimum ratio of air that must move to/from a tile diff --git a/code/__DEFINES/blob_defines.dm b/code/__DEFINES/blob_defines.dm index c74625d792e..1800230e650 100644 --- a/code/__DEFINES/blob_defines.dm +++ b/code/__DEFINES/blob_defines.dm @@ -3,11 +3,11 @@ #define OVERMIND_MAX_POINTS_DEFAULT 100 // Max point storage #define OVERMIND_STARTING_POINTS 60 // Points granted upon start #define OVERMIND_STARTING_REROLLS 1 // Free strain rerolls at the start -#define OVERMIND_STARTING_MIN_PLACE_TIME 1 MINUTES // Minimum time before the core can be placed -#define OVERMIND_STARTING_AUTO_PLACE_TIME 6 MINUTES // After this time, randomly place the core somewhere viable +#define OVERMIND_STARTING_MIN_PLACE_TIME (1 MINUTES) // Minimum time before the core can be placed +#define OVERMIND_STARTING_AUTO_PLACE_TIME (6 MINUTES) // After this time, randomly place the core somewhere viable #define OVERMIND_WIN_CONDITION_AMOUNT 400 // Blob structures required to win #define OVERMIND_ANNOUNCEMENT_MIN_SIZE 75 // Once the blob has this many structures, announce their presence -#define OVERMIND_ANNOUNCEMENT_MAX_TIME 10 MINUTES // If the blob hasn't reached the minimum size before this time, announce their presence +#define OVERMIND_ANNOUNCEMENT_MAX_TIME (10 MINUTES) // If the blob hasn't reached the minimum size before this time, announce their presence #define OVERMIND_MAX_CAMERA_STRAY "3x3" // How far the overmind camera is allowed to stray from blob tiles. 3x3 is 1 tile away, 5x5 2 tiles etc @@ -52,8 +52,8 @@ #define BLOB_RESOURCE_MAX_HP 60 #define BLOB_RESOURCE_HP_REGEN 15 #define BLOB_RESOURCE_MIN_DISTANCE 4 // Minimum distance between resource blobs -#define BLOB_RESOURCE_GATHER_DELAY 4 SECONDS // Gather points when pulsed outside this interval -#define BLOB_RESOURCE_GATHER_ADDED_DELAY 0.25 SECONDS // Every additional resource blob adds this amount to the gather delay +#define BLOB_RESOURCE_GATHER_DELAY (4 SECONDS) // Gather points when pulsed outside this interval +#define BLOB_RESOURCE_GATHER_ADDED_DELAY (0.25 SECONDS) // Every additional resource blob adds this amount to the gather delay #define BLOB_RESOURCE_GATHER_AMOUNT 1 // The amount of points added to the overmind #define BLOB_REGULAR_MAX_HP 25 @@ -85,7 +85,7 @@ #define BLOB_POWER_RELOCATE_COST 80 // Resource cost to move your core to a different node #define BLOB_POWER_REROLL_COST 40 // Strain reroll -#define BLOB_POWER_REROLL_FREE_TIME 4 MINUTES // Gain a free strain reroll every x minutes +#define BLOB_POWER_REROLL_FREE_TIME (4 MINUTES) // Gain a free strain reroll every x minutes #define BLOB_POWER_REROLL_CHOICES 6 // Possibilities to choose from; keep in mind increasing this might fuck with the radial menu @@ -93,7 +93,7 @@ #define BLOBMOB_HEALING_MULTIPLIER 0.0125 // Multiplies by -maxHealth and heals the blob by this amount every blob_act #define BLOBMOB_SPORE_HEALTH 30 // Base spore health -#define BLOBMOB_SPORE_SPAWN_COOLDOWN 8 SECONDS +#define BLOBMOB_SPORE_SPAWN_COOLDOWN (8 SECONDS) #define BLOBMOB_SPORE_DMG_LOWER 2 #define BLOBMOB_SPORE_DMG_UPPER 4 #define BLOBMOB_BLOBBERNAUT_RESOURCE_COST 40 // Purchase price for making a blobbernaut diff --git a/code/__DEFINES/inventory.dm b/code/__DEFINES/inventory.dm index 36e99a9444f..21178be6439 100644 --- a/code/__DEFINES/inventory.dm +++ b/code/__DEFINES/inventory.dm @@ -153,7 +153,7 @@ /// How many messages you can remember while logged out before you stop remembering new ones #define AFK_THEFT_MAX_MESSAGES 10 /// If someone logs back in and there are entries older than this, just tell them they can't remember who it was or when -#define AFK_THEFT_FORGET_DETAILS_TIME 5 MINUTES +#define AFK_THEFT_FORGET_DETAILS_TIME (5 MINUTES) /// The index of the entry in 'afk_thefts' with the person's visible name at the time #define AFK_THEFT_NAME 1 /// The index of the entry in 'afk_thefts' with the text diff --git a/code/__DEFINES/lights.dm b/code/__DEFINES/lights.dm index 196ab838d22..e137744195c 100644 --- a/code/__DEFINES/lights.dm +++ b/code/__DEFINES/lights.dm @@ -12,7 +12,7 @@ #define BROKEN_SPARKS_MAX (9 MINUTES) ///Amount of time that takes an ethereal to take energy from the lights -#define LIGHT_DRAIN_TIME 2.5 SECONDS +#define LIGHT_DRAIN_TIME (2.5 SECONDS) ///Amount of charge the ethereal gain after the drain #define LIGHT_POWER_GAIN 35 diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm index 1171f7c9526..8b7f5a16ee3 100644 --- a/code/__DEFINES/mobs.dm +++ b/code/__DEFINES/mobs.dm @@ -289,10 +289,10 @@ #define ETHEREAL_CHARGE_DANGEROUS 3000 -#define CRYSTALIZE_COOLDOWN_LENGTH 120 SECONDS -#define CRYSTALIZE_PRE_WAIT_TIME 40 SECONDS -#define CRYSTALIZE_DISARM_WAIT_TIME 120 SECONDS -#define CRYSTALIZE_HEAL_TIME 60 SECONDS +#define CRYSTALIZE_COOLDOWN_LENGTH (120 SECONDS) +#define CRYSTALIZE_PRE_WAIT_TIME (40 SECONDS) +#define CRYSTALIZE_DISARM_WAIT_TIME (120 SECONDS) +#define CRYSTALIZE_HEAL_TIME (60 SECONDS) #define BRUTE_DAMAGE_REQUIRED_TO_STOP_CRYSTALIZATION 30 @@ -521,13 +521,13 @@ // recent examine defines /// How long it takes for an examined atom to be removed from recent_examines. Should be the max of the below time windows -#define RECENT_EXAMINE_MAX_WINDOW 2 SECONDS +#define RECENT_EXAMINE_MAX_WINDOW (2 SECONDS) /// If you examine the same atom twice in this timeframe, we call examine_more() instead of examine() -#define EXAMINE_MORE_WINDOW 1 SECONDS +#define EXAMINE_MORE_WINDOW (1 SECONDS) /// If you examine another mob who's successfully examined you during this duration of time, you two try to make eye contact. Cute! -#define EYE_CONTACT_WINDOW 2 SECONDS +#define EYE_CONTACT_WINDOW (2 SECONDS) /// If you yawn while someone nearby has examined you within this time frame, it will force them to yawn as well. Tradecraft! -#define YAWN_PROPAGATION_EXAMINE_WINDOW 2 SECONDS +#define YAWN_PROPAGATION_EXAMINE_WINDOW (2 SECONDS) /// How far away you can be to make eye contact with someone while examining #define EYE_CONTACT_RANGE 5 diff --git a/code/__DEFINES/mod.dm b/code/__DEFINES/mod.dm index cc309df533c..0e380f9e959 100644 --- a/code/__DEFINES/mod.dm +++ b/code/__DEFINES/mod.dm @@ -5,7 +5,7 @@ #define DEFAULT_CHARGE_DRAIN 5 /// Default time for a part to seal -#define MOD_ACTIVATION_STEP_TIME 2 SECONDS +#define MOD_ACTIVATION_STEP_TIME (2 SECONDS) /// Passive module, just acts when put in naturally. #define MODULE_PASSIVE 0 diff --git a/code/__DEFINES/monkeys.dm b/code/__DEFINES/monkeys.dm index 284fc4c7d1e..50b712ade4b 100644 --- a/code/__DEFINES/monkeys.dm +++ b/code/__DEFINES/monkeys.dm @@ -34,4 +34,4 @@ #define MONKEY_HATRED_REDUCTION_PROB 20 ///Monkey recruit cooldown -#define MONKEY_RECRUIT_COOLDOWN 1 MINUTES +#define MONKEY_RECRUIT_COOLDOWN (1 MINUTES) diff --git a/code/__DEFINES/qdel.dm b/code/__DEFINES/qdel.dm index cb28143d392..2e5c3cebaac 100644 --- a/code/__DEFINES/qdel.dm +++ b/code/__DEFINES/qdel.dm @@ -31,9 +31,9 @@ #define GC_QUEUE_COUNT 3 //! Number of queues, used for allocating the nested lists. Don't forget to increase this if you add a new queue stage // Defines for the time an item has to get its reference cleaned before it fails the queue and moves to the next. -#define GC_FILTER_QUEUE 1 SECONDS -#define GC_CHECK_QUEUE 5 MINUTES -#define GC_DEL_QUEUE 10 SECONDS +#define GC_FILTER_QUEUE (1 SECONDS) +#define GC_CHECK_QUEUE (5 MINUTES) +#define GC_DEL_QUEUE (10 SECONDS) #define QDEL_ITEM_ADMINS_WARNED (1<<0) //! Set when admins are told about lag causing qdels in this type. diff --git a/code/__DEFINES/reactions.dm b/code/__DEFINES/reactions.dm index 6a6b6f18d56..f51271d0e22 100644 --- a/code/__DEFINES/reactions.dm +++ b/code/__DEFINES/reactions.dm @@ -160,7 +160,7 @@ // Freon: /// The minimum temperature freon can form from plasma, CO2, and BZ at. -#define FREON_FORMATION_MIN_TEMPERATURE FIRE_MINIMUM_TEMPERATURE_TO_EXIST + 100 +#define FREON_FORMATION_MIN_TEMPERATURE (FIRE_MINIMUM_TEMPERATURE_TO_EXIST + 100) /// The amount of energy 2.5 moles of freon forming from plasma, CO2, and BZ consumes. #define FREON_FORMATION_ENERGY 100 diff --git a/code/__DEFINES/reagents.dm b/code/__DEFINES/reagents.dm index 0033f5e2c42..f888358c5b4 100644 --- a/code/__DEFINES/reagents.dm +++ b/code/__DEFINES/reagents.dm @@ -35,7 +35,7 @@ #define INJECT (1<<4) // How long do mime drinks silence the drinker (if they are a mime)? -#define MIMEDRINK_SILENCE_DURATION 1 MINUTES +#define MIMEDRINK_SILENCE_DURATION (1 MINUTES) ///Health threshold for synthflesh and rezadone to unhusk someone #define UNHUSK_DAMAGE_THRESHOLD 50 ///Amount of synthflesh required to unhusk someone diff --git a/code/__DEFINES/supermatter.dm b/code/__DEFINES/supermatter.dm index 779afa16707..dbfd7265c55 100644 --- a/code/__DEFINES/supermatter.dm +++ b/code/__DEFINES/supermatter.dm @@ -29,12 +29,12 @@ #define MATTER_POWER_CONVERSION 10 //Crystal converts 1/this value of stored matter into energy. //These would be what you would get at point blank, decreases with distance -#define DETONATION_HALLUCINATION 20 MINUTES +#define DETONATION_HALLUCINATION (20 MINUTES) /// All humans within this range will be irradiated #define DETONATION_RADIATION_RANGE 20 -#define SUPERMATTER_WARNING_DELAY 60 SECONDS +#define SUPERMATTER_WARNING_DELAY (60 SECONDS) #define SM_HALLUCINATION_RANGE(P) (min(7, round(P ** 0.25))) @@ -46,10 +46,10 @@ #define VORTEX_ANOMALY "vortex_anomaly" #define DIMENSIONAL_ANOMALY "dimensional_anomaly" -#define SUPERMATTER_COUNTDOWN_TIME 30 SECONDS +#define SUPERMATTER_COUNTDOWN_TIME (30 SECONDS) ///to prevent accent sounds from layering -#define SUPERMATTER_ACCENT_SOUND_MIN_COOLDOWN 2 SECONDS +#define SUPERMATTER_ACCENT_SOUND_MIN_COOLDOWN (2 SECONDS) #define DEFAULT_ZAP_ICON_STATE "sm_arc" #define SLIGHTLY_CHARGED_ZAP_ICON_STATE "sm_arc_supercharged" diff --git a/code/__DEFINES/tgui.dm b/code/__DEFINES/tgui.dm index 60b7bea8547..02d6a25a660 100644 --- a/code/__DEFINES/tgui.dm +++ b/code/__DEFINES/tgui.dm @@ -13,9 +13,9 @@ #define TGUI_WINDOW_HARD_LIMIT 9 /// Maximum ping timeout allowed to detect zombie windows -#define TGUI_PING_TIMEOUT 4 SECONDS +#define TGUI_PING_TIMEOUT (4 SECONDS) /// Used for rate-limiting to prevent DoS by excessively refreshing a TGUI window -#define TGUI_REFRESH_FULL_UPDATE_COOLDOWN 1 SECONDS +#define TGUI_REFRESH_FULL_UPDATE_COOLDOWN (1 SECONDS) /// Window does not exist #define TGUI_WINDOW_CLOSED 0 diff --git a/code/__DEFINES/turfs.dm b/code/__DEFINES/turfs.dm index 43bd601fc40..6ff862413bf 100644 --- a/code/__DEFINES/turfs.dm +++ b/code/__DEFINES/turfs.dm @@ -52,7 +52,7 @@ #define IS_WET_OPEN_TURF(O) O.GetComponent(/datum/component/wet_floor) /// Maximum amount of time, (in deciseconds) a tile can be wet for. -#define MAXIMUM_WET_TIME 5 MINUTES +#define MAXIMUM_WET_TIME (5 MINUTES) /** * Get the turf that `A` resides in, regardless of any containers. diff --git a/code/__DEFINES/vehicles.dm b/code/__DEFINES/vehicles.dm index 122be15c2cf..9aac19be3c1 100644 --- a/code/__DEFINES/vehicles.dm +++ b/code/__DEFINES/vehicles.dm @@ -37,7 +37,7 @@ //Vim defines ///cooldown between uses of the sound maker -#define VIM_SOUND_COOLDOWN 1 SECONDS +#define VIM_SOUND_COOLDOWN (1 SECONDS) ///how much vim heals per weld #define VIM_HEAL_AMOUNT 20 diff --git a/code/__DEFINES/wiremod.dm b/code/__DEFINES/wiremod.dm index befbcdb8c74..14a03d780ce 100644 --- a/code/__DEFINES/wiremod.dm +++ b/code/__DEFINES/wiremod.dm @@ -77,7 +77,7 @@ #define COMP_COMPARISON_LESS_THAN_OR_EQUAL "<=" // Clock component -#define COMP_CLOCK_DELAY 0.9 SECONDS +#define COMP_CLOCK_DELAY (0.9 SECONDS) // Shells diff --git a/code/__DEFINES/wounds.dm b/code/__DEFINES/wounds.dm index f30947c0362..bc3ddfb5cba 100644 --- a/code/__DEFINES/wounds.dm +++ b/code/__DEFINES/wounds.dm @@ -157,7 +157,7 @@ GLOBAL_LIST_INIT(global_all_wound_types, list(/datum/wound/blunt/critical, /datu #define BLOOD_FLOW_INCREASING 1 /// How often can we annoy the player about their bleeding? This duration is extended if it's not serious bleeding -#define BLEEDING_MESSAGE_BASE_CD 10 SECONDS +#define BLEEDING_MESSAGE_BASE_CD (10 SECONDS) /// Skeletons and other BIO_ONLY_BONE creatures respond much better to bone gel and can have severe and critical bone wounds healed by bone gel alone. The duration it takes to heal is also multiplied by this, lucky them! #define WOUND_BONE_BIO_BONE_GEL_MULT 0.25 diff --git a/code/__HELPERS/game.dm b/code/__HELPERS/game.dm index dcd1c98f3cc..c43bb08814b 100644 --- a/code/__HELPERS/game.dm +++ b/code/__HELPERS/game.dm @@ -1,5 +1,5 @@ ///Time before being allowed to select a new cult leader again -#define CULT_POLL_WAIT 240 SECONDS +#define CULT_POLL_WAIT (240 SECONDS) /// Returns either the error landmark or the location of the room. Needless to say, if this is used, it means things have gone awry. #define GET_ERROR_ROOM ((locate(/obj/effect/landmark/error) in GLOB.landmarks_list) || locate(4,4,1)) diff --git a/code/controllers/subsystem/persistent_paintings.dm b/code/controllers/subsystem/persistent_paintings.dm index b0124553def..b7b930c1a1d 100644 --- a/code/controllers/subsystem/persistent_paintings.dm +++ b/code/controllers/subsystem/persistent_paintings.dm @@ -1,13 +1,13 @@ #define PAINTINGS_DATA_FORMAT_VERSION 2 // Patronage thresholds for paintings. Different cosmetic frames become available as more credits are spent on the patronage. -#define PATRONAGE_OK_FRAME PAYCHECK_CREW * 3 // 150 credits, as of march 2022 -#define PATRONAGE_NICE_FRAME PATRONAGE_OK_FRAME * 2.5 -#define PATRONAGE_GREAT_FRAME PATRONAGE_NICE_FRAME * 2 -#define PATRONAGE_EXCELLENT_FRAME PATRONAGE_GREAT_FRAME * 2 -#define PATRONAGE_AMAZING_FRAME PATRONAGE_EXCELLENT_FRAME * 2 -#define PATRONAGE_SUPERB_FRAME PATRONAGE_AMAZING_FRAME * 2 -#define PATRONAGE_LEGENDARY_FRAME PATRONAGE_SUPERB_FRAME * 2 +#define PATRONAGE_OK_FRAME (PAYCHECK_CREW * 3) // 150 credits, as of march 2022 +#define PATRONAGE_NICE_FRAME (PATRONAGE_OK_FRAME * 2.5) +#define PATRONAGE_GREAT_FRAME (PATRONAGE_NICE_FRAME * 2) +#define PATRONAGE_EXCELLENT_FRAME (PATRONAGE_GREAT_FRAME * 2) +#define PATRONAGE_AMAZING_FRAME (PATRONAGE_EXCELLENT_FRAME * 2) +#define PATRONAGE_SUPERB_FRAME (PATRONAGE_AMAZING_FRAME * 2) +#define PATRONAGE_LEGENDARY_FRAME (PATRONAGE_SUPERB_FRAME * 2) /* { diff --git a/code/datums/chatmessage.dm b/code/datums/chatmessage.dm index 692bb17fdad..55f8510fc57 100644 --- a/code/datums/chatmessage.dm +++ b/code/datums/chatmessage.dm @@ -1,9 +1,9 @@ /// How long the chat message's spawn-in animation will occur for -#define CHAT_MESSAGE_SPAWN_TIME 0.2 SECONDS +#define CHAT_MESSAGE_SPAWN_TIME (0.2 SECONDS) /// How long the chat message will exist prior to any exponential decay -#define CHAT_MESSAGE_LIFESPAN 5 SECONDS +#define CHAT_MESSAGE_LIFESPAN (5 SECONDS) /// How long the chat message's end of life fading animation will occur for -#define CHAT_MESSAGE_EOL_FADE 0.7 SECONDS +#define CHAT_MESSAGE_EOL_FADE (0.7 SECONDS) /// Factor of how much the message index (number of messages) will account to exponential decay #define CHAT_MESSAGE_EXP_DECAY 0.7 /// Factor of how much height will account to exponential decay diff --git a/code/datums/components/food/decomposition.dm b/code/datums/components/food/decomposition.dm index 69ce595d19f..d051a80336d 100644 --- a/code/datums/components/food/decomposition.dm +++ b/code/datums/components/food/decomposition.dm @@ -1,8 +1,8 @@ //"Don't leave food on the floor, that's how we get ants" -#define DECOMPOSITION_TIME 10 MINUTES -#define DECOMPOSITION_TIME_RAW 5 MINUTES -#define DECOMPOSITION_TIME_GROSS 7 MINUTES +#define DECOMPOSITION_TIME (10 MINUTES) +#define DECOMPOSITION_TIME_RAW (5 MINUTES) +#define DECOMPOSITION_TIME_GROSS (7 MINUTES) /datum/component/decomposition dupe_mode = COMPONENT_DUPE_UNIQUE diff --git a/code/datums/components/food/edible.dm b/code/datums/components/food/edible.dm index 578ba8fbe20..3b2f39c8b37 100644 --- a/code/datums/components/food/edible.dm +++ b/code/datums/components/food/edible.dm @@ -297,7 +297,7 @@ Behavior that's still missing from this component that original food items had t return TRUE /// Normal time to forcefeed someone something -#define EAT_TIME_FORCE_FEED 3 SECONDS +#define EAT_TIME_FORCE_FEED (3 SECONDS) /// Multiplier for eat time if the eater has TRAIT_VORACIOUS #define EAT_TIME_VORACIOUS_MULT 0.65 // voracious folk eat 35% faster /// Multiplier for how much longer it takes a voracious folk to eat while full diff --git a/code/datums/components/gunpoint.dm b/code/datums/components/gunpoint.dm index 5da3c07781a..59c241f814f 100644 --- a/code/datums/components/gunpoint.dm +++ b/code/datums/components/gunpoint.dm @@ -1,9 +1,9 @@ /// How many tiles around the target the shooter can roam without losing their shot #define GUNPOINT_SHOOTER_STRAY_RANGE 2 /// How long it takes from the gunpoint is initiated to reach stage 2 -#define GUNPOINT_DELAY_STAGE_2 2.5 SECONDS +#define GUNPOINT_DELAY_STAGE_2 (2.5 SECONDS) /// How long it takes from stage 2 starting to move up to stage 3 -#define GUNPOINT_DELAY_STAGE_3 7.5 SECONDS +#define GUNPOINT_DELAY_STAGE_3 (7.5 SECONDS) /// If the projectile doesn't have a wound_bonus of CANT_WOUND, we add (this * the stage mult) to their wound_bonus and bare_wound_bonus upon triggering #define GUNPOINT_BASE_WOUND_BONUS 5 /// How much the damage and wound bonus mod is multiplied when you're on stage 1 diff --git a/code/datums/components/shy.dm b/code/datums/components/shy.dm index 8f71b61df46..114c38fcdf5 100644 --- a/code/datums/components/shy.dm +++ b/code/datums/components/shy.dm @@ -1,4 +1,4 @@ -#define SHY_COMPONENT_CACHE_TIME 0.5 SECONDS +#define SHY_COMPONENT_CACHE_TIME (0.5 SECONDS) /// You can't use items on anyone other than yourself if there are other living mobs around you /datum/component/shy diff --git a/code/datums/station_traits/positive_traits.dm b/code/datums/station_traits/positive_traits.dm index 77d30291c3f..880cf910424 100644 --- a/code/datums/station_traits/positive_traits.dm +++ b/code/datums/station_traits/positive_traits.dm @@ -1,5 +1,5 @@ -#define PARTY_COOLDOWN_LENGTH_MIN 6 MINUTES -#define PARTY_COOLDOWN_LENGTH_MAX 12 MINUTES +#define PARTY_COOLDOWN_LENGTH_MIN (6 MINUTES) +#define PARTY_COOLDOWN_LENGTH_MAX (12 MINUTES) /datum/station_trait/lucky_winner diff --git a/code/datums/voice_of_god_command.dm b/code/datums/voice_of_god_command.dm index 9dd8c13730a..9159042adfa 100644 --- a/code/datums/voice_of_god_command.dm +++ b/code/datums/voice_of_god_command.dm @@ -1,7 +1,7 @@ -#define COOLDOWN_STUN 120 SECONDS -#define COOLDOWN_DAMAGE 60 SECONDS -#define COOLDOWN_MEME 30 SECONDS -#define COOLDOWN_NONE 10 SECONDS +#define COOLDOWN_STUN (120 SECONDS) +#define COOLDOWN_DAMAGE (60 SECONDS) +#define COOLDOWN_MEME (30 SECONDS) +#define COOLDOWN_NONE (10 SECONDS) /// Used to stop listeners with silly or clown-esque (first) names such as "Honk" or "Flip" from screwing up certain commands. GLOBAL_DATUM(all_voice_of_god_triggers, /regex) diff --git a/code/game/machinery/computer/crew.dm b/code/game/machinery/computer/crew.dm index 88398137c90..7f7f467cc71 100644 --- a/code/game/machinery/computer/crew.dm +++ b/code/game/machinery/computer/crew.dm @@ -1,5 +1,5 @@ /// How often the sensor data is updated -#define SENSORS_UPDATE_PERIOD 10 SECONDS //How often the sensor data updates. +#define SENSORS_UPDATE_PERIOD (10 SECONDS) //How often the sensor data updates. /// The job sorting ID associated with otherwise unknown jobs #define UNKNOWN_JOB_ID 81 diff --git a/code/game/machinery/computer/mechlaunchpad.dm b/code/game/machinery/computer/mechlaunchpad.dm index f803980b5e8..0fa013c491b 100644 --- a/code/game/machinery/computer/mechlaunchpad.dm +++ b/code/game/machinery/computer/mechlaunchpad.dm @@ -44,7 +44,7 @@ if(mechpads.len > maximum_pads) break -#define MECH_LAUNCH_TIME 5 SECONDS +#define MECH_LAUNCH_TIME (5 SECONDS) /obj/machinery/computer/mechpad/mech_melee_attack(obj/vehicle/sealed/mecha/mecha_attacker, mob/living/user) if(user.combat_mode || machine_stat & (NOPOWER|BROKEN) || DOING_INTERACTION_WITH_TARGET(user, src)) diff --git a/code/game/machinery/doors/brigdoors.dm b/code/game/machinery/doors/brigdoors.dm index 7a1be48b31f..cee8b7ebfd1 100644 --- a/code/game/machinery/doors/brigdoors.dm +++ b/code/game/machinery/doors/brigdoors.dm @@ -1,7 +1,7 @@ -#define MAX_TIMER 15 MINUTES -#define PRESET_SHORT 2 MINUTES -#define PRESET_MEDIUM 3 MINUTES -#define PRESET_LONG 5 MINUTES +#define MAX_TIMER (15 MINUTES) +#define PRESET_SHORT (2 MINUTES) +#define PRESET_MEDIUM (3 MINUTES) +#define PRESET_LONG (5 MINUTES) /** * Brig Door control displays. diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index 216b73d7433..b4766f69f69 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -1,7 +1,7 @@ #define CONSTRUCTION_PANEL_OPEN 1 //Maintenance panel is open, still functioning #define CONSTRUCTION_NO_CIRCUIT 2 //Circuit board removed, can safely weld apart #define DEFAULT_STEP_TIME 20 /// default time for each step -#define REACTIVATION_DELAY 3 SECONDS // Delay on reactivation, used to prevent dumb crowbar things. Just trust me +#define REACTIVATION_DELAY (3 SECONDS) // Delay on reactivation, used to prevent dumb crowbar things. Just trust me /obj/machinery/door/firedoor name = "firelock" diff --git a/code/game/machinery/launch_pad.dm b/code/game/machinery/launch_pad.dm index 788965f009d..ee378f2b0ea 100644 --- a/code/game/machinery/launch_pad.dm +++ b/code/game/machinery/launch_pad.dm @@ -1,4 +1,4 @@ -#define BEAM_FADE_TIME 1 SECONDS +#define BEAM_FADE_TIME (1 SECONDS) /obj/machinery/launchpad name = "bluespace launchpad" diff --git a/code/game/machinery/newscaster/newscaster_machine.dm b/code/game/machinery/newscaster/newscaster_machine.dm index ea71f181e97..c4bb2e95a57 100644 --- a/code/game/machinery/newscaster/newscaster_machine.dm +++ b/code/game/machinery/newscaster/newscaster_machine.dm @@ -1,4 +1,4 @@ -#define ALERT_DELAY 50 SECONDS +#define ALERT_DELAY (50 SECONDS) /obj/machinery/newscaster name = "newscaster" diff --git a/code/game/machinery/prisongate.dm b/code/game/machinery/prisongate.dm index 396ce3fa158..4dc3c92a120 100644 --- a/code/game/machinery/prisongate.dm +++ b/code/game/machinery/prisongate.dm @@ -1,4 +1,4 @@ -#define SPAM_CD 3 SECONDS +#define SPAM_CD (3 SECONDS) /obj/machinery/prisongate name = "prison gate scanner" diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm index b50a319c357..acc7fe4b8a6 100644 --- a/code/game/objects/items/cards_ids.dm +++ b/code/game/objects/items/cards_ids.dm @@ -8,7 +8,7 @@ #define INTERN_THRESHOLD_FALLBACK_HOURS 15 /// Max time interval between projecting holopays -#define HOLOPAY_PROJECTION_INTERVAL 7 SECONDS +#define HOLOPAY_PROJECTION_INTERVAL (7 SECONDS) /* Cards * Contains: diff --git a/code/game/objects/items/devices/reverse_bear_trap.dm b/code/game/objects/items/devices/reverse_bear_trap.dm index 4b0a3b092cb..8498813bf5e 100644 --- a/code/game/objects/items/devices/reverse_bear_trap.dm +++ b/code/game/objects/items/devices/reverse_bear_trap.dm @@ -1,4 +1,4 @@ -#define REVERSE_BEAR_TRAP_COUNTDOWN 60 SECONDS +#define REVERSE_BEAR_TRAP_COUNTDOWN (60 SECONDS) /obj/item/reverse_bear_trap name = "reverse bear trap" diff --git a/code/game/objects/items/grenades/clusterbuster.dm b/code/game/objects/items/grenades/clusterbuster.dm index 73692eb41f1..b770bfa5d9b 100644 --- a/code/game/objects/items/grenades/clusterbuster.dm +++ b/code/game/objects/items/grenades/clusterbuster.dm @@ -2,8 +2,8 @@ //Clusterbang //////////////////// -#define RANDOM_DETONATE_MIN_TIME 1.5 SECONDS -#define RANDOM_DETONATE_MAX_TIME 6 SECONDS +#define RANDOM_DETONATE_MIN_TIME (1.5 SECONDS) +#define RANDOM_DETONATE_MAX_TIME (6 SECONDS) /obj/item/grenade/clusterbuster desc = "Use of this weapon may constitute a war crime in your area, consult your local captain." diff --git a/code/game/objects/items/robot/items/tools.dm b/code/game/objects/items/robot/items/tools.dm index d33efc5a652..5cc30780741 100644 --- a/code/game/objects/items/robot/items/tools.dm +++ b/code/game/objects/items/robot/items/tools.dm @@ -1,4 +1,4 @@ -#define PKBORG_DAMPEN_CYCLE_DELAY 2 SECONDS +#define PKBORG_DAMPEN_CYCLE_DELAY (2 SECONDS) /obj/item/cautery/prt //it's a subtype of cauteries so that it inherits the cautery sprites and behavior and stuff, because I'm too lazy to make sprites for this thing name = "plating repair tool" diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 9da38cc390d..d9885294a18 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -1367,9 +1367,9 @@ GLOBAL_LIST_EMPTY(intento_players) #define STATE_END_OF_GAME "end_of_game" #define STATE_RETALIATION "retaliation" -#define TIME_TO_BEGIN 1.6 SECONDS -#define TIME_PER_DEMO_STEP 0.6 SECONDS -#define TIME_TO_RESET_ICON 0.5 SECONDS +#define TIME_TO_BEGIN (1.6 SECONDS) +#define TIME_PER_DEMO_STEP (0.6 SECONDS) +#define TIME_TO_RESET_ICON (0.5 SECONDS) /obj/item/toy/intento name = "\improper Intento" diff --git a/code/game/objects/items/v8_engine.dm b/code/game/objects/items/v8_engine.dm index 6575e05c5a2..aadc5dbe9e5 100644 --- a/code/game/objects/items/v8_engine.dm +++ b/code/game/objects/items/v8_engine.dm @@ -1,5 +1,5 @@ -#define ENGINE_COOLDOWN 5 SECONDS -#define DASH_COOLDOWN 2.5 SECONDS +#define ENGINE_COOLDOWN (5 SECONDS) +#define DASH_COOLDOWN (2.5 SECONDS) #define HOUSE_EDGE_ICONS_MAX 3 #define HOUSE_EDGE_ICONS_MIN 0 diff --git a/code/game/objects/structures/maintenance.dm b/code/game/objects/structures/maintenance.dm index fad2fc5a7f1..be2c1a463a5 100644 --- a/code/game/objects/structures/maintenance.dm +++ b/code/game/objects/structures/maintenance.dm @@ -116,7 +116,7 @@ at the cost of risking a vicious bite.**/ #define ALTAR_STAGEONE 1 #define ALTAR_STAGETWO 2 #define ALTAR_STAGETHREE 3 -#define ALTAR_TIME 9.5 SECONDS +#define ALTAR_TIME (9.5 SECONDS) /obj/structure/destructible/cult/pants_altar name = "strange structure" diff --git a/code/game/objects/structures/mystery_box.dm b/code/game/objects/structures/mystery_box.dm index 2f4a3544823..e29493d53e4 100644 --- a/code/game/objects/structures/mystery_box.dm +++ b/code/game/objects/structures/mystery_box.dm @@ -10,13 +10,13 @@ // delays for the different stages of the box's state, the visuals, and the audio /// How long the box takes to decide what the prize is -#define MBOX_DURATION_CHOOSING 5 SECONDS +#define MBOX_DURATION_CHOOSING (5 SECONDS) /// How long the box takes to start expiring the offer, though it's still valid until MBOX_DURATION_EXPIRING finishes. Timed to the sound clips -#define MBOX_DURATION_PRESENTING 3.5 SECONDS +#define MBOX_DURATION_PRESENTING (3.5 SECONDS) /// How long the box takes to start lowering the prize back into itself. When this finishes, the prize is gone -#define MBOX_DURATION_EXPIRING 4.5 SECONDS +#define MBOX_DURATION_EXPIRING (4.5 SECONDS) /// How long after the box closes until it can go again -#define MBOX_DURATION_STANDBY 2.7 SECONDS +#define MBOX_DURATION_STANDBY (2.7 SECONDS) GLOBAL_LIST_INIT(mystery_box_guns, list( /obj/item/gun/energy/lasercannon, diff --git a/code/modules/admin/smites/bsa.dm b/code/modules/admin/smites/bsa.dm index 58503a43db1..cf0399acf26 100644 --- a/code/modules/admin/smites/bsa.dm +++ b/code/modules/admin/smites/bsa.dm @@ -1,7 +1,7 @@ #define BSA_CHANCE_TO_BREAK_TILE_TO_PLATING 80 #define BSA_MAX_DAMAGE 99 -#define BSA_PARALYZE_TIME 40 SECONDS -#define BSA_STUTTER_TIME 40 SECONDS +#define BSA_PARALYZE_TIME (40 SECONDS) +#define BSA_STUTTER_TIME (40 SECONDS) /// Fires the BSA at the target /datum/smite/bsa diff --git a/code/modules/antagonists/changeling/changeling.dm b/code/modules/antagonists/changeling/changeling.dm index dbb81b8010d..257032eb514 100644 --- a/code/modules/antagonists/changeling/changeling.dm +++ b/code/modules/antagonists/changeling/changeling.dm @@ -1,5 +1,5 @@ /// The duration of the fakedeath coma. -#define LING_FAKEDEATH_TIME 40 SECONDS +#define LING_FAKEDEATH_TIME (40 SECONDS) /// The number of recent spoken lines to gain on absorbing a mob #define LING_ABSORB_RECENT_SPEECH 8 diff --git a/code/modules/antagonists/cult/cult_items.dm b/code/modules/antagonists/cult/cult_items.dm index 9ae11432a26..70c585447f5 100644 --- a/code/modules/antagonists/cult/cult_items.dm +++ b/code/modules/antagonists/cult/cult_items.dm @@ -147,7 +147,7 @@ Striking a noncultist, however, will tear their flesh."} breakouttime = 6 SECONDS knockdown = 30 -#define CULT_BOLA_PICKUP_STUN 6 SECONDS +#define CULT_BOLA_PICKUP_STUN (6 SECONDS) /obj/item/restraints/legcuffs/bola/cult/attack_hand(mob/living/carbon/user, list/modifiers) . = ..() @@ -371,7 +371,7 @@ Striking a noncultist, however, will tear their flesh."} ///how many times can the shuttle be cursed? #define MAX_SHUTTLE_CURSES 3 ///if the max number of shuttle curses are used within this duration, the entire cult gets an achievement -#define SHUTTLE_CURSE_OMFG_TIMESPAN 10 SECONDS +#define SHUTTLE_CURSE_OMFG_TIMESPAN (10 SECONDS) /obj/item/shuttle_curse name = "cursed orb" diff --git a/code/modules/antagonists/disease/disease_mob.dm b/code/modules/antagonists/disease/disease_mob.dm index b27dba98051..3fe1b37734e 100644 --- a/code/modules/antagonists/disease/disease_mob.dm +++ b/code/modules/antagonists/disease/disease_mob.dm @@ -1,4 +1,4 @@ -#define FREEMOVE_TIME 2 MINUTES +#define FREEMOVE_TIME (2 MINUTES) /* A mob of type /mob/camera/disease is an overmind coordinating at least one instance of /datum/disease/advance/sentient_disease diff --git a/code/modules/antagonists/heretic/knowledge/blade_lore.dm b/code/modules/antagonists/heretic/knowledge/blade_lore.dm index b96aa7720ad..26aeeec86e1 100644 --- a/code/modules/antagonists/heretic/knowledge/blade_lore.dm +++ b/code/modules/antagonists/heretic/knowledge/blade_lore.dm @@ -92,7 +92,7 @@ playsound(get_turf(target), 'sound/weapons/guillotine.ogg', 100, TRUE) /// The cooldown duration between trigers of blade dance -#define BLADE_DANCE_COOLDOWN 20 SECONDS +#define BLADE_DANCE_COOLDOWN (20 SECONDS) /datum/heretic_knowledge/blade_dance name = "Dance of the Brand" diff --git a/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_knowledge.dm b/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_knowledge.dm index d9d35b1c89b..3415b9f5603 100644 --- a/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_knowledge.dm +++ b/code/modules/antagonists/heretic/knowledge/sacrifice_knowledge/sacrifice_knowledge.dm @@ -1,9 +1,9 @@ // The knowledge and process of heretic sacrificing. /// How long we put the target so sleep for (during sacrifice). -#define SACRIFICE_SLEEP_DURATION 12 SECONDS +#define SACRIFICE_SLEEP_DURATION (12 SECONDS) /// How long sacrifices must stay in the shadow realm to survive. -#define SACRIFICE_REALM_DURATION 2.5 MINUTES +#define SACRIFICE_REALM_DURATION (2.5 MINUTES) /** * Allows the heretic to sacrifice living heart targets. diff --git a/code/modules/atmospherics/machinery/components/fusion/hfr_defines.dm b/code/modules/atmospherics/machinery/components/fusion/hfr_defines.dm index 70f877215da..46a64a7e10a 100644 --- a/code/modules/atmospherics/machinery/components/fusion/hfr_defines.dm +++ b/code/modules/atmospherics/machinery/components/fusion/hfr_defines.dm @@ -43,9 +43,9 @@ #define WARNING_TIME_DELAY 60 ///to prevent accent sounds from layering -#define HYPERTORUS_ACCENT_SOUND_MIN_COOLDOWN 3 SECONDS +#define HYPERTORUS_ACCENT_SOUND_MIN_COOLDOWN (3 SECONDS) -#define HYPERTORUS_COUNTDOWN_TIME 30 SECONDS +#define HYPERTORUS_COUNTDOWN_TIME (30 SECONDS) // // Damage source: Too much mass in the fusion mix at high fusion levels diff --git a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm index 2d2b75bfddb..b47ecade096 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm @@ -8,7 +8,7 @@ #define CRYO_TX_QTY 0.5 // The minimum O2 moles in the cryotube before it switches off. #define CRYO_MIN_GAS_MOLES 5 -#define CRYO_BREAKOUT_TIME 30 SECONDS +#define CRYO_BREAKOUT_TIME (30 SECONDS) /// This is a visual helper that shows the occupant inside the cryo cell. /atom/movable/visual/cryo_occupant diff --git a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm index 4c9b4a36d5a..579ad72794e 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm @@ -256,7 +256,7 @@ return TRUE ///filtered gases at or below this amount automatically get removed from the mix -#define MINIMUM_MOLES_TO_SCRUB MOLAR_ACCURACY*100 +#define MINIMUM_MOLES_TO_SCRUB (MOLAR_ACCURACY*100) /obj/machinery/atmospherics/components/unary/vent_scrubber/proc/scrub(turf/tile) if(!istype(tile)) diff --git a/code/modules/clothing/head/tophat.dm b/code/modules/clothing/head/tophat.dm index f34e41a93b7..1a144f2f13d 100644 --- a/code/modules/clothing/head/tophat.dm +++ b/code/modules/clothing/head/tophat.dm @@ -1,4 +1,4 @@ -#define RABBIT_CD_TIME 30 SECONDS +#define RABBIT_CD_TIME (30 SECONDS) /obj/item/clothing/head/hats/tophat name = "top-hat" diff --git a/code/modules/explorer_drone/scanner_array.dm b/code/modules/explorer_drone/scanner_array.dm index 3cac95cd906..322917d2f1f 100644 --- a/code/modules/explorer_drone/scanner_array.dm +++ b/code/modules/explorer_drone/scanner_array.dm @@ -15,8 +15,8 @@ GLOBAL_LIST_INIT(scan_conditions,init_scan_conditions()) #define MAX_SCAN_DISTANCE 10 #define WIDE_SCAN_COST(BAND, SCAN_POWER) (((BAND*BAND)/(SCAN_POWER))*2*60*10) -#define BASE_POINT_SCAN_TIME 5 MINUTES -#define BASE_DEEP_SCAN_TIME 5 MINUTES +#define BASE_POINT_SCAN_TIME (5 MINUTES) +#define BASE_DEEP_SCAN_TIME (5 MINUTES) /// Represents scan in progress, only one globally for now, todo later split per z or allow partial dish swarm usage /datum/exoscan diff --git a/code/modules/holodeck/computer.dm b/code/modules/holodeck/computer.dm index baa2a1f1588..8ec695e1de6 100644 --- a/code/modules/holodeck/computer.dm +++ b/code/modules/holodeck/computer.dm @@ -22,8 +22,8 @@ created from them: make sure you handle that list correctly! Either copy them by and clear when youre done! if you dont i will use :newspaper2: on you */ -#define HOLODECK_CD 2 SECONDS -#define HOLODECK_DMG_CD 5 SECONDS +#define HOLODECK_CD (2 SECONDS) +#define HOLODECK_DMG_CD (5 SECONDS) /// typecache for turfs that should be considered ok during floorchecks. /// A linked turf being anything not in this typecache will cause the holodeck to perform an emergency shutdown. diff --git a/code/modules/library/lib_machines.dm b/code/modules/library/lib_machines.dm index 2c4c33928cb..2925701ae87 100644 --- a/code/modules/library/lib_machines.dm +++ b/code/modules/library/lib_machines.dm @@ -247,7 +247,7 @@ var/checkout var/duedate -#define PRINTER_COOLDOWN 6 SECONDS +#define PRINTER_COOLDOWN (6 SECONDS) #define LIBRARY_NEWSFEED "Nanotrasen Book Club" //The different states the computer can be in, only send the info we need yeah? #define LIBRARY_INVENTORY 1 diff --git a/code/modules/library/skill_learning/skill_station.dm b/code/modules/library/skill_learning/skill_station.dm index 61832579df8..e8c378d7699 100644 --- a/code/modules/library/skill_learning/skill_station.dm +++ b/code/modules/library/skill_learning/skill_station.dm @@ -1,5 +1,5 @@ -#define SKILLCHIP_IMPLANT_TIME 15 SECONDS -#define SKILLCHIP_REMOVAL_TIME 15 SECONDS +#define SKILLCHIP_IMPLANT_TIME (15 SECONDS) +#define SKILLCHIP_REMOVAL_TIME (15 SECONDS) /obj/machinery/skill_station name = "\improper Skillsoft station" diff --git a/code/modules/mining/lavaland/megafauna_loot.dm b/code/modules/mining/lavaland/megafauna_loot.dm index 159e54ea883..6a87583ba8a 100644 --- a/code/modules/mining/lavaland/megafauna_loot.dm +++ b/code/modules/mining/lavaland/megafauna_loot.dm @@ -4,7 +4,7 @@ //Hierophant: Hierophant Club #define HIEROPHANT_BLINK_RANGE 5 -#define HIEROPHANT_BLINK_COOLDOWN 15 SECONDS +#define HIEROPHANT_BLINK_COOLDOWN (15 SECONDS) /datum/action/innate/dash/hierophant current_charges = 1 diff --git a/code/modules/mob/emote.dm b/code/modules/mob/emote.dm index 8680bd11bb2..ff2e414dd70 100644 --- a/code/modules/mob/emote.dm +++ b/code/modules/mob/emote.dm @@ -1,15 +1,15 @@ ///How confused a carbon must be before they will vomit -#define BEYBLADE_PUKE_THRESHOLD 30 SECONDS +#define BEYBLADE_PUKE_THRESHOLD (30 SECONDS) ///How must nutrition is lost when a carbon pukes #define BEYBLADE_PUKE_NUTRIENT_LOSS 60 ///How often a carbon becomes penalized #define BEYBLADE_DIZZINESS_PROBABILITY 20 ///How long the screenshake lasts -#define BEYBLADE_DIZZINESS_DURATION 20 SECONDS +#define BEYBLADE_DIZZINESS_DURATION (20 SECONDS) ///How much confusion a carbon gets every time they are penalized -#define BEYBLADE_CONFUSION_INCREMENT 10 SECONDS +#define BEYBLADE_CONFUSION_INCREMENT (10 SECONDS) ///A max for how much confusion a carbon will be for beyblading -#define BEYBLADE_CONFUSION_LIMIT 40 SECONDS +#define BEYBLADE_CONFUSION_LIMIT (40 SECONDS) //The code execution of the emote datum is located at code/datums/emotes.dm /mob/proc/emote(act, m_type = null, message = null, intentional = FALSE, force_silence = FALSE) diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index 9b9eabed246..324743fd8bb 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -2,7 +2,7 @@ mob_type_allowed_typecache = list(/mob/living/carbon/human) /// The time it takes for the crying visual to be removed -#define CRY_DURATION 12.8 SECONDS +#define CRY_DURATION (12.8 SECONDS) /datum/emote/living/carbon/human/cry key = "cry" diff --git a/code/modules/mob/living/emote.dm b/code/modules/mob/living/emote.dm index 1ae72ff488f..6a17f89f525 100644 --- a/code/modules/mob/living/emote.dm +++ b/code/modules/mob/living/emote.dm @@ -5,7 +5,7 @@ mob_type_blacklist_typecache = list(/mob/living/brain) /// The time it takes for the blush visual to be removed -#define BLUSH_DURATION 5.2 SECONDS +#define BLUSH_DURATION (5.2 SECONDS) /datum/emote/living/blush key = "blush" diff --git a/code/modules/mob/living/simple_animal/hostile/headcrab.dm b/code/modules/mob/living/simple_animal/hostile/headcrab.dm index 0d69abdd344..37ac108169a 100644 --- a/code/modules/mob/living/simple_animal/hostile/headcrab.dm +++ b/code/modules/mob/living/simple_animal/hostile/headcrab.dm @@ -1,4 +1,4 @@ -#define EGG_INCUBATION_TIME 4 MINUTES +#define EGG_INCUBATION_TIME (4 MINUTES) /mob/living/simple_animal/hostile/headcrab name = "headslug" diff --git a/code/modules/mod/mod_ai.dm b/code/modules/mod/mod_ai.dm index 2474a1195a3..efdc9115f13 100644 --- a/code/modules/mod/mod_ai.dm +++ b/code/modules/mod/mod_ai.dm @@ -70,8 +70,8 @@ #define MOVE_DELAY 2 #define WEARER_DELAY 1 #define LONE_DELAY 5 -#define CHARGE_PER_STEP DEFAULT_CHARGE_DRAIN * 2.5 -#define AI_FALL_TIME 1 SECONDS +#define CHARGE_PER_STEP (DEFAULT_CHARGE_DRAIN * 2.5) +#define AI_FALL_TIME (1 SECONDS) /obj/item/mod/control/relaymove(mob/user, direction) if((!active && wearer) || get_charge() < CHARGE_PER_STEP || user != ai || !COOLDOWN_FINISHED(src, cooldown_mod_move) || (wearer?.pulledby?.grab_state > GRAB_PASSIVE)) diff --git a/code/modules/mod/modules/modules_maint.dm b/code/modules/mod/modules/modules_maint.dm index 18b68366207..69352bbdf18 100644 --- a/code/modules/mod/modules/modules_maint.dm +++ b/code/modules/mod/modules/modules_maint.dm @@ -324,7 +324,7 @@ playsound(current_turf, 'sound/items/modsuit/atrocinator_step.ogg', 50) step_count++ -#define FLY_TIME 5 SECONDS +#define FLY_TIME (5 SECONDS) /obj/item/mod/module/atrocinator/proc/fly_away() you_fucked_up = TRUE diff --git a/code/modules/research/bepis.dm b/code/modules/research/bepis.dm index 1f420a8c2f6..1771b01fef6 100644 --- a/code/modules/research/bepis.dm +++ b/code/modules/research/bepis.dm @@ -4,10 +4,10 @@ #define MACHINE_OPERATION 100000 #define MACHINE_OVERLOAD 500000 -#define MAJOR_THRESHOLD 6*CARGO_CRATE_VALUE -#define MINOR_THRESHOLD 4*CARGO_CRATE_VALUE -#define STANDARD_DEVIATION 2*CARGO_CRATE_VALUE -#define PART_CASH_OFFSET_AMOUNT 0.5*CARGO_CRATE_VALUE +#define MAJOR_THRESHOLD (6*CARGO_CRATE_VALUE) +#define MINOR_THRESHOLD (4*CARGO_CRATE_VALUE) +#define STANDARD_DEVIATION (2*CARGO_CRATE_VALUE) +#define PART_CASH_OFFSET_AMOUNT (0.5*CARGO_CRATE_VALUE) /obj/machinery/rnd/bepis name = "\improper B.E.P.I.S. Chamber" diff --git a/code/modules/shuttle/syndicate.dm b/code/modules/shuttle/syndicate.dm index 31b1f6e66fe..db2efb37551 100644 --- a/code/modules/shuttle/syndicate.dm +++ b/code/modules/shuttle/syndicate.dm @@ -1,4 +1,4 @@ -#define SYNDICATE_CHALLENGE_TIMER 20 MINUTES +#define SYNDICATE_CHALLENGE_TIMER (20 MINUTES) /obj/machinery/computer/shuttle/syndicate name = "syndicate shuttle terminal" diff --git a/code/modules/tgui_panel/telemetry.dm b/code/modules/tgui_panel/telemetry.dm index 790b9fe10db..70028e2680b 100644 --- a/code/modules/tgui_panel/telemetry.dm +++ b/code/modules/tgui_panel/telemetry.dm @@ -12,7 +12,7 @@ /** * Maximum time allocated for sending a telemetry packet. */ -#define TGUI_TELEMETRY_RESPONSE_WINDOW 30 SECONDS +#define TGUI_TELEMETRY_RESPONSE_WINDOW (30 SECONDS) /// Time of telemetry request /datum/tgui_panel/var/telemetry_requested_at @@ -133,7 +133,7 @@ "ckey" = ckey, "telemetry_ckey" = one_query["telemetry_ckey"], "address" = one_query["address"], - "computer_id" = one_query["computer_id"], + "computer_id" = one_query["computer_id"], "round_id" = GLOB.round_id, )) query.Execute() diff --git a/code/modules/vehicles/mecha/combat/savannah_ivanov.dm b/code/modules/vehicles/mecha/combat/savannah_ivanov.dm index 916b890a5cc..0a81b429e12 100644 --- a/code/modules/vehicles/mecha/combat/savannah_ivanov.dm +++ b/code/modules/vehicles/mecha/combat/savannah_ivanov.dm @@ -1,10 +1,10 @@ ///how much time between charge_level going up by 1 -#define SKYFALL_SINGLE_CHARGE_TIME 2 SECONDS +#define SKYFALL_SINGLE_CHARGE_TIME (2 SECONDS) ///enough charge level to take off, basically done charging #define SKYFALL_CHARGELEVEL_LAUNCH 5 ///how much time you're in the air -#define TOTAL_SKYFALL_LEAP_TIME 3 SECONDS +#define TOTAL_SKYFALL_LEAP_TIME (3 SECONDS) /** * ## Savannah-Ivanov! diff --git a/code/modules/vehicles/mecha/working/clarke.dm b/code/modules/vehicles/mecha/working/clarke.dm index a9a8d0f21d9..6e99c53238c 100644 --- a/code/modules/vehicles/mecha/working/clarke.dm +++ b/code/modules/vehicles/mecha/working/clarke.dm @@ -69,7 +69,7 @@ hostmech.box?.dump_box_contents() activated = TRUE -#define SEARCH_COOLDOWN 1 MINUTES +#define SEARCH_COOLDOWN (1 MINUTES) /datum/action/vehicle/sealed/mecha/mech_search_ruins name = "Search for Ruins"