From e7bc2c7d4fa191f7121b227a255ea7f650efc679 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Tue, 10 Jan 2023 07:03:10 +0100 Subject: [PATCH] [MIRROR] Removes double spaces in defines and removes some unused ones [MDB IGNORE] (#18622) * Removes double spaces in defines and removes some unused ones (#72466) ## About The Pull Request 1. Removes unused defines (DIAG_CIRCUIT_HUD, LIGHTING_BASE_MATRIX, pda_styles and the defines it uses, MAFIA_MEDAL_CHARISMATIC & MAFIA_MEDAL_VIP). 2. Removes double spaces (or tab->space & space->tab) from everywhere I saw them in the defines folder (unless used by autodoc) 3. Removes the unecessary amount of tabs from lists in HubMigrator, this PR was at first gonna be around achievements but this just bugged me, which spiraled into this. ## Why It's Good For The Game me when i spread my code standards onto the codebase i contribute to this doesn't affect the game however it does make the defines look cleaner and brings it up to date with our most recent standards. ## Changelog not player-facing. * Removes double spaces in defines and removes some unused ones Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com> --- code/__DEFINES/achievements.dm | 47 +++++------ code/__DEFINES/atom_hud.dm | 22 +++-- code/__DEFINES/blood.dm | 8 +- code/__DEFINES/colors.dm | 46 +++++----- code/__DEFINES/combat.dm | 4 +- code/__DEFINES/fonts.dm | 8 -- code/__DEFINES/food.dm | 2 +- code/__DEFINES/hud.dm | 4 +- code/__DEFINES/icon_smoothing.dm | 4 +- code/__DEFINES/lighting.dm | 21 ++--- code/__DEFINES/mobs.dm | 24 +++--- code/__DEFINES/modular_computer.dm | 2 +- code/__DEFINES/monkeys.dm | 2 +- code/__DEFINES/networks.dm | 2 +- code/__DEFINES/power.dm | 6 +- code/__DEFINES/preferences.dm | 2 +- code/__DEFINES/radiation.dm | 2 +- code/__DEFINES/radio.dm | 40 ++++----- code/__DEFINES/resonator.dm | 2 +- code/__DEFINES/turfs.dm | 2 +- code/_onclick/hud/ghost.dm | 4 +- code/game/data_huds.dm | 4 +- tools/HubMigrator/HubMigrator.dm | 130 +++++++++++++++-------------- 23 files changed, 184 insertions(+), 204 deletions(-) diff --git a/code/__DEFINES/achievements.dm b/code/__DEFINES/achievements.dm index a4b84f3ae80..3502a6f4fc4 100644 --- a/code/__DEFINES/achievements.dm +++ b/code/__DEFINES/achievements.dm @@ -35,7 +35,7 @@ #define MEDAL_VOID_ASCENSION "Void" #define MEDAL_BLADE_ASCENSION "Blade" #define MEDAL_TOOLBOX_SOUL "Toolsoul" -#define MEDAL_CHEM_TUT "Beginner Chemist" +#define MEDAL_CHEM_TUT "Beginner Chemist" #define MEDAL_HOT_DAMN "Hot Damn!" #define MEDAL_CAYENNE_DISK "Very Important Piscis" #define MEDAL_TRAM_SURFER "Tram Surfer" @@ -69,24 +69,23 @@ //Mafia medal hub IDs (misc stuff) #define MAFIA_MEDAL_HATED "Universally Hated" -#define MAFIA_MEDAL_CHARISMATIC "Charismatic" -#define MAFIA_MEDAL_VIP "VIP" //Boss medals // Medal hub IDs for boss medals (Pre-fixes) -#define BOSS_MEDAL_ANY "Boss Killer" -#define BOSS_MEDAL_MINER "Blood-drunk Miner Killer" +#define BOSS_MEDAL_ANY "Boss Killer" + +#define BOSS_MEDAL_MINER "Blood-drunk Miner Killer" #define BOSS_MEDAL_FROSTMINER "Demonic-frost Miner Killer" -#define BOSS_MEDAL_BUBBLEGUM "Bubblegum Killer" -#define BOSS_MEDAL_COLOSSUS "Colossus Killer" -#define BOSS_MEDAL_DRAKE "Drake Killer" +#define BOSS_MEDAL_BUBBLEGUM "Bubblegum Killer" +#define BOSS_MEDAL_COLOSSUS "Colossus Killer" +#define BOSS_MEDAL_DRAKE "Drake Killer" #define BOSS_MEDAL_HIEROPHANT "Hierophant Killer" -#define BOSS_MEDAL_LEGION "Legion Killer" -#define BOSS_MEDAL_TENDRIL "Tendril Exterminator" -#define BOSS_MEDAL_SWARMERS "Swarmer Beacon Killer" -#define BOSS_MEDAL_WENDIGO "Wendigo Killer" -#define BOSS_MEDAL_KINGGOAT "King Goat Killer" +#define BOSS_MEDAL_LEGION "Legion Killer" +#define BOSS_MEDAL_TENDRIL "Tendril Exterminator" +#define BOSS_MEDAL_SWARMERS "Swarmer Beacon Killer" +#define BOSS_MEDAL_WENDIGO "Wendigo Killer" +#define BOSS_MEDAL_KINGGOAT "King Goat Killer" #define BOSS_MEDAL_MINER_CRUSHER "Blood-drunk Miner Crusher" #define BOSS_MEDAL_FROSTMINER_CRUSHER "Demonic-frost Miner Crusher" @@ -100,18 +99,18 @@ #define BOSS_MEDAL_KINGGOAT_CRUSHER "King Goat Crusher" // Medal hub IDs for boss-kill scores -#define BOSS_SCORE "Bosses Killed" -#define MINER_SCORE "BDMs Killed" -#define FROST_MINER_SCORE "DFMs Killed" -#define BUBBLEGUM_SCORE "Bubblegum Killed" -#define COLOSSUS_SCORE "Colossus Killed" -#define DRAKE_SCORE "Drakes Killed" -#define HIEROPHANT_SCORE "Hierophants Killed" -#define LEGION_SCORE "Legion Killed" +#define BOSS_SCORE "Bosses Killed" +#define MINER_SCORE "BDMs Killed" +#define FROST_MINER_SCORE "DFMs Killed" +#define BUBBLEGUM_SCORE "Bubblegum Killed" +#define COLOSSUS_SCORE "Colossus Killed" +#define DRAKE_SCORE "Drakes Killed" +#define HIEROPHANT_SCORE "Hierophants Killed" +#define LEGION_SCORE "Legion Killed" #define SWARMER_BEACON_SCORE "Swarmer Beacs Killed" -#define WENDIGO_SCORE "Wendigos Killed" -#define KINGGOAT_SCORE "King Goat Killed" -#define TENDRIL_CLEAR_SCORE "Tendrils Killed" +#define WENDIGO_SCORE "Wendigos Killed" +#define KINGGOAT_SCORE "King Goat Killed" +#define TENDRIL_CLEAR_SCORE "Tendrils Killed" // DB ID for hardcore random mode #define HARDCORE_RANDOM_SCORE "Hardcore Random Score" diff --git a/code/__DEFINES/atom_hud.dm b/code/__DEFINES/atom_hud.dm index 656a51c7f4c..5fa0dc389ce 100644 --- a/code/__DEFINES/atom_hud.dm +++ b/code/__DEFINES/atom_hud.dm @@ -27,26 +27,24 @@ #define DIAG_MECH_HUD "11" /// Bot HUDs #define DIAG_BOT_HUD "12" -/// Circuit assembly health bar -#define DIAG_CIRCUIT_HUD "13" /// Mech/Silicon tracking beacon, Circutry long range icon -#define DIAG_TRACK_HUD "14" +#define DIAG_TRACK_HUD "13" /// Airlock shock overlay -#define DIAG_AIRLOCK_HUD "15" +#define DIAG_AIRLOCK_HUD "14" /// Bot path indicators -#define DIAG_PATH_HUD "16" +#define DIAG_PATH_HUD "15" /// Gland indicators for abductors -#define GLAND_HUD "17" -#define SENTIENT_DISEASE_HUD "18" -#define AI_DETECT_HUD "19" +#define GLAND_HUD "16" +#define SENTIENT_DISEASE_HUD "17" +#define AI_DETECT_HUD "18" /// Displays launchpads' targeting reticle -#define DIAG_LAUNCHPAD_HUD "22" +#define DIAG_LAUNCHPAD_HUD "19" //for antag huds. these are used at the /mob level -#define ANTAG_HUD "23" +#define ANTAG_HUD "20" // for fans to identify pins -#define FAN_HUD "24" +#define FAN_HUD "21" /// Mech camera HUD -#define DIAG_CAMERA_HUD "25" +#define DIAG_CAMERA_HUD "22" // SKYRAT EDIT ADDITION BEGIN - gun permits /// ammo of guns diff --git a/code/__DEFINES/blood.dm b/code/__DEFINES/blood.dm index 320c3ded51a..3bf4af65969 100644 --- a/code/__DEFINES/blood.dm +++ b/code/__DEFINES/blood.dm @@ -2,13 +2,13 @@ /// Minimum alpha of footprints #define BLOODY_FOOTPRINT_BASE_ALPHA 20 /// How much blood a regular blood splatter contains -#define BLOOD_AMOUNT_PER_DECAL 50 +#define BLOOD_AMOUNT_PER_DECAL 50 /// How much blood an item can have stuck on it -#define BLOOD_ITEM_MAX 200 +#define BLOOD_ITEM_MAX 200 /// How much blood a blood decal can contain -#define BLOOD_POOL_MAX 300 +#define BLOOD_POOL_MAX 300 /// How much blood a footprint need to at least contain -#define BLOOD_FOOTPRINTS_MIN 5 +#define BLOOD_FOOTPRINTS_MIN 5 //Bloody shoe blood states /// Red blood diff --git a/code/__DEFINES/colors.dm b/code/__DEFINES/colors.dm index 7792ea62894..1a025c502ac 100644 --- a/code/__DEFINES/colors.dm +++ b/code/__DEFINES/colors.dm @@ -29,7 +29,7 @@ #define COLOR_FULL_TONER_BLACK "#101010" #define COLOR_PRISONER_BLACK "#292929" #define COLOR_BLACK "#000000" -#define COLOR_HALF_TRANSPARENT_BLACK "#0000007A" +#define COLOR_HALF_TRANSPARENT_BLACK "#0000007A" #define COLOR_RED "#FF0000" #define COLOR_SYNDIE_RED "#F10303" @@ -120,30 +120,30 @@ #define COLOR_SOAPSTONE_GOLD "#FFD900" #define COLOR_SOAPSTONE_DIAMOND "#00ffee" -#define COLOR_GREEN_GRAY "#99BB76" -#define COLOR_RED_GRAY "#B4696A" -#define COLOR_PALE_BLUE_GRAY "#98C5DF" -#define COLOR_PALE_GREEN_GRAY "#B7D993" -#define COLOR_PALE_RED_GRAY "#D59998" +#define COLOR_GREEN_GRAY "#99BB76" +#define COLOR_RED_GRAY "#B4696A" +#define COLOR_PALE_BLUE_GRAY "#98C5DF" +#define COLOR_PALE_GREEN_GRAY "#B7D993" +#define COLOR_PALE_RED_GRAY "#D59998" #define COLOR_PALE_PURPLE_GRAY "#CBB1CA" -#define COLOR_PURPLE_GRAY "#AE8CA8" +#define COLOR_PURPLE_GRAY "#AE8CA8" //Color defines used by the assembly detailer. -#define COLOR_ASSEMBLY_BLACK "#545454" -#define COLOR_ASSEMBLY_BGRAY "#9497AB" -#define COLOR_ASSEMBLY_WHITE "#E2E2E2" -#define COLOR_ASSEMBLY_RED "#CC4242" -#define COLOR_ASSEMBLY_ORANGE "#E39751" -#define COLOR_ASSEMBLY_BEIGE "#AF9366" -#define COLOR_ASSEMBLY_BROWN "#97670E" -#define COLOR_ASSEMBLY_GOLD "#AA9100" -#define COLOR_ASSEMBLY_YELLOW "#CECA2B" -#define COLOR_ASSEMBLY_GURKHA "#999875" -#define COLOR_ASSEMBLY_LGREEN "#789876" -#define COLOR_ASSEMBLY_GREEN "#44843C" -#define COLOR_ASSEMBLY_LBLUE "#5D99BE" -#define COLOR_ASSEMBLY_BLUE "#38559E" -#define COLOR_ASSEMBLY_PURPLE "#6F6192" +#define COLOR_ASSEMBLY_BLACK "#545454" +#define COLOR_ASSEMBLY_BGRAY "#9497AB" +#define COLOR_ASSEMBLY_WHITE "#E2E2E2" +#define COLOR_ASSEMBLY_RED "#CC4242" +#define COLOR_ASSEMBLY_ORANGE "#E39751" +#define COLOR_ASSEMBLY_BEIGE "#AF9366" +#define COLOR_ASSEMBLY_BROWN "#97670E" +#define COLOR_ASSEMBLY_GOLD "#AA9100" +#define COLOR_ASSEMBLY_YELLOW "#CECA2B" +#define COLOR_ASSEMBLY_GURKHA "#999875" +#define COLOR_ASSEMBLY_LGREEN "#789876" +#define COLOR_ASSEMBLY_GREEN "#44843C" +#define COLOR_ASSEMBLY_LBLUE "#5D99BE" +#define COLOR_ASSEMBLY_BLUE "#38559E" +#define COLOR_ASSEMBLY_PURPLE "#6F6192" ///Colors for grayscale tools #define COLOR_TOOL_BLUE "#1861d5" @@ -303,4 +303,4 @@ GLOBAL_LIST_INIT(cable_colors, list( CABLE_COLOR_WHITE = CABLE_HEX_COLOR_WHITE, CABLE_COLOR_YELLOW = CABLE_HEX_COLOR_YELLOW, CABLE_COLOR_BROWN = CABLE_HEX_COLOR_BROWN - )) +)) diff --git a/code/__DEFINES/combat.dm b/code/__DEFINES/combat.dm index 83518fb5b59..28bd44e2ff3 100644 --- a/code/__DEFINES/combat.dm +++ b/code/__DEFINES/combat.dm @@ -56,9 +56,9 @@ #define FIRELOSS (1<<1) #define TOXLOSS (1<<2) #define OXYLOSS (1<<3) -#define SHAME (1<<4) +#define SHAME (1<<4) #define MANUAL_SUICIDE (1<<5) //suicide_act will do the actual killing. -#define MANUAL_SUICIDE_NONLETHAL (1<<6) //when the suicide is conditionally lethal +#define MANUAL_SUICIDE_NONLETHAL (1<<6) //when the suicide is conditionally lethal #define EFFECT_STUN "stun" #define EFFECT_KNOCKDOWN "knockdown" diff --git a/code/__DEFINES/fonts.dm b/code/__DEFINES/fonts.dm index be1d483a1b7..3b2ec46b178 100644 --- a/code/__DEFINES/fonts.dm +++ b/code/__DEFINES/fonts.dm @@ -12,13 +12,5 @@ /// Font used when signing on paper. #define SIGNATURE_FONT "Segoe Script" -//pda fonts -#define MONO "Monospaced" -#define VT "VT323" -#define ORBITRON "Orbitron" -#define SHARE "Share Tech Mono" - -GLOBAL_LIST_INIT(pda_styles, sort_list(list(MONO, VT, ORBITRON, SHARE))) - /// Emoji icon set #define EMOJI_SET 'modular_skyrat/master_files/icons/emoji.dmi' // SKYRAT EDIT - ORIGINAL: 'icons/ui_icons/emoji/emoji.dmi' diff --git a/code/__DEFINES/food.dm b/code/__DEFINES/food.dm index 87e27413358..128c82c7c9a 100644 --- a/code/__DEFINES/food.dm +++ b/code/__DEFINES/food.dm @@ -117,7 +117,7 @@ DEFINE_BITFIELD(food_flags, list( ///Amount of reagents you start with on crafted food excluding the used parts #define CRAFTED_FOOD_BASE_REAGENT_MODIFIER 0.7 ///Modifier of reagents you get when crafting food from the parts used -#define CRAFTED_FOOD_INGREDIENT_REAGENT_MODIFIER 0.5 +#define CRAFTED_FOOD_INGREDIENT_REAGENT_MODIFIER 0.5 #define IS_EDIBLE(O) (O.GetComponent(/datum/component/edible)) diff --git a/code/__DEFINES/hud.dm b/code/__DEFINES/hud.dm index 16cc59a00f9..ba4f0f12ea4 100644 --- a/code/__DEFINES/hud.dm +++ b/code/__DEFINES/hud.dm @@ -135,8 +135,8 @@ #define ui_borg_lamp "CENTER-3:16, SOUTH:5" #define ui_borg_tablet "CENTER-4:16, SOUTH:5" #define ui_inv1 "CENTER-2:16,SOUTH:5" -#define ui_inv2 "CENTER-1 :16,SOUTH:5" -#define ui_inv3 "CENTER :16,SOUTH:5" +#define ui_inv2 "CENTER-1 :16,SOUTH:5" +#define ui_inv3 "CENTER :16,SOUTH:5" #define ui_borg_module "CENTER+1:16,SOUTH:5" #define ui_borg_store "CENTER+2:16,SOUTH:5" #define ui_borg_camera "CENTER+3:21,SOUTH:5" diff --git a/code/__DEFINES/icon_smoothing.dm b/code/__DEFINES/icon_smoothing.dm index 3336f96ad0d..b1b145a0eb4 100644 --- a/code/__DEFINES/icon_smoothing.dm +++ b/code/__DEFINES/icon_smoothing.dm @@ -146,8 +146,8 @@ DEFINE_BITFIELD(smoothing_flags, list( #define SMOOTH_GROUP_WINDOW_FULLTILE_PLASTITANIUM S_OBJ(24) ///turf/closed/indestructible/opsglass, /obj/structure/window/reinforced/plasma/plastitanium #define SMOOTH_GROUP_WINDOW_FULLTILE_SHUTTLE S_OBJ(25) ///obj/structure/window/reinforced/shuttle -#define SMOOTH_GROUP_LATTICE S_OBJ(31) ///obj/structure/lattice -#define SMOOTH_GROUP_CATWALK S_OBJ(32) ///obj/structure/lattice/catwalk +#define SMOOTH_GROUP_LATTICE S_OBJ(31) ///obj/structure/lattice +#define SMOOTH_GROUP_CATWALK S_OBJ(32) ///obj/structure/lattice/catwalk #define SMOOTH_GROUP_AIRLOCK S_OBJ(41) ///obj/machinery/door/airlock diff --git a/code/__DEFINES/lighting.dm b/code/__DEFINES/lighting.dm index 62734b909a0..7bda18b5cd5 100644 --- a/code/__DEFINES/lighting.dm +++ b/code/__DEFINES/lighting.dm @@ -12,18 +12,18 @@ //Bay lighting engine shit, not in /code/modules/lighting because BYOND is being shit about it /// frequency, in 1/10ths of a second, of the lighting process -#define LIGHTING_INTERVAL 5 +#define LIGHTING_INTERVAL 5 #define MINIMUM_USEFUL_LIGHT_RANGE 1.4 /// type of falloff to use for lighting; 1 for circular, 2 for square -#define LIGHTING_FALLOFF 1 +#define LIGHTING_FALLOFF 1 /// use lambertian shading for light sources -#define LIGHTING_LAMBERTIAN 0 +#define LIGHTING_LAMBERTIAN 0 /// height off the ground of light sources on the pseudo-z-axis, you should probably leave this alone -#define LIGHTING_HEIGHT 1 +#define LIGHTING_HEIGHT 1 /// Value used to round lumcounts, values smaller than 1/129 don't matter (if they do, thanks sinking points), greater values will make lighting less precise, but in turn increase performance, VERY SLIGHTLY. -#define LIGHTING_ROUND_VALUE (1 / 64) +#define LIGHTING_ROUND_VALUE (1 / 64) /// icon used for lighting shading effects #define LIGHTING_ICON 'icons/effects/lighting_object.dmi' @@ -32,17 +32,6 @@ /// Set to zero to disable soft lighting. Luminosity changes then work if it's lit at all. #define LIGHTING_SOFT_THRESHOLD 0 -/// If I were you I'd leave this alone. -#define LIGHTING_BASE_MATRIX \ - list \ - ( \ - 1, 1, 1, 0, \ - 1, 1, 1, 0, \ - 1, 1, 1, 0, \ - 1, 1, 1, 0, \ - 0, 0, 0, 1 \ - ) \ - ///How many tiles standard fires glow. #define LIGHT_RANGE_FIRE 3 diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm index 459eae812cc..4dcd37bd165 100644 --- a/code/__DEFINES/mobs.dm +++ b/code/__DEFINES/mobs.dm @@ -8,7 +8,7 @@ //movement intent defines for the m_intent var #define MOVE_INTENT_WALK "walk" -#define MOVE_INTENT_RUN "run" +#define MOVE_INTENT_RUN "run" //Blood levels #define BLOOD_VOLUME_MAX_LETHAL 2150 @@ -35,8 +35,8 @@ #define MOB_SIZE_HUGE 4 // Use this for things you don't want bluespace body-bagged //Ventcrawling defines -#define VENTCRAWLER_NONE 0 -#define VENTCRAWLER_NUDE 1 +#define VENTCRAWLER_NONE 0 +#define VENTCRAWLER_NUDE 1 #define VENTCRAWLER_ALWAYS 2 //Mob bio-types flags @@ -183,12 +183,12 @@ #define BRAIN_TRAUMA_SPECIAL /datum/brain_trauma/special #define BRAIN_TRAUMA_MAGIC /datum/brain_trauma/magic -#define TRAUMA_RESILIENCE_BASIC 1 //Curable with chems -#define TRAUMA_RESILIENCE_SURGERY 2 //Curable with brain surgery -#define TRAUMA_RESILIENCE_LOBOTOMY 3 //Curable with lobotomy -#define TRAUMA_RESILIENCE_WOUND 4 //Curable by healing the head wound -#define TRAUMA_RESILIENCE_MAGIC 5 //Curable only with magic -#define TRAUMA_RESILIENCE_ABSOLUTE 6 //This is here to stay +#define TRAUMA_RESILIENCE_BASIC 1 //Curable with chems +#define TRAUMA_RESILIENCE_SURGERY 2 //Curable with brain surgery +#define TRAUMA_RESILIENCE_LOBOTOMY 3 //Curable with lobotomy +#define TRAUMA_RESILIENCE_WOUND 4 //Curable by healing the head wound +#define TRAUMA_RESILIENCE_MAGIC 5 //Curable only with magic +#define TRAUMA_RESILIENCE_ABSOLUTE 6 //This is here to stay //Limit of traumas for each resilience tier #define TRAUMA_LIMIT_BASIC 3 @@ -349,7 +349,7 @@ //determines if a mob can smash through it #define ENVIRONMENT_SMASH_NONE 0 #define ENVIRONMENT_SMASH_STRUCTURES 1 //crates, lockers, ect -#define ENVIRONMENT_SMASH_WALLS 2 //walls +#define ENVIRONMENT_SMASH_WALLS 2 //walls #define ENVIRONMENT_SMASH_RWALLS 3 //rwalls #define NO_SLIP_WHEN_WALKING (1<<0) @@ -420,12 +420,12 @@ //#define AGE_MIN 17 //youngest a character can be //ORIGINAL #define AGE_MIN 18 //youngest a character can be //SKYRAT EDIT CHANGE - age #define AGE_MAX 85 //oldest a character can be -#define AGE_MINOR 20 //legal age of space drinking and smoking +#define AGE_MINOR 20 //legal age of space drinking and smoking #define WIZARD_AGE_MIN 30 //youngest a wizard can be #define APPRENTICE_AGE_MIN 29 //youngest an apprentice can be #define SHOES_SLOWDOWN 0 //How much shoes slow you down by default. Negative values speed you up -#define SHOES_SPEED_SLIGHT SHOES_SLOWDOWN - 1 // slightest speed boost to movement +#define SHOES_SPEED_SLIGHT SHOES_SLOWDOWN - 1 // slightest speed boost to movement #define POCKET_STRIP_DELAY (4 SECONDS) //time taken to search somebody's pockets #define DOOR_CRUSH_DAMAGE 15 //the amount of damage that airlocks deal when they crush you diff --git a/code/__DEFINES/modular_computer.dm b/code/__DEFINES/modular_computer.dm index f0f0877d47e..e7c6fd797df 100644 --- a/code/__DEFINES/modular_computer.dm +++ b/code/__DEFINES/modular_computer.dm @@ -25,7 +25,7 @@ #define PROGRAM_CATEGORY_CREW "Crew" #define PROGRAM_CATEGORY_ENGI "Engineering" #define PROGRAM_CATEGORY_SUPL "Supply" -#define PROGRAM_CATEGORY_SCI "Science" +#define PROGRAM_CATEGORY_SCI "Science" #define PROGRAM_CATEGORY_MISC "Other" #define DETOMATIX_RESIST_MINOR 1 diff --git a/code/__DEFINES/monkeys.dm b/code/__DEFINES/monkeys.dm index 50b712ade4b..f487f805d50 100644 --- a/code/__DEFINES/monkeys.dm +++ b/code/__DEFINES/monkeys.dm @@ -14,7 +14,7 @@ #define MONKEY_SYRINGE_RETALIATION_PROB 20 // Probability per Life tick that the monkey will: -/// probability that monkey aggro against the mob pulling it +/// probability that monkey aggro against the mob pulling it #define MONKEY_PULL_AGGRO_PROB 5 /// probability that monkey will get into mischief, i.e. finding/stealing items #define MONKEY_SHENANIGAN_PROB 20 diff --git a/code/__DEFINES/networks.dm b/code/__DEFINES/networks.dm index 8fc6b530e7f..ebd85c86c1e 100644 --- a/code/__DEFINES/networks.dm +++ b/code/__DEFINES/networks.dm @@ -78,7 +78,7 @@ #define NETWORK_PORT_UPDATE(LIST) if(LIST) { LIST["_updated"] = TRUE } #define NETWORK_PORT_CLEAR_UPDATE(LIST) if(LIST) { LIST["_updated"] = FALSE } #define NETWORK_PORT_SET_UPDATE(LIST) if(LIST) { LIST["_updated"] = TRUE } -#define NETWORK_PORT_DISCONNECT(LIST) if(LIST) { LIST["_disconnected"] = TRUE } +#define NETWORK_PORT_DISCONNECT(LIST) if(LIST) { LIST["_disconnected"] = TRUE } /// Error codes #define NETWORK_ERROR_OK null diff --git a/code/__DEFINES/power.dm b/code/__DEFINES/power.dm index 36cb2cdbb0f..b07ba5e9b58 100644 --- a/code/__DEFINES/power.dm +++ b/code/__DEFINES/power.dm @@ -4,9 +4,9 @@ #define MACHINERY_LAYER_1 1 -#define SOLAR_TRACK_OFF 0 -#define SOLAR_TRACK_TIMED 1 -#define SOLAR_TRACK_AUTO 2 +#define SOLAR_TRACK_OFF 0 +#define SOLAR_TRACK_TIMED 1 +#define SOLAR_TRACK_AUTO 2 ///conversion ratio from joules to watts #define WATTS / 0.002 diff --git a/code/__DEFINES/preferences.dm b/code/__DEFINES/preferences.dm index 8294c35d0fa..24e14b06fa7 100644 --- a/code/__DEFINES/preferences.dm +++ b/code/__DEFINES/preferences.dm @@ -31,7 +31,7 @@ #define CHAT_GHOSTWHISPER (1<<7) #define CHAT_GHOSTPDA (1<<8) #define CHAT_GHOSTRADIO (1<<9) -#define CHAT_BANKCARD (1<<10) +#define CHAT_BANKCARD (1<<10) #define CHAT_GHOSTLAWS (1<<11) #define CHAT_LOGIN_LOGOUT (1<<12) diff --git a/code/__DEFINES/radiation.dm b/code/__DEFINES/radiation.dm index ed6a4b547f7..bb345312ce5 100644 --- a/code/__DEFINES/radiation.dm +++ b/code/__DEFINES/radiation.dm @@ -29,7 +29,7 @@ Ask Mothblocks if they're around #define RAD_NO_INSULATION 1.0 // For things that shouldn't become irradiated for whatever reason #define RAD_VERY_LIGHT_INSULATION 0.9 // What girders have #define RAD_LIGHT_INSULATION 0.8 -#define RAD_MEDIUM_INSULATION 0.7 // What common walls have +#define RAD_MEDIUM_INSULATION 0.7 // What common walls have #define RAD_HEAVY_INSULATION 0.6 // What reinforced walls have #define RAD_EXTREME_INSULATION 0.5 // What rad collectors have #define RAD_FULL_INSULATION 0 // Completely stops radiation from coming through diff --git a/code/__DEFINES/radio.dm b/code/__DEFINES/radio.dm index 105c2cf7f06..324b5d68f16 100644 --- a/code/__DEFINES/radio.dm +++ b/code/__DEFINES/radio.dm @@ -60,19 +60,19 @@ // Frequencies are always odd numbers and range from 1201 to 1599. #define FREQ_UPLINK 1211 // Dummy loopback frequency, used for radio uplink. Not seen in game. -#define FREQ_SYNDICATE 1213 // Nuke op comms frequency, dark brown -#define FREQ_CTF_RED 1215 // CTF red team comms frequency, red -#define FREQ_CTF_BLUE 1217 // CTF blue team comms frequency, blue -#define FREQ_CTF_GREEN 1219 // CTF green team comms frequency, green -#define FREQ_CTF_YELLOW 1221 // CTF yellow team comms frequency, yellow -#define FREQ_CENTCOM 1337 // CentCom comms frequency, gray -#define FREQ_SUPPLY 1347 // Supply comms frequency, light brown -#define FREQ_SERVICE 1349 // Service comms frequency, green -#define FREQ_SCIENCE 1351 // Science comms frequency, plum -#define FREQ_COMMAND 1353 // Command comms frequency, gold -#define FREQ_MEDICAL 1355 // Medical comms frequency, soft blue -#define FREQ_ENGINEERING 1357 // Engineering comms frequency, orange -#define FREQ_SECURITY 1359 // Security comms frequency, red +#define FREQ_SYNDICATE 1213 // Nuke op comms frequency, dark brown +#define FREQ_CTF_RED 1215 // CTF red team comms frequency, red +#define FREQ_CTF_BLUE 1217 // CTF blue team comms frequency, blue +#define FREQ_CTF_GREEN 1219 // CTF green team comms frequency, green +#define FREQ_CTF_YELLOW 1221 // CTF yellow team comms frequency, yellow +#define FREQ_CENTCOM 1337 // CentCom comms frequency, gray +#define FREQ_SUPPLY 1347 // Supply comms frequency, light brown +#define FREQ_SERVICE 1349 // Service comms frequency, green +#define FREQ_SCIENCE 1351 // Science comms frequency, plum +#define FREQ_COMMAND 1353 // Command comms frequency, gold +#define FREQ_MEDICAL 1355 // Medical comms frequency, soft blue +#define FREQ_ENGINEERING 1357 // Engineering comms frequency, orange +#define FREQ_SECURITY 1359 // Security comms frequency, red #define FREQ_HOLOGRID_SOLUTION 1433 #define FREQ_STATUS_DISPLAYS 1435 @@ -82,23 +82,23 @@ // This represents 1/8th of the available spectrum. #define FREQ_NAV_BEACON 1445 -#define FREQ_AI_PRIVATE 1447 // AI private comms frequency, magenta +#define FREQ_AI_PRIVATE 1447 // AI private comms frequency, magenta #define FREQ_PRESSURE_PLATE 1447 #define FREQ_ELECTROPACK 1449 #define FREQ_MAGNETS 1449 #define FREQ_LOCATOR_IMPLANT 1451 -#define FREQ_SIGNALER 1457 // the default for new signalers -#define FREQ_COMMON 1459 // Common comms frequency, dark green +#define FREQ_SIGNALER 1457 // the default for new signalers +#define FREQ_COMMON 1459 // Common comms frequency, dark green #define MAX_FREQ 1489 // ------------------------------------------------------ #define MAX_FREE_FREQ 1599 // ------------------------------------------------- // Transmission types. -#define TRANSMISSION_WIRE 0 // some sort of wired connection, not used -#define TRANSMISSION_RADIO 1 // electromagnetic radiation (default) -#define TRANSMISSION_SUBSPACE 2 // subspace transmission (headsets only) -#define TRANSMISSION_SUPERSPACE 3 // reaches independent (CentCom) radios only +#define TRANSMISSION_WIRE 0 // some sort of wired connection, not used +#define TRANSMISSION_RADIO 1 // electromagnetic radiation (default) +#define TRANSMISSION_SUBSPACE 2 // subspace transmission (headsets only) +#define TRANSMISSION_SUPERSPACE 3 // reaches independent (CentCom) radios only // Filter types, used as an optimization to avoid unnecessary proc calls. #define RADIO_SIGNALER "signaler" diff --git a/code/__DEFINES/resonator.dm b/code/__DEFINES/resonator.dm index b6a4b897d26..1801fc0da46 100644 --- a/code/__DEFINES/resonator.dm +++ b/code/__DEFINES/resonator.dm @@ -1,3 +1,3 @@ -#define RESONATOR_MODE_AUTO 1 +#define RESONATOR_MODE_AUTO 1 #define RESONATOR_MODE_MANUAL 2 #define RESONATOR_MODE_MATRIX 3 diff --git a/code/__DEFINES/turfs.dm b/code/__DEFINES/turfs.dm index 6ff862413bf..a4fcb170dec 100644 --- a/code/__DEFINES/turfs.dm +++ b/code/__DEFINES/turfs.dm @@ -15,7 +15,7 @@ #define RECT_TURFS(H_RADIUS, V_RADIUS, CENTER) \ block( \ - locate(max(CENTER.x-(H_RADIUS),1), max(CENTER.y-(V_RADIUS),1), CENTER.z), \ + locate(max(CENTER.x-(H_RADIUS),1), max(CENTER.y-(V_RADIUS),1), CENTER.z), \ locate(min(CENTER.x+(H_RADIUS),world.maxx), min(CENTER.y+(V_RADIUS),world.maxy), CENTER.z) \ ) diff --git a/code/_onclick/hud/ghost.dm b/code/_onclick/hud/ghost.dm index eeb8dccb933..b620d19cbb8 100644 --- a/code/_onclick/hud/ghost.dm +++ b/code/_onclick/hud/ghost.dm @@ -48,7 +48,7 @@ /atom/movable/screen/ghost/minigames_menu name ="Minigames" icon_state = "minigames" - + /atom/movable/screen/ghost/minigames_menu/Click() var/mob/dead/observer/observer = usr observer.open_minigames_menu() @@ -88,7 +88,7 @@ static_inventory += using using = new /atom/movable/screen/language_menu - using.screen_loc = ui_ghost_language_menu + using.screen_loc = ui_ghost_language_menu using.icon = ui_style using.hud = src static_inventory += using diff --git a/code/game/data_huds.dm b/code/game/data_huds.dm index 1c6ecf7ba9c..27cd5175cfe 100644 --- a/code/game/data_huds.dm +++ b/code/game/data_huds.dm @@ -55,10 +55,10 @@ /datum/atom_hud/data/diagnostic /datum/atom_hud/data/diagnostic/basic - hud_icons = list(DIAG_HUD, DIAG_STAT_HUD, DIAG_BATT_HUD, DIAG_MECH_HUD, DIAG_BOT_HUD, DIAG_CIRCUIT_HUD, DIAG_TRACK_HUD, DIAG_CAMERA_HUD, DIAG_AIRLOCK_HUD, DIAG_LAUNCHPAD_HUD) + hud_icons = list(DIAG_HUD, DIAG_STAT_HUD, DIAG_BATT_HUD, DIAG_MECH_HUD, DIAG_BOT_HUD, DIAG_TRACK_HUD, DIAG_CAMERA_HUD, DIAG_AIRLOCK_HUD, DIAG_LAUNCHPAD_HUD) /datum/atom_hud/data/diagnostic/advanced - hud_icons = list(DIAG_HUD, DIAG_STAT_HUD, DIAG_BATT_HUD, DIAG_MECH_HUD, DIAG_BOT_HUD, DIAG_CIRCUIT_HUD, DIAG_TRACK_HUD, DIAG_CAMERA_HUD, DIAG_AIRLOCK_HUD, DIAG_LAUNCHPAD_HUD, DIAG_PATH_HUD) + hud_icons = list(DIAG_HUD, DIAG_STAT_HUD, DIAG_BATT_HUD, DIAG_MECH_HUD, DIAG_BOT_HUD, DIAG_TRACK_HUD, DIAG_CAMERA_HUD, DIAG_AIRLOCK_HUD, DIAG_LAUNCHPAD_HUD, DIAG_PATH_HUD) /datum/atom_hud/data/bot_path // This hud exists so the bot can see itself, that's all diff --git a/tools/HubMigrator/HubMigrator.dm b/tools/HubMigrator/HubMigrator.dm index cd7f7e6020e..89eb4c8c6b7 100644 --- a/tools/HubMigrator/HubMigrator.dm +++ b/tools/HubMigrator/HubMigrator.dm @@ -1,45 +1,45 @@ //Misc Medal hub IDs -#define MEDAL_METEOR "Your Life Before Your Eyes" -#define MEDAL_PULSE "Jackpot" -#define MEDAL_TIMEWASTE "Overextended The Joke" -#define MEDAL_RODSUPLEX "Feat of Strength" -#define MEDAL_CLOWNCARKING "Round and Full" -#define MEDAL_THANKSALOT "The Best Driver" -#define MEDAL_HELBITALJANKEN "Hel-bent on Winning" -#define MEDAL_MATERIALCRAFT "Getting an Upgrade" +#define MEDAL_METEOR "Your Life Before Your Eyes" +#define MEDAL_PULSE "Jackpot" +#define MEDAL_TIMEWASTE "Overextended The Joke" +#define MEDAL_RODSUPLEX "Feat of Strength" +#define MEDAL_CLOWNCARKING "Round and Full" +#define MEDAL_THANKSALOT "The Best Driver" +#define MEDAL_HELBITALJANKEN "Hel-bent on Winning" +#define MEDAL_MATERIALCRAFT "Getting an Upgrade" //Boss medals // Medal hub IDs for boss medals (Pre-fixes) -#define BOSS_MEDAL_ANY "Boss Killer" -#define BOSS_MEDAL_MINER "Blood-drunk Miner Killer" -#define BOSS_MEDAL_BUBBLEGUM "Bubblegum Killer" -#define BOSS_MEDAL_COLOSSUS "Colossus Killer" -#define BOSS_MEDAL_DRAKE "Drake Killer" +#define BOSS_MEDAL_ANY "Boss Killer" +#define BOSS_MEDAL_MINER "Blood-drunk Miner Killer" +#define BOSS_MEDAL_BUBBLEGUM "Bubblegum Killer" +#define BOSS_MEDAL_COLOSSUS "Colossus Killer" +#define BOSS_MEDAL_DRAKE "Drake Killer" #define BOSS_MEDAL_HIEROPHANT "Hierophant Killer" -#define BOSS_MEDAL_LEGION "Legion Killer" -#define BOSS_MEDAL_TENDRIL "Tendril Exterminator" -#define BOSS_MEDAL_SWARMERS "Swarmer Beacon Killer" +#define BOSS_MEDAL_LEGION "Legion Killer" +#define BOSS_MEDAL_TENDRIL "Tendril Exterminator" +#define BOSS_MEDAL_SWARMERS "Swarmer Beacon Killer" -#define BOSS_MEDAL_MINER_CRUSHER "Blood-drunk Miner Crusher" -#define BOSS_MEDAL_BUBBLEGUM_CRUSHER "Bubblegum Crusher" -#define BOSS_MEDAL_COLOSSUS_CRUSHER "Colossus Crusher" -#define BOSS_MEDAL_DRAKE_CRUSHER "Drake Crusher" -#define BOSS_MEDAL_HIEROPHANT_CRUSHER "Hierophant Crusher" -#define BOSS_MEDAL_LEGION_CRUSHER "Legion Crusher" -#define BOSS_MEDAL_SWARMERS_CRUSHER "Swarmer Beacon Crusher" +#define BOSS_MEDAL_MINER_CRUSHER "Blood-drunk Miner Crusher" +#define BOSS_MEDAL_BUBBLEGUM_CRUSHER "Bubblegum Crusher" +#define BOSS_MEDAL_COLOSSUS_CRUSHER "Colossus Crusher" +#define BOSS_MEDAL_DRAKE_CRUSHER "Drake Crusher" +#define BOSS_MEDAL_HIEROPHANT_CRUSHER "Hierophant Crusher" +#define BOSS_MEDAL_LEGION_CRUSHER "Legion Crusher" +#define BOSS_MEDAL_SWARMERS_CRUSHER "Swarmer Beacon Crusher" // Medal hub IDs for boss-kill scores -#define BOSS_SCORE "Bosses Killed" -#define MINER_SCORE "BDMs Killed" -#define BUBBLEGUM_SCORE "Bubblegum Killed" -#define COLOSSUS_SCORE "Colossus Killed" -#define DRAKE_SCORE "Drakes Killed" -#define HIEROPHANT_SCORE "Hierophants Killed" -#define LEGION_SCORE "Legion Killed" +#define BOSS_SCORE "Bosses Killed" +#define MINER_SCORE "BDMs Killed" +#define BUBBLEGUM_SCORE "Bubblegum Killed" +#define COLOSSUS_SCORE "Colossus Killed" +#define DRAKE_SCORE "Drakes Killed" +#define HIEROPHANT_SCORE "Hierophants Killed" +#define LEGION_SCORE "Legion Killed" #define SWARMER_BEACON_SCORE "Swarmer Beacs Killed" -#define TENDRIL_CLEAR_SCORE "Tendrils Killed" +#define TENDRIL_CLEAR_SCORE "Tendrils Killed" @@ -52,41 +52,43 @@ var/hub_password = "REPLACEME" var/list/valid_medals = list( - MEDAL_METEOR, - MEDAL_PULSE, - MEDAL_TIMEWASTE, - MEDAL_RODSUPLEX, - MEDAL_CLOWNCARKING, - MEDAL_THANKSALOT, - MEDAL_HELBITALJANKEN, - MEDAL_MATERIALCRAFT, - BOSS_MEDAL_ANY, - BOSS_MEDAL_MINER, - BOSS_MEDAL_BUBBLEGUM, - BOSS_MEDAL_COLOSSUS, - BOSS_MEDAL_DRAKE, - BOSS_MEDAL_HIEROPHANT, - BOSS_MEDAL_LEGION, - BOSS_MEDAL_TENDRIL, - BOSS_MEDAL_SWARMERS, - BOSS_MEDAL_MINER_CRUSHER, - BOSS_MEDAL_BUBBLEGUM_CRUSHER, - BOSS_MEDAL_COLOSSUS_CRUSHER, - BOSS_MEDAL_DRAKE_CRUSHER, - BOSS_MEDAL_HIEROPHANT_CRUSHER, - BOSS_MEDAL_LEGION_CRUSHER, - BOSS_MEDAL_SWARMERS_CRUSHER) + MEDAL_METEOR, + MEDAL_PULSE, + MEDAL_TIMEWASTE, + MEDAL_RODSUPLEX, + MEDAL_CLOWNCARKING, + MEDAL_THANKSALOT, + MEDAL_HELBITALJANKEN, + MEDAL_MATERIALCRAFT, + BOSS_MEDAL_ANY, + BOSS_MEDAL_MINER, + BOSS_MEDAL_BUBBLEGUM, + BOSS_MEDAL_COLOSSUS, + BOSS_MEDAL_DRAKE, + BOSS_MEDAL_HIEROPHANT, + BOSS_MEDAL_LEGION, + BOSS_MEDAL_TENDRIL, + BOSS_MEDAL_SWARMERS, + BOSS_MEDAL_MINER_CRUSHER, + BOSS_MEDAL_BUBBLEGUM_CRUSHER, + BOSS_MEDAL_COLOSSUS_CRUSHER, + BOSS_MEDAL_DRAKE_CRUSHER, + BOSS_MEDAL_HIEROPHANT_CRUSHER, + BOSS_MEDAL_LEGION_CRUSHER, + BOSS_MEDAL_SWARMERS_CRUSHER, + ) var/list/valid_scores = list( - BOSS_SCORE, - MINER_SCORE, - BUBBLEGUM_SCORE, - COLOSSUS_SCORE, - DRAKE_SCORE, - HIEROPHANT_SCORE, - LEGION_SCORE, - SWARMER_BEACON_SCORE, - TENDRIL_CLEAR_SCORE) + BOSS_SCORE, + MINER_SCORE, + BUBBLEGUM_SCORE, + COLOSSUS_SCORE, + DRAKE_SCORE, + HIEROPHANT_SCORE, + LEGION_SCORE, + SWARMER_BEACON_SCORE, + TENDRIL_CLEAR_SCORE, + ) var/ach = "achievements" //IMPORTANT : ADD PREFIX HERE IF YOU'RE USING PREFIXED SCHEMA