[MIRROR] Throws a bunch of parenthesis around to ensure dear Aunt Sally is always properly excused. [MDB IGNORE] (#17654)

2026-08-26 22:50:26 +01:00 · 2022-11-22 19:44:59 -08:00
parent 25bb463527
commit b9b6a803b0
108 changed files with 232 additions and 232 deletions
@@ -158,9 +158,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
@@ -113,7 +113,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.
@@ -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)
@@ -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
@@ -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
@@ -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
@@ -178,7 +178,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
@@ -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

@@ -296,10 +296,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

@@ -531,13 +531,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
@@ -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
@@ -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)
@@ -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.
@@ -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

@@ -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
@@ -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"
@@ -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
@@ -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.
@@ -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

@@ -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

@@ -165,7 +165,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
@@ -1,9 +1,9 @@
 // Just keeping this easy to maintain in the future.
-#define JOB_NOT_VETERAN JOB_UNAVAILABLE_ANTAG_INCOMPAT + 1
-#define JOB_UNAVAILABLE_QUIRK JOB_NOT_VETERAN + 1
-#define JOB_UNAVAILABLE_SPECIES JOB_UNAVAILABLE_QUIRK + 1
-#define JOB_UNAVAILABLE_LANGUAGE JOB_UNAVAILABLE_SPECIES + 1
-#define JOB_UNAVAILABLE_FLAVOUR JOB_UNAVAILABLE_LANGUAGE + 1
+#define JOB_NOT_VETERAN (JOB_UNAVAILABLE_ANTAG_INCOMPAT + 1)
+#define JOB_UNAVAILABLE_QUIRK (JOB_NOT_VETERAN + 1)
+#define JOB_UNAVAILABLE_SPECIES (JOB_UNAVAILABLE_QUIRK + 1)
+#define JOB_UNAVAILABLE_LANGUAGE (JOB_UNAVAILABLE_SPECIES + 1)
+#define JOB_UNAVAILABLE_FLAVOUR (JOB_UNAVAILABLE_LANGUAGE + 1)

 #define SEC_RESTRICTED_QUIRKS "Blind" = TRUE, "Brain Tumor" = TRUE, "Deaf" = TRUE, "Paraplegic" = TRUE, "Mute" = TRUE, "Foreigner" = TRUE, "Pacifist" = TRUE, "Chunky Fingers" = TRUE, "No Guns" = TRUE, "Illiterate" = TRUE, "Nerve Stapled" = TRUE
 #define HEAD_RESTRICTED_QUIRKS "Blind" = TRUE, "Deaf" = TRUE, "Mute" = TRUE, "Foreigner" = TRUE, "Chunky Fingers" = TRUE, "Brain Tumor" = TRUE, "Illiterate" = TRUE
@@ -23,8 +23,8 @@
 #define OPFOR_SUBSYSTEM_REJECT_CLOSED "OPFOR application system is not accepting new applications"
 #define OPFOR_SUBSYSTEM_READY "OPFOR application system is ready to accept new applications"

-#define OPFOR_REQUEST_UPDATE_COOLDOWN 5 MINUTES
-#define OPFOR_PING_COOLDOWN 1 MINUTES
+#define OPFOR_REQUEST_UPDATE_COOLDOWN (5 MINUTES)
+#define OPFOR_PING_COOLDOWN (1 MINUTES)

 #define OPFOR_TEXT_LIMIT_TITLE 40
 #define OPFOR_TEXT_LIMIT_BACKSTORY 1000
@@ -24,7 +24,7 @@
 #define POLLUTANT_SMELL_NORMAL 20
 #define POLLUTANT_SMELL_STRONG 40

-#define SMELL_COOLDOWN 1 MINUTES
+#define SMELL_COOLDOWN (1 MINUTES)

 //Bitflags for pollutants
 #define POLLUTANT_APPEARANCE (1<<0) //Pollutant has an appearance
@@ -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))
@@ -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)

 /*
 {
@@ -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
@@ -1,8 +1,8 @@
 //"Don't leave food on the floor, that's how we get ants"

-#define DECOMPOSITION_TIME 20 MINUTES //SKYRAT CHANGE, INCREASED TIME
-#define DECOMPOSITION_TIME_RAW 15 MINUTES //SKYRAT CHANGE, INCREASED TIME
-#define DECOMPOSITION_TIME_GROSS 10 MINUTES //SKYRAT CHANGE, INCREASED TIME
+#define DECOMPOSITION_TIME (20 MINUTES) //SKYRAT CHANGE, INCREASED TIME
+#define DECOMPOSITION_TIME_RAW (15 MINUTES) //SKYRAT CHANGE, INCREASED TIME
+#define DECOMPOSITION_TIME_GROSS (10 MINUTES) //SKYRAT CHANGE, INCREASED TIME

 /datum/component/decomposition
 	dupe_mode = COMPONENT_DUPE_UNIQUE
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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)
@@ -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

@@ -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))
@@ -1,11 +1,11 @@
-//#define MAX_TIMER 15 MINUTES //ORIGINAL
-#define MAX_TIMER 60 MINUTES //SKYRAT EDIT CHANGE
-//#define PRESET_SHORT 2 MINUTES //ORIGINAL
-#define PRESET_SHORT 5 MINUTES //SKYRAT EDIT CHANGE
-//#define PRESET_MEDIUM 3 MINUTES //ORIGINAL
-#define PRESET_MEDIUM 10 MINUTES //SKYRAT EDIT CHANGE
-//#define PRESET_LONG 5 MINUTES //ORIGINAL
-#define PRESET_LONG 15 MINUTES //SKYRAT EDIT CHANGE
+//#define MAX_TIMER (15 MINUTES) //ORIGINAL
+#define MAX_TIMER (60 MINUTES) //SKYRAT EDIT CHANGE
+//#define PRESET_SHORT (2 MINUTES) //ORIGINAL
+#define PRESET_SHORT (5 MINUTES) //SKYRAT EDIT CHANGE
+//#define PRESET_MEDIUM (3 MINUTES) //ORIGINAL
+#define PRESET_MEDIUM (10 MINUTES) //SKYRAT EDIT CHANGE
+//#define PRESET_LONG (5 MINUTES) //ORIGINAL
+#define PRESET_LONG (15 MINUTES) //SKYRAT EDIT CHANGE

 /**
 * Brig Door control displays.
@@ -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"
@@ -1,4 +1,4 @@
-#define BEAM_FADE_TIME 1 SECONDS
+#define BEAM_FADE_TIME (1 SECONDS)

 /obj/machinery/launchpad
 	name = "bluespace launchpad"
@@ -1,4 +1,4 @@
-#define ALERT_DELAY 50 SECONDS
+#define ALERT_DELAY (50 SECONDS)

 /obj/machinery/newscaster
 	name = "newscaster"
@@ -1,4 +1,4 @@
-#define SPAM_CD 3 SECONDS
+#define SPAM_CD (3 SECONDS)

 /obj/machinery/prisongate
 	name = "prison gate scanner"
@@ -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:
@@ -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"
@@ -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."
@@ -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"
@@ -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"
@@ -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

@@ -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"
@@ -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,
@@ -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
@@ -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

@@ -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"
@@ -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
@@ -93,7 +93,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"
@@ -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.
@@ -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
@@ -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
@@ -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))
@@ -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"
@@ -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
@@ -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.
@@ -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
@@ -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"
@@ -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
@@ -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)
@@ -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"
@@ -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"
@@ -1,4 +1,4 @@
-#define EGG_INCUBATION_TIME 4 MINUTES
+#define EGG_INCUBATION_TIME (4 MINUTES)

 /mob/living/simple_animal/hostile/headcrab
 	name = "headslug"
@@ -71,8 +71,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))
@@ -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
@@ -145,8 +145,8 @@


 //SKYRAT EDIT ADDITION BEGIN - AESTHETICS
-#define LIGHT_ON_DELAY_UPPER 3 SECONDS
-#define LIGHT_ON_DELAY_LOWER 1 SECONDS
+#define LIGHT_ON_DELAY_UPPER (3 SECONDS)
+#define LIGHT_ON_DELAY_LOWER (1 SECONDS)
 //SKYRAT EDIT END

 // Area sensitivity is traditionally tied directly to power use, as an optimization
@@ -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"
@@ -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"
@@ -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()
@@ -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!
@@ -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"
@@ -1,4 +1,4 @@
-#define OXY_CANDLE_RELEASE_TEMP  T20C + 10 // 30 celsius, it's hot. Will be even hotter with hotspot expose
+#define OXY_CANDLE_RELEASE_TEMP (T20C + 10) // 30 celsius, it's hot. Will be even hotter with hotspot expose

 /obj/item/oxygen_candle
 	name = "oxygen candle"
@@ -1,4 +1,4 @@
-#define SAUNA_H2O_TEMP  T20C + 20
+#define SAUNA_H2O_TEMP (T20C + 20)
 #define SAUNA_LOG_FUEL 150
 #define SAUNA_PAPER_FUEL 5
 #define SAUNA_MAXIMUM_FUEL 3000
@@ -1,7 +1,7 @@
 GLOBAL_LIST_EMPTY(goldeneye_pinpointers)

-#define ICARUS_IGNITION_TIME 20 SECONDS
-#define PINPOINTER_PING_TIME 4 SECONDS
+#define ICARUS_IGNITION_TIME (20 SECONDS)
+#define PINPOINTER_PING_TIME (4 SECONDS)

 /**
 * GoldenEye defence network
@@ -1,6 +1,6 @@
-#define STAGE_PROCESS_TIME_LOWER 30 SECONDS
-#define STAGE_PROCESS_TIME_UPPER 1 MINUTES
-#define ALERT_CREW_TIME 25 SECONDS
+#define STAGE_PROCESS_TIME_LOWER (30 SECONDS)
+#define STAGE_PROCESS_TIME_UPPER (1 MINUTES)
+#define ALERT_CREW_TIME (25 SECONDS)

 /**
 * The interrorgator, a piece of machinery used in assault ops to extract GoldenEye keys from heads of staff.
@@ -1,7 +1,7 @@
 #define SUNBEAM_OBLITERATION_RANGE_FIRE 2
 #define SUNBEAM_OBLITERATION_RANGE_FLATTEN 1
-#define SUNBEAM_OBLITERATION_COOLDOWN 0.2 SECONDS
-#define SUNBEAM_MOVEMENT_COOLDOWN 0.3 SECONDS
+#define SUNBEAM_OBLITERATION_COOLDOWN (0.2 SECONDS)
+#define SUNBEAM_MOVEMENT_COOLDOWN (0.3 SECONDS)
 #define SUNBEAM_DEFAULT_SCALE_X 2
 #define SUNBEAM_DEFAULT_SCALE_Y 2
 #define SUNBEAM_OVERLAYS 16
@@ -42,7 +42,7 @@
 	mid_sounds = list('modular_skyrat/master_files/sound/effects/heart_beat_loop3.ogg'=1)
 	volume = 20

-#define CORE_RETALIATION_COOLDOWN 5 SECONDS
+#define CORE_RETALIATION_COOLDOWN (5 SECONDS)

 /obj/structure/biohazard_blob/structure/core
 	name = "glowing core"
@@ -192,7 +192,7 @@
 	moan_chance = 50

 #define MAX_FAKE_STEAM_STAGES 5
-#define STAGE_DOWN_TIME 10 SECONDS
+#define STAGE_DOWN_TIME (10 SECONDS)

 /// Fake steam effect
 /obj/effect/abstract/fake_steam
@@ -12,7 +12,7 @@
 #define SYSTEM_RELOADING "SYSTEM RELOADING"
 #define SYSTEM_INTERRUPTED "SYSTEM INTERRUPTED"

-#define SUPERWEAPON_RELOAD_TIME 30 SECONDS
+#define SUPERWEAPON_RELOAD_TIME (30 SECONDS)

 /datum/station_goal/bluespace_cannon
 	name = "Bluespace Artillery"
@@ -23,43 +23,43 @@ GLOBAL_LIST_INIT(cme_loot_list, list(
 #define CME_MINIMAL_LIGHT_RANGE_UPPER 10 //The highest range for the emp pulse light range.
 #define CME_MINIMAL_HEAVY_RANGE_LOWER 5 //The lowest range for the emp pulse heavy range.
 #define CME_MINIMAL_HEAVY_RANGE_UPPER 7 //The highest range for the emp pulse heavy range.
-#define CME_MINIMAL_FREQUENCY_LOWER 30 * 0.5 //The lower time range for cme bubbles to appear.
-#define CME_MINIMAL_FREQUENCY_UPPER 35 * 0.5 //The higher time range for cme bubbles to appear.
-#define CME_MINIMAL_BUBBLE_BURST_TIME 45 SECONDS //The time taken for a cme bubble to pop.
-#define CME_MINIMAL_START_LOWER 120 * 0.5 //The lowest amount of time for the event to start from the announcement. - Prep time
-#define CME_MINIMAL_START_UPPER 180 * 0.5 //The highest amount of time for the event to start from the announcement. - Prep time
-#define CME_MINIMAL_END 60 * 0.5 //The amount of time starting from THE MINIMAL START TIME for the event to end. - How long it actually lasts.
+#define CME_MINIMAL_FREQUENCY_LOWER (30 * 0.5) //The lower time range for cme bubbles to appear.
+#define CME_MINIMAL_FREQUENCY_UPPER (35 * 0.5) //The higher time range for cme bubbles to appear.
+#define CME_MINIMAL_BUBBLE_BURST_TIME (45 SECONDS) //The time taken for a cme bubble to pop.
+#define CME_MINIMAL_START_LOWER (120 * 0.5) //The lowest amount of time for the event to start from the announcement. - Prep time
+#define CME_MINIMAL_START_UPPER (180 * 0.5) //The highest amount of time for the event to start from the announcement. - Prep time
+#define CME_MINIMAL_END (60 * 0.5) //The amount of time starting from THE MINIMAL START TIME for the event to end. - How long it actually lasts.

 #define CME_MODERATE_LIGHT_RANGE_LOWER 10
 #define CME_MODERATE_LIGHT_RANGE_UPPER 15
 #define CME_MODERATE_HEAVY_RANGE_LOWER 7
 #define CME_MODERATE_HEAVY_RANGE_UPPER 10
-#define CME_MODERATE_FREQUENCY_LOWER 25 * 0.5
-#define CME_MODERATE_FREQUENCY_UPPER 30 * 0.5
-#define CME_MODERATE_BUBBLE_BURST_TIME 35 SECONDS
-#define CME_MODERATE_START_LOWER 120 * 0.5
-#define CME_MODERATE_START_UPPER 180 * 0.5
-#define CME_MODERATE_END 90 * 0.5
+#define CME_MODERATE_FREQUENCY_LOWER (25 * 0.5)
+#define CME_MODERATE_FREQUENCY_UPPER (30 * 0.5)
+#define CME_MODERATE_BUBBLE_BURST_TIME (35 SECONDS)
+#define CME_MODERATE_START_LOWER (120 * 0.5)
+#define CME_MODERATE_START_UPPER (180 * 0.5)
+#define CME_MODERATE_END (90 * 0.5)


 #define CME_EXTREME_LIGHT_RANGE_LOWER 15
 #define CME_EXTREME_LIGHT_RANGE_UPPER 20
 #define CME_EXTREME_HEAVY_RANGE_LOWER 10
 #define CME_EXTREME_HEAVY_RANGE_UPPER 13
-#define CME_EXTREME_FREQUENCY_LOWER 20 * 0.5
-#define CME_EXTREME_FREQUENCY_UPPER 25 * 0.5
-#define CME_EXTREME_BUBBLE_BURST_TIME 25 SECONDS
-#define CME_EXTREME_START_LOWER 60 * 0.5
-#define CME_EXTREME_START_UPPER 120 * 0.5
-#define CME_EXTREME_END 120 * 0.5
+#define CME_EXTREME_FREQUENCY_LOWER (20 * 0.5)
+#define CME_EXTREME_FREQUENCY_UPPER (25 * 0.5)
+#define CME_EXTREME_BUBBLE_BURST_TIME (25 SECONDS)
+#define CME_EXTREME_START_LOWER (60 * 0.5)
+#define CME_EXTREME_START_UPPER (120 * 0.5)
+#define CME_EXTREME_END (120 * 0.5)

 #define CME_ARMAGEDDON_LIGHT_RANGE_LOWER 25
 #define CME_ARMAGEDDON_LIGHT_RANGE_UPPER 30
 #define CME_ARMAGEDDON_HEAVY_RANGE_LOWER 20
 #define CME_ARMAGEDDON_HEAVY_RANGE_UPPER 25
-#define CME_ARMAGEDDON_FREQUENCY_LOWER 5 * 0.5
-#define CME_ARMAGEDDON_FREQUENCY_UPPER 7 * 0.5
-#define CME_ARMAGEDDON_BUBBLE_BURST_TIME 10 SECONDS
-#define CME_ARMAGEDDON_START_LOWER 60 * 0.5
-#define CME_ARMAGEDDON_START_UPPER 70 * 0.5
-#define CME_ARMAGEDDON_END 300 * 0.5
+#define CME_ARMAGEDDON_FREQUENCY_LOWER (5 * 0.5)
+#define CME_ARMAGEDDON_FREQUENCY_UPPER (7 * 0.5)
+#define CME_ARMAGEDDON_BUBBLE_BURST_TIME (10 SECONDS)
+#define CME_ARMAGEDDON_START_LOWER (60 * 0.5)
+#define CME_ARMAGEDDON_START_UPPER (70 * 0.5)
+#define CME_ARMAGEDDON_END (300 * 0.5)
@@ -1,5 +1,5 @@
 #define CHEMICALS_PER_UNIT 2
-#define CHEMICAL_SECOND_DIVISOR 5 SECONDS
+#define CHEMICAL_SECOND_DIVISOR (5 SECONDS)
 #define OUT_OF_HOST_EGG_COST 50
 #define BLOOD_CHEM_OBJECTIVE 5

@@ -3,5 +3,5 @@
 #define DNA_FEATURE_BLOCKS_TOTAL_SIZE_PER_FEATURE (DNA_BLOCK_SIZE + DNA_BLOCK_SIZE_COLOR * DNA_FEATURE_COLOR_BLOCKS_PER_FEATURE)
 #define DNA_BLOCKS_PER_MARKING 2
 #define DNA_MARKING_COLOR_BLOCKS_PER_MARKING 1
-#define DNA_BLOCKS_PER_MARKING_ZONE MAXIMUM_MARKINGS_PER_LIMB * DNA_BLOCKS_PER_MARKING + 1
+#define DNA_BLOCKS_PER_MARKING_ZONE (MAXIMUM_MARKINGS_PER_LIMB * DNA_BLOCKS_PER_MARKING + 1)
 #define DNA_MARKING_BLOCKS_TOTAL_SIZE_PER_MARKING (DNA_BLOCK_SIZE + DNA_BLOCK_SIZE_COLOR * DNA_MARKING_COLOR_BLOCKS_PER_MARKING)
@@ -3,7 +3,7 @@
 /// How much blood do Hemophages normally lose per second (visible effect is every two seconds, so twice this value).
 #define NORMAL_BLOOD_DRAIN 0.125
 /// Minimum amount of blood that you can reach via blood regeneration, regeneration will stop below this.
-#define MINIMUM_VOLUME_FOR_REGEN BLOOD_VOLUME_BAD + 1 // We do this to avoid any jankiness, and because we want to ensure that they don't fall into a state where they're constantly passing out in a locker.
+#define MINIMUM_VOLUME_FOR_REGEN (BLOOD_VOLUME_BAD + 1) // We do this to avoid any jankiness, and because we want to ensure that they don't fall into a state where they're constantly passing out in a locker.
 /// Minimum amount of light for Hemophages to be considered in pure darkness, and therefore be allowed to heal just like in a closet.
 #define MINIMUM_LIGHT_THRESHOLD_FOR_REGEN 0
 /// How much organ damage do all hemophage organs take per second when the tumor is removed?
@@ -1,4 +1,4 @@
-#define EXTRA_ABOVE_MOB_LAYER ABOVE_MOB_LAYER + 0.01
+#define EXTRA_ABOVE_MOB_LAYER (ABOVE_MOB_LAYER + 0.01)

 /obj/structure/mark_turf
 	name = "turf"
@@ -1,5 +1,5 @@

-#define EMOTE_DELAY 5 SECONDS //To prevent spam emotes.
+#define EMOTE_DELAY (5 SECONDS) //To prevent spam emotes.

 /mob
 	var/nextsoundemote = 1 //Time at which the next emote can be played
@@ -2,12 +2,12 @@
 * A simple voting system to replace the current random events, if no votes are recieved, it will be random.
 */

-#define LOW_CHAOS_TIMER_LOWER 5 MINUTES
+#define LOW_CHAOS_TIMER_LOWER (5 MINUTES)

-#define LOW_CHAOS_TIMER_UPPER 15 MINUTES
+#define LOW_CHAOS_TIMER_UPPER (15 MINUTES)

 /// How long does the vote last?
-#define EVENT_VOTE_TIME 1 MINUTES
+#define EVENT_VOTE_TIME (1 MINUTES)

 /// Public vote amount
 #define EVENT_PUBLIC_VOTE_AMOUNT 5
@@ -1,5 +1,5 @@
-#define MARKED_ONE_STUN_DURATION 1.5 SECONDS
-#define MARKED_ONE_ANGER_DURATION 10 MINUTES
+#define MARKED_ONE_STUN_DURATION (1.5 SECONDS)
+#define MARKED_ONE_ANGER_DURATION (10 MINUTES)
 #define MARKED_ONE_FIRST_PHASE 1
 #define MARKED_ONE_SECOND_PHASE 2
 #define MARKED_ONE_THIRD_PHASE 3
@@ -101,7 +101,7 @@
 #define SPREAD_UNDEPLOYED 17
 #define SPREAD_DEPLOYED 6
 #define HEAT_PER_SHOT 1.5
-#define TIME_TO_COOLDOWN 20 SECONDS
+#define TIME_TO_COOLDOWN (20 SECONDS)
 #define BARREL_COOLDOWN_RATE 2

 /obj/item/gun/ballistic/automatic/mg34/mg42
@@ -17,12 +17,12 @@
 #define HEV_POWERUSE_HIT 100
 #define HEV_POWERUSE_HEAL 150

-#define HEV_COOLDOWN_HEAL 10 SECONDS
-#define HEV_COOLDOWN_RADS 20 SECONDS
-#define HEV_COOLDOWN_ACID 20 SECONDS
-#define PCV_COOLDOWN_HEAL 15 SECONDS
-#define PCV_COOLDOWN_RADS 30 SECONDS
-#define PCV_COOLDOWN_ACID 30 SECONDS
+#define HEV_COOLDOWN_HEAL (10 SECONDS)
+#define HEV_COOLDOWN_RADS (20 SECONDS)
+#define HEV_COOLDOWN_ACID (20 SECONDS)
+#define PCV_COOLDOWN_HEAL (15 SECONDS)
+#define PCV_COOLDOWN_RADS (30 SECONDS)
+#define PCV_COOLDOWN_ACID (30 SECONDS)

 #define HEV_HEAL_AMOUNT 10
 #define PCV_HEAL_AMOUNT 5
@@ -1,4 +1,4 @@
-#define TRUE_CHANGELING_REFORM_THRESHOLD 5 MINUTES
+#define TRUE_CHANGELING_REFORM_THRESHOLD (5 MINUTES)
 #define TRUE_CHANGELING_PASSIVE_HEAL 3 //Amount of brute damage restored per tick

 //Changelings in their true form.
@@ -1,4 +1,4 @@
-#define COMBAT_NOTICE_COOLDOWN 10 SECONDS
+#define COMBAT_NOTICE_COOLDOWN (10 SECONDS)
 GLOBAL_VAR_INIT(combat_indicator_overlay, GenerateCombatOverlay())

 /proc/GenerateCombatOverlay()
@@ -1,5 +1,5 @@
-#define SELF_AID_REMOVE_DELAY 5 SECONDS
-#define OTHER_AID_REMOVE_DELAY 2 SECONDS
+#define SELF_AID_REMOVE_DELAY (5 SECONDS)
+#define OTHER_AID_REMOVE_DELAY (2 SECONDS)

 /datum/bodypart_aid
 	var/name
@@ -8,9 +8,9 @@
 #define MICROFUSION_CELL_RADIATION_RANGE_FAILURE 1

 /// The lower most time for a microfusion cell meltdown.
-#define MICROFUSION_CELL_FAILURE_LOWER 10 SECONDS
+#define MICROFUSION_CELL_FAILURE_LOWER (10 SECONDS)
 /// The upper most time for a microfusion cell meltdown.
-#define MICROFUSION_CELL_FAILURE_UPPER 15 SECONDS
+#define MICROFUSION_CELL_FAILURE_UPPER (15 SECONDS)

 /// A charge drain failure.
 #define MICROFUSION_CELL_FAILURE_TYPE_CHARGE_DRAIN 1
@@ -83,8 +83,8 @@
 #define MOVE_DELAY 2
 #define WEARER_DELAY 1
 #define LONE_DELAY 5
-#define CELL_PER_STEP DEFAULT_CHARGE_DRAIN * 2.5
-#define PAI_FALL_TIME 1 SECONDS
+#define CELL_PER_STEP (DEFAULT_CHARGE_DRAIN * 2.5)
+#define PAI_FALL_TIME (1 SECONDS)

 /obj/item/mod/control/relaymove(mob/user, direction)
 	if((!active && wearer) || (active && !can_pai_move_suit) || !core.charge_source() || core.charge_amount() < CELL_PER_STEP  || user != mod_pai || !COOLDOWN_FINISHED(src, cooldown_mod_move))
@@ -1,4 +1,4 @@
-#define CUM_VOLUME_MULTIPLIER 5 + 5
+#define CUM_VOLUME_MULTIPLIER 10

 /obj/item/hand_item/coom
 	name = "cum"
@@ -6,12 +6,12 @@
 */


-#define CURE_TIME 10 SECONDS
-#define REVIVE_TIME_LOWER 2 MINUTES
-#define REVIVE_TIME_UPPER 3 MINUTES
-#define IMMUNITY_LOWER 5 MINUTES
-#define IMMUNITY_UPPER 10 MINUTES
-#define RNA_REFRESH_TIME 2 MINUTES // How soon can we extract more RNA?
+#define CURE_TIME (10 SECONDS)
+#define REVIVE_TIME_LOWER (2 MINUTES)
+#define REVIVE_TIME_UPPER (3 MINUTES)
+#define IMMUNITY_LOWER (5 MINUTES)
+#define IMMUNITY_UPPER (10 MINUTES)
+#define RNA_REFRESH_TIME (2 MINUTES) // How soon can we extract more RNA?

 /datum/component/mutant_infection
 	/// The reference to our host body.
@@ -139,7 +139,7 @@
 #define STATUS_IDLE "System Idle"
 #define STATUS_RECOMBINATING_VIRUS "System Synthesising Virus"
 #define STATUS_RECOMBINATING_CURE "System Synthesising Cure"
-#define RECOMBINATION_STEP_TIME 15 SECONDS
+#define RECOMBINATION_STEP_TIME (15 SECONDS)
 #define RECOMBINATION_STEP_AMOUNT 25

 /obj/machinery/rnd/rna_recombinator
--- a/Show More
+++ b/Show More