diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index f657cf9b3f0..6b291b55245 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -212,7 +212,19 @@ While DM allows other ways of declaring variables, this one should be used for c ### Tabs, not spaces You must use tabs to indent your code, NOT SPACES. -You may use spaces to align something, but you should tab to the block level first, then add the remaining spaces. +Do not use tabs/spaces for indentation in the middle of a code line. Not only is this inconsistent because the size of a tab is undefined, but it means that, should the line you're aligning to change size at all, we have to adjust a ton of other code. Plus, it often time hurts readability. + +```dm +// Bad +#define SPECIES_MOTH "moth" +#define SPECIES_LIZARDMAN "lizardman" +#define SPECIES_FELINID "felinid" + +// Good +#define SPECIES_MOTH "moth" +#define SPECIES_LIZARDMAN "lizardman" +#define SPECIES_FELINID "felinid" +``` ### No hacky code Hacky code, such as adding specific checks, is highly discouraged and only allowed when there is ***no*** other option. (Protip: "I couldn't immediately think of a proper way so thus there must be no other option" is not gonna cut it here! If you can't think of anything else, say that outright and admit that you need help with it. Maintainers exist for exactly that reason.) diff --git a/code/__DEFINES/DNA.dm b/code/__DEFINES/DNA.dm index 5ad465efac9..2eabecb652d 100644 --- a/code/__DEFINES/DNA.dm +++ b/code/__DEFINES/DNA.dm @@ -3,59 +3,59 @@ #define CHECK_DNA_AND_SPECIES(C) if(!(C.dna?.species)) return //Defines copying names of mutations in all cases, make sure to change this if you change mutation's type -#define HULK /datum/mutation/human/hulk -#define XRAY /datum/mutation/human/thermal/x_ray -#define SPACEMUT /datum/mutation/human/space_adaptation -#define TK /datum/mutation/human/telekinesis -#define NERVOUS /datum/mutation/human/nervousness -#define EPILEPSY /datum/mutation/human/epilepsy -#define MUTATE /datum/mutation/human/bad_dna -#define COUGH /datum/mutation/human/cough -#define DWARFISM /datum/mutation/human/dwarfism -#define GIGANTISM /datum/mutation/human/gigantism -#define CLOWNMUT /datum/mutation/human/clumsy -#define TOURETTES /datum/mutation/human/tourettes -#define DEAFMUT /datum/mutation/human/deaf -#define BLINDMUT /datum/mutation/human/blind -#define RACEMUT /datum/mutation/human/race -#define BADSIGHT /datum/mutation/human/nearsight -#define LASEREYES /datum/mutation/human/laser_eyes -#define CHAMELEON /datum/mutation/human/chameleon -#define WACKY /datum/mutation/human/wacky -#define MUT_MUTE /datum/mutation/human/mute -#define STONER /datum/mutation/human/stoner -#define UNINTELLIGIBLE /datum/mutation/human/unintelligible -#define SWEDISH /datum/mutation/human/swedish -#define CHAV /datum/mutation/human/chav -#define ELVIS /datum/mutation/human/elvis -#define MEDIEVAL /datum/mutation/human/medieval -#define RADIOACTIVE /datum/mutation/human/radioactive -#define GLOWY /datum/mutation/human/glow -#define ANTIGLOWY /datum/mutation/human/glow/anti -#define TELEPATHY /datum/mutation/human/telepathy -#define FIREBREATH /datum/mutation/human/firebreath -#define VOID /datum/mutation/human/void -#define TONGUESPIKE /datum/mutation/human/tonguespike -#define TONGUESPIKECHEM /datum/mutation/human/tongue_spike/chem -#define STRONG /datum/mutation/human/strong -#define STIMMED /datum/mutation/human/stimmed -#define FIRESWEAT /datum/mutation/human/fire -#define THERMAL /datum/mutation/human/thermal -#define ANTENNA /datum/mutation/human/antenna -#define PARANOIA /datum/mutation/human/paranoia -#define MINDREAD /datum/mutation/human/mindreader -#define INSULATED /datum/mutation/human/insulated -#define SHOCKTOUCH /datum/mutation/human/shock -#define OLFACTION /datum/mutation/human/olfaction -#define ACIDFLESH /datum/mutation/human/acidflesh -#define BADBLINK /datum/mutation/human/badblink -#define SPASTIC /datum/mutation/human/spastic -#define EXTRASTUN /datum/mutation/human/extrastun -#define GELADIKINESIS /datum/mutation/human/geladikinesis +#define HULK /datum/mutation/human/hulk +#define XRAY /datum/mutation/human/thermal/x_ray +#define SPACEMUT /datum/mutation/human/space_adaptation +#define TK /datum/mutation/human/telekinesis +#define NERVOUS /datum/mutation/human/nervousness +#define EPILEPSY /datum/mutation/human/epilepsy +#define MUTATE /datum/mutation/human/bad_dna +#define COUGH /datum/mutation/human/cough +#define DWARFISM /datum/mutation/human/dwarfism +#define GIGANTISM /datum/mutation/human/gigantism +#define CLOWNMUT /datum/mutation/human/clumsy +#define TOURETTES /datum/mutation/human/tourettes +#define DEAFMUT /datum/mutation/human/deaf +#define BLINDMUT /datum/mutation/human/blind +#define RACEMUT /datum/mutation/human/race +#define BADSIGHT /datum/mutation/human/nearsight +#define LASEREYES /datum/mutation/human/laser_eyes +#define CHAMELEON /datum/mutation/human/chameleon +#define WACKY /datum/mutation/human/wacky +#define MUT_MUTE /datum/mutation/human/mute +#define STONER /datum/mutation/human/stoner +#define UNINTELLIGIBLE /datum/mutation/human/unintelligible +#define SWEDISH /datum/mutation/human/swedish +#define CHAV /datum/mutation/human/chav +#define ELVIS /datum/mutation/human/elvis +#define MEDIEVAL /datum/mutation/human/medieval +#define RADIOACTIVE /datum/mutation/human/radioactive +#define GLOWY /datum/mutation/human/glow +#define ANTIGLOWY /datum/mutation/human/glow/anti +#define TELEPATHY /datum/mutation/human/telepathy +#define FIREBREATH /datum/mutation/human/firebreath +#define VOID /datum/mutation/human/void +#define TONGUESPIKE /datum/mutation/human/tonguespike +#define TONGUESPIKECHEM /datum/mutation/human/tongue_spike/chem +#define STRONG /datum/mutation/human/strong +#define STIMMED /datum/mutation/human/stimmed +#define FIRESWEAT /datum/mutation/human/fire +#define THERMAL /datum/mutation/human/thermal +#define ANTENNA /datum/mutation/human/antenna +#define PARANOIA /datum/mutation/human/paranoia +#define MINDREAD /datum/mutation/human/mindreader +#define INSULATED /datum/mutation/human/insulated +#define SHOCKTOUCH /datum/mutation/human/shock +#define OLFACTION /datum/mutation/human/olfaction +#define ACIDFLESH /datum/mutation/human/acidflesh +#define BADBLINK /datum/mutation/human/badblink +#define SPASTIC /datum/mutation/human/spastic +#define EXTRASTUN /datum/mutation/human/extrastun +#define GELADIKINESIS /datum/mutation/human/geladikinesis #define CRYOKINESIS /datum/mutation/human/cryokinesis -#define SPIDER_WEB /datum/mutation/human/webbing -#define MARTYRDOM /datum/mutation/human/martyrdom -#define HARS /datum/mutation/human/headless +#define SPIDER_WEB /datum/mutation/human/webbing +#define MARTYRDOM /datum/mutation/human/martyrdom +#define HARS /datum/mutation/human/headless #define BIOTECHCOMPAT /datum/mutation/human/biotechcompat #define UI_CHANGED "ui changed" @@ -66,9 +66,9 @@ // String identifiers for associative list lookup //Types of usual mutations -#define POSITIVE 1 -#define NEGATIVE 2 -#define MINOR_NEGATIVE 4 +#define POSITIVE 1 +#define NEGATIVE 2 +#define MINOR_NEGATIVE 4 //Mutation classes. Normal being on them, extra being additional mutations with instability and other being stuff you dont want people to fuck with like wizard mutate @@ -77,54 +77,54 @@ #define MUT_OTHER 3 //DNA - Because fuck you and your magic numbers being all over the codebase. -#define DNA_BLOCK_SIZE 3 +#define DNA_BLOCK_SIZE 3 -#define DNA_UNI_IDENTITY_BLOCKS 7 -#define DNA_HAIR_COLOR_BLOCK 1 -#define DNA_FACIAL_HAIR_COLOR_BLOCK 2 -#define DNA_SKIN_TONE_BLOCK 3 -#define DNA_EYE_COLOR_BLOCK 4 -#define DNA_GENDER_BLOCK 5 -#define DNA_FACIAL_HAIRSTYLE_BLOCK 6 -#define DNA_HAIRSTYLE_BLOCK 7 +#define DNA_UNI_IDENTITY_BLOCKS 7 +#define DNA_HAIR_COLOR_BLOCK 1 +#define DNA_FACIAL_HAIR_COLOR_BLOCK 2 +#define DNA_SKIN_TONE_BLOCK 3 +#define DNA_EYE_COLOR_BLOCK 4 +#define DNA_GENDER_BLOCK 5 +#define DNA_FACIAL_HAIRSTYLE_BLOCK 6 +#define DNA_HAIRSTYLE_BLOCK 7 -#define DNA_SEQUENCE_LENGTH 4 -#define DNA_MUTATION_BLOCKS 8 -#define DNA_UNIQUE_ENZYMES_LEN 32 +#define DNA_SEQUENCE_LENGTH 4 +#define DNA_MUTATION_BLOCKS 8 +#define DNA_UNIQUE_ENZYMES_LEN 32 //species traits for mutantraces -#define MUTCOLORS 1 -#define HAIR 2 -#define FACEHAIR 3 -#define EYECOLOR 4 -#define LIPS 5 -#define NOBLOOD 6 -#define NOTRANSSTING 7 +#define MUTCOLORS 1 +#define HAIR 2 +#define FACEHAIR 3 +#define EYECOLOR 4 +#define LIPS 5 +#define NOBLOOD 6 +#define NOTRANSSTING 7 /// Used if we want the mutant colour to be only used by mutant bodyparts. Don't combine this with MUTCOLORS, or it will be useless. -#define MUTCOLORS_PARTSONLY 8 -#define NOZOMBIE 9 +#define MUTCOLORS_PARTSONLY 8 +#define NOZOMBIE 9 /// Uses weird leg sprites. Optional for Lizards, required for ashwalkers. Don't give it to other races unless you make sprites for this (see human_parts_greyscale.dmi) -#define DIGITIGRADE 10 -#define NO_UNDERWEAR 11 -#define NOSTOMACH 12 +#define DIGITIGRADE 10 +#define NO_UNDERWEAR 11 +#define NOSTOMACH 12 #define NO_DNA_COPY 13 -#define DRINKSBLOOD 14 +#define DRINKSBLOOD 14 /// Use this if you want to change the race's color without the player being able to pick their own color. AKA special color shifting -#define DYNCOLORS 15 -#define AGENDER 16 +#define DYNCOLORS 15 +#define AGENDER 16 /// Do not draw eyes or eyeless overlay -#define NOEYESPRITES 17 +#define NOEYESPRITES 17 /// Used for determining which wounds are applicable to this species. /// if we have flesh (can suffer slash/piercing/burn wounds, requires they don't have NOBLOOD) -#define HAS_FLESH 18 +#define HAS_FLESH 18 /// if we have bones (can suffer bone wounds) -#define HAS_BONE 19 +#define HAS_BONE 19 ///If we have a limb-specific overlay sprite #define HAS_MARKINGS 20 /// Do not draw blood overlay #define NOBLOODOVERLAY 21 ///No augments, for monkeys in specific because they will turn into fucking freakazoids https://cdn.discordapp.com/attachments/326831214667235328/791313258912153640/102707682-fa7cad80-4294-11eb-8f13-8c689468aeb0.png -#define NOAUGMENTS 22 +#define NOAUGMENTS 22 //organ slots #define ORGAN_SLOT_BRAIN "brain" @@ -161,10 +161,10 @@ #define ORGAN_SLOT_XENO_EGGSAC "eggsac" //organ defines -#define STANDARD_ORGAN_THRESHOLD 100 -#define STANDARD_ORGAN_HEALING 0.001 +#define STANDARD_ORGAN_THRESHOLD 100 +#define STANDARD_ORGAN_HEALING 0.001 /// designed to fail organs when left to decay for ~15 minutes -#define STANDARD_ORGAN_DECAY 0.00222 +#define STANDARD_ORGAN_DECAY 0.00222 //used for the can_chromosome var on mutations #define CHROMOSOME_NEVER 0 diff --git a/code/__DEFINES/MC.dm b/code/__DEFINES/MC.dm index b1a955e411e..ad8796757cd 100644 --- a/code/__DEFINES/MC.dm +++ b/code/__DEFINES/MC.dm @@ -55,12 +55,12 @@ #define SS_POST_FIRE_TIMING 64 //! SUBSYSTEM STATES -#define SS_IDLE 0 /// ain't doing shit. -#define SS_QUEUED 1 /// queued to run -#define SS_RUNNING 2 /// actively running -#define SS_PAUSED 3 /// paused by mc_tick_check -#define SS_SLEEPING 4 /// fire() slept. -#define SS_PAUSING 5 /// in the middle of pausing +#define SS_IDLE 0 /// ain't doing shit. +#define SS_QUEUED 1 /// queued to run +#define SS_RUNNING 2 /// actively running +#define SS_PAUSED 3 /// paused by mc_tick_check +#define SS_SLEEPING 4 /// fire() slept. +#define SS_PAUSING 5 /// in the middle of pausing #define SUBSYSTEM_DEF(X) GLOBAL_REAL(SS##X, /datum/controller/subsystem/##X);\ /datum/controller/subsystem/##X/New(){\ diff --git a/code/__DEFINES/achievements.dm b/code/__DEFINES/achievements.dm index da640d795e4..c39531971cb 100644 --- a/code/__DEFINES/achievements.dm +++ b/code/__DEFINES/achievements.dm @@ -4,102 +4,102 @@ #define ACHIEVEMENT_SCORE "score" //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_DISKPLEASE "Disk, Please!" -#define MEDAL_GAMER "I'm Not Important" -#define MEDAL_VENDORSQUISH "Teenage Anarchist" -#define MEDAL_SWIRLIE "Bowl-d" -#define MEDAL_SELFOUCH "Hands???" -#define MEDAL_SANDMAN "Mister Sandman" -#define MEDAL_CLEANBOSS "Cleanboss" -#define MEDAL_RULE8 "Rule 8" -#define MEDAL_LONGSHIFT "longshift" -#define MEDAL_SNAIL "KKKiiilll mmmeee" -#define MEDAL_LOOKOUTSIR "Look Out, Sir!" -#define MEDAL_GOTTEM "GOTTEM" -#define MEDAL_ASCENSION "Ascension" -#define MEDAL_FRENCHING "FrenchingTheBubble" -#define MEDAL_ASH_ASCENSION "Ash" -#define MEDAL_FLESH_ASCENSION "Flesh" -#define MEDAL_RUST_ASCENSION "Rust" -#define MEDAL_VOID_ASCENSION "Void" -#define MEDAL_TOOLBOX_SOUL "Toolsoul" +#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_DISKPLEASE "Disk, Please!" +#define MEDAL_GAMER "I'm Not Important" +#define MEDAL_VENDORSQUISH "Teenage Anarchist" +#define MEDAL_SWIRLIE "Bowl-d" +#define MEDAL_SELFOUCH "Hands???" +#define MEDAL_SANDMAN "Mister Sandman" +#define MEDAL_CLEANBOSS "Cleanboss" +#define MEDAL_RULE8 "Rule 8" +#define MEDAL_LONGSHIFT "longshift" +#define MEDAL_SNAIL "KKKiiilll mmmeee" +#define MEDAL_LOOKOUTSIR "Look Out, Sir!" +#define MEDAL_GOTTEM "GOTTEM" +#define MEDAL_ASCENSION "Ascension" +#define MEDAL_FRENCHING "FrenchingTheBubble" +#define MEDAL_ASH_ASCENSION "Ash" +#define MEDAL_FLESH_ASCENSION "Flesh" +#define MEDAL_RUST_ASCENSION "Rust" +#define MEDAL_VOID_ASCENSION "Void" +#define MEDAL_TOOLBOX_SOUL "Toolsoul" #define MEDAL_CHEM_TUT "Beginner Chemist" //Skill medal hub IDs -#define MEDAL_LEGENDARY_MINER "Legendary Miner" +#define MEDAL_LEGENDARY_MINER "Legendary Miner" //Mafia medal hub IDs (wins) -#define MAFIA_MEDAL_ASSISTANT "Assistant" -#define MAFIA_MEDAL_DETECTIVE "Detective" -#define MAFIA_MEDAL_PSYCHOLOGIST "Psychologist" -#define MAFIA_MEDAL_CHAPLAIN "Chaplain" -#define MAFIA_MEDAL_MD "Medical Doctor" -#define MAFIA_MEDAL_OFFICER "Security Officer" -#define MAFIA_MEDAL_LAWYER "Lawyer" -#define MAFIA_MEDAL_HOP "Head of Personnel" -#define MAFIA_MEDAL_HOS "Head of Security" -#define MAFIA_MEDAL_WARDEN "Warden" -#define MAFIA_MEDAL_CHANGELING "CHANGELING" -#define MAFIA_MEDAL_THOUGHTFEEDER "Thoughtfeeder" -#define MAFIA_MEDAL_TRAITOR "Traitor" -#define MAFIA_MEDAL_NIGHTMARE "Nightmare" -#define MAFIA_MEDAL_FUGITIVE "Fugitive" -#define MAFIA_MEDAL_OBSESSED "Obsessed" -#define MAFIA_MEDAL_CLOWN "Clown" +#define MAFIA_MEDAL_ASSISTANT "Assistant" +#define MAFIA_MEDAL_DETECTIVE "Detective" +#define MAFIA_MEDAL_PSYCHOLOGIST "Psychologist" +#define MAFIA_MEDAL_CHAPLAIN "Chaplain" +#define MAFIA_MEDAL_MD "Medical Doctor" +#define MAFIA_MEDAL_OFFICER "Security Officer" +#define MAFIA_MEDAL_LAWYER "Lawyer" +#define MAFIA_MEDAL_HOP "Head of Personnel" +#define MAFIA_MEDAL_HOS "Head of Security" +#define MAFIA_MEDAL_WARDEN "Warden" +#define MAFIA_MEDAL_CHANGELING "CHANGELING" +#define MAFIA_MEDAL_THOUGHTFEEDER "Thoughtfeeder" +#define MAFIA_MEDAL_TRAITOR "Traitor" +#define MAFIA_MEDAL_NIGHTMARE "Nightmare" +#define MAFIA_MEDAL_FUGITIVE "Fugitive" +#define MAFIA_MEDAL_OBSESSED "Obsessed" +#define MAFIA_MEDAL_CLOWN "Clown" //Mafia medal hub IDs (misc stuff) -#define MAFIA_MEDAL_HATED "Universally Hated" -#define MAFIA_MEDAL_CHARISMATIC "Charismatic" -#define MAFIA_MEDAL_VIP "VIP" +#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_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_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" -#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_WENDIGO_CRUSHER "Wendigo Crusher" -#define BOSS_MEDAL_KINGGOAT_CRUSHER "King Goat Crusher" +#define BOSS_MEDAL_MINER_CRUSHER "Blood-drunk Miner Crusher" +#define BOSS_MEDAL_FROSTMINER_CRUSHER "Demonic-frost 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_WENDIGO_CRUSHER "Wendigo Crusher" +#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/acid.dm b/code/__DEFINES/acid.dm index 5f28ceebb5c..37bf5f07ed5 100644 --- a/code/__DEFINES/acid.dm +++ b/code/__DEFINES/acid.dm @@ -1,21 +1,21 @@ /// The acid power required to destroy most closed turfs. -#define ACID_POWER_MELT_TURF 200 +#define ACID_POWER_MELT_TURF 200 /// The maximum amount of damage (per second) acid can deal to an [/obj]. -#define OBJ_ACID_DAMAGE_MAX 300 +#define OBJ_ACID_DAMAGE_MAX 300 /// Maximum acid volume that can be applied to an [/obj]. -#define OBJ_ACID_VOLUME_MAX 300 +#define OBJ_ACID_VOLUME_MAX 300 /// Maximum acid volume that can be applied to a [/mob/living]. -#define MOB_ACID_VOLUME_MAX 1000 +#define MOB_ACID_VOLUME_MAX 1000 /// Maximum acid volume that can be applied to a [/turf]. -#define TURF_ACID_VOLUME_MAX 12000 +#define TURF_ACID_VOLUME_MAX 12000 // Acid decay rate constants. /// The constant factor for the acid decay rate. -#define ACID_DECAY_BASE 1 +#define ACID_DECAY_BASE 1 /// The scaling factor for the acid decay rate. -#define ACID_DECAY_SCALING 1 +#define ACID_DECAY_SCALING 1 /// The default icon state for the acid overlay. Not to be confused with the error icon state. -#define ACID_OVERLAY_DEFAULT "default" +#define ACID_OVERLAY_DEFAULT "default" /// The combined acid power and acid volume required to burn hands. -#define ACID_LEVEL_HANDBURN 20 +#define ACID_LEVEL_HANDBURN 20 diff --git a/code/__DEFINES/admin.dm b/code/__DEFINES/admin.dm index 9bb64c21703..f491b3437b7 100644 --- a/code/__DEFINES/admin.dm +++ b/code/__DEFINES/admin.dm @@ -1,42 +1,42 @@ //A set of constants used to determine which type of mute an admin wishes to apply: //Please read and understand the muting/automuting stuff before changing these. MUTE_IC_AUTO etc = (MUTE_IC << 1) //Therefore there needs to be a gap between the flags for the automute flags -#define MUTE_IC (1<<0) -#define MUTE_OOC (1<<1) -#define MUTE_PRAY (1<<2) -#define MUTE_ADMINHELP (1<<3) -#define MUTE_DEADCHAT (1<<4) -#define MUTE_ALL (~0) +#define MUTE_IC (1<<0) +#define MUTE_OOC (1<<1) +#define MUTE_PRAY (1<<2) +#define MUTE_ADMINHELP (1<<3) +#define MUTE_DEADCHAT (1<<4) +#define MUTE_ALL (~0) //Some constants for DB_Ban -#define BANTYPE_PERMA 1 -#define BANTYPE_TEMP 2 -#define BANTYPE_JOB_PERMA 3 -#define BANTYPE_JOB_TEMP 4 +#define BANTYPE_PERMA 1 +#define BANTYPE_TEMP 2 +#define BANTYPE_JOB_PERMA 3 +#define BANTYPE_JOB_TEMP 4 /// used to locate stuff to unban. -#define BANTYPE_ANY_FULLBAN 5 +#define BANTYPE_ANY_FULLBAN 5 -#define BANTYPE_ADMIN_PERMA 7 -#define BANTYPE_ADMIN_TEMP 8 +#define BANTYPE_ADMIN_PERMA 7 +#define BANTYPE_ADMIN_TEMP 8 /// used to remove jobbans -#define BANTYPE_ANY_JOB 9 +#define BANTYPE_ANY_JOB 9 //Admin Permissions -#define R_BUILD (1<<0) -#define R_ADMIN (1<<1) -#define R_BAN (1<<2) -#define R_FUN (1<<3) -#define R_SERVER (1<<4) -#define R_DEBUG (1<<5) -#define R_POSSESS (1<<6) -#define R_PERMISSIONS (1<<7) -#define R_STEALTH (1<<8) -#define R_POLL (1<<9) -#define R_VAREDIT (1<<10) -#define R_SOUND (1<<11) -#define R_SPAWN (1<<12) -#define R_AUTOADMIN (1<<13) -#define R_DBRANKS (1<<14) +#define R_BUILD (1<<0) +#define R_ADMIN (1<<1) +#define R_BAN (1<<2) +#define R_FUN (1<<3) +#define R_SERVER (1<<4) +#define R_DEBUG (1<<5) +#define R_POSSESS (1<<6) +#define R_PERMISSIONS (1<<7) +#define R_STEALTH (1<<8) +#define R_POLL (1<<9) +#define R_VAREDIT (1<<10) +#define R_SOUND (1<<11) +#define R_SPAWN (1<<12) +#define R_AUTOADMIN (1<<13) +#define R_DBRANKS (1<<14) #define R_DEFAULT R_AUTOADMIN @@ -89,12 +89,12 @@ #define AHELP_RESOLVED 3 /// Amount of time (in deciseconds) after the rounds starts, that the player disconnect report is issued. -#define ROUNDSTART_LOGOUT_REPORT_TIME 6000 +#define ROUNDSTART_LOGOUT_REPORT_TIME 6000 /// Number of identical messages required before the spam-prevention will warn you to stfu -#define SPAM_TRIGGER_WARNING 5 +#define SPAM_TRIGGER_WARNING 5 /// Number of identical messages required before the spam-prevention will automute you -#define SPAM_TRIGGER_AUTOMUTE 10 +#define SPAM_TRIGGER_AUTOMUTE 10 ///Max length of a keypress command before it's considered to be a forged packet/bogus command #define MAX_KEYPRESS_COMMANDLENGTH 16 @@ -128,12 +128,12 @@ GLOBAL_VAR_INIT(ghost_role_flags, (~0)) //Flags that control what ways ghosts can get back into the round //ie fugitives, space dragon, etc. also includes dynamic midrounds as it's the same deal -#define GHOSTROLE_MIDROUND_EVENT (1<<0) +#define GHOSTROLE_MIDROUND_EVENT (1<<0) //ie ashwalkers, free golems, beach bums -#define GHOSTROLE_SPAWNER (1<<1) +#define GHOSTROLE_SPAWNER (1<<1) //ie mind monkeys, sentience potion -#define GHOSTROLE_STATION_SENTIENCE (1<<2) +#define GHOSTROLE_STATION_SENTIENCE (1<<2) //ie pais, posibrains -#define GHOSTROLE_SILICONS (1<<3) +#define GHOSTROLE_SILICONS (1<<3) //ie mafia, ctf -#define GHOSTROLE_MINIGAME (1<<4) +#define GHOSTROLE_MINIGAME (1<<4) diff --git a/code/__DEFINES/ai.dm b/code/__DEFINES/ai.dm index 471a7925324..a87781a40c0 100644 --- a/code/__DEFINES/ai.dm +++ b/code/__DEFINES/ai.dm @@ -1,8 +1,8 @@ #define GET_AI_BEHAVIOR(behavior_type) SSai_controllers.ai_behaviors[behavior_type] #define HAS_AI_CONTROLLER_TYPE(thing, type) istype(thing?.ai_controller, type) -#define AI_STATUS_ON 1 -#define AI_STATUS_OFF 2 +#define AI_STATUS_ON 1 +#define AI_STATUS_OFF 2 ///Monkey checks diff --git a/code/__DEFINES/atmospherics.dm b/code/__DEFINES/atmospherics.dm index af0b9634e14..c4366621e26 100644 --- a/code/__DEFINES/atmospherics.dm +++ b/code/__DEFINES/atmospherics.dm @@ -1,51 +1,51 @@ //LISTMOS //indices of values in gas lists. -#define MOLES 1 -#define ARCHIVE 2 -#define GAS_META 3 -#define META_GAS_SPECIFIC_HEAT 1 -#define META_GAS_NAME 2 -#define META_GAS_MOLES_VISIBLE 3 -#define META_GAS_OVERLAY 4 -#define META_GAS_DANGER 5 -#define META_GAS_ID 6 +#define MOLES 1 +#define ARCHIVE 2 +#define GAS_META 3 +#define META_GAS_SPECIFIC_HEAT 1 +#define META_GAS_NAME 2 +#define META_GAS_MOLES_VISIBLE 3 +#define META_GAS_OVERLAY 4 +#define META_GAS_DANGER 5 +#define META_GAS_ID 6 #define META_GAS_FUSION_POWER 7 //ATMOS //stuff you should probably leave well alone! /// kPa*L/(K*mol) -#define R_IDEAL_GAS_EQUATION 8.31 +#define R_IDEAL_GAS_EQUATION 8.31 /// kPa -#define ONE_ATMOSPHERE 101.325 +#define ONE_ATMOSPHERE 101.325 /// -270.3degC -#define TCMB 2.7 +#define TCMB 2.7 /// -48.15degC -#define TCRYO 225 +#define TCRYO 225 /// 0degC -#define T0C 273.15 +#define T0C 273.15 /// 20degC -#define T20C 293.15 +#define T20C 293.15 /// -14C - Temperature used for kitchen cold room, medical freezer, etc. -#define COLD_ROOM_TEMP 259.15 +#define COLD_ROOM_TEMP 259.15 ///moles in a 2.5 m^3 cell at 101.325 Pa and 20 degC (103 or so) -#define MOLES_CELLSTANDARD (ONE_ATMOSPHERE*CELL_VOLUME/(T20C*R_IDEAL_GAS_EQUATION)) +#define MOLES_CELLSTANDARD (ONE_ATMOSPHERE*CELL_VOLUME/(T20C*R_IDEAL_GAS_EQUATION)) ///compared against for superconductivity -#define M_CELL_WITH_RATIO (MOLES_CELLSTANDARD * 0.005) +#define M_CELL_WITH_RATIO (MOLES_CELLSTANDARD * 0.005) /// percentage of oxygen in a normal mixture of air -#define O2STANDARD 0.21 +#define O2STANDARD 0.21 /// same but for nitrogen -#define N2STANDARD 0.79 +#define N2STANDARD 0.79 /// O2 standard value (21%) -#define MOLES_O2STANDARD (MOLES_CELLSTANDARD*O2STANDARD) +#define MOLES_O2STANDARD (MOLES_CELLSTANDARD*O2STANDARD) /// N2 standard value (79%) -#define MOLES_N2STANDARD (MOLES_CELLSTANDARD*N2STANDARD) +#define MOLES_N2STANDARD (MOLES_CELLSTANDARD*N2STANDARD) /// liters in a cell -#define CELL_VOLUME 2500 +#define CELL_VOLUME 2500 /// liters in a normal breath. note that breaths are taken once every 4 life ticks, which is 8 seconds -#define BREATH_VOLUME 2 +#define BREATH_VOLUME 2 /// Amount of air to take a from a tile -#define BREATH_PERCENTAGE (BREATH_VOLUME/CELL_VOLUME) +#define BREATH_PERCENTAGE (BREATH_VOLUME/CELL_VOLUME) //EXCITED GROUPS @@ -58,25 +58,25 @@ * Because of this and the behavior of share(), the breakdown cycles value can be tweaked directly to effect how fast we want gas to move */ /// number of FULL air controller ticks before an excited group breaks down (averages gas contents across turfs) -#define EXCITED_GROUP_BREAKDOWN_CYCLES 5 +#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 +#define MINIMUM_AIR_RATIO_TO_SUSPEND 0.1 /// Minimum ratio of air that must move to/from a tile -#define MINIMUM_AIR_RATIO_TO_MOVE 0.001 +#define MINIMUM_AIR_RATIO_TO_MOVE 0.001 /// Minimum amount of air that has to move before a group processing can be suspended (Round about 10) -#define MINIMUM_AIR_TO_SUSPEND (MOLES_CELLSTANDARD*MINIMUM_AIR_RATIO_TO_SUSPEND) +#define MINIMUM_AIR_TO_SUSPEND (MOLES_CELLSTANDARD*MINIMUM_AIR_RATIO_TO_SUSPEND) /// Either this must be active (round about 0.1) //Might need to raise this a tad to better support space leaks. we'll see -#define MINIMUM_MOLES_DELTA_TO_MOVE (MOLES_CELLSTANDARD*MINIMUM_AIR_RATIO_TO_MOVE) +#define MINIMUM_MOLES_DELTA_TO_MOVE (MOLES_CELLSTANDARD*MINIMUM_AIR_RATIO_TO_MOVE) /// or this (or both, obviously) -#define MINIMUM_TEMPERATURE_TO_MOVE (T20C+100) +#define MINIMUM_TEMPERATURE_TO_MOVE (T20C+100) /// Minimum temperature difference before group processing is suspended -#define MINIMUM_TEMPERATURE_DELTA_TO_SUSPEND 4 +#define MINIMUM_TEMPERATURE_DELTA_TO_SUSPEND 4 /// Minimum temperature difference before the gas temperatures are just set to be equal -#define MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER 0.5 -#define MINIMUM_TEMPERATURE_FOR_SUPERCONDUCTION (T20C+80) -#define MINIMUM_TEMPERATURE_START_SUPERCONDUCTION (T20C+400) +#define MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER 0.5 +#define MINIMUM_TEMPERATURE_FOR_SUPERCONDUCTION (T20C+80) +#define MINIMUM_TEMPERATURE_START_SUPERCONDUCTION (T20C+400) //Excited Group Cleanup helper defines #define EX_CLEANUP_BREAKDOWN 1 @@ -86,172 +86,172 @@ //HEAT TRANSFER COEFFICIENTS //Must be between 0 and 1. Values closer to 1 equalize temperature faster //Should not exceed 0.4 else strange heat flow occur -#define WALL_HEAT_TRANSFER_COEFFICIENT 0.0 -#define OPEN_HEAT_TRANSFER_COEFFICIENT 0.4 +#define WALL_HEAT_TRANSFER_COEFFICIENT 0.0 +#define OPEN_HEAT_TRANSFER_COEFFICIENT 0.4 /// a hack for now -#define WINDOW_HEAT_TRANSFER_COEFFICIENT 0.1 +#define WINDOW_HEAT_TRANSFER_COEFFICIENT 0.1 /// a hack to help make vacuums "cold", sacrificing realism for gameplay -#define HEAT_CAPACITY_VACUUM 7000 +#define HEAT_CAPACITY_VACUUM 7000 //FIRE -#define FIRE_MINIMUM_TEMPERATURE_TO_SPREAD (150+T0C) -#define FIRE_MINIMUM_TEMPERATURE_TO_EXIST (100+T0C) -#define FIRE_SPREAD_RADIOSITY_SCALE 0.85 -#define FIRE_GROWTH_RATE 40000 //For small fires -#define PLASMA_MINIMUM_BURN_TEMPERATURE (100+T0C) -#define PLASMA_UPPER_TEMPERATURE (1370+T0C) -#define PLASMA_OXYGEN_FULLBURN 10 -#define HYDROGEN_MINIMUM_BURN_TEMPERATURE (100+T0C) -#define HYDROGEN_UPPER_TEMPERATURE (1370+T0C) -#define HYDROGEN_OXYGEN_FULLBURN 10 +#define FIRE_MINIMUM_TEMPERATURE_TO_SPREAD (150+T0C) +#define FIRE_MINIMUM_TEMPERATURE_TO_EXIST (100+T0C) +#define FIRE_SPREAD_RADIOSITY_SCALE 0.85 +#define FIRE_GROWTH_RATE 40000 //For small fires +#define PLASMA_MINIMUM_BURN_TEMPERATURE (100+T0C) +#define PLASMA_UPPER_TEMPERATURE (1370+T0C) +#define PLASMA_OXYGEN_FULLBURN 10 +#define HYDROGEN_MINIMUM_BURN_TEMPERATURE (100+T0C) +#define HYDROGEN_UPPER_TEMPERATURE (1370+T0C) +#define HYDROGEN_OXYGEN_FULLBURN 10 //COLD FIRE (this is used only for the freon-o2 reaction, there is no fire still) -#define COLD_FIRE_MAXIMUM_TEMPERATURE_TO_SPREAD 263 //fire will spread if the temperature is -10 °C -#define COLD_FIRE_MAXIMUM_TEMPERATURE_TO_EXIST 273 //fire will start if the temperature is 0 °C -#define COLD_FIRE_SPREAD_RADIOSITY_SCALE 0.95 -#define COLD_FIRE_GROWTH_RATE 40000 -#define FREON_MAXIMUM_BURN_TEMPERATURE 283 -#define FREON_LOWER_TEMPERATURE 60 //minimum temperature allowed for the burn to go, we would have negative pressure otherwise -#define FREON_OXYGEN_FULLBURN 10 +#define COLD_FIRE_MAXIMUM_TEMPERATURE_TO_SPREAD 263 //fire will spread if the temperature is -10 °C +#define COLD_FIRE_MAXIMUM_TEMPERATURE_TO_EXIST 273 //fire will start if the temperature is 0 °C +#define COLD_FIRE_SPREAD_RADIOSITY_SCALE 0.95 +#define COLD_FIRE_GROWTH_RATE 40000 +#define FREON_MAXIMUM_BURN_TEMPERATURE 283 +#define FREON_LOWER_TEMPERATURE 60 //minimum temperature allowed for the burn to go, we would have negative pressure otherwise +#define FREON_OXYGEN_FULLBURN 10 //GASES -#define MIN_TOXIC_GAS_DAMAGE 1 -#define MAX_TOXIC_GAS_DAMAGE 10 +#define MIN_TOXIC_GAS_DAMAGE 1 +#define MAX_TOXIC_GAS_DAMAGE 10 /// Moles in a standard cell after which gases are visible -#define MOLES_GAS_VISIBLE 0.25 +#define MOLES_GAS_VISIBLE 0.25 /// moles_visible * FACTOR_GAS_VISIBLE_MAX = Moles after which gas is at maximum visibility -#define FACTOR_GAS_VISIBLE_MAX 20 +#define FACTOR_GAS_VISIBLE_MAX 20 /// Mole step for alpha updates. This means alpha can update at 0.25, 0.5, 0.75 and so on -#define MOLES_GAS_VISIBLE_STEP 0.25 +#define MOLES_GAS_VISIBLE_STEP 0.25 /// The total visible states #define TOTAL_VISIBLE_STATES (FACTOR_GAS_VISIBLE_MAX * (1 / MOLES_GAS_VISIBLE_STEP)) //REACTIONS //return values for reactions (bitflags) -#define NO_REACTION 0 -#define REACTING 1 -#define STOP_REACTIONS 2 +#define NO_REACTION 0 +#define REACTING 1 +#define STOP_REACTIONS 2 // Pressure limits. /// This determins at what pressure the ultra-high pressure red icon is displayed. (This one is set as a constant) -#define HAZARD_HIGH_PRESSURE 550 +#define HAZARD_HIGH_PRESSURE 550 /// This determins when the orange pressure icon is displayed (it is 0.7 * HAZARD_HIGH_PRESSURE) -#define WARNING_HIGH_PRESSURE 325 +#define WARNING_HIGH_PRESSURE 325 /// This is when the gray low pressure icon is displayed. (it is 2.5 * HAZARD_LOW_PRESSURE) -#define WARNING_LOW_PRESSURE 50 +#define WARNING_LOW_PRESSURE 50 /// This is when the black ultra-low pressure icon is displayed. (This one is set as a constant) -#define HAZARD_LOW_PRESSURE 20 +#define HAZARD_LOW_PRESSURE 20 /// This is used in handle_temperature_damage() for humans, and in reagents that affect body temperature. Temperature damage is multiplied by this amount. -#define TEMPERATURE_DAMAGE_COEFFICIENT 1.5 +#define TEMPERATURE_DAMAGE_COEFFICIENT 1.5 /// The natural temperature for a body -#define BODYTEMP_NORMAL 310.15 +#define BODYTEMP_NORMAL 310.15 /// This is the divisor which handles how much of the temperature difference between the current body temperature and 310.15K (optimal temperature) humans auto-regenerate each tick. The higher the number, the slower the recovery. This is applied each tick, so long as the mob is alive. -#define BODYTEMP_AUTORECOVERY_DIVISOR 14 +#define BODYTEMP_AUTORECOVERY_DIVISOR 14 /// Minimum amount of kelvin moved toward 310K per tick. So long as abs(310.15 - bodytemp) is more than 50. -#define BODYTEMP_AUTORECOVERY_MINIMUM 6 +#define BODYTEMP_AUTORECOVERY_MINIMUM 6 ///Similar to the BODYTEMP_AUTORECOVERY_DIVISOR, but this is the divisor which is applied at the stage that follows autorecovery. This is the divisor which comes into play when the human's loc temperature is lower than their body temperature. Make it lower to lose bodytemp faster. -#define BODYTEMP_COLD_DIVISOR 15 +#define BODYTEMP_COLD_DIVISOR 15 /// Similar to the BODYTEMP_AUTORECOVERY_DIVISOR, but this is the divisor which is applied at the stage that follows autorecovery. This is the divisor which comes into play when the human's loc temperature is higher than their body temperature. Make it lower to gain bodytemp faster. -#define BODYTEMP_HEAT_DIVISOR 15 +#define BODYTEMP_HEAT_DIVISOR 15 /// The maximum number of degrees that your body can cool in 1 tick, due to the environment, when in a cold area. -#define BODYTEMP_COOLING_MAX -30 +#define BODYTEMP_COOLING_MAX -30 /// The maximum number of degrees that your body can heat up in 1 tick, due to the environment, when in a hot area. -#define BODYTEMP_HEATING_MAX 30 +#define BODYTEMP_HEATING_MAX 30 /// The body temperature limit the human body can take before it starts taking damage from heat. /// This also affects how fast the body normalises it's temperature when hot. /// 340k is about 66c, and rather high for a human. -#define BODYTEMP_HEAT_DAMAGE_LIMIT (BODYTEMP_NORMAL + 30) +#define BODYTEMP_HEAT_DAMAGE_LIMIT (BODYTEMP_NORMAL + 30) /// The body temperature limit the human body can take before it starts taking damage from cold. /// This also affects how fast the body normalises it's temperature when cold. /// 270k is about -3c, that is below freezing and would hurt over time. -#define BODYTEMP_COLD_DAMAGE_LIMIT (BODYTEMP_NORMAL - 40) +#define BODYTEMP_COLD_DAMAGE_LIMIT (BODYTEMP_NORMAL - 40) /// The body temperature limit the human body can take before it will take wound damage. -#define BODYTEMP_HEAT_WOUND_LIMIT (BODYTEMP_NORMAL + 90) // 400.5 k +#define BODYTEMP_HEAT_WOUND_LIMIT (BODYTEMP_NORMAL + 90) // 400.5 k /// The modifier on cold damage limit hulks get ontop of their regular limit #define BODYTEMP_HULK_COLD_DAMAGE_LIMIT_MODIFIER 25 /// The modifier on cold damage hulks get. #define HULK_COLD_DAMAGE_MOD 2 /// what min_cold_protection_temperature is set to for space-helmet quality headwear. MUST NOT BE 0. -#define SPACE_HELM_MIN_TEMP_PROTECT 2.0 +#define SPACE_HELM_MIN_TEMP_PROTECT 2.0 /// Thermal insulation works both ways /Malkevin -#define SPACE_HELM_MAX_TEMP_PROTECT 1500 +#define SPACE_HELM_MAX_TEMP_PROTECT 1500 /// what min_cold_protection_temperature is set to for space-suit quality jumpsuits or suits. MUST NOT BE 0. -#define SPACE_SUIT_MIN_TEMP_PROTECT 2.0 +#define SPACE_SUIT_MIN_TEMP_PROTECT 2.0 /// The min cold protection of a space suit without the heater active -#define SPACE_SUIT_MIN_TEMP_PROTECT_OFF 72 -#define SPACE_SUIT_MAX_TEMP_PROTECT 1500 +#define SPACE_SUIT_MIN_TEMP_PROTECT_OFF 72 +#define SPACE_SUIT_MAX_TEMP_PROTECT 1500 /// Cold protection for firesuits -#define FIRE_SUIT_MIN_TEMP_PROTECT 60 +#define FIRE_SUIT_MIN_TEMP_PROTECT 60 /// what max_heat_protection_temperature is set to for firesuit quality suits. MUST NOT BE 0. -#define FIRE_SUIT_MAX_TEMP_PROTECT 30000 +#define FIRE_SUIT_MAX_TEMP_PROTECT 30000 /// Cold protection for fire helmets -#define FIRE_HELM_MIN_TEMP_PROTECT 60 +#define FIRE_HELM_MIN_TEMP_PROTECT 60 /// for fire helmet quality items (red and white hardhats) -#define FIRE_HELM_MAX_TEMP_PROTECT 30000 +#define FIRE_HELM_MAX_TEMP_PROTECT 30000 /// what max_heat_protection_temperature is set to for firesuit quality suits and helmets. MUST NOT BE 0. -#define FIRE_IMMUNITY_MAX_TEMP_PROTECT 35000 +#define FIRE_IMMUNITY_MAX_TEMP_PROTECT 35000 /// For normal helmets -#define HELMET_MIN_TEMP_PROTECT 160 +#define HELMET_MIN_TEMP_PROTECT 160 /// For normal helmets -#define HELMET_MAX_TEMP_PROTECT 600 +#define HELMET_MAX_TEMP_PROTECT 600 /// For armor -#define ARMOR_MIN_TEMP_PROTECT 160 +#define ARMOR_MIN_TEMP_PROTECT 160 /// For armor -#define ARMOR_MAX_TEMP_PROTECT 600 +#define ARMOR_MAX_TEMP_PROTECT 600 /// For some gloves (black and) -#define GLOVES_MIN_TEMP_PROTECT 2.0 +#define GLOVES_MIN_TEMP_PROTECT 2.0 /// For some gloves -#define GLOVES_MAX_TEMP_PROTECT 1500 +#define GLOVES_MAX_TEMP_PROTECT 1500 /// For gloves -#define SHOES_MIN_TEMP_PROTECT 2.0 +#define SHOES_MIN_TEMP_PROTECT 2.0 /// For gloves -#define SHOES_MAX_TEMP_PROTECT 1500 +#define SHOES_MAX_TEMP_PROTECT 1500 /// The amount of pressure damage someone takes is equal to (pressure / HAZARD_HIGH_PRESSURE)*PRESSURE_DAMAGE_COEFFICIENT, with the maximum of MAX_PRESSURE_DAMAGE -#define PRESSURE_DAMAGE_COEFFICIENT 4 -#define MAX_HIGH_PRESSURE_DAMAGE 4 +#define PRESSURE_DAMAGE_COEFFICIENT 4 +#define MAX_HIGH_PRESSURE_DAMAGE 4 /// The amount of damage someone takes when in a low pressure area (The pressure threshold is so low that it doesn't make sense to do any calculations, so it just applies this flat value). -#define LOW_PRESSURE_DAMAGE 4 +#define LOW_PRESSURE_DAMAGE 4 /// Humans are slowed by the difference between bodytemp and BODYTEMP_COLD_DAMAGE_LIMIT divided by this -#define COLD_SLOWDOWN_FACTOR 20 +#define COLD_SLOWDOWN_FACTOR 20 //PIPES //Atmos pipe limits /// (kPa) What pressure pumps and powered equipment max out at. -#define MAX_OUTPUT_PRESSURE 4500 +#define MAX_OUTPUT_PRESSURE 4500 /// (L/s) Maximum speed powered equipment can work at. -#define MAX_TRANSFER_RATE 400 +#define MAX_TRANSFER_RATE 400 /// How many percent of the contents that an overclocked volume pumps leak into the air -#define VOLUME_PUMP_LEAK_AMOUNT 0.2 +#define VOLUME_PUMP_LEAK_AMOUNT 0.2 //used for device_type vars -#define UNARY 1 -#define BINARY 2 -#define TRINARY 3 -#define QUATERNARY 4 +#define UNARY 1 +#define BINARY 2 +#define TRINARY 3 +#define QUATERNARY 4 //TANKS /// temperature in kelvins at which a tank will start to melt -#define TANK_MELT_TEMPERATURE 1000000 +#define TANK_MELT_TEMPERATURE 1000000 /// Tank starts leaking -#define TANK_LEAK_PRESSURE (30.*ONE_ATMOSPHERE) +#define TANK_LEAK_PRESSURE (30.*ONE_ATMOSPHERE) /// Tank spills all contents into atmosphere -#define TANK_RUPTURE_PRESSURE (35.*ONE_ATMOSPHERE) +#define TANK_RUPTURE_PRESSURE (35.*ONE_ATMOSPHERE) /// Boom 3x3 base explosion -#define TANK_FRAGMENT_PRESSURE (40.*ONE_ATMOSPHERE) +#define TANK_FRAGMENT_PRESSURE (40.*ONE_ATMOSPHERE) /// +1 for each SCALE kPa aboe threshold -#define TANK_FRAGMENT_SCALE (6.*ONE_ATMOSPHERE) -#define TANK_MAX_RELEASE_PRESSURE (ONE_ATMOSPHERE*3) -#define TANK_MIN_RELEASE_PRESSURE 0 -#define TANK_DEFAULT_RELEASE_PRESSURE 16 +#define TANK_FRAGMENT_SCALE (6.*ONE_ATMOSPHERE) +#define TANK_MAX_RELEASE_PRESSURE (ONE_ATMOSPHERE*3) +#define TANK_MIN_RELEASE_PRESSURE 0 +#define TANK_DEFAULT_RELEASE_PRESSURE 16 //CANATMOSPASS #define ATMOS_PASS_YES 1 @@ -267,50 +267,50 @@ //OPEN TURF ATMOS /// the default air mix that open turfs spawn -#define OPENTURF_DEFAULT_ATMOS "o2=22;n2=82;TEMP=293.15" -#define OPENTURF_LOW_PRESSURE "o2=14;n2=30;TEMP=293.15" +#define OPENTURF_DEFAULT_ATMOS "o2=22;n2=82;TEMP=293.15" +#define OPENTURF_LOW_PRESSURE "o2=14;n2=30;TEMP=293.15" /// -193,15°C telecommunications. also used for xenobiology slime killrooms -#define TCOMMS_ATMOS "n2=100;TEMP=80" +#define TCOMMS_ATMOS "n2=100;TEMP=80" /// space -#define AIRLESS_ATMOS "TEMP=2.7" +#define AIRLESS_ATMOS "TEMP=2.7" /// -93.15°C snow and ice turfs -#define FROZEN_ATMOS "o2=22;n2=82;TEMP=180" +#define FROZEN_ATMOS "o2=22;n2=82;TEMP=180" /// -14°C kitchen coldroom, just might loss your tail; higher amount of mol to reach about 101.3 kpA -#define KITCHEN_COLDROOM_ATMOS "o2=26;n2=97;TEMP=[COLD_ROOM_TEMP]" +#define KITCHEN_COLDROOM_ATMOS "o2=26;n2=97;TEMP=[COLD_ROOM_TEMP]" /// used in the holodeck burn test program -#define BURNMIX_ATMOS "o2=2500;plasma=5000;TEMP=370" +#define BURNMIX_ATMOS "o2=2500;plasma=5000;TEMP=370" //ATMOSPHERICS DEPARTMENT GAS TANK TURFS -#define ATMOS_TANK_N2O "n2o=6000;TEMP=293.15" -#define ATMOS_TANK_CO2 "co2=50000;TEMP=293.15" -#define ATMOS_TANK_PLASMA "plasma=70000;TEMP=293.15" -#define ATMOS_TANK_O2 "o2=100000;TEMP=293.15" -#define ATMOS_TANK_N2 "n2=100000;TEMP=293.15" -#define ATMOS_TANK_BZ "bz=100000;TEMP=293.15" -#define ATMOS_TANK_FREON "freon=100000;TEMP=293.15" -#define ATMOS_TANK_HALON "halon=100000;TEMP=293.15" -#define ATMOS_TANK_HEALIUM "healium=100000;TEMP=293.15" -#define ATMOS_TANK_H2 "hydrogen=100000;TEMP=293.15" -#define ATMOS_TANK_HYPERNOBLIUM "nob=100000;TEMP=293.15" -#define ATMOS_TANK_MIASMA "miasma=100000;TEMP=293.15" -#define ATMOS_TANK_NO2 "no2=100000;TEMP=293.15" -#define ATMOS_TANK_PLUOXIUM "pluox=100000;TEMP=293.15" -#define ATMOS_TANK_PROTO_NITRATE "proto_nitrate=100000;TEMP=293.15" -#define ATMOS_TANK_STIMULUM "stim=100000;TEMP=293.15" -#define ATMOS_TANK_TRITIUM "tritium=100000;TEMP=293.15" -#define ATMOS_TANK_H2O "water_vapor=100000;TEMP=293.15" -#define ATMOS_TANK_ZAUKER "zauker=100000;TEMP=293.15" -#define ATMOS_TANK_HELIUM "helium=100000;TEMP=293.15" -#define ATMOS_TANK_ANTINOBLIUM "antinoblium=100000;TEMP=293.15" -#define ATMOS_TANK_AIRMIX "o2=2644;n2=10580;TEMP=293.15" +#define ATMOS_TANK_N2O "n2o=6000;TEMP=293.15" +#define ATMOS_TANK_CO2 "co2=50000;TEMP=293.15" +#define ATMOS_TANK_PLASMA "plasma=70000;TEMP=293.15" +#define ATMOS_TANK_O2 "o2=100000;TEMP=293.15" +#define ATMOS_TANK_N2 "n2=100000;TEMP=293.15" +#define ATMOS_TANK_BZ "bz=100000;TEMP=293.15" +#define ATMOS_TANK_FREON "freon=100000;TEMP=293.15" +#define ATMOS_TANK_HALON "halon=100000;TEMP=293.15" +#define ATMOS_TANK_HEALIUM "healium=100000;TEMP=293.15" +#define ATMOS_TANK_H2 "hydrogen=100000;TEMP=293.15" +#define ATMOS_TANK_HYPERNOBLIUM "nob=100000;TEMP=293.15" +#define ATMOS_TANK_MIASMA "miasma=100000;TEMP=293.15" +#define ATMOS_TANK_NO2 "no2=100000;TEMP=293.15" +#define ATMOS_TANK_PLUOXIUM "pluox=100000;TEMP=293.15" +#define ATMOS_TANK_PROTO_NITRATE "proto_nitrate=100000;TEMP=293.15" +#define ATMOS_TANK_STIMULUM "stim=100000;TEMP=293.15" +#define ATMOS_TANK_TRITIUM "tritium=100000;TEMP=293.15" +#define ATMOS_TANK_H2O "water_vapor=100000;TEMP=293.15" +#define ATMOS_TANK_ZAUKER "zauker=100000;TEMP=293.15" +#define ATMOS_TANK_HELIUM "helium=100000;TEMP=293.15" +#define ATMOS_TANK_ANTINOBLIUM "antinoblium=100000;TEMP=293.15" +#define ATMOS_TANK_AIRMIX "o2=2644;n2=10580;TEMP=293.15" //LAVALAND /// what pressure you have to be under to increase the effect of equipment meant for lavaland #define LAVALAND_EQUIPMENT_EFFECT_PRESSURE 50 //ATMOS MIX IDS -#define LAVALAND_DEFAULT_ATMOS "LAVALAND_ATMOS" -#define ICEMOON_DEFAULT_ATMOS "ICEMOON_ATMOS" +#define LAVALAND_DEFAULT_ATMOS "LAVALAND_ATMOS" +#define ICEMOON_DEFAULT_ATMOS "ICEMOON_ATMOS" //ATMOSIA GAS MONITOR TAGS #define ATMOS_GAS_MONITOR_INPUT_O2 "o2_in" @@ -422,35 +422,35 @@ //AIRLOCK CONTROLLER TAGS //RnD toxins burn chamber -#define INCINERATOR_TOXMIX_IGNITER "toxmix_igniter" -#define INCINERATOR_TOXMIX_VENT "toxmix_vent" -#define INCINERATOR_TOXMIX_DP_VENTPUMP "toxmix_airlock_pump" -#define INCINERATOR_TOXMIX_AIRLOCK_SENSOR "toxmix_airlock_sensor" -#define INCINERATOR_TOXMIX_AIRLOCK_CONTROLLER "toxmix_airlock_controller" -#define INCINERATOR_TOXMIX_AIRLOCK_INTERIOR "toxmix_airlock_interior" -#define INCINERATOR_TOXMIX_AIRLOCK_EXTERIOR "toxmix_airlock_exterior" +#define INCINERATOR_TOXMIX_IGNITER "toxmix_igniter" +#define INCINERATOR_TOXMIX_VENT "toxmix_vent" +#define INCINERATOR_TOXMIX_DP_VENTPUMP "toxmix_airlock_pump" +#define INCINERATOR_TOXMIX_AIRLOCK_SENSOR "toxmix_airlock_sensor" +#define INCINERATOR_TOXMIX_AIRLOCK_CONTROLLER "toxmix_airlock_controller" +#define INCINERATOR_TOXMIX_AIRLOCK_INTERIOR "toxmix_airlock_interior" +#define INCINERATOR_TOXMIX_AIRLOCK_EXTERIOR "toxmix_airlock_exterior" //Atmospherics/maintenance incinerator -#define INCINERATOR_ATMOS_IGNITER "atmos_incinerator_igniter" -#define INCINERATOR_ATMOS_MAINVENT "atmos_incinerator_mainvent" -#define INCINERATOR_ATMOS_AUXVENT "atmos_incinerator_auxvent" -#define INCINERATOR_ATMOS_DP_VENTPUMP "atmos_incinerator_airlock_pump" -#define INCINERATOR_ATMOS_AIRLOCK_SENSOR "atmos_incinerator_airlock_sensor" -#define INCINERATOR_ATMOS_AIRLOCK_CONTROLLER "atmos_incinerator_airlock_controller" -#define INCINERATOR_ATMOS_AIRLOCK_INTERIOR "atmos_incinerator_airlock_interior" -#define INCINERATOR_ATMOS_AIRLOCK_EXTERIOR "atmos_incinerator_airlock_exterior" -#define TEST_ROOM_ATMOS_MAINVENT_1 "atmos_test_room_mainvent_1" -#define TEST_ROOM_ATMOS_MAINVENT_2 "atmos_test_room_mainvent_2" +#define INCINERATOR_ATMOS_IGNITER "atmos_incinerator_igniter" +#define INCINERATOR_ATMOS_MAINVENT "atmos_incinerator_mainvent" +#define INCINERATOR_ATMOS_AUXVENT "atmos_incinerator_auxvent" +#define INCINERATOR_ATMOS_DP_VENTPUMP "atmos_incinerator_airlock_pump" +#define INCINERATOR_ATMOS_AIRLOCK_SENSOR "atmos_incinerator_airlock_sensor" +#define INCINERATOR_ATMOS_AIRLOCK_CONTROLLER "atmos_incinerator_airlock_controller" +#define INCINERATOR_ATMOS_AIRLOCK_INTERIOR "atmos_incinerator_airlock_interior" +#define INCINERATOR_ATMOS_AIRLOCK_EXTERIOR "atmos_incinerator_airlock_exterior" +#define TEST_ROOM_ATMOS_MAINVENT_1 "atmos_test_room_mainvent_1" +#define TEST_ROOM_ATMOS_MAINVENT_2 "atmos_test_room_mainvent_2" //Syndicate lavaland base incinerator (lavaland_surface_syndicate_base1.dmm) -#define INCINERATOR_SYNDICATELAVA_IGNITER "syndicatelava_igniter" -#define INCINERATOR_SYNDICATELAVA_MAINVENT "syndicatelava_mainvent" -#define INCINERATOR_SYNDICATELAVA_AUXVENT "syndicatelava_auxvent" -#define INCINERATOR_SYNDICATELAVA_DP_VENTPUMP "syndicatelava_airlock_pump" -#define INCINERATOR_SYNDICATELAVA_AIRLOCK_SENSOR "syndicatelava_airlock_sensor" -#define INCINERATOR_SYNDICATELAVA_AIRLOCK_CONTROLLER "syndicatelava_airlock_controller" -#define INCINERATOR_SYNDICATELAVA_AIRLOCK_INTERIOR "syndicatelava_airlock_interior" -#define INCINERATOR_SYNDICATELAVA_AIRLOCK_EXTERIOR "syndicatelava_airlock_exterior" +#define INCINERATOR_SYNDICATELAVA_IGNITER "syndicatelava_igniter" +#define INCINERATOR_SYNDICATELAVA_MAINVENT "syndicatelava_mainvent" +#define INCINERATOR_SYNDICATELAVA_AUXVENT "syndicatelava_auxvent" +#define INCINERATOR_SYNDICATELAVA_DP_VENTPUMP "syndicatelava_airlock_pump" +#define INCINERATOR_SYNDICATELAVA_AIRLOCK_SENSOR "syndicatelava_airlock_sensor" +#define INCINERATOR_SYNDICATELAVA_AIRLOCK_CONTROLLER "syndicatelava_airlock_controller" +#define INCINERATOR_SYNDICATELAVA_AIRLOCK_INTERIOR "syndicatelava_airlock_interior" +#define INCINERATOR_SYNDICATELAVA_AIRLOCK_EXTERIOR "syndicatelava_airlock_exterior" //MULTIPIPES //IF YOU EVER CHANGE THESE CHANGE SPRITES TO MATCH. @@ -463,28 +463,28 @@ #define PIPING_LAYER_LCHANGE 0.05 /// intended to connect with all layers, check for all instead of just one. -#define PIPING_ALL_LAYER (1<<0) +#define PIPING_ALL_LAYER (1<<0) /// can only be built if nothing else with this flag is on the tile already. -#define PIPING_ONE_PER_TURF (1<<1) +#define PIPING_ONE_PER_TURF (1<<1) /// can only exist at PIPING_LAYER_DEFAULT -#define PIPING_DEFAULT_LAYER_ONLY (1<<2) +#define PIPING_DEFAULT_LAYER_ONLY (1<<2) /// north/south east/west doesn't matter, auto normalize on build. -#define PIPING_CARDINAL_AUTONORMALIZE (1<<3) +#define PIPING_CARDINAL_AUTONORMALIZE (1<<3) //HELPERS #define PIPING_LAYER_SHIFT(T, PipingLayer) \ - if(T.dir & (NORTH|SOUTH)) { \ + if(T.dir & (NORTH|SOUTH)) { \ T.pixel_x = (PipingLayer - PIPING_LAYER_DEFAULT) * PIPING_LAYER_P_X;\ - } \ - if(T.dir & (EAST|WEST)) { \ + } \ + if(T.dir & (EAST|WEST)) { \ T.pixel_y = (PipingLayer - PIPING_LAYER_DEFAULT) * PIPING_LAYER_P_Y;\ } #define PIPING_FORWARD_SHIFT(T, PipingLayer, more_shift) \ - if(T.dir & (NORTH|SOUTH)) { \ + if(T.dir & (NORTH|SOUTH)) { \ T.pixel_y += more_shift * (PipingLayer - PIPING_LAYER_DEFAULT);\ - } \ - if(T.dir & (EAST|WEST)) { \ + } \ + if(T.dir & (EAST|WEST)) { \ T.pixel_x += more_shift * (PipingLayer - PIPING_LAYER_DEFAULT);\ } diff --git a/code/__DEFINES/atom_hud.dm b/code/__DEFINES/atom_hud.dm index 2b71276a359..6495c88136e 100644 --- a/code/__DEFINES/atom_hud.dm +++ b/code/__DEFINES/atom_hud.dm @@ -3,49 +3,49 @@ // /datum/atom_hud expects these to be unique // these need to be strings in order to make them associative lists /// dead, alive, sick, health status -#define HEALTH_HUD "1" +#define HEALTH_HUD "1" /// a simple line rounding the mob's number health -#define STATUS_HUD "2" +#define STATUS_HUD "2" /// the job asigned to your ID -#define ID_HUD "3" +#define ID_HUD "3" /// wanted, released, parroled, security status -#define WANTED_HUD "4" +#define WANTED_HUD "4" /// loyality implant -#define IMPLOYAL_HUD "5" +#define IMPLOYAL_HUD "5" /// chemical implant -#define IMPCHEM_HUD "6" +#define IMPCHEM_HUD "6" /// tracking implant -#define IMPTRACK_HUD "7" +#define IMPTRACK_HUD "7" /// Silicon/Mech/Circuit Status -#define DIAG_STAT_HUD "8" +#define DIAG_STAT_HUD "8" /// Silicon health bar -#define DIAG_HUD "9" +#define DIAG_HUD "9" /// Borg/Mech/Circutry power meter -#define DIAG_BATT_HUD "10" +#define DIAG_BATT_HUD "10" /// Mech health bar -#define DIAG_MECH_HUD "11" +#define DIAG_MECH_HUD "11" /// Bot HUDs -#define DIAG_BOT_HUD "12" +#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 "14" /// Airlock shock overlay #define DIAG_AIRLOCK_HUD "15" /// Bot path indicators #define DIAG_PATH_HUD "16" /// Gland indicators for abductors #define GLAND_HUD "17" -#define SENTIENT_DISEASE_HUD "18" -#define AI_DETECT_HUD "19" +#define SENTIENT_DISEASE_HUD "18" +#define AI_DETECT_HUD "19" #define NANITE_HUD "20" #define DIAG_NANITE_FULL_HUD "21" /// Displays launchpads' targeting reticle #define DIAG_LAUNCHPAD_HUD "22" //for antag huds. these are used at the /mob level -#define ANTAG_HUD "23" +#define ANTAG_HUD "23" // for fans to identify pins -#define FAN_HUD "24" +#define FAN_HUD "24" //by default everything in the hud_list of an atom is an image //a value in hud_list with one of these will change that behavior @@ -53,33 +53,33 @@ //data HUD (medhud, sechud) defines //Don't forget to update human/New() if you change these! -#define DATA_HUD_SECURITY_BASIC 1 -#define DATA_HUD_SECURITY_ADVANCED 2 -#define DATA_HUD_MEDICAL_BASIC 3 -#define DATA_HUD_MEDICAL_ADVANCED 4 -#define DATA_HUD_DIAGNOSTIC_BASIC 5 -#define DATA_HUD_DIAGNOSTIC_ADVANCED 6 -#define DATA_HUD_ABDUCTOR 7 -#define DATA_HUD_SENTIENT_DISEASE 8 -#define DATA_HUD_AI_DETECT 9 -#define DATA_HUD_FAN 10 +#define DATA_HUD_SECURITY_BASIC 1 +#define DATA_HUD_SECURITY_ADVANCED 2 +#define DATA_HUD_MEDICAL_BASIC 3 +#define DATA_HUD_MEDICAL_ADVANCED 4 +#define DATA_HUD_DIAGNOSTIC_BASIC 5 +#define DATA_HUD_DIAGNOSTIC_ADVANCED 6 +#define DATA_HUD_ABDUCTOR 7 +#define DATA_HUD_SENTIENT_DISEASE 8 +#define DATA_HUD_AI_DETECT 9 +#define DATA_HUD_FAN 10 //antag HUD defines -#define ANTAG_HUD_CULT 11 -#define ANTAG_HUD_REV 12 -#define ANTAG_HUD_OPS 13 -#define ANTAG_HUD_WIZ 14 -#define ANTAG_HUD_SHADOW 15 -#define ANTAG_HUD_TRAITOR 16 -#define ANTAG_HUD_NINJA 17 -#define ANTAG_HUD_CHANGELING 18 -#define ANTAG_HUD_ABDUCTOR 19 -#define ANTAG_HUD_BROTHER 20 -#define ANTAG_HUD_OBSESSED 21 -#define ANTAG_HUD_FUGITIVE 22 -#define ANTAG_HUD_GANGSTER 23 -#define ANTAG_HUD_SPACECOP 24 -#define ANTAG_HUD_HERETIC 25 +#define ANTAG_HUD_CULT 11 +#define ANTAG_HUD_REV 12 +#define ANTAG_HUD_OPS 13 +#define ANTAG_HUD_WIZ 14 +#define ANTAG_HUD_SHADOW 15 +#define ANTAG_HUD_TRAITOR 16 +#define ANTAG_HUD_NINJA 17 +#define ANTAG_HUD_CHANGELING 18 +#define ANTAG_HUD_ABDUCTOR 19 +#define ANTAG_HUD_BROTHER 20 +#define ANTAG_HUD_OBSESSED 21 +#define ANTAG_HUD_FUGITIVE 22 +#define ANTAG_HUD_GANGSTER 23 +#define ANTAG_HUD_SPACECOP 24 +#define ANTAG_HUD_HERETIC 25 // Notification action types #define NOTIFY_JUMP "jump" diff --git a/code/__DEFINES/blackmarket.dm b/code/__DEFINES/blackmarket.dm index 569759f5437..5494c371db7 100644 --- a/code/__DEFINES/blackmarket.dm +++ b/code/__DEFINES/blackmarket.dm @@ -2,9 +2,9 @@ // Shipping methods // The BEST way of shipping items: accurate, "undetectable" -#define SHIPPING_METHOD_LTSRBT "LTSRBT" +#define SHIPPING_METHOD_LTSRBT "LTSRBT" // Picks a random area to teleport the item to and gives you a minute to get there before it is sent. -#define SHIPPING_METHOD_TELEPORT "Teleport" +#define SHIPPING_METHOD_TELEPORT "Teleport" // Throws the item from somewhere at the station. -#define SHIPPING_METHOD_LAUNCH "Launch" +#define SHIPPING_METHOD_LAUNCH "Launch" diff --git a/code/__DEFINES/botany.dm b/code/__DEFINES/botany.dm index cedc7ac66e7..0614a4fa46d 100644 --- a/code/__DEFINES/botany.dm +++ b/code/__DEFINES/botany.dm @@ -35,7 +35,7 @@ /// -- Flags for seeds. -- /// Allows a plant to wild mutate (mutate on haravest) at a certain instability. -#define MUTATE_EARLY (1<<0) +#define MUTATE_EARLY (1<<0) /// -- Flags for traits. -- /// Caps the plant's yield at 5 instead of 10. diff --git a/code/__DEFINES/callbacks.dm b/code/__DEFINES/callbacks.dm index f25dfdf1500..6d23e509054 100644 --- a/code/__DEFINES/callbacks.dm +++ b/code/__DEFINES/callbacks.dm @@ -1,4 +1,4 @@ -#define GLOBAL_PROC "some_magic_bullshit" +#define GLOBAL_PROC "some_magic_bullshit" /// A shorthand for the callback datum, [documented here](datum/callback.html) #define CALLBACK new /datum/callback #define INVOKE_ASYNC world.ImmediateInvokeAsync diff --git a/code/__DEFINES/cargo.dm b/code/__DEFINES/cargo.dm index e835db6b92b..0cbd0420f69 100644 --- a/code/__DEFINES/cargo.dm +++ b/code/__DEFINES/cargo.dm @@ -43,18 +43,18 @@ GLOBAL_LIST_EMPTY(supplypod_loading_bays) GLOBAL_LIST_INIT(podstyles, list(\ - list(POD_SHAPE_NORML, "pod", TRUE, "default", "yellow", RUBBLE_NORMAL, "supply pod", "A Nanotrasen supply drop pod."),\ - list(POD_SHAPE_NORML, "advpod", TRUE, "bluespace", "blue", RUBBLE_NORMAL, "bluespace supply pod" , "A Nanotrasen Bluespace supply pod. Teleports back to CentCom after delivery."),\ - list(POD_SHAPE_NORML, "advpod", TRUE, "centcom", "blue", RUBBLE_NORMAL, "\improper CentCom supply pod", "A Nanotrasen supply pod, this one has been marked with Central Command's designations. Teleports back to CentCom after delivery."),\ - list(POD_SHAPE_NORML, "darkpod", TRUE, "syndicate", "red", RUBBLE_NORMAL, "blood-red supply pod", "An intimidating supply pod, covered in the blood-red markings of the Syndicate. It's probably best to stand back from this."),\ - list(POD_SHAPE_NORML, "darkpod", TRUE, "deathsquad", "blue", RUBBLE_NORMAL, "\improper Deathsquad drop pod", "A Nanotrasen drop pod. This one has been marked the markings of Nanotrasen's elite strike team."),\ - list(POD_SHAPE_NORML, "pod", TRUE, "cultist", "red", RUBBLE_NORMAL, "bloody supply pod", "A Nanotrasen supply pod covered in scratch-marks, blood, and strange runes."),\ - list(POD_SHAPE_OTHER, "missile", FALSE, FALSE, FALSE, RUBBLE_THIN, "cruise missile", "A big ass missile that didn't seem to fully detonate. It was likely launched from some far-off deep space missile silo. There appears to be an auxillery payload hatch on the side, though manually opening it is likely impossible."),\ - list(POD_SHAPE_OTHER, "smissile", FALSE, FALSE, FALSE, RUBBLE_THIN, "\improper Syndicate cruise missile", "A big ass, blood-red missile that didn't seem to fully detonate. It was likely launched from some deep space Syndicate missile silo. There appears to be an auxillery payload hatch on the side, though manually opening it is likely impossible."),\ - list(POD_SHAPE_OTHER, "box", TRUE, FALSE, FALSE, RUBBLE_WIDE, "\improper Aussec supply crate", "An incredibly sturdy supply crate, designed to withstand orbital re-entry. Has 'Aussec Armory - 2532' engraved on the side."),\ - list(POD_SHAPE_NORML, "clownpod", TRUE, "clown", "green", RUBBLE_NORMAL, "\improper HONK pod", "A brightly-colored supply pod. It likely originated from the Clown Federation."),\ - list(POD_SHAPE_OTHER, "orange", TRUE, FALSE, FALSE, RUBBLE_NONE, "\improper Orange", "An angry orange."),\ - list(POD_SHAPE_OTHER, FALSE, FALSE, FALSE, FALSE, RUBBLE_NONE, "\improper S.T.E.A.L.T.H. pod MKVII", "A supply pod that, under normal circumstances, is completely invisible to conventional methods of detection. How are you even seeing this?"),\ - list(POD_SHAPE_OTHER, "gondola", FALSE, FALSE, FALSE, RUBBLE_NONE, "gondola", "The silent walker. This one seems to be part of a delivery agency."),\ - list(POD_SHAPE_OTHER, FALSE, FALSE, FALSE, FALSE, RUBBLE_NONE, FALSE, FALSE, "rl_click", "give_po")\ + list(POD_SHAPE_NORML, "pod", TRUE, "default", "yellow", RUBBLE_NORMAL, "supply pod", "A Nanotrasen supply drop pod."),\ + list(POD_SHAPE_NORML, "advpod", TRUE, "bluespace", "blue", RUBBLE_NORMAL, "bluespace supply pod" , "A Nanotrasen Bluespace supply pod. Teleports back to CentCom after delivery."),\ + list(POD_SHAPE_NORML, "advpod", TRUE, "centcom", "blue", RUBBLE_NORMAL, "\improper CentCom supply pod", "A Nanotrasen supply pod, this one has been marked with Central Command's designations. Teleports back to CentCom after delivery."),\ + list(POD_SHAPE_NORML, "darkpod", TRUE, "syndicate", "red", RUBBLE_NORMAL, "blood-red supply pod", "An intimidating supply pod, covered in the blood-red markings of the Syndicate. It's probably best to stand back from this."),\ + list(POD_SHAPE_NORML, "darkpod", TRUE, "deathsquad", "blue", RUBBLE_NORMAL, "\improper Deathsquad drop pod", "A Nanotrasen drop pod. This one has been marked the markings of Nanotrasen's elite strike team."),\ + list(POD_SHAPE_NORML, "pod", TRUE, "cultist", "red", RUBBLE_NORMAL, "bloody supply pod", "A Nanotrasen supply pod covered in scratch-marks, blood, and strange runes."),\ + list(POD_SHAPE_OTHER, "missile", FALSE, FALSE, FALSE, RUBBLE_THIN, "cruise missile", "A big ass missile that didn't seem to fully detonate. It was likely launched from some far-off deep space missile silo. There appears to be an auxillery payload hatch on the side, though manually opening it is likely impossible."),\ + list(POD_SHAPE_OTHER, "smissile", FALSE, FALSE, FALSE, RUBBLE_THIN, "\improper Syndicate cruise missile", "A big ass, blood-red missile that didn't seem to fully detonate. It was likely launched from some deep space Syndicate missile silo. There appears to be an auxillery payload hatch on the side, though manually opening it is likely impossible."),\ + list(POD_SHAPE_OTHER, "box", TRUE, FALSE, FALSE, RUBBLE_WIDE, "\improper Aussec supply crate", "An incredibly sturdy supply crate, designed to withstand orbital re-entry. Has 'Aussec Armory - 2532' engraved on the side."),\ + list(POD_SHAPE_NORML, "clownpod", TRUE, "clown", "green", RUBBLE_NORMAL, "\improper HONK pod", "A brightly-colored supply pod. It likely originated from the Clown Federation."),\ + list(POD_SHAPE_OTHER, "orange", TRUE, FALSE, FALSE, RUBBLE_NONE, "\improper Orange", "An angry orange."),\ + list(POD_SHAPE_OTHER, FALSE, FALSE, FALSE, FALSE, RUBBLE_NONE, "\improper S.T.E.A.L.T.H. pod MKVII", "A supply pod that, under normal circumstances, is completely invisible to conventional methods of detection. How are you even seeing this?"),\ + list(POD_SHAPE_OTHER, "gondola", FALSE, FALSE, FALSE, RUBBLE_NONE, "gondola", "The silent walker. This one seems to be part of a delivery agency."),\ + list(POD_SHAPE_OTHER, FALSE, FALSE, FALSE, FALSE, RUBBLE_NONE, FALSE, FALSE, "rl_click", "give_po")\ )) diff --git a/code/__DEFINES/cleaning.dm b/code/__DEFINES/cleaning.dm index a6201ed3f91..a0e19ebef16 100644 --- a/code/__DEFINES/cleaning.dm +++ b/code/__DEFINES/cleaning.dm @@ -4,27 +4,27 @@ // Different kinds of things that can be cleaned. // Use these when overriding the wash proc or registering for the clean signals to check if your thing should be cleaned /// Cleans blood off of the cleanable atom. -#define CLEAN_TYPE_BLOOD (1 << 0) +#define CLEAN_TYPE_BLOOD (1 << 0) /// Cleans runes off of the cleanable atom. -#define CLEAN_TYPE_RUNES (1 << 1) +#define CLEAN_TYPE_RUNES (1 << 1) /// Cleans fingerprints off of the cleanable atom. -#define CLEAN_TYPE_FINGERPRINTS (1 << 2) +#define CLEAN_TYPE_FINGERPRINTS (1 << 2) /// Cleans fibres off of the cleanable atom. -#define CLEAN_TYPE_FIBERS (1 << 3) +#define CLEAN_TYPE_FIBERS (1 << 3) /// Cleans radiation off of the cleanable atom. -#define CLEAN_TYPE_RADIATION (1 << 4) +#define CLEAN_TYPE_RADIATION (1 << 4) /// Cleans diseases off of the cleanable atom. -#define CLEAN_TYPE_DISEASE (1 << 5) +#define CLEAN_TYPE_DISEASE (1 << 5) /// Special type, add this flag to make some cleaning processes non-instant. Currently only used for showers when removing radiation. -#define CLEAN_TYPE_WEAK (1 << 6) +#define CLEAN_TYPE_WEAK (1 << 6) /// Cleans paint off of the cleanable atom. -#define CLEAN_TYPE_PAINT (1 << 7) +#define CLEAN_TYPE_PAINT (1 << 7) /// Cleans acid off of the cleanable atom. -#define CLEAN_TYPE_ACID (1 << 8) +#define CLEAN_TYPE_ACID (1 << 8) /// Cleans decals such as dirt and oil off the floor -#define CLEAN_TYPE_LIGHT_DECAL (1 << 9) +#define CLEAN_TYPE_LIGHT_DECAL (1 << 9) /// Cleans decals such as cobwebs off the floor -#define CLEAN_TYPE_HARD_DECAL (1 << 10) +#define CLEAN_TYPE_HARD_DECAL (1 << 10) // Different cleaning methods. // Use these when calling the wash proc for your cleaning apparatus diff --git a/code/__DEFINES/colors.dm b/code/__DEFINES/colors.dm index 119473eecf1..6d6e87ef6bb 100644 --- a/code/__DEFINES/colors.dm +++ b/code/__DEFINES/colors.dm @@ -1,76 +1,76 @@ // This is eventually for wjohn to add more color standardization stuff like I keep asking him >:( -#define COLOR_INPUT_DISABLED "#F0F0F0" -#define COLOR_INPUT_ENABLED "#D3B5B5" +#define COLOR_INPUT_DISABLED "#F0F0F0" +#define COLOR_INPUT_ENABLED "#D3B5B5" -#define COLOR_DARKMODE_BACKGROUND "#202020" -#define COLOR_DARKMODE_DARKBACKGROUND "#171717" -#define COLOR_DARKMODE_TEXT "#a4bad6" +#define COLOR_DARKMODE_BACKGROUND "#202020" +#define COLOR_DARKMODE_DARKBACKGROUND "#171717" +#define COLOR_DARKMODE_TEXT "#a4bad6" -#define COLOR_WHITE "#FFFFFF" -#define COLOR_VERY_LIGHT_GRAY "#EEEEEE" -#define COLOR_SILVER "#C0C0C0" -#define COLOR_GRAY "#808080" -#define COLOR_FLOORTILE_GRAY "#8D8B8B" -#define COLOR_ALMOST_BLACK "#333333" -#define COLOR_BLACK "#000000" +#define COLOR_WHITE "#FFFFFF" +#define COLOR_VERY_LIGHT_GRAY "#EEEEEE" +#define COLOR_SILVER "#C0C0C0" +#define COLOR_GRAY "#808080" +#define COLOR_FLOORTILE_GRAY "#8D8B8B" +#define COLOR_ALMOST_BLACK "#333333" +#define COLOR_BLACK "#000000" #define COLOR_HALF_TRANSPARENT_BLACK "#0000007A" -#define COLOR_RED "#FF0000" -#define COLOR_MOSTLY_PURE_RED "#FF3300" -#define COLOR_DARK_RED "#A50824" -#define COLOR_RED_LIGHT "#FF3333" -#define COLOR_MAROON "#800000" -#define COLOR_VIVID_RED "#FF3232" -#define COLOR_LIGHT_GRAYISH_RED "#E4C7C5" -#define COLOR_SOFT_RED "#FA8282" -#define COLOR_BUBBLEGUM_RED "#950A0A" +#define COLOR_RED "#FF0000" +#define COLOR_MOSTLY_PURE_RED "#FF3300" +#define COLOR_DARK_RED "#A50824" +#define COLOR_RED_LIGHT "#FF3333" +#define COLOR_MAROON "#800000" +#define COLOR_VIVID_RED "#FF3232" +#define COLOR_LIGHT_GRAYISH_RED "#E4C7C5" +#define COLOR_SOFT_RED "#FA8282" +#define COLOR_BUBBLEGUM_RED "#950A0A" -#define COLOR_YELLOW "#FFFF00" -#define COLOR_VIVID_YELLOW "#FBFF23" -#define COLOR_VERY_SOFT_YELLOW "#FAE48E" +#define COLOR_YELLOW "#FFFF00" +#define COLOR_VIVID_YELLOW "#FBFF23" +#define COLOR_VERY_SOFT_YELLOW "#FAE48E" -#define COLOR_OLIVE "#808000" -#define COLOR_VIBRANT_LIME "#00FF00" -#define COLOR_LIME "#32CD32" -#define COLOR_DARK_LIME "#00aa00" -#define COLOR_VERY_PALE_LIME_GREEN "#DDFFD3" -#define COLOR_VERY_DARK_LIME_GREEN "#003300" -#define COLOR_GREEN "#008000" -#define COLOR_DARK_MODERATE_LIME_GREEN "#44964A" +#define COLOR_OLIVE "#808000" +#define COLOR_VIBRANT_LIME "#00FF00" +#define COLOR_LIME "#32CD32" +#define COLOR_DARK_LIME "#00aa00" +#define COLOR_VERY_PALE_LIME_GREEN "#DDFFD3" +#define COLOR_VERY_DARK_LIME_GREEN "#003300" +#define COLOR_GREEN "#008000" +#define COLOR_DARK_MODERATE_LIME_GREEN "#44964A" -#define COLOR_CYAN "#00FFFF" -#define COLOR_DARK_CYAN "#00A2FF" -#define COLOR_TEAL "#008080" -#define COLOR_BLUE "#0000FF" -#define COLOR_STRONG_BLUE "#1919c8" -#define COLOR_BRIGHT_BLUE "#2CB2E8" -#define COLOR_MODERATE_BLUE "#555CC2" -#define COLOR_BLUE_LIGHT "#33CCFF" -#define COLOR_NAVY "#000080" -#define COLOR_BLUE_GRAY "#75A2BB" +#define COLOR_CYAN "#00FFFF" +#define COLOR_DARK_CYAN "#00A2FF" +#define COLOR_TEAL "#008080" +#define COLOR_BLUE "#0000FF" +#define COLOR_STRONG_BLUE "#1919c8" +#define COLOR_BRIGHT_BLUE "#2CB2E8" +#define COLOR_MODERATE_BLUE "#555CC2" +#define COLOR_BLUE_LIGHT "#33CCFF" +#define COLOR_NAVY "#000080" +#define COLOR_BLUE_GRAY "#75A2BB" -#define COLOR_PINK "#FFC0CB" -#define COLOR_LIGHT_PINK "#ff3cc8" -#define COLOR_MOSTLY_PURE_PINK "#E4005B" -#define COLOR_MAGENTA "#FF00FF" -#define COLOR_STRONG_MAGENTA "#B800B8" -#define COLOR_PURPLE "#800080" -#define COLOR_VIOLET "#B900F7" -#define COLOR_STRONG_VIOLET "#6927c5" +#define COLOR_PINK "#FFC0CB" +#define COLOR_LIGHT_PINK "#ff3cc8" +#define COLOR_MOSTLY_PURE_PINK "#E4005B" +#define COLOR_MAGENTA "#FF00FF" +#define COLOR_STRONG_MAGENTA "#B800B8" +#define COLOR_PURPLE "#800080" +#define COLOR_VIOLET "#B900F7" +#define COLOR_STRONG_VIOLET "#6927c5" -#define COLOR_ORANGE "#FF9900" -#define COLOR_MOSTLY_PURE_ORANGE "#ff8000" -#define COLOR_TAN_ORANGE "#FF7B00" -#define COLOR_BRIGHT_ORANGE "#E2853D" -#define COLOR_LIGHT_ORANGE "#ffc44d" -#define COLOR_PALE_ORANGE "#FFBE9D" -#define COLOR_BEIGE "#CEB689" -#define COLOR_DARK_ORANGE "#C3630C" -#define COLOR_DARK_MODERATE_ORANGE "#8B633B" +#define COLOR_ORANGE "#FF9900" +#define COLOR_MOSTLY_PURE_ORANGE "#ff8000" +#define COLOR_TAN_ORANGE "#FF7B00" +#define COLOR_BRIGHT_ORANGE "#E2853D" +#define COLOR_LIGHT_ORANGE "#ffc44d" +#define COLOR_PALE_ORANGE "#FFBE9D" +#define COLOR_BEIGE "#CEB689" +#define COLOR_DARK_ORANGE "#C3630C" +#define COLOR_DARK_MODERATE_ORANGE "#8B633B" -#define COLOR_BROWN "#BA9F6D" -#define COLOR_DARK_BROWN "#997C4F" +#define COLOR_BROWN "#BA9F6D" +#define COLOR_DARK_BROWN "#997C4F" #define COLOR_GREEN_GRAY "#99BB76" #define COLOR_RED_GRAY "#B4696A" @@ -120,7 +120,7 @@ /// Diluted cyan. rgb(125, 225, 225) #define LIGHT_COLOR_CYAN "#7DE1E1" /// Electric cyan rgb(0, 255, 255) -#define LIGHT_COLOR_ELECTRIC_CYAN "#00FFFF" +#define LIGHT_COLOR_ELECTRIC_CYAN "#00FFFF" /// More-saturated cyan. rgb(16, 21, 22) #define LIGHT_COLOR_LIGHT_CYAN "#40CEFF" /// Saturated blue. rgb(51, 117, 248) @@ -138,9 +138,9 @@ /// Less-saturated light purple. rgb(155, 81, 255) #define LIGHT_COLOR_LAVENDER "#9B51FF" ///slightly desaturated bright yellow. -#define LIGHT_COLOR_HOLY_MAGIC "#FFF743" +#define LIGHT_COLOR_HOLY_MAGIC "#FFF743" /// deep crimson -#define LIGHT_COLOR_BLOOD_MAGIC "#D00000" +#define LIGHT_COLOR_BLOOD_MAGIC "#D00000" /* These ones aren't a direct colour like the ones above, because nothing would fit */ /// Warm orange color, leaning strongly towards yellow. rgb(250, 160, 25) diff --git a/code/__DEFINES/combat.dm b/code/__DEFINES/combat.dm index 4d7c95e84a5..ef1d0ea8deb 100644 --- a/code/__DEFINES/combat.dm +++ b/code/__DEFINES/combat.dm @@ -4,71 +4,71 @@ //Damage defines //TODO: merge these down to reduce on defines /// Physical fracturing and warping of the material. -#define BRUTE "brute" +#define BRUTE "brute" /// Scorching and charring of the material. -#define BURN "burn" +#define BURN "burn" /// Poisoning. Mostly caused by reagents. -#define TOX "toxin" +#define TOX "toxin" /// Suffocation. -#define OXY "oxygen" +#define OXY "oxygen" /// Cellular degredation. Rare and difficult to treat. -#define CLONE "clone" +#define CLONE "clone" /// Exhaustion and nonlethal damage. -#define STAMINA "stamina" +#define STAMINA "stamina" /// Brain damage. Should probably be decomissioned and replaced with proper organ damage. -#define BRAIN "brain" +#define BRAIN "brain" //Damage flag defines // /// Involves a melee attack or a thrown object. -#define MELEE "melee" +#define MELEE "melee" /// Involves a solid projectile. -#define BULLET "bullet" +#define BULLET "bullet" /// Involves a laser. -#define LASER "laser" +#define LASER "laser" /// Involves an EMP or energy-based projectile. -#define ENERGY "energy" +#define ENERGY "energy" /// Involves a shockwave, usually from an explosion. -#define BOMB "bomb" +#define BOMB "bomb" /// Involved in checking wheter a disease can infect or spread. Also involved in xeno neurotoxin. -#define BIO "bio" +#define BIO "bio" /// Involves ionizing radiation. -#define RAD "rad" +#define RAD "rad" /// Involves fire or temperature extremes. -#define FIRE "fire" +#define FIRE "fire" /// Involves corrosive substances. -#define ACID "acid" +#define ACID "acid" /// Involves magic. -#define MAGIC "magic" +#define MAGIC "magic" /// Involved in checking the likelyhood of applying a wound to a mob. -#define WOUND "wound" +#define WOUND "wound" //bitflag damage defines used for suicide_act -#define BRUTELOSS (1<<0) -#define FIRELOSS (1<<1) -#define TOXLOSS (1<<2) -#define OXYLOSS (1<<3) -#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 BRUTELOSS (1<<0) +#define FIRELOSS (1<<1) +#define TOXLOSS (1<<2) +#define OXYLOSS (1<<3) +#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 EFFECT_STUN "stun" -#define EFFECT_KNOCKDOWN "knockdown" -#define EFFECT_UNCONSCIOUS "unconscious" -#define EFFECT_PARALYZE "paralyze" -#define EFFECT_IMMOBILIZE "immobilize" -#define EFFECT_IRRADIATE "irradiate" -#define EFFECT_STUTTER "stutter" -#define EFFECT_SLUR "slur" -#define EFFECT_EYE_BLUR "eye_blur" -#define EFFECT_DROWSY "drowsy" -#define EFFECT_JITTER "jitter" +#define EFFECT_STUN "stun" +#define EFFECT_KNOCKDOWN "knockdown" +#define EFFECT_UNCONSCIOUS "unconscious" +#define EFFECT_PARALYZE "paralyze" +#define EFFECT_IMMOBILIZE "immobilize" +#define EFFECT_IRRADIATE "irradiate" +#define EFFECT_STUTTER "stutter" +#define EFFECT_SLUR "slur" +#define EFFECT_EYE_BLUR "eye_blur" +#define EFFECT_DROWSY "drowsy" +#define EFFECT_JITTER "jitter" //Bitflags defining which status effects could be or are inflicted on a mob -#define CANSTUN (1<<0) -#define CANKNOCKDOWN (1<<1) -#define CANUNCONSCIOUS (1<<2) -#define CANPUSH (1<<3) -#define GODMODE (1<<4) +#define CANSTUN (1<<0) +#define CANKNOCKDOWN (1<<1) +#define CANUNCONSCIOUS (1<<2) +#define CANPUSH (1<<3) +#define GODMODE (1<<4) //Health Defines #define HEALTH_THRESHOLD_CRIT 0 @@ -96,13 +96,13 @@ #define INSTANT_CUFFBREAK 2 //Grab levels -#define GRAB_PASSIVE 0 -#define GRAB_AGGRESSIVE 1 -#define GRAB_NECK 2 -#define GRAB_KILL 3 +#define GRAB_PASSIVE 0 +#define GRAB_AGGRESSIVE 1 +#define GRAB_NECK 2 +#define GRAB_KILL 3 //Grab breakout odds -#define BASE_GRAB_RESIST_CHANCE 60 //base chance for whether or not you can escape from a grab +#define BASE_GRAB_RESIST_CHANCE 60 //base chance for whether or not you can escape from a grab //slowdown when in softcrit. Note that crawling slowdown will also apply at the same time! #define SOFTCRIT_ADD_SLOWDOWN 2 @@ -117,16 +117,16 @@ #define LEAP_ATTACK 5 //attack visual effects -#define ATTACK_EFFECT_PUNCH "punch" -#define ATTACK_EFFECT_KICK "kick" -#define ATTACK_EFFECT_SMASH "smash" -#define ATTACK_EFFECT_CLAW "claw" -#define ATTACK_EFFECT_SLASH "slash" -#define ATTACK_EFFECT_DISARM "disarm" -#define ATTACK_EFFECT_BITE "bite" -#define ATTACK_EFFECT_MECHFIRE "mech_fire" -#define ATTACK_EFFECT_MECHTOXIN "mech_toxin" -#define ATTACK_EFFECT_BOOP "boop" //Honk +#define ATTACK_EFFECT_PUNCH "punch" +#define ATTACK_EFFECT_KICK "kick" +#define ATTACK_EFFECT_SMASH "smash" +#define ATTACK_EFFECT_CLAW "claw" +#define ATTACK_EFFECT_SLASH "slash" +#define ATTACK_EFFECT_DISARM "disarm" +#define ATTACK_EFFECT_BITE "bite" +#define ATTACK_EFFECT_MECHFIRE "mech_fire" +#define ATTACK_EFFECT_MECHTOXIN "mech_toxin" +#define ATTACK_EFFECT_BOOP "boop" //Honk //the define for visible message range in combat #define COMBAT_MESSAGE_RANGE 3 @@ -223,8 +223,8 @@ GLOBAL_LIST_INIT(shove_disarming_types, typecacheof(list( #define SUPPRESSED_VERY 2 /// no message //Projectile Reflect -#define REFLECT_NORMAL (1<<0) -#define REFLECT_FAKEPROJECTILE (1<<1) +#define REFLECT_NORMAL (1<<0) +#define REFLECT_FAKEPROJECTILE (1<<1) //His Grace. #define HIS_GRACE_SATIATED 0 //He hungers not. If bloodthirst is set to this, His Grace is asleep. @@ -237,11 +237,11 @@ GLOBAL_LIST_INIT(shove_disarming_types, typecacheof(list( #define HIS_GRACE_FORCE_BONUS 4 //How much force is gained per kill. -#define EXPLODE_NONE 0 //Don't even ask me why we need this. +#define EXPLODE_NONE 0 //Don't even ask me why we need this. #define EXPLODE_DEVASTATE 1 #define EXPLODE_HEAVY 2 #define EXPLODE_LIGHT 3 -#define EXPLODE_GIB_THRESHOLD 50 //ex_act() with EXPLODE_DEVASTATE severity will gib mobs with less than this much bomb armor +#define EXPLODE_GIB_THRESHOLD 50 //ex_act() with EXPLODE_DEVASTATE severity will gib mobs with less than this much bomb armor #define EMP_HEAVY 1 #define EMP_LIGHT 2 @@ -250,33 +250,33 @@ GLOBAL_LIST_INIT(shove_disarming_types, typecacheof(list( #define GRENADE_NONCLUMSY_FUMBLE 2 #define GRENADE_NO_FUMBLE 3 -#define BODY_ZONE_HEAD "head" -#define BODY_ZONE_CHEST "chest" -#define BODY_ZONE_L_ARM "l_arm" -#define BODY_ZONE_R_ARM "r_arm" -#define BODY_ZONE_L_LEG "l_leg" -#define BODY_ZONE_R_LEG "r_leg" +#define BODY_ZONE_HEAD "head" +#define BODY_ZONE_CHEST "chest" +#define BODY_ZONE_L_ARM "l_arm" +#define BODY_ZONE_R_ARM "r_arm" +#define BODY_ZONE_L_LEG "l_leg" +#define BODY_ZONE_R_LEG "r_leg" -#define BODY_ZONE_PRECISE_EYES "eyes" -#define BODY_ZONE_PRECISE_MOUTH "mouth" -#define BODY_ZONE_PRECISE_GROIN "groin" -#define BODY_ZONE_PRECISE_L_HAND "l_hand" -#define BODY_ZONE_PRECISE_R_HAND "r_hand" -#define BODY_ZONE_PRECISE_L_FOOT "l_foot" -#define BODY_ZONE_PRECISE_R_FOOT "r_foot" +#define BODY_ZONE_PRECISE_EYES "eyes" +#define BODY_ZONE_PRECISE_MOUTH "mouth" +#define BODY_ZONE_PRECISE_GROIN "groin" +#define BODY_ZONE_PRECISE_L_HAND "l_hand" +#define BODY_ZONE_PRECISE_R_HAND "r_hand" +#define BODY_ZONE_PRECISE_L_FOOT "l_foot" +#define BODY_ZONE_PRECISE_R_FOOT "r_foot" //We will round to this value in damage calculations. #define DAMAGE_PRECISION 0.1 //bullet_act() return values -#define BULLET_ACT_HIT "HIT" //It's a successful hit, whatever that means in the context of the thing it's hitting. -#define BULLET_ACT_BLOCK "BLOCK" //It's a blocked hit, whatever that means in the context of the thing it's hitting. -#define BULLET_ACT_FORCE_PIERCE "PIERCE" //It pierces through the object regardless of the bullet being piercing by default. +#define BULLET_ACT_HIT "HIT" //It's a successful hit, whatever that means in the context of the thing it's hitting. +#define BULLET_ACT_BLOCK "BLOCK" //It's a blocked hit, whatever that means in the context of the thing it's hitting. +#define BULLET_ACT_FORCE_PIERCE "PIERCE" //It pierces through the object regardless of the bullet being piercing by default. -#define NICE_SHOT_RICOCHET_BONUS 10 //if the shooter has the NICE_SHOT trait and they fire a ricocheting projectile, add this to the ricochet chance and auto aim angle +#define NICE_SHOT_RICOCHET_BONUS 10 //if the shooter has the NICE_SHOT trait and they fire a ricocheting projectile, add this to the ricochet chance and auto aim angle /// If a carbon is thrown at a speed faster than normal and impacts something solid, they take extra damage for every extra speed up to this number (see [/mob/living/carbon/proc/throw_impact]) -#define CARBON_MAX_IMPACT_SPEED_BONUS 5 +#define CARBON_MAX_IMPACT_SPEED_BONUS 5 /// Alternate attack defines. Return these at the end of procs like afterattack_secondary. /// Calls the normal attack proc. For example, if returned in afterattack_secondary, will call afterattack. diff --git a/code/__DEFINES/construction.dm b/code/__DEFINES/construction.dm index e15d1e6ac20..3b2bc30bb2c 100644 --- a/code/__DEFINES/construction.dm +++ b/code/__DEFINES/construction.dm @@ -71,29 +71,29 @@ #define MAXCOIL 30 //tablecrafting defines -#define CAT_NONE "" -#define CAT_WEAPONRY "Weaponry" -#define CAT_WEAPON "Weapons" -#define CAT_AMMO "Ammunition" -#define CAT_ROBOT "Robots" -#define CAT_MISC "Misc" +#define CAT_NONE "" +#define CAT_WEAPONRY "Weaponry" +#define CAT_WEAPON "Weapons" +#define CAT_AMMO "Ammunition" +#define CAT_ROBOT "Robots" +#define CAT_MISC "Misc" #define CAT_PRIMAL "Tribal" -#define CAT_CLOTHING "Clothing" -#define CAT_FOOD "Foods" -#define CAT_BREAD "Breads" -#define CAT_BURGER "Burgers" -#define CAT_CAKE "Cakes" -#define CAT_EGG "Egg-Based Food" -#define CAT_MEAT "Meats" -#define CAT_MISCFOOD "Misc. Food" -#define CAT_PASTRY "Pastries" -#define CAT_PIE "Pies" -#define CAT_PIZZA "Pizzas" -#define CAT_SALAD "Salads" -#define CAT_SANDWICH "Sandwiches" -#define CAT_SOUP "Soups" -#define CAT_SPAGHETTI "Spaghettis" -#define CAT_ICE "Frozen" +#define CAT_CLOTHING "Clothing" +#define CAT_FOOD "Foods" +#define CAT_BREAD "Breads" +#define CAT_BURGER "Burgers" +#define CAT_CAKE "Cakes" +#define CAT_EGG "Egg-Based Food" +#define CAT_MEAT "Meats" +#define CAT_MISCFOOD "Misc. Food" +#define CAT_PASTRY "Pastries" +#define CAT_PIE "Pies" +#define CAT_PIZZA "Pizzas" +#define CAT_SALAD "Salads" +#define CAT_SANDWICH "Sandwiches" +#define CAT_SOUP "Soups" +#define CAT_SPAGHETTI "Spaghettis" +#define CAT_ICE "Frozen" #define CAT_DRINK "Drinks" //rcd modes @@ -106,7 +106,7 @@ #define RCD_FURNISHING 6 #define RCD_UPGRADE_FRAMES 0 -#define RCD_UPGRADE_SIMPLE_CIRCUITS 1 +#define RCD_UPGRADE_SIMPLE_CIRCUITS 1 #define RCD_UPGRADE_SILO_LINK 2 #define RCD_UPGRADE_FURNISHING 3 diff --git a/code/__DEFINES/cooldowns.dm b/code/__DEFINES/cooldowns.dm index adc4109a2be..09f02927dd5 100644 --- a/code/__DEFINES/cooldowns.dm +++ b/code/__DEFINES/cooldowns.dm @@ -26,7 +26,7 @@ */ //INDEXES -#define COOLDOWN_BORG_SELF_REPAIR "borg_self_repair" +#define COOLDOWN_BORG_SELF_REPAIR "borg_self_repair" #define COOLDOWN_EXPRESSPOD_CONSOLE "expresspod_console" //Mecha cooldowns diff --git a/code/__DEFINES/dcs/flags.dm b/code/__DEFINES/dcs/flags.dm index 4fb68d0bff2..4d0913f6765 100644 --- a/code/__DEFINES/dcs/flags.dm +++ b/code/__DEFINES/dcs/flags.dm @@ -10,31 +10,31 @@ // /datum/element flags /// Causes the detach proc to be called when the host object is being deleted -#define ELEMENT_DETACH (1 << 0) +#define ELEMENT_DETACH (1 << 0) /** * Only elements created with the same arguments given after `id_arg_index` share an element instance * The arguments are the same when the text and number values are the same and all other values have the same ref */ -#define ELEMENT_BESPOKE (1 << 1) +#define ELEMENT_BESPOKE (1 << 1) // How multiple components of the exact same type are handled in the same datum /// old component is deleted (default) -#define COMPONENT_DUPE_HIGHLANDER 0 +#define COMPONENT_DUPE_HIGHLANDER 0 /// duplicates allowed -#define COMPONENT_DUPE_ALLOWED 1 +#define COMPONENT_DUPE_ALLOWED 1 /// new component is deleted -#define COMPONENT_DUPE_UNIQUE 2 +#define COMPONENT_DUPE_UNIQUE 2 /// old component is given the initialization args of the new -#define COMPONENT_DUPE_UNIQUE_PASSARGS 4 +#define COMPONENT_DUPE_UNIQUE_PASSARGS 4 /// each component of the same type is consulted as to whether the duplicate should be allowed -#define COMPONENT_DUPE_SELECTIVE 5 +#define COMPONENT_DUPE_SELECTIVE 5 //Redirection component init flags #define REDIRECT_TRANSFER_WITH_TURF 1 //Arch -#define ARCH_PROB "probability" //Probability for each item -#define ARCH_MAXDROP "max_drop_amount" //each item's max drop amount +#define ARCH_PROB "probability" //Probability for each item +#define ARCH_MAXDROP "max_drop_amount" //each item's max drop amount //Ouch my toes! #define CALTROP_BYPASS_SHOES (1 << 0) @@ -42,12 +42,12 @@ #define CALTROP_SILENT (1 << 2) //Ingredient type in datum/component/customizable_reagent_holder -#define CUSTOM_INGREDIENT_TYPE_EDIBLE 1 +#define CUSTOM_INGREDIENT_TYPE_EDIBLE 1 //Icon overlay type in datum/component/customizable_reagent_holder -#define CUSTOM_INGREDIENT_ICON_NOCHANGE 0 -#define CUSTOM_INGREDIENT_ICON_FILL 1 -#define CUSTOM_INGREDIENT_ICON_SCATTER 2 -#define CUSTOM_INGREDIENT_ICON_STACK 3 -#define CUSTOM_INGREDIENT_ICON_LINE 4 -#define CUSTOM_INGREDIENT_ICON_STACKPLUSTOP 5 +#define CUSTOM_INGREDIENT_ICON_NOCHANGE 0 +#define CUSTOM_INGREDIENT_ICON_FILL 1 +#define CUSTOM_INGREDIENT_ICON_SCATTER 2 +#define CUSTOM_INGREDIENT_ICON_STACK 3 +#define CUSTOM_INGREDIENT_ICON_LINE 4 +#define CUSTOM_INGREDIENT_ICON_STACKPLUSTOP 5 diff --git a/code/__DEFINES/dcs/signals.dm b/code/__DEFINES/dcs/signals.dm index f19bada643a..612899a0995 100644 --- a/code/__DEFINES/dcs/signals.dm +++ b/code/__DEFINES/dcs/signals.dm @@ -84,8 +84,8 @@ #define COMPONENT_EXNAME_CHANGED (1<<0) ///from base of atom/update_icon(): () #define COMSIG_ATOM_UPDATE_ICON "atom_update_icon" - #define COMSIG_ATOM_NO_UPDATE_ICON_STATE (1<<0) - #define COMSIG_ATOM_NO_UPDATE_OVERLAYS (1<<1) + #define COMSIG_ATOM_NO_UPDATE_ICON_STATE (1<<0) + #define COMSIG_ATOM_NO_UPDATE_OVERLAYS (1<<1) ///from base of atom/update_overlays(): (list/new_overlays) #define COMSIG_ATOM_UPDATE_OVERLAYS "atom_update_overlays" ///from base of atom/update_icon(): (signalOut, did_anything) @@ -181,45 +181,45 @@ /// Prevents the atom from being exposed to reagents if returned on [COMSIG_ATOM_EXPOSE_REAGENTS] #define COMPONENT_NO_EXPOSE_REAGENTS (1<<0) ///from base of [/datum/reagent/proc/expose_atom]: (/datum/reagent, reac_volume) -#define COMSIG_ATOM_EXPOSE_REAGENT "atom_expose_reagent" +#define COMSIG_ATOM_EXPOSE_REAGENT "atom_expose_reagent" ///from base of [/datum/reagent/proc/expose_atom]: (/atom, reac_volume) -#define COMSIG_REAGENT_EXPOSE_ATOM "reagent_expose_atom" +#define COMSIG_REAGENT_EXPOSE_ATOM "reagent_expose_atom" ///from base of [/datum/reagent/proc/expose_atom]: (/obj, reac_volume) -#define COMSIG_REAGENT_EXPOSE_OBJ "reagent_expose_obj" +#define COMSIG_REAGENT_EXPOSE_OBJ "reagent_expose_obj" ///from base of [/datum/reagent/proc/expose_atom]: (/mob/living, reac_volume, methods, show_message, touch_protection, /mob/camera/blob) // ovemind arg is only used by blob reagents. -#define COMSIG_REAGENT_EXPOSE_MOB "reagent_expose_mob" +#define COMSIG_REAGENT_EXPOSE_MOB "reagent_expose_mob" ///from base of [/datum/reagent/proc/expose_atom]: (/turf, reac_volume) -#define COMSIG_REAGENT_EXPOSE_TURF "reagent_expose_turf" +#define COMSIG_REAGENT_EXPOSE_TURF "reagent_expose_turf" ///from base of [/datum/controller/subsystem/materials/proc/InitializeMaterial]: (/datum/material) -#define COMSIG_MATERIALS_INIT_MAT "SSmaterials_init_mat" +#define COMSIG_MATERIALS_INIT_MAT "SSmaterials_init_mat" ///from base of [/datum/reagents/proc/add_reagent]: (/datum/reagent, amount, reagtemp, data, no_react) -#define COMSIG_REAGENTS_NEW_REAGENT "reagents_new_reagent" +#define COMSIG_REAGENTS_NEW_REAGENT "reagents_new_reagent" ///from base of [/datum/reagents/proc/add_reagent]: (/datum/reagent, amount, reagtemp, data, no_react) -#define COMSIG_REAGENTS_ADD_REAGENT "reagents_add_reagent" +#define COMSIG_REAGENTS_ADD_REAGENT "reagents_add_reagent" ///from base of [/datum/reagents/proc/del_reagent]: (/datum/reagent) -#define COMSIG_REAGENTS_DEL_REAGENT "reagents_del_reagent" +#define COMSIG_REAGENTS_DEL_REAGENT "reagents_del_reagent" ///from base of [/datum/reagents/proc/clear_reagents]: () -#define COMSIG_REAGENTS_REM_REAGENT "reagents_rem_reagent" +#define COMSIG_REAGENTS_REM_REAGENT "reagents_rem_reagent" ///from base of [/datum/reagents/proc/set_temperature]: (new_temp, old_temp) -#define COMSIG_REAGENTS_CLEAR_REAGENTS "reagents_clear_reagents" +#define COMSIG_REAGENTS_CLEAR_REAGENTS "reagents_clear_reagents" ///from base of [/datum/reagents/proc/remove_reagent]: (/datum/reagent, amount) -#define COMSIG_REAGENTS_TEMP_CHANGE "reagents_temp_change" +#define COMSIG_REAGENTS_TEMP_CHANGE "reagents_temp_change" ///from base of [/datum/reagents/proc/handle_reactions]: (num_reactions) -#define COMSIG_REAGENTS_REACTED "reagents_reacted" +#define COMSIG_REAGENTS_REACTED "reagents_reacted" ///from base of [/datum/reagents/proc/process]: (num_reactions) -#define COMSIG_REAGENTS_REACTION_STEP "reagents_time_step" +#define COMSIG_REAGENTS_REACTION_STEP "reagents_time_step" ///from base of [/atom/proc/expose_reagents]: (/atom, /list, methods, volume_modifier, show_message) -#define COMSIG_REAGENTS_EXPOSE_ATOM "reagents_expose_atom" +#define COMSIG_REAGENTS_EXPOSE_ATOM "reagents_expose_atom" ///from base of [/obj/proc/expose_reagents]: (/obj, /list, methods, volume_modifier, show_message) -#define COMSIG_REAGENTS_EXPOSE_OBJ "reagents_expose_obj" +#define COMSIG_REAGENTS_EXPOSE_OBJ "reagents_expose_obj" ///from base of [/mob/living/proc/expose_reagents]: (/mob/living, /list, methods, volume_modifier, show_message, touch_protection) -#define COMSIG_REAGENTS_EXPOSE_MOB "reagents_expose_mob" +#define COMSIG_REAGENTS_EXPOSE_MOB "reagents_expose_mob" ///from base of [/turf/proc/expose_reagents]: (/turf, /list, methods, volume_modifier, show_message) -#define COMSIG_REAGENTS_EXPOSE_TURF "reagents_expose_turf" +#define COMSIG_REAGENTS_EXPOSE_TURF "reagents_expose_turf" ///from base of [/datum/component/personal_crafting/proc/del_reqs]: () -#define COMSIG_REAGENTS_CRAFTING_PING "reagents_crafting_ping" +#define COMSIG_REAGENTS_CRAFTING_PING "reagents_crafting_ping" ///Called right before the atom changes the value of light_range to a different one, from base atom/set_light_range(): (new_range) #define COMSIG_ATOM_SET_LIGHT_RANGE "atom_set_light_range" @@ -256,7 +256,7 @@ #define COMSIG_CLICK "atom_click" ///from base of atom/ShiftClick(): (/mob) #define COMSIG_CLICK_SHIFT "shift_click" - #define COMPONENT_ALLOW_EXAMINATE (1<<0) //Allows the user to examinate regardless of client.eye. + #define COMPONENT_ALLOW_EXAMINATE (1<<0) //Allows the user to examinate regardless of client.eye. ///from base of atom/CtrlClickOn(): (/mob) #define COMSIG_CLICK_CTRL "ctrl_click" ///from base of atom/AltClick(): (/mob) @@ -311,13 +311,13 @@ #define COMSIG_MOVABLE_BUMP "movable_bump" ///from base of atom/movable/throw_impact(): (/atom/hit_atom, /datum/thrownthing/throwingdatum) #define COMSIG_MOVABLE_IMPACT "movable_impact" - #define COMPONENT_MOVABLE_IMPACT_FLIP_HITPUSH (1<<0) //if true, flip if the impact will push what it hits - #define COMPONENT_MOVABLE_IMPACT_NEVERMIND (1<<1) //return true if you destroyed whatever it was you're impacting and there won't be anything for hitby() to run on + #define COMPONENT_MOVABLE_IMPACT_FLIP_HITPUSH (1<<0) //if true, flip if the impact will push what it hits + #define COMPONENT_MOVABLE_IMPACT_NEVERMIND (1<<1) //return true if you destroyed whatever it was you're impacting and there won't be anything for hitby() to run on ///from base of mob/living/hitby(): (mob/living/target, hit_zone) #define COMSIG_MOVABLE_IMPACT_ZONE "item_impact_zone" ///from /atom/movable/proc/buckle_mob(): (mob/living/M, force, check_loc, buckle_mob_flags) #define COMSIG_MOVABLE_PREBUCKLE "prebuckle" // this is the last chance to interrupt and block a buckle before it finishes - #define COMPONENT_BLOCK_BUCKLE (1<<0) + #define COMPONENT_BLOCK_BUCKLE (1<<0) ///from base of atom/movable/buckle_mob(): (mob, force) #define COMSIG_MOVABLE_BUCKLE "buckle" ///from base of atom/movable/unbuckle_mob(): (mob, force) @@ -390,7 +390,7 @@ #define COMSIG_MOB_HUD_CREATED "mob_hud_created" ///from base of /mob/living/proc/apply_damage(): (damage, damagetype, def_zone) -#define COMSIG_MOB_APPLY_DAMGE "mob_apply_damage" +#define COMSIG_MOB_APPLY_DAMGE "mob_apply_damage" ///from base of /mob/throw_item(): (atom/target) #define COMSIG_MOB_THROW "mob_throw" ///from base of /mob/verb/examinate(): (atom/target) @@ -475,7 +475,7 @@ #define COMSIG_LIVING_STATUS_UNCONSCIOUS "living_unconscious" ///from base of mob/living/Sleeping() (amount, ignore_canstun) #define COMSIG_LIVING_STATUS_SLEEP "living_sleeping" - #define COMPONENT_NO_STUN (1<<0) //For all of them + #define COMPONENT_NO_STUN (1<<0) //For all of them ///from base of /mob/living/can_track(): (mob/user) #define COMSIG_LIVING_CAN_TRACK "mob_cantrack" #define COMPONENT_CANT_TRACK (1<<0) @@ -497,14 +497,14 @@ ///When a carbon gets a vending machine tilted on them #define COMSIG_ON_VENDOR_CRUSH "carbon_vendor_crush" // /mob/living/carbon physiology signals -#define COMSIG_CARBON_GAIN_WOUND "carbon_gain_wound" //from /datum/wound/proc/apply_wound() (/mob/living/carbon/C, /datum/wound/W, /obj/item/bodypart/L) -#define COMSIG_CARBON_LOSE_WOUND "carbon_lose_wound" //from /datum/wound/proc/remove_wound() (/mob/living/carbon/C, /datum/wound/W, /obj/item/bodypart/L) +#define COMSIG_CARBON_GAIN_WOUND "carbon_gain_wound" //from /datum/wound/proc/apply_wound() (/mob/living/carbon/C, /datum/wound/W, /obj/item/bodypart/L) +#define COMSIG_CARBON_LOSE_WOUND "carbon_lose_wound" //from /datum/wound/proc/remove_wound() (/mob/living/carbon/C, /datum/wound/W, /obj/item/bodypart/L) ///from base of /obj/item/bodypart/proc/attach_limb(): (new_limb, special) allows you to fail limb attachment #define COMSIG_CARBON_ATTACH_LIMB "carbon_attach_limb" #define COMPONENT_NO_ATTACH (1<<0) -#define COMSIG_CARBON_REMOVE_LIMB "carbon_remove_limb" //from base of /obj/item/bodypart/proc/drop_limb(special, dismembered) -#define COMSIG_BODYPART_GAUZED "bodypart_gauzed" // from /obj/item/bodypart/proc/apply_gauze(/obj/item/stack/gauze) -#define COMSIG_BODYPART_GAUZE_DESTROYED "bodypart_degauzed" // from [/obj/item/bodypart/proc/seep_gauze] when it runs out of absorption +#define COMSIG_CARBON_REMOVE_LIMB "carbon_remove_limb" //from base of /obj/item/bodypart/proc/drop_limb(special, dismembered) +#define COMSIG_BODYPART_GAUZED "bodypart_gauzed" // from /obj/item/bodypart/proc/apply_gauze(/obj/item/stack/gauze) +#define COMSIG_BODYPART_GAUZE_DESTROYED "bodypart_degauzed" // from [/obj/item/bodypart/proc/seep_gauze] when it runs out of absorption ///from base of mob/living/carbon/soundbang_act(): (list(intensity)) #define COMSIG_CARBON_SOUNDBANG "carbon_soundbang" @@ -535,15 +535,15 @@ // /obj signals ///from base of [/obj/proc/take_damage]: (damage_amount, damage_type, damage_flag, sound_effect, attack_dir, aurmor_penetration) -#define COMSIG_OBJ_TAKE_DAMAGE "obj_take_damage" +#define COMSIG_OBJ_TAKE_DAMAGE "obj_take_damage" /// Return bitflags for the above signal which prevents the object taking any damage. - #define COMPONENT_NO_TAKE_DAMAGE (1<<0) + #define COMPONENT_NO_TAKE_DAMAGE (1<<0) ///from base of obj/deconstruct(): (disassembled) #define COMSIG_OBJ_DECONSTRUCT "obj_deconstruct" ///from base of code/game/machinery #define COMSIG_OBJ_DEFAULT_UNFASTEN_WRENCH "obj_default_unfasten_wrench" ///from base of /turf/proc/levelupdate(). (intact) true to hide and false to unhide -#define COMSIG_OBJ_HIDE "obj_hide" +#define COMSIG_OBJ_HIDE "obj_hide" /// from /obj/item/toy/crayon/spraycan/afterattack: (color_is_dark) #define COMSIG_OBJ_PAINTED "obj_painted" @@ -748,7 +748,7 @@ // /mob/living/carbon/human signals ///Hit by successful disarm attack (mob/living/carbon/human/attacker,zone_targeted) -#define COMSIG_HUMAN_DISARM_HIT "human_disarm_hit" +#define COMSIG_HUMAN_DISARM_HIT "human_disarm_hit" ///Whenever EquipRanked is called, called after job is set #define COMSIG_JOB_RECEIVED "job_received" @@ -762,9 +762,9 @@ // /datum/song signals ///sent to the instrument when a song starts playing -#define COMSIG_SONG_START "song_start" +#define COMSIG_SONG_START "song_start" ///sent to the instrument when a song stops playing -#define COMSIG_SONG_END "song_end" +#define COMSIG_SONG_END "song_end" /*******Component Specific Signals*******/ //Janitor @@ -777,7 +777,7 @@ ///Called on an object to "clean it", such as removing blood decals/overlays, etc. The clean types bitfield is sent with it. Return TRUE if any cleaning was necessary and thus performed. #define COMSIG_COMPONENT_CLEAN_ACT "clean_act" ///Returned by cleanable components when they are cleaned. - #define COMPONENT_CLEANED (1<<0) + #define COMPONENT_CLEANED (1<<0) //Creamed @@ -870,7 +870,7 @@ ///() deletes the nanite component #define COMSIG_NANITE_DELETE "nanite_delete" ///(list/nanite_programs) - makes the input list a copy the nanites' program list -#define COMSIG_NANITE_GET_PROGRAMS "nanite_get_programs" +#define COMSIG_NANITE_GET_PROGRAMS "nanite_get_programs" ///(amount) Returns nanite amount #define COMSIG_NANITE_GET_VOLUME "nanite_get_volume" ///(amount) Sets current nanite volume to the given amount @@ -898,9 +898,9 @@ ///(datum/nanite_program/new_program, datum/nanite_program/source_program) Called when adding a program to a nanite component #define COMSIG_NANITE_ADD_PROGRAM "nanite_add_program" ///Installation successful - #define COMPONENT_PROGRAM_INSTALLED (1<<0) + #define COMPONENT_PROGRAM_INSTALLED (1<<0) ///Installation failed, but there are still nanites - #define COMPONENT_PROGRAM_NOT_INSTALLED (1<<1) + #define COMPONENT_PROGRAM_NOT_INSTALLED (1<<1) ///(datum/component/nanites, full_overwrite, copy_activation) Called to sync the target's nanites to a given nanite component #define COMSIG_NANITE_SYNC "nanite_sync" @@ -934,7 +934,7 @@ #define COMSIG_TRY_STORAGE_CAN_INSERT "storage_can_equip" // /datum/component/swabbing signals -#define COMSIG_SWAB_FOR_SAMPLES "swab_for_samples" ///Called when you try to swab something using the swabable component, includes a mutable list of what has been swabbed so far so it can be modified. +#define COMSIG_SWAB_FOR_SAMPLES "swab_for_samples" ///Called when you try to swab something using the swabable component, includes a mutable list of what has been swabbed so far so it can be modified. #define COMPONENT_SWAB_FOUND (1<<0) // /datum/component/two_handed signals diff --git a/code/__DEFINES/diseases.dm b/code/__DEFINES/diseases.dm index a8112c03911..b84b8cc39f0 100644 --- a/code/__DEFINES/diseases.dm +++ b/code/__DEFINES/diseases.dm @@ -1,36 +1,36 @@ -#define DISEASE_LIMIT 1 -#define VIRUS_SYMPTOM_LIMIT 6 +#define DISEASE_LIMIT 1 +#define VIRUS_SYMPTOM_LIMIT 6 //Visibility Flags -#define HIDDEN_SCANNER (1<<0) -#define HIDDEN_PANDEMIC (1<<1) +#define HIDDEN_SCANNER (1<<0) +#define HIDDEN_PANDEMIC (1<<1) //Disease Flags -#define CURABLE (1<<0) -#define CAN_CARRY (1<<1) -#define CAN_RESIST (1<<2) +#define CURABLE (1<<0) +#define CAN_CARRY (1<<1) +#define CAN_RESIST (1<<2) //Spread Flags -#define DISEASE_SPREAD_SPECIAL (1<<0) -#define DISEASE_SPREAD_NON_CONTAGIOUS (1<<1) -#define DISEASE_SPREAD_BLOOD (1<<2) -#define DISEASE_SPREAD_CONTACT_FLUIDS (1<<3) -#define DISEASE_SPREAD_CONTACT_SKIN (1<<4) -#define DISEASE_SPREAD_AIRBORNE (1<<5) +#define DISEASE_SPREAD_SPECIAL (1<<0) +#define DISEASE_SPREAD_NON_CONTAGIOUS (1<<1) +#define DISEASE_SPREAD_BLOOD (1<<2) +#define DISEASE_SPREAD_CONTACT_FLUIDS (1<<3) +#define DISEASE_SPREAD_CONTACT_SKIN (1<<4) +#define DISEASE_SPREAD_AIRBORNE (1<<5) //Severity Defines /// Diseases that buff, heal, or at least do nothing at all -#define DISEASE_SEVERITY_POSITIVE "Positive" +#define DISEASE_SEVERITY_POSITIVE "Positive" /// Diseases that may have annoying effects, but nothing disruptive (sneezing) -#define DISEASE_SEVERITY_NONTHREAT "Harmless" +#define DISEASE_SEVERITY_NONTHREAT "Harmless" /// Diseases that can annoy in concrete ways (dizziness) -#define DISEASE_SEVERITY_MINOR "Minor" +#define DISEASE_SEVERITY_MINOR "Minor" /// Diseases that can do minor harm, or severe annoyance (vomit) -#define DISEASE_SEVERITY_MEDIUM "Medium" +#define DISEASE_SEVERITY_MEDIUM "Medium" /// Diseases that can do significant harm, or severe disruption (brainrot) -#define DISEASE_SEVERITY_HARMFUL "Harmful" +#define DISEASE_SEVERITY_HARMFUL "Harmful" /// Diseases that can kill or maim if left untreated (flesh eating, blindness) -#define DISEASE_SEVERITY_DANGEROUS "Dangerous" +#define DISEASE_SEVERITY_DANGEROUS "Dangerous" /// Diseases that can quickly kill an unprepared victim (fungal tb, gbs) -#define DISEASE_SEVERITY_BIOHAZARD "BIOHAZARD" +#define DISEASE_SEVERITY_BIOHAZARD "BIOHAZARD" diff --git a/code/__DEFINES/exosuit_fab.dm b/code/__DEFINES/exosuit_fab.dm index 6d12d60a0df..f49f68bd0f3 100644 --- a/code/__DEFINES/exosuit_fab.dm +++ b/code/__DEFINES/exosuit_fab.dm @@ -1,32 +1,32 @@ /// Module is compatible with Security Cyborg model -#define BORG_MODEL_SECURITY (1<<0) +#define BORG_MODEL_SECURITY (1<<0) /// Module is compatible with Miner Cyborg model -#define BORG_MODEL_MINER (1<<1) +#define BORG_MODEL_MINER (1<<1) /// Module is compatible with Janitor Cyborg model -#define BORG_MODEL_JANITOR (1<<2) +#define BORG_MODEL_JANITOR (1<<2) /// Module is compatible with Medical Cyborg model -#define BORG_MODEL_MEDICAL (1<<3) +#define BORG_MODEL_MEDICAL (1<<3) /// Module is compatible with Engineering Cyborg model -#define BORG_MODEL_ENGINEERING (1<<4) +#define BORG_MODEL_ENGINEERING (1<<4) /// Module is compatible with Ripley Exosuit models -#define EXOSUIT_MODULE_RIPLEY (1<<0) +#define EXOSUIT_MODULE_RIPLEY (1<<0) /// Module is compatible with Odyseeus Exosuit models -#define EXOSUIT_MODULE_ODYSSEUS (1<<1) +#define EXOSUIT_MODULE_ODYSSEUS (1<<1) /// Module is compatible with Clarke Exosuit models -#define EXOSUIT_MODULE_CLARKE (1<<2) +#define EXOSUIT_MODULE_CLARKE (1<<2) /// Module is compatible with Gygax Exosuit models -#define EXOSUIT_MODULE_GYGAX (1<<3) +#define EXOSUIT_MODULE_GYGAX (1<<3) /// Module is compatible with Durand Exosuit models -#define EXOSUIT_MODULE_DURAND (1<<4) +#define EXOSUIT_MODULE_DURAND (1<<4) /// Module is compatible with H.O.N.K Exosuit models -#define EXOSUIT_MODULE_HONK (1<<5) +#define EXOSUIT_MODULE_HONK (1<<5) /// Module is compatible with Phazon Exosuit models -#define EXOSUIT_MODULE_PHAZON (1<<6) +#define EXOSUIT_MODULE_PHAZON (1<<6) /// Module is compatible with "Working" Exosuit models - Ripley and Clarke -#define EXOSUIT_MODULE_WORKING EXOSUIT_MODULE_RIPLEY | EXOSUIT_MODULE_CLARKE +#define EXOSUIT_MODULE_WORKING EXOSUIT_MODULE_RIPLEY | EXOSUIT_MODULE_CLARKE /// Module is compatible with "Combat" Exosuit models - Gygax, H.O.N.K, Durand and Phazon -#define EXOSUIT_MODULE_COMBAT EXOSUIT_MODULE_GYGAX | EXOSUIT_MODULE_HONK | EXOSUIT_MODULE_DURAND | EXOSUIT_MODULE_PHAZON +#define EXOSUIT_MODULE_COMBAT EXOSUIT_MODULE_GYGAX | EXOSUIT_MODULE_HONK | EXOSUIT_MODULE_DURAND | EXOSUIT_MODULE_PHAZON /// Module is compatible with "Medical" Exosuit modelsm - Odysseus -#define EXOSUIT_MODULE_MEDICAL EXOSUIT_MODULE_ODYSSEUS +#define EXOSUIT_MODULE_MEDICAL EXOSUIT_MODULE_ODYSSEUS diff --git a/code/__DEFINES/fantasy_affixes.dm b/code/__DEFINES/fantasy_affixes.dm index 20db49bebea..2c6552555d7 100644 --- a/code/__DEFINES/fantasy_affixes.dm +++ b/code/__DEFINES/fantasy_affixes.dm @@ -1,5 +1,5 @@ -#define AFFIX_PREFIX (1 << 0) -#define AFFIX_SUFFIX (1 << 1) +#define AFFIX_PREFIX (1 << 0) +#define AFFIX_SUFFIX (1 << 1) -#define AFFIX_GOOD (1 << 0) -#define AFFIX_EVIL (1 << 1) +#define AFFIX_GOOD (1 << 0) +#define AFFIX_EVIL (1 << 1) diff --git a/code/__DEFINES/flags.dm b/code/__DEFINES/flags.dm index 145effe3dc5..2cb7e78c862 100644 --- a/code/__DEFINES/flags.dm +++ b/code/__DEFINES/flags.dm @@ -24,26 +24,26 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204 // scroll down before changing the numbers on these /// This flag is what recursive_hear_check() uses to determine wether to add an item to the hearer list or not. -#define HEAR_1 (1<<3) +#define HEAR_1 (1<<3) /// Is this object currently processing in the atmos object list? -#define ATMOS_IS_PROCESSING_1 (1<<4) +#define ATMOS_IS_PROCESSING_1 (1<<4) /// conducts electricity (metal etc.) -#define CONDUCT_1 (1<<5) +#define CONDUCT_1 (1<<5) /// For machines and structures that should not break into parts, eg, holodeck stuff -#define NODECONSTRUCT_1 (1<<7) +#define NODECONSTRUCT_1 (1<<7) /// atom queued to SSoverlay -#define OVERLAY_QUEUED_1 (1<<8) +#define OVERLAY_QUEUED_1 (1<<8) /// item has priority to check when entering or leaving -#define ON_BORDER_1 (1<<9) +#define ON_BORDER_1 (1<<9) /// Prevent clicking things below it on the same turf eg. doors/ fulltile windows -#define PREVENT_CLICK_UNDER_1 (1<<11) -#define HOLOGRAM_1 (1<<12) +#define PREVENT_CLICK_UNDER_1 (1<<11) +#define HOLOGRAM_1 (1<<12) /// Prevents mobs from getting chainshocked by teslas and the supermatter -#define SHOCKED_1 (1<<13) +#define SHOCKED_1 (1<<13) ///Whether /atom/Initialize() has already run for the object -#define INITIALIZED_1 (1<<14) +#define INITIALIZED_1 (1<<14) /// was this spawned by an admin? used for stat tracking stuff. -#define ADMIN_SPAWNED_1 (1<<15) +#define ADMIN_SPAWNED_1 (1<<15) /// should not get harmed if this gets caught by an explosion? #define PREVENT_CONTENTS_EXPLOSION_1 (1<<16) /// should the contents of this atom be acted upon @@ -61,99 +61,99 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204 /// If the thing can reflect light (lasers/energy) -#define RICOCHET_SHINY (1<<0) +#define RICOCHET_SHINY (1<<0) /// If the thing can reflect matter (bullets/bomb shrapnel) -#define RICOCHET_HARD (1<<1) +#define RICOCHET_HARD (1<<1) //turf-only flags -#define NOJAUNT_1 (1<<0) -#define UNUSED_RESERVATION_TURF_1 (1<<1) +#define NOJAUNT_1 (1<<0) +#define UNUSED_RESERVATION_TURF_1 (1<<1) /// If a turf can be made dirty at roundstart. This is also used in areas. -#define CAN_BE_DIRTY_1 (1<<2) +#define CAN_BE_DIRTY_1 (1<<2) /// If blood cultists can draw runes or build structures on this turf -#define CULT_PERMITTED_1 (1<<3) +#define CULT_PERMITTED_1 (1<<3) /// Blocks lava rivers being generated on the turf -#define NO_LAVA_GEN_1 (1<<6) +#define NO_LAVA_GEN_1 (1<<6) /// Blocks ruins spawning on the turf -#define NO_RUINS_1 (1<<10) +#define NO_RUINS_1 (1<<10) /// Should this tile be cleaned up and reinserted into an excited group? #define EXCITED_CLEANUP_1 (1 << 13) ////////////////Area flags\\\\\\\\\\\\\\ /// If it's a valid territory for cult summoning or the CRAB-17 phone to spawn -#define VALID_TERRITORY (1<<0) +#define VALID_TERRITORY (1<<0) /// If blobs can spawn there and if it counts towards their score. -#define BLOBS_ALLOWED (1<<1) +#define BLOBS_ALLOWED (1<<1) /// If mining tunnel generation is allowed in this area -#define CAVES_ALLOWED (1<<2) +#define CAVES_ALLOWED (1<<2) /// If flora are allowed to spawn in this area randomly through tunnel generation -#define FLORA_ALLOWED (1<<3) +#define FLORA_ALLOWED (1<<3) /// If mobs can be spawned by natural random generation -#define MOB_SPAWN_ALLOWED (1<<4) +#define MOB_SPAWN_ALLOWED (1<<4) /// If megafauna can be spawned by natural random generation -#define MEGAFAUNA_SPAWN_ALLOWED (1<<5) +#define MEGAFAUNA_SPAWN_ALLOWED (1<<5) /// Are you forbidden from teleporting to the area? (centcom, mobs, wizard, hand teleporter) -#define NOTELEPORT (1<<6) +#define NOTELEPORT (1<<6) /// Hides area from player Teleport function. -#define HIDDEN_AREA (1<<7) +#define HIDDEN_AREA (1<<7) /// If false, loading multiple maps with this area type will create multiple instances. -#define UNIQUE_AREA (1<<8) +#define UNIQUE_AREA (1<<8) /// If people are allowed to suicide in it. Mostly for OOC stuff like minigames -#define BLOCK_SUICIDE (1<<9) +#define BLOCK_SUICIDE (1<<9) /// Can the Xenobio management console transverse this area by default? -#define XENOBIOLOGY_COMPATIBLE (1<<10) +#define XENOBIOLOGY_COMPATIBLE (1<<10) /// If Abductors are unable to teleport in with their observation console -#define ABDUCTOR_PROOF (1<<11) +#define ABDUCTOR_PROOF (1<<11) /// If an area should be hidden from power consoles, power/atmosphere alerts, etc. -#define NO_ALERTS (1<<12) +#define NO_ALERTS (1<<12) /* These defines are used specifically with the atom/pass_flags bitmask the atom/checkpass() proc uses them (tables will call movable atom checkpass(PASSTABLE) for example) */ //flags for pass_flags -#define PASSTABLE (1<<0) -#define PASSGLASS (1<<1) -#define PASSGRILLE (1<<2) -#define PASSBLOB (1<<3) -#define PASSMOB (1<<4) -#define PASSCLOSEDTURF (1<<5) +#define PASSTABLE (1<<0) +#define PASSGLASS (1<<1) +#define PASSGRILLE (1<<2) +#define PASSBLOB (1<<3) +#define PASSMOB (1<<4) +#define PASSCLOSEDTURF (1<<5) /// Let thrown things past us. **ONLY MEANINGFUL ON pass_flags_self!** -#define LETPASSTHROW (1<<6) -#define PASSMACHINE (1<<7) -#define PASSSTRUCTURE (1<<8) -#define PASSFLAPS (1<<9) +#define LETPASSTHROW (1<<6) +#define PASSMACHINE (1<<7) +#define PASSSTRUCTURE (1<<8) +#define PASSFLAPS (1<<9) //Movement Types -#define GROUND (1<<0) -#define FLYING (1<<1) -#define VENTCRAWLING (1<<2) -#define FLOATING (1<<3) +#define GROUND (1<<0) +#define FLYING (1<<1) +#define VENTCRAWLING (1<<2) +#define FLOATING (1<<3) /// When moving, will Cross()/Uncross() everything, but won't stop or Bump() anything. -#define PHASING (1<<4) +#define PHASING (1<<4) //Fire and Acid stuff, for resistance_flags -#define LAVA_PROOF (1<<0) +#define LAVA_PROOF (1<<0) /// 100% immune to fire damage (but not necessarily to lava or heat) -#define FIRE_PROOF (1<<1) -#define FLAMMABLE (1<<2) -#define ON_FIRE (1<<3) +#define FIRE_PROOF (1<<1) +#define FLAMMABLE (1<<2) +#define ON_FIRE (1<<3) /// acid can't even appear on it, let alone melt it. -#define UNACIDABLE (1<<4) +#define UNACIDABLE (1<<4) /// acid stuck on it doesn't melt it. -#define ACID_PROOF (1<<5) +#define ACID_PROOF (1<<5) /// doesn't take damage -#define INDESTRUCTIBLE (1<<6) +#define INDESTRUCTIBLE (1<<6) /// can't be frozen -#define FREEZE_PROOF (1<<7) +#define FREEZE_PROOF (1<<7) //tesla_zap -#define ZAP_MACHINE_EXPLOSIVE (1<<0) -#define ZAP_ALLOW_DUPLICATES (1<<1) -#define ZAP_OBJ_DAMAGE (1<<2) -#define ZAP_MOB_DAMAGE (1<<3) -#define ZAP_MOB_STUN (1<<4) -#define ZAP_GENERATES_POWER (1<<5) +#define ZAP_MACHINE_EXPLOSIVE (1<<0) +#define ZAP_ALLOW_DUPLICATES (1<<1) +#define ZAP_OBJ_DAMAGE (1<<2) +#define ZAP_MOB_DAMAGE (1<<3) +#define ZAP_MOB_STUN (1<<4) +#define ZAP_GENERATES_POWER (1<<5) #define ZAP_DEFAULT_FLAGS ZAP_MOB_STUN | ZAP_MOB_DAMAGE | ZAP_OBJ_DAMAGE #define ZAP_FUSION_FLAGS ZAP_OBJ_DAMAGE | ZAP_MOB_DAMAGE | ZAP_MOB_STUN @@ -166,19 +166,19 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204 //Mob mobility var flags /// can move -#define MOBILITY_MOVE (1<<0) +#define MOBILITY_MOVE (1<<0) /// can, and is, standing up -#define MOBILITY_STAND (1<<1) +#define MOBILITY_STAND (1<<1) /// can pickup items -#define MOBILITY_PICKUP (1<<2) +#define MOBILITY_PICKUP (1<<2) /// can hold and use items -#define MOBILITY_USE (1<<3) +#define MOBILITY_USE (1<<3) /// can use interfaces like machinery -#define MOBILITY_UI (1<<4) +#define MOBILITY_UI (1<<4) /// can use storage item -#define MOBILITY_STORAGE (1<<5) +#define MOBILITY_STORAGE (1<<5) /// can pull things -#define MOBILITY_PULL (1<<6) +#define MOBILITY_PULL (1<<6) /// can rest #define MOBILITY_REST (1<<7) diff --git a/code/__DEFINES/food.dm b/code/__DEFINES/food.dm index 5890f348625..f8694d882f2 100644 --- a/code/__DEFINES/food.dm +++ b/code/__DEFINES/food.dm @@ -1,23 +1,23 @@ -#define MEAT (1<<0) -#define VEGETABLES (1<<1) -#define RAW (1<<2) -#define JUNKFOOD (1<<3) -#define GRAIN (1<<4) -#define FRUIT (1<<5) -#define DAIRY (1<<6) -#define FRIED (1<<7) -#define ALCOHOL (1<<8) -#define SUGAR (1<<9) -#define GROSS (1<<10) -#define TOXIC (1<<11) -#define PINEAPPLE (1<<12) -#define BREAKFAST (1<<13) -#define CLOTH (1<<14) +#define MEAT (1<<0) +#define VEGETABLES (1<<1) +#define RAW (1<<2) +#define JUNKFOOD (1<<3) +#define GRAIN (1<<4) +#define FRUIT (1<<5) +#define DAIRY (1<<6) +#define FRIED (1<<7) +#define ALCOHOL (1<<8) +#define SUGAR (1<<9) +#define GROSS (1<<10) +#define TOXIC (1<<11) +#define PINEAPPLE (1<<12) +#define BREAKFAST (1<<13) +#define CLOTH (1<<14) -#define DRINK_NICE 1 -#define DRINK_GOOD 2 -#define DRINK_VERYGOOD 3 -#define DRINK_FANTASTIC 4 +#define DRINK_NICE 1 +#define DRINK_GOOD 2 +#define DRINK_VERYGOOD 3 +#define DRINK_FANTASTIC 4 #define FOOD_AMAZING 5 #define RACE_DRINK 6 // SKYRAT ADDITION diff --git a/code/__DEFINES/icon_smoothing.dm b/code/__DEFINES/icon_smoothing.dm index 23f0746e2e1..bb7c61f8390 100644 --- a/code/__DEFINES/icon_smoothing.dm +++ b/code/__DEFINES/icon_smoothing.dm @@ -1,16 +1,16 @@ /* smoothing_flags */ /// Smoothing system in where adjacencies are calculated and used to build an image by mounting each corner at runtime. -#define SMOOTH_CORNERS (1<<0) +#define SMOOTH_CORNERS (1<<0) /// Smoothing system in where adjacencies are calculated and used to select a pre-baked icon_state, encoded by bitmasking. -#define SMOOTH_BITMASK (1<<1) +#define SMOOTH_BITMASK (1<<1) /// Atom has diagonal corners, with underlays under them. -#define SMOOTH_DIAGONAL_CORNERS (1<<2) +#define SMOOTH_DIAGONAL_CORNERS (1<<2) /// Atom will smooth with the borders of the map. -#define SMOOTH_BORDER (1<<3) +#define SMOOTH_BORDER (1<<3) /// Atom is currently queued to smooth. -#define SMOOTH_QUEUED (1<<4) +#define SMOOTH_QUEUED (1<<4) /// Smooths with objects, and will thus need to scan turfs for contents. -#define SMOOTH_OBJ (1<<5) +#define SMOOTH_OBJ (1<<5) DEFINE_BITFIELD(smoothing_flags, list( "SMOOTH_CORNERS" = SMOOTH_CORNERS, @@ -38,40 +38,40 @@ DEFINE_BITFIELD(smoothing_flags, list( #define S_TURF(num) ((24 * 0) + num) //Not any different from the number itself, but kept this way in case someone wants to expand it by adding stuff before it. /* /turf only */ -#define SMOOTH_GROUP_TURF_OPEN S_TURF(0) ///turf/open -#define SMOOTH_GROUP_TURF_CHASM S_TURF(1) ///turf/open/chasm, /turf/open/floor/fakepit -#define SMOOTH_GROUP_FLOOR_LAVA S_TURF(2) ///turf/open/lava/smooth -#define SMOOTH_GROUP_FLOOR_TRANSPARENT_GLASS S_TURF(3) ///turf/open/floor/glass +#define SMOOTH_GROUP_TURF_OPEN S_TURF(0) ///turf/open +#define SMOOTH_GROUP_TURF_CHASM S_TURF(1) ///turf/open/chasm, /turf/open/floor/fakepit +#define SMOOTH_GROUP_FLOOR_LAVA S_TURF(2) ///turf/open/lava/smooth +#define SMOOTH_GROUP_FLOOR_TRANSPARENT_GLASS S_TURF(3) ///turf/open/floor/glass -#define SMOOTH_GROUP_OPEN_FLOOR S_TURF(4) ///turf/open/floor +#define SMOOTH_GROUP_OPEN_FLOOR S_TURF(4) ///turf/open/floor -#define SMOOTH_GROUP_FLOOR_GRASS S_TURF(5) ///turf/open/floor/plating/grass -#define SMOOTH_GROUP_FLOOR_ASH S_TURF(6) ///turf/open/floor/plating/ashplanet/ash -#define SMOOTH_GROUP_FLOOR_ASH_ROCKY S_TURF(7) ///turf/open/floor/plating/ashplanet/rocky -#define SMOOTH_GROUP_FLOOR_ICE S_TURF(8) ///turf/open/floor/plating/ice -#define SMOOTH_GROUP_FLOOR_SNOWED S_TURF(9) ///turf/open/floor/plating/snowed +#define SMOOTH_GROUP_FLOOR_GRASS S_TURF(5) ///turf/open/floor/plating/grass +#define SMOOTH_GROUP_FLOOR_ASH S_TURF(6) ///turf/open/floor/plating/ashplanet/ash +#define SMOOTH_GROUP_FLOOR_ASH_ROCKY S_TURF(7) ///turf/open/floor/plating/ashplanet/rocky +#define SMOOTH_GROUP_FLOOR_ICE S_TURF(8) ///turf/open/floor/plating/ice +#define SMOOTH_GROUP_FLOOR_SNOWED S_TURF(9) ///turf/open/floor/plating/snowed -#define SMOOTH_GROUP_CARPET S_TURF(10) ///turf/open/floor/carpet -#define SMOOTH_GROUP_CARPET_BLACK S_TURF(11) ///turf/open/floor/carpet/black -#define SMOOTH_GROUP_CARPET_BLUE S_TURF(12) ///turf/open/floor/carpet/blue -#define SMOOTH_GROUP_CARPET_CYAN S_TURF(13) ///turf/open/floor/carpet/cyan -#define SMOOTH_GROUP_CARPET_GREEN S_TURF(14) ///turf/open/floor/carpet/green -#define SMOOTH_GROUP_CARPET_ORANGE S_TURF(15) ///turf/open/floor/carpet/orange -#define SMOOTH_GROUP_CARPET_PURPLE S_TURF(16) ///turf/open/floor/carpet/purple -#define SMOOTH_GROUP_CARPET_RED S_TURF(17) ///turf/open/floor/carpet/red -#define SMOOTH_GROUP_CARPET_ROYAL_BLACK S_TURF(18) ///turf/open/floor/carpet/royalblack -#define SMOOTH_GROUP_CARPET_ROYAL_BLUE S_TURF(19) ///turf/open/floor/carpet/royalblue -#define SMOOTH_GROUP_CARPET_EXECUTIVE S_TURF(20) ///turf/open/floor/carpet/executive -#define SMOOTH_GROUP_CARPET_STELLAR S_TURF(21) ///turf/open/floor/carpet/stellar -#define SMOOTH_GROUP_CARPET_DONK S_TURF(22) ///turf/open/floor/carpet/donk +#define SMOOTH_GROUP_CARPET S_TURF(10) ///turf/open/floor/carpet +#define SMOOTH_GROUP_CARPET_BLACK S_TURF(11) ///turf/open/floor/carpet/black +#define SMOOTH_GROUP_CARPET_BLUE S_TURF(12) ///turf/open/floor/carpet/blue +#define SMOOTH_GROUP_CARPET_CYAN S_TURF(13) ///turf/open/floor/carpet/cyan +#define SMOOTH_GROUP_CARPET_GREEN S_TURF(14) ///turf/open/floor/carpet/green +#define SMOOTH_GROUP_CARPET_ORANGE S_TURF(15) ///turf/open/floor/carpet/orange +#define SMOOTH_GROUP_CARPET_PURPLE S_TURF(16) ///turf/open/floor/carpet/purple +#define SMOOTH_GROUP_CARPET_RED S_TURF(17) ///turf/open/floor/carpet/red +#define SMOOTH_GROUP_CARPET_ROYAL_BLACK S_TURF(18) ///turf/open/floor/carpet/royalblack +#define SMOOTH_GROUP_CARPET_ROYAL_BLUE S_TURF(19) ///turf/open/floor/carpet/royalblue +#define SMOOTH_GROUP_CARPET_EXECUTIVE S_TURF(20) ///turf/open/floor/carpet/executive +#define SMOOTH_GROUP_CARPET_STELLAR S_TURF(21) ///turf/open/floor/carpet/stellar +#define SMOOTH_GROUP_CARPET_DONK S_TURF(22) ///turf/open/floor/carpet/donk -#define SMOOTH_GROUP_CLOSED_TURFS S_TURF(24) ///turf/closed -#define SMOOTH_GROUP_MATERIAL_WALLS S_TURF(25) ///turf/closed/wall/material -#define SMOOTH_GROUP_SYNDICATE_WALLS S_TURF(26) ///turf/closed/wall/r_wall/syndicate, /turf/closed/indestructible/syndicate -#define SMOOTH_GROUP_HOTEL_WALLS S_TURF(27) ///turf/closed/indestructible/hotelwall -#define SMOOTH_GROUP_MINERAL_WALLS S_TURF(28) ///turf/closed/mineral, /turf/closed/indestructible -#define SMOOTH_GROUP_BOSS_WALLS S_TURF(29) ///turf/closed/indestructible/riveted/boss -#define SMOOTH_GROUP_SURVIVAL_TITANIUM_WALLS S_TURF(30) ///turf/closed/wall/mineral/titanium/survival +#define SMOOTH_GROUP_CLOSED_TURFS S_TURF(24) ///turf/closed +#define SMOOTH_GROUP_MATERIAL_WALLS S_TURF(25) ///turf/closed/wall/material +#define SMOOTH_GROUP_SYNDICATE_WALLS S_TURF(26) ///turf/closed/wall/r_wall/syndicate, /turf/closed/indestructible/syndicate +#define SMOOTH_GROUP_HOTEL_WALLS S_TURF(27) ///turf/closed/indestructible/hotelwall +#define SMOOTH_GROUP_MINERAL_WALLS S_TURF(28) ///turf/closed/mineral, /turf/closed/indestructible +#define SMOOTH_GROUP_BOSS_WALLS S_TURF(29) ///turf/closed/indestructible/riveted/boss +#define SMOOTH_GROUP_SURVIVAL_TITANIUM_WALLS S_TURF(30) ///turf/closed/wall/mineral/titanium/survival #define MAX_S_TURF SMOOTH_GROUP_SURVIVAL_TITANIUM_WALLS //Always match this value with the one above it. @@ -79,56 +79,56 @@ DEFINE_BITFIELD(smoothing_flags, list( #define S_OBJ(num) (MAX_S_TURF + 1 + num) /* /obj included */ -#define SMOOTH_GROUP_WALLS S_OBJ(0) ///turf/closed/wall, /obj/structure/falsewall -#define SMOOTH_GROUP_URANIUM_WALLS S_OBJ(1) ///turf/closed/wall/mineral/uranium, /obj/structure/falsewall/uranium -#define SMOOTH_GROUP_GOLD_WALLS S_OBJ(2) ///turf/closed/wall/mineral/gold, /obj/structure/falsewall/gold -#define SMOOTH_GROUP_SILVER_WALLS S_OBJ(3) ///turf/closed/wall/mineral/silver, /obj/structure/falsewall/silver -#define SMOOTH_GROUP_DIAMOND_WALLS S_OBJ(4) ///turf/closed/wall/mineral/diamond, /obj/structure/falsewall/diamond -#define SMOOTH_GROUP_PLASMA_WALLS S_OBJ(5) ///turf/closed/wall/mineral/plasma, /obj/structure/falsewall/plasma -#define SMOOTH_GROUP_BANANIUM_WALLS S_OBJ(6) ///turf/closed/wall/mineral/bananium, /obj/structure/falsewall/bananium -#define SMOOTH_GROUP_SANDSTONE_WALLS S_OBJ(7) ///turf/closed/wall/mineral/sandstone, /obj/structure/falsewall/sandstone -#define SMOOTH_GROUP_WOOD_WALLS S_OBJ(8) ///turf/closed/wall/mineral/wood, /obj/structure/falsewall/wood -#define SMOOTH_GROUP_IRON_WALLS S_OBJ(9) ///turf/closed/wall/mineral/iron, /obj/structure/falsewall/iron -#define SMOOTH_GROUP_ABDUCTOR_WALLS S_OBJ(10) ///turf/closed/wall/mineral/abductor, /obj/structure/falsewall/abductor -#define SMOOTH_GROUP_TITANIUM_WALLS S_OBJ(11) ///turf/closed/wall/mineral/titanium, /obj/structure/falsewall/titanium -#define SMOOTH_GROUP_PLASTITANIUM_WALLS S_OBJ(13) ///turf/closed/wall/mineral/plastitanium, /obj/structure/falsewall/plastitanium -#define SMOOTH_GROUP_SURVIVAL_TIANIUM_POD S_OBJ(14) ///turf/closed/wall/mineral/titanium/survival/pod, /obj/machinery/door/airlock/survival_pod, /obj/structure/window/shuttle/survival_pod -#define SMOOTH_GROUP_HIERO_WALL S_OBJ(15) ///obj/effect/temp_visual/elite_tumor_wall, /obj/effect/temp_visual/hierophant/wall +#define SMOOTH_GROUP_WALLS S_OBJ(0) ///turf/closed/wall, /obj/structure/falsewall +#define SMOOTH_GROUP_URANIUM_WALLS S_OBJ(1) ///turf/closed/wall/mineral/uranium, /obj/structure/falsewall/uranium +#define SMOOTH_GROUP_GOLD_WALLS S_OBJ(2) ///turf/closed/wall/mineral/gold, /obj/structure/falsewall/gold +#define SMOOTH_GROUP_SILVER_WALLS S_OBJ(3) ///turf/closed/wall/mineral/silver, /obj/structure/falsewall/silver +#define SMOOTH_GROUP_DIAMOND_WALLS S_OBJ(4) ///turf/closed/wall/mineral/diamond, /obj/structure/falsewall/diamond +#define SMOOTH_GROUP_PLASMA_WALLS S_OBJ(5) ///turf/closed/wall/mineral/plasma, /obj/structure/falsewall/plasma +#define SMOOTH_GROUP_BANANIUM_WALLS S_OBJ(6) ///turf/closed/wall/mineral/bananium, /obj/structure/falsewall/bananium +#define SMOOTH_GROUP_SANDSTONE_WALLS S_OBJ(7) ///turf/closed/wall/mineral/sandstone, /obj/structure/falsewall/sandstone +#define SMOOTH_GROUP_WOOD_WALLS S_OBJ(8) ///turf/closed/wall/mineral/wood, /obj/structure/falsewall/wood +#define SMOOTH_GROUP_IRON_WALLS S_OBJ(9) ///turf/closed/wall/mineral/iron, /obj/structure/falsewall/iron +#define SMOOTH_GROUP_ABDUCTOR_WALLS S_OBJ(10) ///turf/closed/wall/mineral/abductor, /obj/structure/falsewall/abductor +#define SMOOTH_GROUP_TITANIUM_WALLS S_OBJ(11) ///turf/closed/wall/mineral/titanium, /obj/structure/falsewall/titanium +#define SMOOTH_GROUP_PLASTITANIUM_WALLS S_OBJ(13) ///turf/closed/wall/mineral/plastitanium, /obj/structure/falsewall/plastitanium +#define SMOOTH_GROUP_SURVIVAL_TIANIUM_POD S_OBJ(14) ///turf/closed/wall/mineral/titanium/survival/pod, /obj/machinery/door/airlock/survival_pod, /obj/structure/window/shuttle/survival_pod +#define SMOOTH_GROUP_HIERO_WALL S_OBJ(15) ///obj/effect/temp_visual/elite_tumor_wall, /obj/effect/temp_visual/hierophant/wall -#define SMOOTH_GROUP_PAPERFRAME S_OBJ(20) ///obj/structure/window/paperframe, /obj/structure/mineral_door/paperframe +#define SMOOTH_GROUP_PAPERFRAME S_OBJ(20) ///obj/structure/window/paperframe, /obj/structure/mineral_door/paperframe -#define SMOOTH_GROUP_WINDOW_FULLTILE S_OBJ(21) ///turf/closed/indestructible/fakeglass, /obj/structure/window/fulltile, /obj/structure/window/reinforced/fulltile, /obj/structure/window/reinforced/tinted/fulltile, /obj/structure/window/plasma/fulltile, /obj/structure/window/plasma/reinforced/fulltile -#define SMOOTH_GROUP_WINDOW_FULLTILE_BRONZE S_OBJ(22) ///obj/structure/window/bronze/fulltile -#define SMOOTH_GROUP_WINDOW_FULLTILE_PLASTITANIUM S_OBJ(23) ///turf/closed/indestructible/opsglass, /obj/structure/window/plasma/reinforced/plastitanium -#define SMOOTH_GROUP_WINDOW_FULLTILE_SHUTTLE S_OBJ(24) ///obj/structure/window/shuttle +#define SMOOTH_GROUP_WINDOW_FULLTILE S_OBJ(21) ///turf/closed/indestructible/fakeglass, /obj/structure/window/fulltile, /obj/structure/window/reinforced/fulltile, /obj/structure/window/reinforced/tinted/fulltile, /obj/structure/window/plasma/fulltile, /obj/structure/window/plasma/reinforced/fulltile +#define SMOOTH_GROUP_WINDOW_FULLTILE_BRONZE S_OBJ(22) ///obj/structure/window/bronze/fulltile +#define SMOOTH_GROUP_WINDOW_FULLTILE_PLASTITANIUM S_OBJ(23) ///turf/closed/indestructible/opsglass, /obj/structure/window/plasma/reinforced/plastitanium +#define SMOOTH_GROUP_WINDOW_FULLTILE_SHUTTLE S_OBJ(24) ///obj/structure/window/shuttle -#define SMOOTH_GROUP_LATTICE S_OBJ(30) ///obj/structure/lattice -#define SMOOTH_GROUP_CATWALK S_OBJ(31) ///obj/structure/lattice/catwalk +#define SMOOTH_GROUP_LATTICE S_OBJ(30) ///obj/structure/lattice +#define SMOOTH_GROUP_CATWALK S_OBJ(31) ///obj/structure/lattice/catwalk -#define SMOOTH_GROUP_AIRLOCK S_OBJ(40) ///obj/machinery/door/airlock +#define SMOOTH_GROUP_AIRLOCK S_OBJ(40) ///obj/machinery/door/airlock -#define SMOOTH_GROUP_TABLES S_OBJ(50) ///obj/structure/table -#define SMOOTH_GROUP_WOOD_TABLES S_OBJ(51) ///obj/structure/table/wood -#define SMOOTH_GROUP_FANCY_WOOD_TABLES S_OBJ(52) ///obj/structure/table/wood/fancy -#define SMOOTH_GROUP_BRONZE_TABLES S_OBJ(53) ///obj/structure/table/bronze -#define SMOOTH_GROUP_ABDUCTOR_TABLES S_OBJ(54) ///obj/structure/table/abductor -#define SMOOTH_GROUP_GLASS_TABLES S_OBJ(55) ///obj/structure/table/glass +#define SMOOTH_GROUP_TABLES S_OBJ(50) ///obj/structure/table +#define SMOOTH_GROUP_WOOD_TABLES S_OBJ(51) ///obj/structure/table/wood +#define SMOOTH_GROUP_FANCY_WOOD_TABLES S_OBJ(52) ///obj/structure/table/wood/fancy +#define SMOOTH_GROUP_BRONZE_TABLES S_OBJ(53) ///obj/structure/table/bronze +#define SMOOTH_GROUP_ABDUCTOR_TABLES S_OBJ(54) ///obj/structure/table/abductor +#define SMOOTH_GROUP_GLASS_TABLES S_OBJ(55) ///obj/structure/table/glass -#define SMOOTH_GROUP_ALIEN_NEST S_OBJ(59) ///obj/structure/bed/nest -#define SMOOTH_GROUP_ALIEN_RESIN S_OBJ(60) ///obj/structure/alien/resin -#define SMOOTH_GROUP_ALIEN_WALLS S_OBJ(61) ///obj/structure/alien/resin/wall, /obj/structure/alien/resin/membrane -#define SMOOTH_GROUP_ALIEN_WEEDS S_OBJ(62) ///obj/structure/alien/weeds +#define SMOOTH_GROUP_ALIEN_NEST S_OBJ(59) ///obj/structure/bed/nest +#define SMOOTH_GROUP_ALIEN_RESIN S_OBJ(60) ///obj/structure/alien/resin +#define SMOOTH_GROUP_ALIEN_WALLS S_OBJ(61) ///obj/structure/alien/resin/wall, /obj/structure/alien/resin/membrane +#define SMOOTH_GROUP_ALIEN_WEEDS S_OBJ(62) ///obj/structure/alien/weeds -#define SMOOTH_GROUP_SECURITY_BARRICADE S_OBJ(63) ///obj/structure/barricade/security -#define SMOOTH_GROUP_SANDBAGS S_OBJ(64) ///obj/structure/barricade/sandbags +#define SMOOTH_GROUP_SECURITY_BARRICADE S_OBJ(63) ///obj/structure/barricade/security +#define SMOOTH_GROUP_SANDBAGS S_OBJ(64) ///obj/structure/barricade/sandbags -#define SMOOTH_GROUP_HEDGE_FLUFF S_OBJ(65) ///obj/structure/fluff/hedge +#define SMOOTH_GROUP_HEDGE_FLUFF S_OBJ(65) ///obj/structure/fluff/hedge -#define SMOOTH_GROUP_SHUTTLE_PARTS S_OBJ(66) ///obj/structure/window/shuttle, /obj/structure/window/plasma/reinforced/plastitanium, /turf/closed/indestructible/opsglass, /obj/structure/shuttle +#define SMOOTH_GROUP_SHUTTLE_PARTS S_OBJ(66) ///obj/structure/window/shuttle, /obj/structure/window/plasma/reinforced/plastitanium, /turf/closed/indestructible/opsglass, /obj/structure/shuttle -#define SMOOTH_GROUP_CLEANABLE_DIRT S_OBJ(67) ///obj/effect/decal/cleanable/dirt +#define SMOOTH_GROUP_CLEANABLE_DIRT S_OBJ(67) ///obj/effect/decal/cleanable/dirt -#define SMOOTH_GROUP_INDUSTRIAL_LIFT S_OBJ(70) ///obj/structure/industrial_lift +#define SMOOTH_GROUP_INDUSTRIAL_LIFT S_OBJ(70) ///obj/structure/industrial_lift #define SMOOTH_GROUP_SHUTTERS S_OBJ(71) //SKYRAT EDIT ADDITION - ASSAULTOPS diff --git a/code/__DEFINES/instruments.dm b/code/__DEFINES/instruments.dm index 6a01630733e..fa09eee0dd7 100644 --- a/code/__DEFINES/instruments.dm +++ b/code/__DEFINES/instruments.dm @@ -10,8 +10,8 @@ #define INSTRUMENT_MAX_TOTAL_SUSTAIN (5 SECONDS) /// These are per decisecond. -#define INSTRUMENT_EXP_FALLOFF_MIN 1.025 //100/(1.025^50) calculated for [INSTRUMENT_MIN_SUSTAIN_DROPOFF] to be 30. -#define INSTRUMENT_EXP_FALLOFF_MAX 10 +#define INSTRUMENT_EXP_FALLOFF_MIN 1.025 //100/(1.025^50) calculated for [INSTRUMENT_MIN_SUSTAIN_DROPOFF] to be 30. +#define INSTRUMENT_EXP_FALLOFF_MAX 10 /// Minimum volume for when the sound is considered dead. #define INSTRUMENT_MIN_SUSTAIN_DROPOFF 0 @@ -20,5 +20,5 @@ #define SUSTAIN_EXPONENTIAL 2 // /datum/instrument instrument_flags -#define INSTRUMENT_LEGACY (1<<0) //Legacy instrument. Implies INSTRUMENT_DO_NOT_AUTOSAMPLE -#define INSTRUMENT_DO_NOT_AUTOSAMPLE (1<<1) //Do not automatically sample +#define INSTRUMENT_LEGACY (1<<0) //Legacy instrument. Implies INSTRUMENT_DO_NOT_AUTOSAMPLE +#define INSTRUMENT_DO_NOT_AUTOSAMPLE (1<<1) //Do not automatically sample diff --git a/code/__DEFINES/interaction_flags.dm b/code/__DEFINES/interaction_flags.dm index b3f2b9d1c7c..df6ae2d899d 100644 --- a/code/__DEFINES/interaction_flags.dm +++ b/code/__DEFINES/interaction_flags.dm @@ -1,40 +1,40 @@ /// whether can_interact() checks for anchored. only works on movables. -#define INTERACT_ATOM_REQUIRES_ANCHORED (1<<0) +#define INTERACT_ATOM_REQUIRES_ANCHORED (1<<0) /// calls try_interact() on attack_hand() and returns that. -#define INTERACT_ATOM_ATTACK_HAND (1<<1) +#define INTERACT_ATOM_ATTACK_HAND (1<<1) /// automatically calls and returns ui_interact() on interact(). -#define INTERACT_ATOM_UI_INTERACT (1<<2) +#define INTERACT_ATOM_UI_INTERACT (1<<2) /// user must be dextrous -#define INTERACT_ATOM_REQUIRES_DEXTERITY (1<<3) +#define INTERACT_ATOM_REQUIRES_DEXTERITY (1<<3) /// ignores incapacitated check -#define INTERACT_ATOM_IGNORE_INCAPACITATED (1<<4) +#define INTERACT_ATOM_IGNORE_INCAPACITATED (1<<4) /// incapacitated check ignores restrained -#define INTERACT_ATOM_IGNORE_RESTRAINED (1<<5) +#define INTERACT_ATOM_IGNORE_RESTRAINED (1<<5) /// incapacitated check checks grab -#define INTERACT_ATOM_CHECK_GRAB (1<<6) +#define INTERACT_ATOM_CHECK_GRAB (1<<6) /// prevents leaving fingerprints automatically on attack_hand -#define INTERACT_ATOM_NO_FINGERPRINT_ATTACK_HAND (1<<7) +#define INTERACT_ATOM_NO_FINGERPRINT_ATTACK_HAND (1<<7) /// adds hiddenprints instead of fingerprints on interact -#define INTERACT_ATOM_NO_FINGERPRINT_INTERACT (1<<8) +#define INTERACT_ATOM_NO_FINGERPRINT_INTERACT (1<<8) /// attempt pickup on attack_hand for items #define INTERACT_ITEM_ATTACK_HAND_PICKUP (1<<0) /// can_interact() while open -#define INTERACT_MACHINE_OPEN (1<<0) +#define INTERACT_MACHINE_OPEN (1<<0) /// can_interact() while offline -#define INTERACT_MACHINE_OFFLINE (1<<1) +#define INTERACT_MACHINE_OFFLINE (1<<1) /// try to interact with wires if open -#define INTERACT_MACHINE_WIRES_IF_OPEN (1<<2) +#define INTERACT_MACHINE_WIRES_IF_OPEN (1<<2) /// let silicons interact -#define INTERACT_MACHINE_ALLOW_SILICON (1<<3) +#define INTERACT_MACHINE_ALLOW_SILICON (1<<3) /// let silicons interact while open -#define INTERACT_MACHINE_OPEN_SILICON (1<<4) +#define INTERACT_MACHINE_OPEN_SILICON (1<<4) /// must be silicon to interact -#define INTERACT_MACHINE_REQUIRES_SILICON (1<<5) +#define INTERACT_MACHINE_REQUIRES_SILICON (1<<5) /// MACHINES HAVE THIS BY DEFAULT, SOMEONE SHOULD RUN THROUGH MACHINES AND REMOVE IT FROM THINGS LIKE LIGHT SWITCHES WHEN POSSIBLE!!-------------------------- /// This flag determines if a machine set_machine's the user when the user uses it, making updateUsrDialog make the user re-call interact() on it. /// THIS FLAG IS ON ALL MACHINES BY DEFAULT, NEEDS TO BE RE-EVALUATED LATER!! -#define INTERACT_MACHINE_SET_MACHINE (1<<6) +#define INTERACT_MACHINE_SET_MACHINE (1<<6) /// the user must have vision to interact (blind people need not apply) -#define INTERACT_MACHINE_REQUIRES_SIGHT (1<<7) +#define INTERACT_MACHINE_REQUIRES_SIGHT (1<<7) diff --git a/code/__DEFINES/inventory.dm b/code/__DEFINES/inventory.dm index d1e6815c32c..ae88dd313b7 100644 --- a/code/__DEFINES/inventory.dm +++ b/code/__DEFINES/inventory.dm @@ -16,126 +16,126 @@ //Inventory depth: limits how many nested storage items you can access directly. //1: stuff in mob, 2: stuff in backpack, 3: stuff in box in backpack, etc -#define INVENTORY_DEPTH 3 -#define STORAGE_VIEW_DEPTH 2 +#define INVENTORY_DEPTH 3 +#define STORAGE_VIEW_DEPTH 2 //ITEM INVENTORY SLOT BITMASKS /// Suit slot (armors, costumes, space suits, etc.) -#define ITEM_SLOT_OCLOTHING (1<<0) +#define ITEM_SLOT_OCLOTHING (1<<0) /// Jumpsuit slot -#define ITEM_SLOT_ICLOTHING (1<<1) +#define ITEM_SLOT_ICLOTHING (1<<1) /// Glove slot -#define ITEM_SLOT_GLOVES (1<<2) +#define ITEM_SLOT_GLOVES (1<<2) /// Glasses slot -#define ITEM_SLOT_EYES (1<<3) +#define ITEM_SLOT_EYES (1<<3) /// Ear slot (radios, earmuffs) -#define ITEM_SLOT_EARS (1<<4) +#define ITEM_SLOT_EARS (1<<4) /// Mask slot -#define ITEM_SLOT_MASK (1<<5) +#define ITEM_SLOT_MASK (1<<5) /// Head slot (helmets, hats, etc.) -#define ITEM_SLOT_HEAD (1<<6) +#define ITEM_SLOT_HEAD (1<<6) /// Shoe slot -#define ITEM_SLOT_FEET (1<<7) +#define ITEM_SLOT_FEET (1<<7) /// ID slot -#define ITEM_SLOT_ID (1<<8) +#define ITEM_SLOT_ID (1<<8) /// Belt slot -#define ITEM_SLOT_BELT (1<<9) +#define ITEM_SLOT_BELT (1<<9) /// Back slot -#define ITEM_SLOT_BACK (1<<10) +#define ITEM_SLOT_BACK (1<<10) /// Dextrous simplemob "hands" (used for Drones and Dextrous Guardians) -#define ITEM_SLOT_DEX_STORAGE (1<<11) +#define ITEM_SLOT_DEX_STORAGE (1<<11) /// Neck slot (ties, bedsheets, scarves) -#define ITEM_SLOT_NECK (1<<12) +#define ITEM_SLOT_NECK (1<<12) /// A character's hand slots -#define ITEM_SLOT_HANDS (1<<13) +#define ITEM_SLOT_HANDS (1<<13) /// Inside of a character's backpack -#define ITEM_SLOT_BACKPACK (1<<14) +#define ITEM_SLOT_BACKPACK (1<<14) /// Suit Storage slot -#define ITEM_SLOT_SUITSTORE (1<<15) +#define ITEM_SLOT_SUITSTORE (1<<15) /// Left Pocket slot -#define ITEM_SLOT_LPOCKET (1<<16) +#define ITEM_SLOT_LPOCKET (1<<16) /// Right Pocket slot -#define ITEM_SLOT_RPOCKET (1<<17) +#define ITEM_SLOT_RPOCKET (1<<17) /// Handcuff slot -#define ITEM_SLOT_HANDCUFFED (1<<18) +#define ITEM_SLOT_HANDCUFFED (1<<18) /// Legcuff slot (bolas, beartraps) -#define ITEM_SLOT_LEGCUFFED (1<<19) +#define ITEM_SLOT_LEGCUFFED (1<<19) /// Total amount of slots -#define SLOTS_AMT 20 // Keep this up to date! +#define SLOTS_AMT 20 // Keep this up to date! //SLOT GROUP HELPERS -#define ITEM_SLOT_POCKETS (ITEM_SLOT_LPOCKET|ITEM_SLOT_RPOCKET) +#define ITEM_SLOT_POCKETS (ITEM_SLOT_LPOCKET|ITEM_SLOT_RPOCKET) //Bit flags for the flags_inv variable, which determine when a piece of clothing hides another. IE a helmet hiding glasses. //Make sure to update check_obscured_slots() if you add more. -#define HIDEGLOVES (1<<0) -#define HIDESUITSTORAGE (1<<1) -#define HIDEJUMPSUIT (1<<2) //these first four are only used in exterior suits -#define HIDESHOES (1<<3) -#define HIDEMASK (1<<4) //these next seven are only used in masks and headgear. -#define HIDEEARS (1<<5) // (ears means headsets and such) -#define HIDEEYES (1<<6) // Whether eyes and glasses are hidden -#define HIDEFACE (1<<7) // Whether we appear as unknown. -#define HIDEHAIR (1<<8) -#define HIDEFACIALHAIR (1<<9) -#define HIDENECK (1<<10) +#define HIDEGLOVES (1<<0) +#define HIDESUITSTORAGE (1<<1) +#define HIDEJUMPSUIT (1<<2) //these first four are only used in exterior suits +#define HIDESHOES (1<<3) +#define HIDEMASK (1<<4) //these next seven are only used in masks and headgear. +#define HIDEEARS (1<<5) // (ears means headsets and such) +#define HIDEEYES (1<<6) // Whether eyes and glasses are hidden +#define HIDEFACE (1<<7) // Whether we appear as unknown. +#define HIDEHAIR (1<<8) +#define HIDEFACIALHAIR (1<<9) +#define HIDENECK (1<<10) /// for wigs, only obscures the headgear -#define HIDEHEADGEAR (1<<11) +#define HIDEHEADGEAR (1<<11) ///for lizard snouts, because some HIDEFACE clothes don't actually conceal that portion of the head. -#define HIDESNOUT (1<<12) +#define HIDESNOUT (1<<12) //bitflags for clothing coverage - also used for limbs -#define HEAD (1<<0) -#define CHEST (1<<1) -#define GROIN (1<<2) -#define LEG_LEFT (1<<3) -#define LEG_RIGHT (1<<4) -#define LEGS (LEG_LEFT | LEG_RIGHT) -#define FOOT_LEFT (1<<5) -#define FOOT_RIGHT (1<<6) -#define FEET (FOOT_LEFT | FOOT_RIGHT) -#define ARM_LEFT (1<<7) -#define ARM_RIGHT (1<<8) -#define ARMS (ARM_LEFT | ARM_RIGHT) -#define HAND_LEFT (1<<9) -#define HAND_RIGHT (1<<10) -#define HANDS (HAND_LEFT | HAND_RIGHT) -#define NECK (1<<11) -#define FULL_BODY (~0) +#define HEAD (1<<0) +#define CHEST (1<<1) +#define GROIN (1<<2) +#define LEG_LEFT (1<<3) +#define LEG_RIGHT (1<<4) +#define LEGS (LEG_LEFT | LEG_RIGHT) +#define FOOT_LEFT (1<<5) +#define FOOT_RIGHT (1<<6) +#define FEET (FOOT_LEFT | FOOT_RIGHT) +#define ARM_LEFT (1<<7) +#define ARM_RIGHT (1<<8) +#define ARMS (ARM_LEFT | ARM_RIGHT) +#define HAND_LEFT (1<<9) +#define HAND_RIGHT (1<<10) +#define HANDS (HAND_LEFT | HAND_RIGHT) +#define NECK (1<<11) +#define FULL_BODY (~0) //defines for the index of hands #define LEFT_HANDS 1 #define RIGHT_HANDS 2 //flags for female outfits: How much the game can safely "take off" the uniform without it looking weird -#define NO_FEMALE_UNIFORM 0 -#define FEMALE_UNIFORM_FULL 1 -#define FEMALE_UNIFORM_TOP 2 +#define NO_FEMALE_UNIFORM 0 +#define FEMALE_UNIFORM_FULL 1 +#define FEMALE_UNIFORM_TOP 2 //flags for alternate styles: These are hard sprited so don't set this if you didn't put the effort in -#define NORMAL_STYLE 0 -#define ALT_STYLE 1 -#define DIGITIGRADE_STYLE 2 +#define NORMAL_STYLE 0 +#define ALT_STYLE 1 +#define DIGITIGRADE_STYLE 2 //flags for outfits that have mutantrace variants (try not to use this): Currently only needed if you're trying to add tight fitting bootyshorts -#define NO_MUTANTRACE_VARIATION 0 -#define MUTANTRACE_VARIATION 1 +#define NO_MUTANTRACE_VARIATION 0 +#define MUTANTRACE_VARIATION 1 -#define NOT_DIGITIGRADE 0 -#define FULL_DIGITIGRADE 1 -#define SQUISHED_DIGITIGRADE 2 +#define NOT_DIGITIGRADE 0 +#define FULL_DIGITIGRADE 1 +#define SQUISHED_DIGITIGRADE 2 //flags for covering body parts -#define GLASSESCOVERSEYES (1<<0) -#define MASKCOVERSEYES (1<<1) // get rid of some of the other stupidness in these flags -#define HEADCOVERSEYES (1<<2) // feel free to realloc these numbers for other purposes -#define MASKCOVERSMOUTH (1<<3) // on other items, these are just for mask/head -#define HEADCOVERSMOUTH (1<<4) -#define PEPPERPROOF (1<<5) //protects against pepperspray +#define GLASSESCOVERSEYES (1<<0) +#define MASKCOVERSEYES (1<<1) // get rid of some of the other stupidness in these flags +#define HEADCOVERSEYES (1<<2) // feel free to realloc these numbers for other purposes +#define MASKCOVERSMOUTH (1<<3) // on other items, these are just for mask/head +#define HEADCOVERSMOUTH (1<<4) +#define PEPPERPROOF (1<<5) //protects against pepperspray -#define TINT_DARKENED 2 //Threshold of tint level to apply weld mask overlay -#define TINT_BLIND 3 //Threshold of tint level to obscure vision fully +#define TINT_DARKENED 2 //Threshold of tint level to apply weld mask overlay +#define TINT_BLIND 3 //Threshold of tint level to obscure vision fully //Allowed equipment lists for security vests and hardsuits. diff --git a/code/__DEFINES/language.dm b/code/__DEFINES/language.dm index e1cb5cd3fc4..0db55e6eb48 100644 --- a/code/__DEFINES/language.dm +++ b/code/__DEFINES/language.dm @@ -4,21 +4,21 @@ #define LANGUAGE_HIDE_ICON_IF_NOT_UNDERSTOOD 8 // LANGUAGE SOURCE DEFINES -#define LANGUAGE_ALL "all" // For use in full removal only. -#define LANGUAGE_ATOM "atom" -#define LANGUAGE_MIND "mind" +#define LANGUAGE_ALL "all" // For use in full removal only. +#define LANGUAGE_ATOM "atom" +#define LANGUAGE_MIND "mind" -#define LANGUAGE_ABSORB "absorb" -#define LANGUAGE_APHASIA "aphasia" -#define LANGUAGE_CTF "ctf" -#define LANGUAGE_CULTIST "cultist" -#define LANGUAGE_CURATOR "curator" -#define LANGUAGE_GLAND "gland" -#define LANGUAGE_HAT "hat" -#define LANGUAGE_HIGH "high" -#define LANGUAGE_MALF "malf" -#define LANGUAGE_MASTER "master" -#define LANGUAGE_SOFTWARE "software" -#define LANGUAGE_STONER "stoner" -#define LANGUAGE_VOICECHANGE "voicechange" +#define LANGUAGE_ABSORB "absorb" +#define LANGUAGE_APHASIA "aphasia" +#define LANGUAGE_CTF "ctf" +#define LANGUAGE_CULTIST "cultist" +#define LANGUAGE_CURATOR "curator" +#define LANGUAGE_GLAND "gland" +#define LANGUAGE_HAT "hat" +#define LANGUAGE_HIGH "high" +#define LANGUAGE_MALF "malf" +#define LANGUAGE_MASTER "master" +#define LANGUAGE_SOFTWARE "software" +#define LANGUAGE_STONER "stoner" +#define LANGUAGE_VOICECHANGE "voicechange" diff --git a/code/__DEFINES/lighting.dm b/code/__DEFINES/lighting.dm index bd7489935aa..d23ce875b67 100644 --- a/code/__DEFINES/lighting.dm +++ b/code/__DEFINES/lighting.dm @@ -44,7 +44,7 @@ ) \ ///How many tiles standard fires glow. -#define LIGHT_RANGE_FIRE 3 +#define LIGHT_RANGE_FIRE 3 #define LIGHTING_PLANE_ALPHA_VISIBLE 255 #define LIGHTING_PLANE_ALPHA_NV_TRAIT 245 diff --git a/code/__DEFINES/logging.dm b/code/__DEFINES/logging.dm index fb49d8259fd..863c65f05ce 100644 --- a/code/__DEFINES/logging.dm +++ b/code/__DEFINES/logging.dm @@ -1,54 +1,54 @@ //Investigate logging defines -#define INVESTIGATE_ATMOS "atmos" -#define INVESTIGATE_BOTANY "botany" -#define INVESTIGATE_CARGO "cargo" -#define INVESTIGATE_EXPERIMENTOR "experimentor" -#define INVESTIGATE_GRAVITY "gravity" -#define INVESTIGATE_RECORDS "records" -#define INVESTIGATE_SINGULO "singulo" -#define INVESTIGATE_SUPERMATTER "supermatter" -#define INVESTIGATE_TELESCI "telesci" -#define INVESTIGATE_WIRES "wires" -#define INVESTIGATE_PORTAL "portals" -#define INVESTIGATE_RESEARCH "research" -#define INVESTIGATE_HALLUCINATIONS "hallucinations" -#define INVESTIGATE_RADIATION "radiation" -#define INVESTIGATE_EXONET "exonet" -#define INVESTIGATE_NANITES "nanites" -#define INVESTIGATE_PRESENTS "presents" -#define INVESTIGATE_HYPERTORUS "hypertorus" -#define INVESTIGATE_ACCESSCHANGES "id_card_changes" +#define INVESTIGATE_ATMOS "atmos" +#define INVESTIGATE_BOTANY "botany" +#define INVESTIGATE_CARGO "cargo" +#define INVESTIGATE_EXPERIMENTOR "experimentor" +#define INVESTIGATE_GRAVITY "gravity" +#define INVESTIGATE_RECORDS "records" +#define INVESTIGATE_SINGULO "singulo" +#define INVESTIGATE_SUPERMATTER "supermatter" +#define INVESTIGATE_TELESCI "telesci" +#define INVESTIGATE_WIRES "wires" +#define INVESTIGATE_PORTAL "portals" +#define INVESTIGATE_RESEARCH "research" +#define INVESTIGATE_HALLUCINATIONS "hallucinations" +#define INVESTIGATE_RADIATION "radiation" +#define INVESTIGATE_EXONET "exonet" +#define INVESTIGATE_NANITES "nanites" +#define INVESTIGATE_PRESENTS "presents" +#define INVESTIGATE_HYPERTORUS "hypertorus" +#define INVESTIGATE_ACCESSCHANGES "id_card_changes" // Logging types for log_message() -#define LOG_ATTACK (1 << 0) -#define LOG_SAY (1 << 1) -#define LOG_WHISPER (1 << 2) -#define LOG_EMOTE (1 << 3) -#define LOG_DSAY (1 << 4) -#define LOG_PDA (1 << 5) -#define LOG_CHAT (1 << 6) -#define LOG_COMMENT (1 << 7) -#define LOG_TELECOMMS (1 << 8) -#define LOG_OOC (1 << 9) -#define LOG_ADMIN (1 << 10) -#define LOG_OWNERSHIP (1 << 11) -#define LOG_GAME (1 << 12) -#define LOG_ADMIN_PRIVATE (1 << 13) -#define LOG_ASAY (1 << 14) -#define LOG_MECHA (1 << 15) -#define LOG_VIRUS (1 << 16) -#define LOG_CLONING (1 << 17) -#define LOG_SHUTTLE (1 << 18) -#define LOG_ECON (1 << 19) +#define LOG_ATTACK (1 << 0) +#define LOG_SAY (1 << 1) +#define LOG_WHISPER (1 << 2) +#define LOG_EMOTE (1 << 3) +#define LOG_DSAY (1 << 4) +#define LOG_PDA (1 << 5) +#define LOG_CHAT (1 << 6) +#define LOG_COMMENT (1 << 7) +#define LOG_TELECOMMS (1 << 8) +#define LOG_OOC (1 << 9) +#define LOG_ADMIN (1 << 10) +#define LOG_OWNERSHIP (1 << 11) +#define LOG_GAME (1 << 12) +#define LOG_ADMIN_PRIVATE (1 << 13) +#define LOG_ASAY (1 << 14) +#define LOG_MECHA (1 << 15) +#define LOG_VIRUS (1 << 16) +#define LOG_CLONING (1 << 17) +#define LOG_SHUTTLE (1 << 18) +#define LOG_ECON (1 << 19) //Individual logging panel pages -#define INDIVIDUAL_ATTACK_LOG (LOG_ATTACK) -#define INDIVIDUAL_SAY_LOG (LOG_SAY | LOG_WHISPER | LOG_DSAY) -#define INDIVIDUAL_EMOTE_LOG (LOG_EMOTE) -#define INDIVIDUAL_COMMS_LOG (LOG_PDA | LOG_CHAT | LOG_COMMENT | LOG_TELECOMMS) -#define INDIVIDUAL_OOC_LOG (LOG_OOC | LOG_ADMIN) -#define INDIVIDUAL_OWNERSHIP_LOG (LOG_OWNERSHIP) -#define INDIVIDUAL_SHOW_ALL_LOG (LOG_ATTACK | LOG_SAY | LOG_WHISPER | LOG_EMOTE | LOG_DSAY | LOG_PDA | LOG_CHAT | LOG_COMMENT | LOG_TELECOMMS | LOG_OOC | LOG_ADMIN | LOG_OWNERSHIP | LOG_GAME | LOG_ADMIN_PRIVATE | LOG_ASAY | LOG_MECHA | LOG_VIRUS | LOG_CLONING | LOG_SHUTTLE | LOG_ECON) +#define INDIVIDUAL_ATTACK_LOG (LOG_ATTACK) +#define INDIVIDUAL_SAY_LOG (LOG_SAY | LOG_WHISPER | LOG_DSAY) +#define INDIVIDUAL_EMOTE_LOG (LOG_EMOTE) +#define INDIVIDUAL_COMMS_LOG (LOG_PDA | LOG_CHAT | LOG_COMMENT | LOG_TELECOMMS) +#define INDIVIDUAL_OOC_LOG (LOG_OOC | LOG_ADMIN) +#define INDIVIDUAL_OWNERSHIP_LOG (LOG_OWNERSHIP) +#define INDIVIDUAL_SHOW_ALL_LOG (LOG_ATTACK | LOG_SAY | LOG_WHISPER | LOG_EMOTE | LOG_DSAY | LOG_PDA | LOG_CHAT | LOG_COMMENT | LOG_TELECOMMS | LOG_OOC | LOG_ADMIN | LOG_OWNERSHIP | LOG_GAME | LOG_ADMIN_PRIVATE | LOG_ASAY | LOG_MECHA | LOG_VIRUS | LOG_CLONING | LOG_SHUTTLE | LOG_ECON) #define LOGSRC_CLIENT "Client" #define LOGSRC_MOB "Mob" diff --git a/code/__DEFINES/machines.dm b/code/__DEFINES/machines.dm index 0c554b3139e..e66543fbec4 100644 --- a/code/__DEFINES/machines.dm +++ b/code/__DEFINES/machines.dm @@ -1,11 +1,11 @@ // channel numbers for power // These are indexes in a list, and indexes for "dynamic" and static channels should be kept contiguous -#define AREA_USAGE_EQUIP 1 -#define AREA_USAGE_LIGHT 2 -#define AREA_USAGE_ENVIRON 3 -#define AREA_USAGE_STATIC_EQUIP 4 -#define AREA_USAGE_STATIC_LIGHT 5 -#define AREA_USAGE_STATIC_ENVIRON 6 +#define AREA_USAGE_EQUIP 1 +#define AREA_USAGE_LIGHT 2 +#define AREA_USAGE_ENVIRON 3 +#define AREA_USAGE_STATIC_EQUIP 4 +#define AREA_USAGE_STATIC_LIGHT 5 +#define AREA_USAGE_STATIC_ENVIRON 6 #define AREA_USAGE_LEN AREA_USAGE_STATIC_ENVIRON // largest idx /// Index of the first dynamic usage channel #define AREA_USAGE_DYNAMIC_START AREA_USAGE_EQUIP @@ -23,24 +23,24 @@ #define ACTIVE_POWER_USE 2 /// Bitflags for a machine's preferences on when it should start processing. For use with machinery's `processing_flags` var. -#define START_PROCESSING_ON_INIT (1<<0) /// Indicates the machine will automatically start processing right after it's `Initialize()` is ran. -#define START_PROCESSING_MANUALLY (1<<1) /// Machines with this flag will not start processing when it's spawned. Use this if you want to manually control when a machine starts processing. +#define START_PROCESSING_ON_INIT (1<<0) /// Indicates the machine will automatically start processing right after it's `Initialize()` is ran. +#define START_PROCESSING_MANUALLY (1<<1) /// Machines with this flag will not start processing when it's spawned. Use this if you want to manually control when a machine starts processing. //bitflags for door switches. -#define OPEN (1<<0) -#define IDSCAN (1<<1) -#define BOLTS (1<<2) -#define SHOCK (1<<3) -#define SAFE (1<<4) +#define OPEN (1<<0) +#define IDSCAN (1<<1) +#define BOLTS (1<<2) +#define SHOCK (1<<3) +#define SAFE (1<<4) //used in design to specify which machine can build it -#define IMPRINTER (1<<0) //For circuits. Uses glass/chemicals. -#define PROTOLATHE (1<<1) //New stuff. Uses various minerals -#define AUTOLATHE (1<<2) //Prints basic designs without research -#define MECHFAB (1<<3) //Remember, objects utilising this flag should have construction_time and construction_cost vars. -#define BIOGENERATOR (1<<4) //Uses biomass -#define LIMBGROWER (1<<5) //Uses synthetic flesh -#define SMELTER (1<<6) //uses various minerals +#define IMPRINTER (1<<0) //For circuits. Uses glass/chemicals. +#define PROTOLATHE (1<<1) //New stuff. Uses various minerals +#define AUTOLATHE (1<<2) //Prints basic designs without research +#define MECHFAB (1<<3) //Remember, objects utilising this flag should have construction_time and construction_cost vars. +#define BIOGENERATOR (1<<4) //Uses biomass +#define LIMBGROWER (1<<5) //Uses synthetic flesh +#define SMELTER (1<<6) //uses various minerals #define NANITE_COMPILER (1<<7) //Prints nanite disks //Note: More than one of these can be added to a design but imprinter and lathe designs are incompatable. @@ -61,25 +61,25 @@ //NTNet stuff, for modular computers // NTNet module-configuration values. Do not change these. If you need to add another use larger number (5..6..7 etc) -#define NTNET_SOFTWAREDOWNLOAD 1 // Downloads of software from NTNet -#define NTNET_PEERTOPEER 2 // P2P transfers of files between devices -#define NTNET_COMMUNICATION 3 // Communication (messaging) -#define NTNET_SYSTEMCONTROL 4 // Control of various systems, RCon, air alarm control, etc. +#define NTNET_SOFTWAREDOWNLOAD 1 // Downloads of software from NTNet +#define NTNET_PEERTOPEER 2 // P2P transfers of files between devices +#define NTNET_COMMUNICATION 3 // Communication (messaging) +#define NTNET_SYSTEMCONTROL 4 // Control of various systems, RCon, air alarm control, etc. //NTNet transfer speeds, used when downloading/uploading a file/program. -#define NTNETSPEED_LOWSIGNAL 0.5 // GQ/s transfer speed when the device is wirelessly connected and on Low signal -#define NTNETSPEED_HIGHSIGNAL 1 // GQ/s transfer speed when the device is wirelessly connected and on High signal -#define NTNETSPEED_ETHERNET 2 // GQ/s transfer speed when the device is using wired connection +#define NTNETSPEED_LOWSIGNAL 0.5 // GQ/s transfer speed when the device is wirelessly connected and on Low signal +#define NTNETSPEED_HIGHSIGNAL 1 // GQ/s transfer speed when the device is wirelessly connected and on High signal +#define NTNETSPEED_ETHERNET 2 // GQ/s transfer speed when the device is using wired connection //Caps for NTNet logging. Less than 10 would make logging useless anyway, more than 500 may make the log browser too laggy. Defaults to 100 unless user changes it. #define MAX_NTNET_LOGS 300 #define MIN_NTNET_LOGS 10 //Program bitflags -#define PROGRAM_ALL (~0) -#define PROGRAM_CONSOLE (1<<0) -#define PROGRAM_LAPTOP (1<<1) -#define PROGRAM_TABLET (1<<2) +#define PROGRAM_ALL (~0) +#define PROGRAM_CONSOLE (1<<0) +#define PROGRAM_LAPTOP (1<<1) +#define PROGRAM_TABLET (1<<2) //Program states #define PROGRAM_STATE_KILLED 0 #define PROGRAM_STATE_BACKGROUND 1 @@ -97,29 +97,29 @@ // These are used by supermatter and supermatter monitor program, mostly for UI updating purposes. Higher should always be worse! -#define SUPERMATTER_ERROR -1 // Unknown status, shouldn't happen but just in case. -#define SUPERMATTER_INACTIVE 0 // No or minimal energy -#define SUPERMATTER_NORMAL 1 // Normal operation -#define SUPERMATTER_NOTIFY 2 // Ambient temp > 80% of CRITICAL_TEMPERATURE -#define SUPERMATTER_WARNING 3 // Ambient temp > CRITICAL_TEMPERATURE OR integrity damaged -#define SUPERMATTER_DANGER 4 // Integrity < 50% -#define SUPERMATTER_EMERGENCY 5 // Integrity < 25% -#define SUPERMATTER_DELAMINATING 6 // Pretty obvious. +#define SUPERMATTER_ERROR -1 // Unknown status, shouldn't happen but just in case. +#define SUPERMATTER_INACTIVE 0 // No or minimal energy +#define SUPERMATTER_NORMAL 1 // Normal operation +#define SUPERMATTER_NOTIFY 2 // Ambient temp > 80% of CRITICAL_TEMPERATURE +#define SUPERMATTER_WARNING 3 // Ambient temp > CRITICAL_TEMPERATURE OR integrity damaged +#define SUPERMATTER_DANGER 4 // Integrity < 50% +#define SUPERMATTER_EMERGENCY 5 // Integrity < 25% +#define SUPERMATTER_DELAMINATING 6 // Pretty obvious. -#define HYPERTORUS_INACTIVE 0 // No or minimal energy -#define HYPERTORUS_NOMINAL 1 // Normal operation -#define HYPERTORUS_WARNING 2 // Integrity damaged -#define HYPERTORUS_DANGER 3 // Integrity < 50% -#define HYPERTORUS_EMERGENCY 4 // Integrity < 25% -#define HYPERTORUS_MELTING 5 // Pretty obvious. +#define HYPERTORUS_INACTIVE 0 // No or minimal energy +#define HYPERTORUS_NOMINAL 1 // Normal operation +#define HYPERTORUS_WARNING 2 // Integrity damaged +#define HYPERTORUS_DANGER 3 // Integrity < 50% +#define HYPERTORUS_EMERGENCY 4 // Integrity < 25% +#define HYPERTORUS_MELTING 5 // Pretty obvious. //Nuclear bomb stuff -#define NUKESTATE_INTACT 5 -#define NUKESTATE_UNSCREWED 4 -#define NUKESTATE_PANEL_REMOVED 3 -#define NUKESTATE_WELDED 2 -#define NUKESTATE_CORE_EXPOSED 1 -#define NUKESTATE_CORE_REMOVED 0 +#define NUKESTATE_INTACT 5 +#define NUKESTATE_UNSCREWED 4 +#define NUKESTATE_PANEL_REMOVED 3 +#define NUKESTATE_WELDED 2 +#define NUKESTATE_CORE_EXPOSED 1 +#define NUKESTATE_CORE_REMOVED 0 #define NUKEUI_AWAIT_DISK 0 #define NUKEUI_AWAIT_CODE 1 @@ -128,18 +128,18 @@ #define NUKEUI_TIMING 4 #define NUKEUI_EXPLODED 5 -#define NUKE_OFF_LOCKED 0 -#define NUKE_OFF_UNLOCKED 1 -#define NUKE_ON_TIMING 2 -#define NUKE_ON_EXPLODING 3 +#define NUKE_OFF_LOCKED 0 +#define NUKE_OFF_UNLOCKED 1 +#define NUKE_ON_TIMING 2 +#define NUKE_ON_EXPLODING 3 #define MACHINE_NOT_ELECTRIFIED 0 #define MACHINE_ELECTRIFIED_PERMANENT -1 #define MACHINE_DEFAULT_ELECTRIFY_TIME 30 //these flags are used to tell the DNA modifier if a plant gene cannot be extracted or modified. -#define PLANT_GENE_REMOVABLE (1<<0) -#define PLANT_GENE_EXTRACTABLE (1<<1) +#define PLANT_GENE_REMOVABLE (1<<0) +#define PLANT_GENE_EXTRACTABLE (1<<1) //mass drivers and related machinery #define MASSDRIVER_TOXINS "toxinsdriver" diff --git a/code/__DEFINES/maps.dm b/code/__DEFINES/maps.dm index 8615214d252..8f08dfcf67a 100644 --- a/code/__DEFINES/maps.dm +++ b/code/__DEFINES/maps.dm @@ -96,7 +96,7 @@ require only minor tweaks. #define CAMERA_LOCK_CENTCOM 4 //Reserved/Transit turf type -#define RESERVED_TURF_TYPE /turf/open/space/basic //What the turf is when not being used +#define RESERVED_TURF_TYPE /turf/open/space/basic //What the turf is when not being used //Ruin Generation diff --git a/code/__DEFINES/materials.dm b/code/__DEFINES/materials.dm index 2914384d463..f2b6af0aeaf 100644 --- a/code/__DEFINES/materials.dm +++ b/code/__DEFINES/materials.dm @@ -11,39 +11,39 @@ #define MAT_CATEGORY_BASE_RECIPES "basic recipes" /// Used to make a material initialize at roundstart. -#define MATERIAL_INIT_MAPLOAD (1<<0) +#define MATERIAL_INIT_MAPLOAD (1<<0) /// Used to make a material type able to be instantiated on demand after roundstart. -#define MATERIAL_INIT_BESPOKE (1<<1) +#define MATERIAL_INIT_BESPOKE (1<<1) //Material Container Flags. ///If the container shows the amount of contained materials on examine. -#define MATCONTAINER_EXAMINE (1<<0) +#define MATCONTAINER_EXAMINE (1<<0) ///If the container cannot have materials inserted through attackby(). -#define MATCONTAINER_NO_INSERT (1<<1) +#define MATCONTAINER_NO_INSERT (1<<1) ///if the user can insert mats into the container despite the intent. -#define MATCONTAINER_ANY_INTENT (1<<2) +#define MATCONTAINER_ANY_INTENT (1<<2) ///if the user won't receive a warning when attacking the container with an unallowed item. -#define MATCONTAINER_SILENT (1<<3) +#define MATCONTAINER_SILENT (1<<3) // The following flags are for decomposing alloys. Should be expanded upon and diversified once someone gets around to reworking recycling. /// Can reduce an alloy into its component materials. -#define BREAKDOWN_ALLOYS (1<<4) +#define BREAKDOWN_ALLOYS (1<<4) /// Makes the material composition include transmuted materials objects -#define BREAKDOWN_INCLUDE_ALCHEMY (1<<5) +#define BREAKDOWN_INCLUDE_ALCHEMY (1<<5) /// Breakdown flags used by techfabs and circuit printers. -#define BREAKDOWN_FLAGS_LATHE (BREAKDOWN_ALLOYS) +#define BREAKDOWN_FLAGS_LATHE (BREAKDOWN_ALLOYS) /// Breakdown flags used by the ORM. -#define BREAKDOWN_FLAGS_ORM (BREAKDOWN_ALLOYS) +#define BREAKDOWN_FLAGS_ORM (BREAKDOWN_ALLOYS) /// Breakdown flags used by the recycler. -#define BREAKDOWN_FLAGS_RECYCLER (BREAKDOWN_ALLOYS) +#define BREAKDOWN_FLAGS_RECYCLER (BREAKDOWN_ALLOYS) /// Breakdown flags used by the sheetifier. -#define BREAKDOWN_FLAGS_SHEETIFIER (BREAKDOWN_ALLOYS) +#define BREAKDOWN_FLAGS_SHEETIFIER (BREAKDOWN_ALLOYS) /// Breakdown flags used by the ore processor. -#define BREAKDOWN_FLAGS_ORE_PROCESSOR (BREAKDOWN_ALLOYS) +#define BREAKDOWN_FLAGS_ORE_PROCESSOR (BREAKDOWN_ALLOYS) /// Breakdown flags used by the drone dispenser. -#define BREAKDOWN_FLAGS_DRONE_DISPENSER (BREAKDOWN_ALLOYS) +#define BREAKDOWN_FLAGS_DRONE_DISPENSER (BREAKDOWN_ALLOYS) /// Breakdown flags used when exporting materials. -#define BREAKDOWN_FLAGS_EXPORT (NONE) +#define BREAKDOWN_FLAGS_EXPORT (NONE) /// Flag for atoms, this flag ensures it isn't re-colored by materials. Useful for snowflake icons such as default toolboxes. #define MATERIAL_COLOR (1<<0) @@ -60,6 +60,6 @@ // Slowdown values. /// The slowdown value of one [MINERAL_MATERIAL_AMOUNT] of plasteel. -#define MATERIAL_SLOWDOWN_PLASTEEL (0.05) +#define MATERIAL_SLOWDOWN_PLASTEEL (0.05) /// The slowdown value of one [MINERAL_MATERIAL_AMOUNT] of alien alloy. -#define MATERIAL_SLOWDOWN_ALIEN_ALLOY (0.1) +#define MATERIAL_SLOWDOWN_ALIEN_ALLOY (0.1) diff --git a/code/__DEFINES/maths.dm b/code/__DEFINES/maths.dm index 417caf28ca3..0b978632549 100644 --- a/code/__DEFINES/maths.dm +++ b/code/__DEFINES/maths.dm @@ -4,8 +4,8 @@ #define NUM_E 2.71828183 -#define PI 3.1416 -#define INFINITY 1e31 //closer then enough +#define PI 3.1416 +#define INFINITY 1e31 //closer then enough #define SHORT_REAL_LIMIT 16777216 @@ -94,7 +94,7 @@ /proc/SolveQuadratic(a, b, c) ASSERT(a) . = list() - var/d = b*b - 4 * a * c + var/d = b*b - 4 * a * c var/bottom = 2 * a if(d < 0) return diff --git a/code/__DEFINES/mecha.dm b/code/__DEFINES/mecha.dm index 72839d293c7..4689591960b 100644 --- a/code/__DEFINES/mecha.dm +++ b/code/__DEFINES/mecha.dm @@ -1,18 +1,18 @@ -#define MECHA_INT_FIRE (1<<0) -#define MECHA_INT_TEMP_CONTROL (1<<1) -#define MECHA_INT_SHORT_CIRCUIT (1<<2) -#define MECHA_INT_TANK_BREACH (1<<3) -#define MECHA_INT_CONTROL_LOST (1<<4) +#define MECHA_INT_FIRE (1<<0) +#define MECHA_INT_TEMP_CONTROL (1<<1) +#define MECHA_INT_SHORT_CIRCUIT (1<<2) +#define MECHA_INT_TANK_BREACH (1<<3) +#define MECHA_INT_CONTROL_LOST (1<<4) -#define ADDING_ACCESS_POSSIBLE (1<<0) -#define ADDING_MAINT_ACCESS_POSSIBLE (1<<1) -#define CANSTRAFE (1<<2) -#define LIGHTS_ON (1<<3) -#define SILICON_PILOT (1<<4) -#define IS_ENCLOSED (1<<5) -#define HAS_LIGHTS (1<<6) -#define QUIET_STEPS (1<<7) -#define QUIET_TURNS (1<<8) +#define ADDING_ACCESS_POSSIBLE (1<<0) +#define ADDING_MAINT_ACCESS_POSSIBLE (1<<1) +#define CANSTRAFE (1<<2) +#define LIGHTS_ON (1<<3) +#define SILICON_PILOT (1<<4) +#define IS_ENCLOSED (1<<5) +#define HAS_LIGHTS (1<<6) +#define QUIET_STEPS (1<<7) +#define QUIET_TURNS (1<<8) #define MECHA_MELEE (1 << 0) #define MECHA_RANGED (1 << 1) diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm index f8ed791c3f4..8b6dca0ff4d 100644 --- a/code/__DEFINES/misc.dm +++ b/code/__DEFINES/misc.dm @@ -4,83 +4,82 @@ // #define EAST 4 // #define WEST 8 -#define TEXT_NORTH "[NORTH]" -#define TEXT_SOUTH "[SOUTH]" -#define TEXT_EAST "[EAST]" -#define TEXT_WEST "[WEST]" +#define TEXT_NORTH "[NORTH]" +#define TEXT_SOUTH "[SOUTH]" +#define TEXT_EAST "[EAST]" +#define TEXT_WEST "[WEST]" /// Inverse direction, taking into account UP|DOWN if necessary. #define REVERSE_DIR(dir) ( ((dir & 85) << 1) | ((dir & 170) >> 1) ) //Human Overlays Indexes///////// -#define MUTATIONS_LAYER 29 //mutations. Tk headglows, cold resistance glow, etc -#define BODY_BEHIND_LAYER 28 //certain mutantrace features (tail when looking south) that must appear behind the body parts -#define BODYPARTS_LAYER 27 //Initially "AUGMENTS", this was repurposed to be a catch-all bodyparts flag -#define BODY_ADJ_LAYER 26 //certain mutantrace features (snout, body markings) that must appear above the body parts -#define BODY_LAYER 25 //underwear, undershirts, socks, eyes, lips(makeup) -#define FRONT_MUTATIONS_LAYER 24 //mutations that should appear above body, body_adj and bodyparts layer (e.g. laser eyes) -#define DAMAGE_LAYER 23 //damage indicators (cuts and burns) -#define UNIFORM_LAYER 22 -#define BANDAGE_LAYER 21 //Overlays related to wounds, bandages and splints too //SKYRAT EDIT ADDITION - MEDICAL -#define ID_LAYER 20 //lmao at the idiot who put both ids and hands on the same layer -#define HANDS_PART_LAYER 19 -#define GLOVES_LAYER 18 -#define SHOES_LAYER 17 -#define EARS_LAYER 16 -#define SUIT_LAYER 15 -#define GLASSES_LAYER 14 -#define BELT_LAYER 13 //Possible make this an overlay of somethign required to wear a belt? -#define SUIT_STORE_LAYER 12 -#define NECK_LAYER 11 -#define BACK_LAYER 10 -#define HAIR_LAYER 9 //TODO: make part of head layer? -#define FACEMASK_LAYER 8 -#define HEAD_LAYER 7 -#define HANDCUFF_LAYER 6 -#define LEGCUFF_LAYER 5 -#define HANDS_LAYER 4 -#define BODY_FRONT_LAYER 3 -#define HALO_LAYER 2 //blood cult ascended halo, because there's currently no better solution for adding/removing -#define FIRE_LAYER 1 //If you're on fire -#define TOTAL_LAYERS 29 //KEEP THIS UP-TO-DATE OR SHIT WILL BREAK ;_; //SKYRAT EDIT CHANGE - 29 from 28. Added BANDAGE_LAYER +#define MUTATIONS_LAYER 29 //mutations. Tk headglows, cold resistance glow, etc +#define BODY_BEHIND_LAYER 28 //certain mutantrace features (tail when looking south) that must appear behind the body parts +#define BODYPARTS_LAYER 27 //Initially "AUGMENTS", this was repurposed to be a catch-all bodyparts flag +#define BODY_ADJ_LAYER 26 //certain mutantrace features (snout, body markings) that must appear above the body parts +#define BODY_LAYER 25 //underwear, undershirts, socks, eyes, lips(makeup) +#define FRONT_MUTATIONS_LAYER 24 //mutations that should appear above body, body_adj and bodyparts layer (e.g. laser eyes) +#define DAMAGE_LAYER 23 //damage indicators (cuts and burns) +#define UNIFORM_LAYER 22 +#define BANDAGE_LAYER 21 //Overlays related to wounds, bandages and splints too //SKYRAT EDIT ADDITION - MEDICAL +#define ID_LAYER 20 //lmao at the idiot who put both ids and hands on the same layer +#define HANDS_PART_LAYER 19 +#define GLOVES_LAYER 18 +#define SHOES_LAYER 17 +#define EARS_LAYER 16 +#define SUIT_LAYER 15 +#define GLASSES_LAYER 14 +#define BELT_LAYER 13 //Possible make this an overlay of somethign required to wear a belt? +#define SUIT_STORE_LAYER 12 +#define NECK_LAYER 11 +#define BACK_LAYER 10 +#define HAIR_LAYER 9 //TODO: make part of head layer? +#define FACEMASK_LAYER 8 +#define HEAD_LAYER 7 +#define HANDCUFF_LAYER 6 +#define LEGCUFF_LAYER 5 +#define HANDS_LAYER 4 +#define BODY_FRONT_LAYER 3 +#define HALO_LAYER 2 //blood cult ascended halo, because there's currently no better solution for adding/removing +#define FIRE_LAYER 1 //If you're on fire +#define TOTAL_LAYERS 29 //KEEP THIS UP-TO-DATE OR SHIT WILL BREAK ;_; //SKYRAT EDIT CHANGE - 29 from 28. Added BANDAGE_LAYER //Human Overlay Index Shortcuts for alternate_worn_layer, layers //Because I *KNOW* somebody will think layer+1 means "above" //IT DOESN'T OK, IT MEANS "UNDER" -#define UNDER_SUIT_LAYER (SUIT_LAYER+1) -#define UNDER_HEAD_LAYER (HEAD_LAYER+1) +#define UNDER_SUIT_LAYER (SUIT_LAYER+1) +#define UNDER_HEAD_LAYER (HEAD_LAYER+1) //AND -1 MEANS "ABOVE", OK?, OK!?! -#define ABOVE_SHOES_LAYER (SHOES_LAYER-1) -#define ABOVE_BODY_FRONT_LAYER (BODY_FRONT_LAYER-1) +#define ABOVE_SHOES_LAYER (SHOES_LAYER-1) +#define ABOVE_BODY_FRONT_LAYER (BODY_FRONT_LAYER-1) //SKYRAT EDIT REMOVAL BEGIN - ALERTS (moved to modular defines) /* //Security levels -#define SEC_LEVEL_GREEN 0 -#define SEC_LEVEL_BLUE 1 -#define SEC_LEVEL_RED 2 -#define SEC_LEVEL_DELTA 3 +#define SEC_LEVEL_GREEN 0 +#define SEC_LEVEL_BLUE 1 +#define SEC_LEVEL_RED 2 +#define SEC_LEVEL_DELTA 3 */ //SKYRAT EDIT END - //some arbitrary defines to be used by self-pruning global lists. (see master_controller) -#define PROCESS_KILL 26 //Used to trigger removal from a processing list +#define PROCESS_KILL 26 //Used to trigger removal from a processing list // Cargo-related stuff. -#define MANIFEST_ERROR_CHANCE 5 -#define MANIFEST_ERROR_NAME 1 -#define MANIFEST_ERROR_CONTENTS 2 -#define MANIFEST_ERROR_ITEM 4 +#define MANIFEST_ERROR_CHANCE 5 +#define MANIFEST_ERROR_NAME 1 +#define MANIFEST_ERROR_CONTENTS 2 +#define MANIFEST_ERROR_ITEM 4 -#define TRANSITIONEDGE 7 //Distance from edge to move to another z-level +#define TRANSITIONEDGE 7 //Distance from edge to move to another z-level //used by canUseTopic() -#define BE_CLOSE TRUE //in the case of a silicon, to select if they need to be next to the atom -#define NO_DEXTERITY TRUE //if other mobs (monkeys, aliens, etc) can use this // I had to change 20+ files because some non-dnd-playing fuckchumbis can't spell "dexterity" -#define NO_TK TRUE // if you can't use it from a distance with telekinesis -#define FLOOR_OKAY TRUE // if you can use it while resting +#define BE_CLOSE TRUE //in the case of a silicon, to select if they need to be next to the atom +#define NO_DEXTERITY TRUE //if other mobs (monkeys, aliens, etc) can use this // I had to change 20+ files because some non-dnd-playing fuckchumbis can't spell "dexterity" +#define NO_TK TRUE // if you can't use it from a distance with telekinesis +#define FLOOR_OKAY TRUE // if you can use it while resting //singularity defines #define STAGE_ONE 1 @@ -91,11 +90,11 @@ #define STAGE_SIX 11 //From supermatter shard //SSticker.current_state values -#define GAME_STATE_STARTUP 0 -#define GAME_STATE_PREGAME 1 -#define GAME_STATE_SETTING_UP 2 -#define GAME_STATE_PLAYING 3 -#define GAME_STATE_FINISHED 4 +#define GAME_STATE_STARTUP 0 +#define GAME_STATE_PREGAME 1 +#define GAME_STATE_SETTING_UP 2 +#define GAME_STATE_PLAYING 3 +#define GAME_STATE_FINISHED 4 //FONTS: // Used by Paper and PhotoCopier (and PaperBin once a year). @@ -112,14 +111,14 @@ #define RESIZE_DEFAULT_SIZE 1 //transfer_ai() defines. Main proc in ai_core.dm -#define AI_TRANS_TO_CARD 1 //Downloading AI to InteliCard. -#define AI_TRANS_FROM_CARD 2 //Uploading AI from InteliCard -#define AI_MECH_HACK 3 //Malfunctioning AI hijacking mecha +#define AI_TRANS_TO_CARD 1 //Downloading AI to InteliCard. +#define AI_TRANS_FROM_CARD 2 //Uploading AI from InteliCard +#define AI_MECH_HACK 3 //Malfunctioning AI hijacking mecha //check_target_facings() return defines -#define FACING_SAME_DIR 1 -#define FACING_EACHOTHER 2 -#define FACING_INIT_FACING_TARGET_TARGET_FACING_PERPENDICULAR 3 //Do I win the most informative but also most stupid define award? +#define FACING_SAME_DIR 1 +#define FACING_EACHOTHER 2 +#define FACING_INIT_FACING_TARGET_TARGET_FACING_PERPENDICULAR 3 //Do I win the most informative but also most stupid define award? //stages of shoe tying-ness #define SHOES_UNTIED 0 @@ -127,10 +126,10 @@ #define SHOES_KNOTTED 2 //how fast a disposal machinery thing is ejecting things -#define EJECT_SPEED_SLOW 1 -#define EJECT_SPEED_MED 2 -#define EJECT_SPEED_FAST 4 -#define EJECT_SPEED_YEET 6 +#define EJECT_SPEED_SLOW 1 +#define EJECT_SPEED_MED 2 +#define EJECT_SPEED_FAST 4 +#define EJECT_SPEED_YEET 6 //Cache of bloody footprint images //Key: @@ -146,10 +145,10 @@ GLOBAL_LIST_EMPTY(bloody_footprints_cache) #define BLOOD_FOOTPRINTS_MIN 5 /// How much blood a footprint need to at least contain //Bloody shoe blood states -#define BLOOD_STATE_HUMAN "blood" -#define BLOOD_STATE_XENO "xeno" -#define BLOOD_STATE_OIL "oil" -#define BLOOD_STATE_NOT_BLOODY "no blood whatsoever" +#define BLOOD_STATE_HUMAN "blood" +#define BLOOD_STATE_XENO "xeno" +#define BLOOD_STATE_OIL "oil" +#define BLOOD_STATE_NOT_BLOODY "no blood whatsoever" //suit sensors: sensor_mode defines @@ -166,12 +165,12 @@ GLOBAL_LIST_EMPTY(bloody_footprints_cache) #define LOCKED_SENSORS 2 //Wet floor type flags. Stronger ones should be higher in number. -#define TURF_DRY (0) -#define TURF_WET_WATER (1<<0) -#define TURF_WET_PERMAFROST (1<<1) -#define TURF_WET_ICE (1<<2) -#define TURF_WET_LUBE (1<<3) -#define TURF_WET_SUPERLUBE (1<<4) +#define TURF_DRY (0) +#define TURF_WET_WATER (1<<0) +#define TURF_WET_PERMAFROST (1<<1) +#define TURF_WET_ICE (1<<2) +#define TURF_WET_LUBE (1<<3) +#define TURF_WET_SUPERLUBE (1<<4) #define IS_WET_OPEN_TURF(O) O.GetComponent(/datum/component/wet_floor) @@ -179,11 +178,11 @@ GLOBAL_LIST_EMPTY(bloody_footprints_cache) #define MAXIMUM_WET_TIME 5 MINUTES //unmagic-strings for types of polls -#define POLLTYPE_OPTION "OPTION" -#define POLLTYPE_TEXT "TEXT" -#define POLLTYPE_RATING "NUMVAL" -#define POLLTYPE_MULTI "MULTICHOICE" -#define POLLTYPE_IRV "IRV" +#define POLLTYPE_OPTION "OPTION" +#define POLLTYPE_TEXT "TEXT" +#define POLLTYPE_RATING "NUMVAL" +#define POLLTYPE_MULTI "MULTICHOICE" +#define POLLTYPE_IRV "IRV" @@ -206,34 +205,34 @@ GLOBAL_LIST_EMPTY(bloody_footprints_cache) #define get_area(A) (isarea(A) ? A : get_step(A, 0)?.loc) //Ghost orbit types: -#define GHOST_ORBIT_CIRCLE "circle" -#define GHOST_ORBIT_TRIANGLE "triangle" -#define GHOST_ORBIT_HEXAGON "hexagon" -#define GHOST_ORBIT_SQUARE "square" -#define GHOST_ORBIT_PENTAGON "pentagon" +#define GHOST_ORBIT_CIRCLE "circle" +#define GHOST_ORBIT_TRIANGLE "triangle" +#define GHOST_ORBIT_HEXAGON "hexagon" +#define GHOST_ORBIT_SQUARE "square" +#define GHOST_ORBIT_PENTAGON "pentagon" //Ghost showing preferences: -#define GHOST_ACCS_NONE 1 -#define GHOST_ACCS_DIR 50 -#define GHOST_ACCS_FULL 100 +#define GHOST_ACCS_NONE 1 +#define GHOST_ACCS_DIR 50 +#define GHOST_ACCS_FULL 100 -#define GHOST_ACCS_NONE_NAME "default sprites" -#define GHOST_ACCS_DIR_NAME "only directional sprites" -#define GHOST_ACCS_FULL_NAME "full accessories" +#define GHOST_ACCS_NONE_NAME "default sprites" +#define GHOST_ACCS_DIR_NAME "only directional sprites" +#define GHOST_ACCS_FULL_NAME "full accessories" -#define GHOST_ACCS_DEFAULT_OPTION GHOST_ACCS_FULL +#define GHOST_ACCS_DEFAULT_OPTION GHOST_ACCS_FULL GLOBAL_LIST_INIT(ghost_accs_options, list(GHOST_ACCS_NONE, GHOST_ACCS_DIR, GHOST_ACCS_FULL)) //So save files can be sanitized properly. -#define GHOST_OTHERS_SIMPLE 1 -#define GHOST_OTHERS_DEFAULT_SPRITE 50 -#define GHOST_OTHERS_THEIR_SETTING 100 +#define GHOST_OTHERS_SIMPLE 1 +#define GHOST_OTHERS_DEFAULT_SPRITE 50 +#define GHOST_OTHERS_THEIR_SETTING 100 -#define GHOST_OTHERS_SIMPLE_NAME "white ghost" -#define GHOST_OTHERS_DEFAULT_SPRITE_NAME "default sprites" -#define GHOST_OTHERS_THEIR_SETTING_NAME "their setting" +#define GHOST_OTHERS_SIMPLE_NAME "white ghost" +#define GHOST_OTHERS_DEFAULT_SPRITE_NAME "default sprites" +#define GHOST_OTHERS_THEIR_SETTING_NAME "their setting" -#define GHOST_OTHERS_DEFAULT_OPTION GHOST_OTHERS_THEIR_SETTING +#define GHOST_OTHERS_DEFAULT_OPTION GHOST_OTHERS_THEIR_SETTING #define GHOST_MAX_VIEW_RANGE_DEFAULT 10 #define GHOST_MAX_VIEW_RANGE_MEMBER 14 @@ -242,10 +241,10 @@ GLOBAL_LIST_INIT(ghost_accs_options, list(GHOST_ACCS_NONE, GHOST_ACCS_DIR, GHOST GLOBAL_LIST_INIT(ghost_others_options, list(GHOST_OTHERS_SIMPLE, GHOST_OTHERS_DEFAULT_SPRITE, GHOST_OTHERS_THEIR_SETTING)) //Same as ghost_accs_options. //pda fonts -#define MONO "Monospaced" -#define VT "VT323" -#define ORBITRON "Orbitron" -#define SHARE "Share Tech Mono" +#define MONO "Monospaced" +#define VT "VT323" +#define ORBITRON "Orbitron" +#define SHARE "Share Tech Mono" GLOBAL_LIST_INIT(pda_styles, sortList(list(MONO, VT, ORBITRON, SHARE))) @@ -256,29 +255,29 @@ GLOBAL_LIST_INIT(pda_styles, sortList(list(MONO, VT, ORBITRON, SHARE))) /* // Disabling certain features -#define APPEARANCE_IGNORE_TRANSFORM RESET_TRANSFORM -#define APPEARANCE_IGNORE_COLOUR RESET_COLOR -#define APPEARANCE_IGNORE_CLIENT_COLOUR NO_CLIENT_COLOR -#define APPEARANCE_IGNORE_COLOURING (RESET_COLOR|NO_CLIENT_COLOR) -#define APPEARANCE_IGNORE_ALPHA RESET_ALPHA -#define APPEARANCE_NORMAL_GLIDE ~LONG_GLIDE +#define APPEARANCE_IGNORE_TRANSFORM RESET_TRANSFORM +#define APPEARANCE_IGNORE_COLOUR RESET_COLOR +#define APPEARANCE_IGNORE_CLIENT_COLOUR NO_CLIENT_COLOR +#define APPEARANCE_IGNORE_COLOURING (RESET_COLOR|NO_CLIENT_COLOR) +#define APPEARANCE_IGNORE_ALPHA RESET_ALPHA +#define APPEARANCE_NORMAL_GLIDE ~LONG_GLIDE // Enabling certain features -#define APPEARANCE_CONSIDER_TRANSFORM ~RESET_TRANSFORM -#define APPEARANCE_CONSIDER_COLOUR ~RESET_COLOUR -#define APPEARANCE_CONSIDER_CLIENT_COLOUR ~NO_CLIENT_COLOR -#define APPEARANCE_CONSIDER_COLOURING (~RESET_COLOR|~NO_CLIENT_COLOR) -#define APPEARANCE_CONSIDER_ALPHA ~RESET_ALPHA -#define APPEARANCE_LONG_GLIDE LONG_GLIDE +#define APPEARANCE_CONSIDER_TRANSFORM ~RESET_TRANSFORM +#define APPEARANCE_CONSIDER_COLOUR ~RESET_COLOUR +#define APPEARANCE_CONSIDER_CLIENT_COLOUR ~NO_CLIENT_COLOR +#define APPEARANCE_CONSIDER_COLOURING (~RESET_COLOR|~NO_CLIENT_COLOR) +#define APPEARANCE_CONSIDER_ALPHA ~RESET_ALPHA +#define APPEARANCE_LONG_GLIDE LONG_GLIDE */ // Consider these images/atoms as part of the UI/HUD -#define APPEARANCE_UI_IGNORE_ALPHA (RESET_COLOR|RESET_TRANSFORM|NO_CLIENT_COLOR|RESET_ALPHA|PIXEL_SCALE) -#define APPEARANCE_UI (RESET_COLOR|RESET_TRANSFORM|NO_CLIENT_COLOR|PIXEL_SCALE) +#define APPEARANCE_UI_IGNORE_ALPHA (RESET_COLOR|RESET_TRANSFORM|NO_CLIENT_COLOR|RESET_ALPHA|PIXEL_SCALE) +#define APPEARANCE_UI (RESET_COLOR|RESET_TRANSFORM|NO_CLIENT_COLOR|PIXEL_SCALE) //Just space -#define SPACE_ICON_STATE "[((x + y) ^ ~(x * y) + z) % 25]" +#define SPACE_ICON_STATE "[((x + y) ^ ~(x * y) + z) % 25]" // Maploader bounds indices #define MAP_MINX 1 @@ -328,10 +327,10 @@ GLOBAL_LIST_INIT(pda_styles, sortList(list(MONO, VT, ORBITRON, SHARE))) #define LUMA_B 0.072 //different types of atom colorations -#define ADMIN_COLOUR_PRIORITY 1 //only used by rare effects like greentext coloring mobs and when admins varedit color -#define TEMPORARY_COLOUR_PRIORITY 2 //e.g. purple effect of the revenant on a mob, black effect when mob electrocuted -#define WASHABLE_COLOUR_PRIORITY 3 //color splashed onto an atom (e.g. paint on turf) -#define FIXED_COLOUR_PRIORITY 4 //color inherent to the atom (e.g. blob color) +#define ADMIN_COLOUR_PRIORITY 1 //only used by rare effects like greentext coloring mobs and when admins varedit color +#define TEMPORARY_COLOUR_PRIORITY 2 //e.g. purple effect of the revenant on a mob, black effect when mob electrocuted +#define WASHABLE_COLOUR_PRIORITY 3 //color splashed onto an atom (e.g. paint on turf) +#define FIXED_COLOUR_PRIORITY 4 //color inherent to the atom (e.g. blob color) #define COLOUR_PRIORITY_AMOUNT 4 //how many priority levels there are. //Endgame Results @@ -448,12 +447,12 @@ GLOBAL_LIST_INIT(pda_styles, sortList(list(MONO, VT, ORBITRON, SHARE))) #define SUMMON_GUNS "guns" #define SUMMON_MAGIC "magic" -#define TELEPORT_CHANNEL_BLUESPACE "bluespace" //Classic bluespace teleportation, requires a sender but no receiver -#define TELEPORT_CHANNEL_QUANTUM "quantum" //Quantum-based teleportation, requires both sender and receiver, but is free from normal disruption -#define TELEPORT_CHANNEL_WORMHOLE "wormhole" //Wormhole teleportation, is not disrupted by bluespace fluctuations but tends to be very random or unsafe -#define TELEPORT_CHANNEL_MAGIC "magic" //Magic teleportation, does whatever it wants (unless there's antimagic) -#define TELEPORT_CHANNEL_CULT "cult" //Cult teleportation, does whatever it wants (unless there's holiness) -#define TELEPORT_CHANNEL_FREE "free" //Anything else +#define TELEPORT_CHANNEL_BLUESPACE "bluespace" //Classic bluespace teleportation, requires a sender but no receiver +#define TELEPORT_CHANNEL_QUANTUM "quantum" //Quantum-based teleportation, requires both sender and receiver, but is free from normal disruption +#define TELEPORT_CHANNEL_WORMHOLE "wormhole" //Wormhole teleportation, is not disrupted by bluespace fluctuations but tends to be very random or unsafe +#define TELEPORT_CHANNEL_MAGIC "magic" //Magic teleportation, does whatever it wants (unless there's antimagic) +#define TELEPORT_CHANNEL_CULT "cult" //Cult teleportation, does whatever it wants (unless there's holiness) +#define TELEPORT_CHANNEL_FREE "free" //Anything else //Force the log directory to be something specific in the data/logs folder #define OVERRIDE_LOG_DIRECTORY_PARAMETER "log-directory" @@ -514,9 +513,9 @@ GLOBAL_LIST_INIT(pda_styles, sortList(list(MONO, VT, ORBITRON, SHARE))) #define GREAT_ART 50 // possible bitflag return values of intercept_zImpact(atom/movable/AM, levels = 1) calls -#define FALL_INTERCEPTED (1<<0) //Stops the movable from falling further and crashing on the ground -#define FALL_NO_MESSAGE (1<<1) //Used to suppress the "[A] falls through [old_turf]" messages where it'd make little sense at all, like going downstairs. -#define FALL_STOP_INTERCEPTING (1<<2) //Used in situations where halting the whole "intercept" loop would be better, like supermatter dusting (and thus deleting) the atom. +#define FALL_INTERCEPTED (1<<0) //Stops the movable from falling further and crashing on the ground +#define FALL_NO_MESSAGE (1<<1) //Used to suppress the "[A] falls through [old_turf]" messages where it'd make little sense at all, like going downstairs. +#define FALL_STOP_INTERCEPTING (1<<2) //Used in situations where halting the whole "intercept" loop would be better, like supermatter dusting (and thus deleting) the atom. //Religion diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm index 8c2d0153039..8d43abb6c59 100644 --- a/code/__DEFINES/mobs.dm +++ b/code/__DEFINES/mobs.dm @@ -8,25 +8,25 @@ #define PLAYER_READY_TO_OBSERVE 2 //Game mode list indexes -#define CURRENT_LIVING_PLAYERS "living_players_list" -#define CURRENT_LIVING_ANTAGS "living_antags_list" -#define CURRENT_DEAD_PLAYERS "dead_players_list" -#define CURRENT_OBSERVERS "current_observers_list" +#define CURRENT_LIVING_PLAYERS "living_players_list" +#define CURRENT_LIVING_ANTAGS "living_antags_list" +#define CURRENT_DEAD_PLAYERS "dead_players_list" +#define CURRENT_OBSERVERS "current_observers_list" //movement intent defines for the m_intent var #define MOVE_INTENT_WALK "walk" #define MOVE_INTENT_RUN "run" //Blood levels -#define BLOOD_VOLUME_MAX_LETHAL 2150 -#define BLOOD_VOLUME_EXCESS 2100 -#define BLOOD_VOLUME_MAXIMUM 2000 -#define BLOOD_VOLUME_SLIME_SPLIT 1120 -#define BLOOD_VOLUME_NORMAL 560 -#define BLOOD_VOLUME_SAFE 475 -#define BLOOD_VOLUME_OKAY 336 -#define BLOOD_VOLUME_BAD 224 -#define BLOOD_VOLUME_SURVIVE 122 +#define BLOOD_VOLUME_MAX_LETHAL 2150 +#define BLOOD_VOLUME_EXCESS 2100 +#define BLOOD_VOLUME_MAXIMUM 2000 +#define BLOOD_VOLUME_SLIME_SPLIT 1120 +#define BLOOD_VOLUME_NORMAL 560 +#define BLOOD_VOLUME_SAFE 475 +#define BLOOD_VOLUME_OKAY 336 +#define BLOOD_VOLUME_BAD 224 +#define BLOOD_VOLUME_SURVIVE 122 //Sizes of mobs, used by mob/living/var/mob_size #define MOB_SIZE_TINY 0 @@ -41,16 +41,16 @@ #define VENTCRAWLER_ALWAYS 2 //Mob bio-types flags -#define MOB_ORGANIC (1 << 0) -#define MOB_MINERAL (1 << 1) -#define MOB_ROBOTIC (1 << 2) -#define MOB_UNDEAD (1 << 3) -#define MOB_HUMANOID (1 << 4) -#define MOB_BUG (1 << 5) -#define MOB_BEAST (1 << 6) -#define MOB_EPIC (1 << 7) //megafauna -#define MOB_REPTILE (1 << 8) -#define MOB_SPIRIT (1 << 9) +#define MOB_ORGANIC (1 << 0) +#define MOB_MINERAL (1 << 1) +#define MOB_ROBOTIC (1 << 2) +#define MOB_UNDEAD (1 << 3) +#define MOB_HUMANOID (1 << 4) +#define MOB_BUG (1 << 5) +#define MOB_BEAST (1 << 6) +#define MOB_EPIC (1 << 7) //megafauna +#define MOB_REPTILE (1 << 8) +#define MOB_SPIRIT (1 << 9) //Organ defines for carbon mobs #define ORGAN_ORGANIC 1 @@ -195,13 +195,13 @@ #define SLIME_EXTRACT_CROSSING_REQUIRED 10 //Slime commands defines -#define SLIME_FRIENDSHIP_FOLLOW 3 //Min friendship to order it to follow -#define SLIME_FRIENDSHIP_STOPEAT 5 //Min friendship to order it to stop eating someone -#define SLIME_FRIENDSHIP_STOPEAT_NOANGRY 7 //Min friendship to order it to stop eating someone without it losing friendship -#define SLIME_FRIENDSHIP_STOPCHASE 4 //Min friendship to order it to stop chasing someone (their target) -#define SLIME_FRIENDSHIP_STOPCHASE_NOANGRY 6 //Min friendship to order it to stop chasing someone (their target) without it losing friendship -#define SLIME_FRIENDSHIP_STAY 3 //Min friendship to order it to stay -#define SLIME_FRIENDSHIP_ATTACK 8 //Min friendship to order it to attack +#define SLIME_FRIENDSHIP_FOLLOW 3 //Min friendship to order it to follow +#define SLIME_FRIENDSHIP_STOPEAT 5 //Min friendship to order it to stop eating someone +#define SLIME_FRIENDSHIP_STOPEAT_NOANGRY 7 //Min friendship to order it to stop eating someone without it losing friendship +#define SLIME_FRIENDSHIP_STOPCHASE 4 //Min friendship to order it to stop chasing someone (their target) +#define SLIME_FRIENDSHIP_STOPCHASE_NOANGRY 6 //Min friendship to order it to stop chasing someone (their target) without it losing friendship +#define SLIME_FRIENDSHIP_STAY 3 //Min friendship to order it to stay +#define SLIME_FRIENDSHIP_ATTACK 8 //Min friendship to order it to attack //Sentience types, to prevent things like sentience potions from giving bosses sentience #define SENTIENCE_ORGANIC 1 @@ -218,25 +218,25 @@ //Hostile simple animals //If you add a new status, be sure to add a list for it to the simple_animals global in _globalvars/lists/mobs.dm -#define AI_ON 1 -#define AI_IDLE 2 -#define AI_OFF 3 -#define AI_Z_OFF 4 +#define AI_ON 1 +#define AI_IDLE 2 +#define AI_OFF 3 +#define AI_Z_OFF 4 //The range at which a mob should wake up if you spawn into the z level near it #define MAX_SIMPLEMOB_WAKEUP_RANGE 5 //determines if a mob can smash through it -#define ENVIRONMENT_SMASH_NONE 0 -#define ENVIRONMENT_SMASH_STRUCTURES (1<<0) //crates, lockers, ect -#define ENVIRONMENT_SMASH_WALLS (1<<1) //walls -#define ENVIRONMENT_SMASH_RWALLS (1<<2) //rwalls +#define ENVIRONMENT_SMASH_NONE 0 +#define ENVIRONMENT_SMASH_STRUCTURES (1<<0) //crates, lockers, ect +#define ENVIRONMENT_SMASH_WALLS (1<<1) //walls +#define ENVIRONMENT_SMASH_RWALLS (1<<2) //rwalls -#define NO_SLIP_WHEN_WALKING (1<<0) -#define SLIDE (1<<1) -#define GALOSHES_DONT_HELP (1<<2) -#define SLIDE_ICE (1<<3) -#define SLIP_WHEN_CRAWLING (1<<4) //clown planet ruin +#define NO_SLIP_WHEN_WALKING (1<<0) +#define SLIDE (1<<1) +#define GALOSHES_DONT_HELP (1<<2) +#define SLIDE_ICE (1<<3) +#define SLIP_WHEN_CRAWLING (1<<4) //clown planet ruin #define MAX_CHICKENS 50 @@ -256,12 +256,12 @@ #define INCORPOREAL_MOVE_JAUNT 3 /// is blocked by holy water/salt //Secbot and ED209 judgement criteria bitflag values -#define JUDGE_EMAGGED (1<<0) -#define JUDGE_IDCHECK (1<<1) -#define JUDGE_WEAPONCHECK (1<<2) -#define JUDGE_RECORDCHECK (1<<3) +#define JUDGE_EMAGGED (1<<0) +#define JUDGE_IDCHECK (1<<1) +#define JUDGE_WEAPONCHECK (1<<2) +#define JUDGE_RECORDCHECK (1<<3) //ED209's ignore monkeys -#define JUDGE_IGNOREMONKEYS (1<<4) +#define JUDGE_IGNOREMONKEYS (1<<4) #define MEGAFAUNA_DEFAULT_RECOVERY_TIME 5 @@ -285,21 +285,22 @@ #define OFFSET_NECK "neck" //MINOR TWEAKS/MISC -//#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 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 POCKET_STRIP_DELAY 40 //time taken (in deciseconds) to search somebody's pockets -#define DOOR_CRUSH_DAMAGE 15 //the amount of damage that airlocks deal when they crush you +//#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 WIZARD_AGE_MIN 30 //youngest a wizard can be +#define APPRENTICE_AGE_MIN 29 //youngest an apprentice can be -#define HUNGER_FACTOR 0.1 //factor at which mob nutrition decreases -#define ETHEREAL_CHARGE_FACTOR 1.6 //factor at which ethereal's charge decreases -#define REAGENTS_METABOLISM 0.4 //How many units of reagent are consumed per tick, by default. -#define REAGENTS_EFFECT_MULTIPLIER (REAGENTS_METABOLISM / 0.4) // By defining the effect multiplier this way, it'll exactly adjust all effects according to how they originally were with the 0.4 metabolism +#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 POCKET_STRIP_DELAY 40 //time taken (in deciseconds) to search somebody's pockets +#define DOOR_CRUSH_DAMAGE 15 //the amount of damage that airlocks deal when they crush you + +#define HUNGER_FACTOR 0.1 //factor at which mob nutrition decreases +#define ETHEREAL_CHARGE_FACTOR 1.6 //factor at which ethereal's charge decreases +#define REAGENTS_METABOLISM 0.4 //How many units of reagent are consumed per tick, by default. +#define REAGENTS_EFFECT_MULTIPLIER (REAGENTS_METABOLISM / 0.4) // By defining the effect multiplier this way, it'll exactly adjust all effects according to how they originally were with the 0.4 metabolism // Eye protection #define FLASH_PROTECTION_SENSITIVE -1 @@ -312,7 +313,7 @@ #define MAX_QUIRKS 6 //The maximum amount of quirks one character can have at roundstart // AI Toggles -#define AI_CAMERA_LUMINOSITY 5 +#define AI_CAMERA_LUMINOSITY 5 #define AI_VOX // Comment out if you don't want VOX to be enabled and have players download the voice sounds. // /obj/item/bodypart on_mob_life() retval flag @@ -321,7 +322,7 @@ #define MAX_REVIVE_FIRE_DAMAGE 180 #define MAX_REVIVE_BRUTE_DAMAGE 180 -#define HUMAN_FIRE_STACK_ICON_NUM 3 +#define HUMAN_FIRE_STACK_ICON_NUM 3 #define GRAB_PIXEL_SHIFT_PASSIVE 6 #define GRAB_PIXEL_SHIFT_AGGRESSIVE 12 @@ -368,9 +369,9 @@ #define DOING_INTERACTION_WITH_TARGET_LIMIT(user, target, max_interaction_count) ((LAZYACCESS(user.do_afters, target) || 0) >= max_interaction_count) /// If you examine the same atom twice in this timeframe, we call examine_more() instead of examine() -#define EXAMINE_MORE_TIME 1 SECONDS +#define EXAMINE_MORE_TIME 1 SECONDS /// How far away you can be to make eye contact with someone while examining -#define EYE_CONTACT_RANGE 5 +#define EYE_CONTACT_RANGE 5 #define SILENCE_RANGED_MESSAGE (1<<0) diff --git a/code/__DEFINES/monkeys.dm b/code/__DEFINES/monkeys.dm index c881e5db2cb..39f687c2ea7 100644 --- a/code/__DEFINES/monkeys.dm +++ b/code/__DEFINES/monkeys.dm @@ -1,39 +1,39 @@ //Monkey defines, placed here so they can be read by other things! /// below this health value the monkey starts to flee from enemies -#define MONKEY_FLEE_HEALTH 40 +#define MONKEY_FLEE_HEALTH 40 /// how close an enemy must be to trigger aggression -#define MONKEY_ENEMY_VISION 9 +#define MONKEY_ENEMY_VISION 9 /// how close an enemy must be before it triggers flee -#define MONKEY_FLEE_VISION 4 +#define MONKEY_FLEE_VISION 4 /// How long does it take the item to be taken from a mobs hand -#define MONKEY_ITEM_SNATCH_DELAY 25 +#define MONKEY_ITEM_SNATCH_DELAY 25 /// Probability monkey will aggro when cuffed -#define MONKEY_CUFF_RETALIATION_PROB 20 +#define MONKEY_CUFF_RETALIATION_PROB 20 /// Probability monkey will aggro when syringed -#define MONKEY_SYRINGE_RETALIATION_PROB 20 +#define MONKEY_SYRINGE_RETALIATION_PROB 20 // Probability per Life tick that the monkey will: /// probability that monkey resist out of restraints -#define MONKEY_RESIST_PROB 50 +#define MONKEY_RESIST_PROB 50 /// probability that monkey aggro against the mob pulling it -#define MONKEY_PULL_AGGRO_PROB 5 +#define MONKEY_PULL_AGGRO_PROB 5 /// probability that monkey will get into mischief, i.e. finding/stealing items -#define MONKEY_SHENANIGAN_PROB 20 +#define MONKEY_SHENANIGAN_PROB 20 /// probability that monkey will disarm an armed attacker -#define MONKEY_ATTACK_DISARM_PROB 20 +#define MONKEY_ATTACK_DISARM_PROB 20 /// probability that monkey will get recruited when friend is attacked -#define MONKEY_RECRUIT_PROB 25 +#define MONKEY_RECRUIT_PROB 25 /// probability for the monkey to aggro when attacked -#define MONKEY_RETALIATE_PROB 85 +#define MONKEY_RETALIATE_PROB 85 /// amount of aggro to add to an enemy when they attack user -#define MONKEY_HATRED_AMOUNT 4 +#define MONKEY_HATRED_AMOUNT 4 /// amount of aggro to add to an enemy when a monkey is recruited -#define MONKEY_RECRUIT_HATED_AMOUNT 2 +#define MONKEY_RECRUIT_HATED_AMOUNT 2 /// probability of reducing aggro by one when the monkey attacks -#define MONKEY_HATRED_REDUCTION_PROB 20 +#define MONKEY_HATRED_REDUCTION_PROB 20 ///Monkey recruit cooldown #define MONKEY_RECRUIT_COOLDOWN 1 MINUTES diff --git a/code/__DEFINES/move_force.dm b/code/__DEFINES/move_force.dm index 1f8819b0c85..d291e95579d 100644 --- a/code/__DEFINES/move_force.dm +++ b/code/__DEFINES/move_force.dm @@ -4,11 +4,11 @@ #define PULL_FORCE_DEFAULT 1000 //Factors/modifiers -#define MOVE_FORCE_PULL_RATIO 1 //Same move force to pull objects -#define MOVE_FORCE_PUSH_RATIO 1 //Same move force to normally push -#define MOVE_FORCE_FORCEPUSH_RATIO 2 //2x move force to forcefully push -#define MOVE_FORCE_CRUSH_RATIO 3 //3x move force to do things like crush objects -#define MOVE_FORCE_THROW_RATIO 1 //Same force throw as resist to throw objects +#define MOVE_FORCE_PULL_RATIO 1 //Same move force to pull objects +#define MOVE_FORCE_PUSH_RATIO 1 //Same move force to normally push +#define MOVE_FORCE_FORCEPUSH_RATIO 2 //2x move force to forcefully push +#define MOVE_FORCE_CRUSH_RATIO 3 //3x move force to do things like crush objects +#define MOVE_FORCE_THROW_RATIO 1 //Same force throw as resist to throw objects #define MOVE_FORCE_OVERPOWERING (MOVE_FORCE_DEFAULT * MOVE_FORCE_CRUSH_RATIO * 10) #define MOVE_FORCE_EXTREMELY_STRONG (MOVE_FORCE_DEFAULT * MOVE_FORCE_CRUSH_RATIO * 3) diff --git a/code/__DEFINES/movespeed_modification.dm b/code/__DEFINES/movespeed_modification.dm index 6b8ef7bd567..104965dc8db 100644 --- a/code/__DEFINES/movespeed_modification.dm +++ b/code/__DEFINES/movespeed_modification.dm @@ -1,12 +1,12 @@ //flags -#define IGNORE_NOSLOW (1 << 0) +#define IGNORE_NOSLOW (1 << 0) //conflict types -#define MOVE_CONFLICT_JETPACK "JETPACK" +#define MOVE_CONFLICT_JETPACK "JETPACK" //ids -#define MOVESPEED_ID_SANITY "sanity_component" +#define MOVESPEED_ID_SANITY "sanity_component" -#define MOVESPEED_ID_MOB_GRAB_STATE "mob_grab_state" -#define MOVESPEED_ID_MOB_WALK_RUN "mob_walk_run" +#define MOVESPEED_ID_MOB_GRAB_STATE "mob_grab_state" +#define MOVESPEED_ID_MOB_WALK_RUN "mob_walk_run" diff --git a/code/__DEFINES/nanites.dm b/code/__DEFINES/nanites.dm index 13fae6b2146..abd2327dd52 100644 --- a/code/__DEFINES/nanites.dm +++ b/code/__DEFINES/nanites.dm @@ -10,7 +10,7 @@ #define NANITE_CLOUD_TOGGLE 1 #define NANITE_CLOUD_DISABLE 2 -#define NANITE_CLOUD_ENABLE 3 +#define NANITE_CLOUD_ENABLE 3 //Nanite excess thresholds #define NANITE_EXCESS_MINOR 25 diff --git a/code/__DEFINES/networks.dm b/code/__DEFINES/networks.dm index 6f1d9ae0e6e..ad877bcec30 100644 --- a/code/__DEFINES/networks.dm +++ b/code/__DEFINES/networks.dm @@ -1,4 +1,4 @@ -#define HID_RESTRICTED_END 101 //the first nonrestricted ID, automatically assigned on connection creation. +#define HID_RESTRICTED_END 101 //the first nonrestricted ID, automatically assigned on connection creation. #define NETWORK_BROADCAST_ID "ALL" @@ -11,44 +11,44 @@ /// all the constants though all the files for them. hurrah! /// Ugh, couldn't get recursive stringafy to work in byond for some reason -#define NETWORK_NAME_COMBINE(L,R) ((L) + "." + (R)) +#define NETWORK_NAME_COMBINE(L,R) ((L) + "." + (R)) /// Station network names. Used as the root networks for main parts of the station -#define __STATION_NETWORK_ROOT "SS13" -#define __CENTCOM_NETWORK_ROOT "CENTCOM" -#define __SYNDICATE_NETWORK_ROOT "SYNDI" -#define __LIMBO_NETWORK_ROOT "LIMBO" // Limbo is a dead network +#define __STATION_NETWORK_ROOT "SS13" +#define __CENTCOM_NETWORK_ROOT "CENTCOM" +#define __SYNDICATE_NETWORK_ROOT "SYNDI" +#define __LIMBO_NETWORK_ROOT "LIMBO" // Limbo is a dead network /// various sub networks pieces -#define __NETWORK_LIMBO "LIMBO" -#define __NETWORK_TOOLS "TOOLS" -#define __NETWORK_REMOTES "REMOTES" -#define __NETWORK_AIRLOCKS "AIRLOCKS" -#define __NETWORK_DOORS "DOORS" -#define __NETWORK_ATMOS "ATMOS" -#define __NETWORK_SCUBBERS "AIRLOCKS" -#define __NETWORK_AIRALARMS "AIRALARMS" -#define __NETWORK_CONTROL "CONTROL" -#define __NETWORK_STORAGE "STORAGE" -#define __NETWORK_CARGO "CARGO" -#define __NETWORK_BOTS "BOTS" -#define __NETWORK_COMPUTER "COMPUTER" -#define __NETWORK_CARDS "CARDS" +#define __NETWORK_LIMBO "LIMBO" +#define __NETWORK_TOOLS "TOOLS" +#define __NETWORK_REMOTES "REMOTES" +#define __NETWORK_AIRLOCKS "AIRLOCKS" +#define __NETWORK_DOORS "DOORS" +#define __NETWORK_ATMOS "ATMOS" +#define __NETWORK_SCUBBERS "AIRLOCKS" +#define __NETWORK_AIRALARMS "AIRALARMS" +#define __NETWORK_CONTROL "CONTROL" +#define __NETWORK_STORAGE "STORAGE" +#define __NETWORK_CARGO "CARGO" +#define __NETWORK_BOTS "BOTS" +#define __NETWORK_COMPUTER "COMPUTER" +#define __NETWORK_CARDS "CARDS" /// Various combined subnetworks -#define NETWORK_DOOR_REMOTES NETWORK_NAME_COMBINE(__NETWORK_DOORS, __NETWORK_REMOTES) -#define NETWORK_DOOR_AIRLOCKS NETWORK_NAME_COMBINE(__NETWORK_DOORS, __NETWORK_AIRLOCKS) -#define NETWORK_ATMOS_AIRALARMS NETWORK_NAME_COMBINE(__NETWORK_ATMOS, __NETWORK_AIRALARMS) -#define NETWORK_ATMOS_SCUBBERS NETWORK_NAME_COMBINE(__NETWORK_ATMOS, __NETWORK_SCUBBERS) -#define NETWORK_CARDS NETWORK_NAME_COMBINE(__NETWORK_COMPUTER, __NETWORK_CARDS) -#define NETWORK_BOTS_CARGO NETWORK_NAME_COMBINE(__NETWORK_CARGO, __NETWORK_BOTS) +#define NETWORK_DOOR_REMOTES NETWORK_NAME_COMBINE(__NETWORK_DOORS, __NETWORK_REMOTES) +#define NETWORK_DOOR_AIRLOCKS NETWORK_NAME_COMBINE(__NETWORK_DOORS, __NETWORK_AIRLOCKS) +#define NETWORK_ATMOS_AIRALARMS NETWORK_NAME_COMBINE(__NETWORK_ATMOS, __NETWORK_AIRALARMS) +#define NETWORK_ATMOS_SCUBBERS NETWORK_NAME_COMBINE(__NETWORK_ATMOS, __NETWORK_SCUBBERS) +#define NETWORK_CARDS NETWORK_NAME_COMBINE(__NETWORK_COMPUTER, __NETWORK_CARDS) +#define NETWORK_BOTS_CARGO NETWORK_NAME_COMBINE(__NETWORK_CARGO, __NETWORK_BOTS) // Finally turn eveything into strings -#define STATION_NETWORK_ROOT __STATION_NETWORK_ROOT -#define CENTCOM_NETWORK_ROOT __CENTCOM_NETWORK_ROOT -#define SYNDICATE_NETWORK_ROOT __SYNDICATE_NETWORK_ROOT -#define LIMBO_NETWORK_ROOT __LIMBO_NETWORK_ROOT +#define STATION_NETWORK_ROOT __STATION_NETWORK_ROOT +#define CENTCOM_NETWORK_ROOT __CENTCOM_NETWORK_ROOT +#define SYNDICATE_NETWORK_ROOT __SYNDICATE_NETWORK_ROOT +#define LIMBO_NETWORK_ROOT __LIMBO_NETWORK_ROOT diff --git a/code/__DEFINES/obj_flags.dm b/code/__DEFINES/obj_flags.dm index d77cfc5bb03..68661c316ad 100644 --- a/code/__DEFINES/obj_flags.dm +++ b/code/__DEFINES/obj_flags.dm @@ -1,50 +1,50 @@ // Flags for the obj_flags var on /obj -#define EMAGGED (1<<0) -#define IN_USE (1<<1) // If we have a user using us, this will be set on. We will check if the user has stopped using us, and thus stop updating and LAGGING EVERYTHING! -#define CAN_BE_HIT (1<<2) //can this be bludgeoned by items? -#define BEING_SHOCKED (1<<3) // Whether this thing is currently (already) being shocked by a tesla -#define DANGEROUS_POSSESSION (1<<4) //Admin possession yes/no -#define ON_BLUEPRINTS (1<<5) //Are we visible on the station blueprints at roundstart? -#define UNIQUE_RENAME (1<<6) // can you customize the description/name of the thing? -#define USES_TGUI (1<<7) //put on things that use tgui on ui_interact instead of custom/old UI. -#define FROZEN (1<<8) -#define BLOCK_Z_OUT_DOWN (1<<9) // Should this object block z falling from loc? -#define BLOCK_Z_OUT_UP (1<<10) // Should this object block z uprise from loc? -#define BLOCK_Z_IN_DOWN (1<<11) // Should this object block z falling from above? -#define BLOCK_Z_IN_UP (1<<12) // Should this object block z uprise from below? +#define EMAGGED (1<<0) +#define IN_USE (1<<1) // If we have a user using us, this will be set on. We will check if the user has stopped using us, and thus stop updating and LAGGING EVERYTHING! +#define CAN_BE_HIT (1<<2) //can this be bludgeoned by items? +#define BEING_SHOCKED (1<<3) // Whether this thing is currently (already) being shocked by a tesla +#define DANGEROUS_POSSESSION (1<<4) //Admin possession yes/no +#define ON_BLUEPRINTS (1<<5) //Are we visible on the station blueprints at roundstart? +#define UNIQUE_RENAME (1<<6) // can you customize the description/name of the thing? +#define USES_TGUI (1<<7) //put on things that use tgui on ui_interact instead of custom/old UI. +#define FROZEN (1<<8) +#define BLOCK_Z_OUT_DOWN (1<<9) // Should this object block z falling from loc? +#define BLOCK_Z_OUT_UP (1<<10) // Should this object block z uprise from loc? +#define BLOCK_Z_IN_DOWN (1<<11) // Should this object block z falling from above? +#define BLOCK_Z_IN_UP (1<<12) // Should this object block z uprise from below? // If you add new ones, be sure to add them to /obj/Initialize as well for complete mapping support // Flags for the item_flags var on /obj/item -#define BEING_REMOVED (1<<0) -#define IN_INVENTORY (1<<1) //is this item equipped into an inventory slot or hand of a mob? used for tooltips -#define FORCE_STRING_OVERRIDE (1<<2) // used for tooltips -#define NEEDS_PERMIT (1<<3) //Used by security bots to determine if this item is safe for public use. -#define SLOWS_WHILE_IN_HAND (1<<4) -#define NO_MAT_REDEMPTION (1<<5) // Stops you from putting things like an RCD or other items into an ORM or protolathe for materials. -#define DROPDEL (1<<6) // When dropped, it calls qdel on itself -#define NOBLUDGEON (1<<7) // when an item has this it produces no "X has been hit by Y with Z" message in the default attackby() -#define ABSTRACT (1<<9) // for all things that are technically items but used for various different stuff <= wow thanks for the fucking insight sherlock -#define IMMUTABLE_SLOW (1<<10) // When players should not be able to change the slowdown of the item (Speed potions, etc) -#define IN_STORAGE (1<<11) //is this item in the storage item, such as backpack? used for tooltips -#define SURGICAL_TOOL (1<<12) //Tool commonly used for surgery: won't attack targets in an active surgical operation on help intent (in case of mistakes) -#define EYE_STAB (1<<13) /// Item can be used to eyestab -#define HAND_ITEM (1<<14) /// If an item is just your hand (circled hand, slapper) and shouldn't block things like riding -#define EXAMINE_SKIP (1<<15) /// Makes the Examine proc not read out this item. -#define XENOMORPH_HOLDABLE (1<<16) /// A Xenomorph can hold this item. +#define BEING_REMOVED (1<<0) +#define IN_INVENTORY (1<<1) //is this item equipped into an inventory slot or hand of a mob? used for tooltips +#define FORCE_STRING_OVERRIDE (1<<2) // used for tooltips +#define NEEDS_PERMIT (1<<3) //Used by security bots to determine if this item is safe for public use. +#define SLOWS_WHILE_IN_HAND (1<<4) +#define NO_MAT_REDEMPTION (1<<5) // Stops you from putting things like an RCD or other items into an ORM or protolathe for materials. +#define DROPDEL (1<<6) // When dropped, it calls qdel on itself +#define NOBLUDGEON (1<<7) // when an item has this it produces no "X has been hit by Y with Z" message in the default attackby() +#define ABSTRACT (1<<9) // for all things that are technically items but used for various different stuff <= wow thanks for the fucking insight sherlock +#define IMMUTABLE_SLOW (1<<10) // When players should not be able to change the slowdown of the item (Speed potions, etc) +#define IN_STORAGE (1<<11) //is this item in the storage item, such as backpack? used for tooltips +#define SURGICAL_TOOL (1<<12) //Tool commonly used for surgery: won't attack targets in an active surgical operation on help intent (in case of mistakes) +#define EYE_STAB (1<<13) /// Item can be used to eyestab +#define HAND_ITEM (1<<14) /// If an item is just your hand (circled hand, slapper) and shouldn't block things like riding +#define EXAMINE_SKIP (1<<15) /// Makes the Examine proc not read out this item. +#define XENOMORPH_HOLDABLE (1<<16) /// A Xenomorph can hold this item. // Flags for the clothing_flags var on /obj/item/clothing #define LAVAPROTECT (1<<0) -#define STOPSPRESSUREDAMAGE (1<<1) //SUIT and HEAD items which stop pressure damage. To stop you taking all pressure damage you must have both a suit and head item with this flag. -#define BLOCK_GAS_SMOKE_EFFECT (1<<2) // blocks the effect that chemical clouds would have on a mob --glasses, mask and helmets ONLY! -#define MASKINTERNALS (1<<3) // mask allows internals +#define STOPSPRESSUREDAMAGE (1<<1) //SUIT and HEAD items which stop pressure damage. To stop you taking all pressure damage you must have both a suit and head item with this flag. +#define BLOCK_GAS_SMOKE_EFFECT (1<<2) // blocks the effect that chemical clouds would have on a mob --glasses, mask and helmets ONLY! +#define MASKINTERNALS (1<<3) // mask allows internals #define NOSLIP (1<<4) //prevents from slipping on wet floors, in space etc -#define NOSLIP_ICE (1<<5) //prevents from slipping on frozen floors -#define THICKMATERIAL (1<<6) //prevents syringes, parapens and hypos if the external suit or helmet (if targeting head) has this flag. Example: space suits, biosuit, bombsuits, thick suits that cover your body. +#define NOSLIP_ICE (1<<5) //prevents from slipping on frozen floors +#define THICKMATERIAL (1<<6) //prevents syringes, parapens and hypos if the external suit or helmet (if targeting head) has this flag. Example: space suits, biosuit, bombsuits, thick suits that cover your body. #define VOICEBOX_TOGGLABLE (1<<7) // The voicebox in this clothing can be toggled. #define VOICEBOX_DISABLED (1<<8) // The voicebox is currently turned off. #define SCAN_REAGENTS (1<<9) // Allows helmets, masks and glasses to scan reagents. @@ -56,19 +56,19 @@ /// Flags for the organ_flags var on /obj/item/organ -#define ORGAN_SYNTHETIC (1<<0) //Synthetic organs, or cybernetic organs. Reacts to EMPs and don't deteriorate or heal -#define ORGAN_FROZEN (1<<1) //Frozen organs, don't deteriorate -#define ORGAN_FAILING (1<<2) //Failing organs perform damaging effects until replaced or fixed -#define ORGAN_EXTERNAL (1<<3) //Was this organ implanted/inserted/etc, if true will not be removed during species change. -#define ORGAN_VITAL (1<<4) //Currently only the brain -#define ORGAN_EDIBLE (1<<5) //is a snack? :D -#define ORGAN_SYNTHETIC_EMP (1<<6) //Synthetic organ affected by an EMP. Deteriorates over time. -#define ORGAN_UNREMOVABLE (1<<7) //Can't be removed using surgery +#define ORGAN_SYNTHETIC (1<<0) //Synthetic organs, or cybernetic organs. Reacts to EMPs and don't deteriorate or heal +#define ORGAN_FROZEN (1<<1) //Frozen organs, don't deteriorate +#define ORGAN_FAILING (1<<2) //Failing organs perform damaging effects until replaced or fixed +#define ORGAN_EXTERNAL (1<<3) //Was this organ implanted/inserted/etc, if true will not be removed during species change. +#define ORGAN_VITAL (1<<4) //Currently only the brain +#define ORGAN_EDIBLE (1<<5) //is a snack? :D +#define ORGAN_SYNTHETIC_EMP (1<<6) //Synthetic organ affected by an EMP. Deteriorates over time. +#define ORGAN_UNREMOVABLE (1<<7) //Can't be removed using surgery /// Integrity defines for clothing (not flags but close enough) -#define CLOTHING_PRISTINE 0 // We have no damage on the clothing -#define CLOTHING_DAMAGED 1 // There's some damage on the clothing but it still has at least one functioning bodypart and can be equipped -#define CLOTHING_SHREDDED 2 // The clothing is useless and cannot be equipped unless repaired first +#define CLOTHING_PRISTINE 0 // We have no damage on the clothing +#define CLOTHING_DAMAGED 1 // There's some damage on the clothing but it still has at least one functioning bodypart and can be equipped +#define CLOTHING_SHREDDED 2 // The clothing is useless and cannot be equipped unless repaired first /// Flags for the pod_flags var on /obj/structure/closet/supplypod #define FIRST_SOUNDS (1<<0) // If it shouldn't play sounds the first time it lands, used for reverse mode diff --git a/code/__DEFINES/pipe_construction.dm b/code/__DEFINES/pipe_construction.dm index 7d2899d8699..852870accf8 100644 --- a/code/__DEFINES/pipe_construction.dm +++ b/code/__DEFINES/pipe_construction.dm @@ -1,32 +1,32 @@ //Construction Categories -#define PIPE_STRAIGHT 0 //2 directions: N/S, E/W -#define PIPE_BENDABLE 1 //6 directions: N/S, E/W, N/E, N/W, S/E, S/W -#define PIPE_TRINARY 2 //4 directions: N/E/S, E/S/W, S/W/N, W/N/E -#define PIPE_TRIN_M 3 //8 directions: N->S+E, S->N+E, N->S+W, S->N+W, E->W+S, W->E+S, E->W+N, W->E+N -#define PIPE_UNARY 4 //4 directions: N, S, E, W -#define PIPE_ONEDIR 5 //1 direction: N/S/E/W -#define PIPE_UNARY_FLIPPABLE 6 //8 directions: N/S/E/W/N-flipped/S-flipped/E-flipped/W-flipped +#define PIPE_STRAIGHT 0 //2 directions: N/S, E/W +#define PIPE_BENDABLE 1 //6 directions: N/S, E/W, N/E, N/W, S/E, S/W +#define PIPE_TRINARY 2 //4 directions: N/E/S, E/S/W, S/W/N, W/N/E +#define PIPE_TRIN_M 3 //8 directions: N->S+E, S->N+E, N->S+W, S->N+W, E->W+S, W->E+S, E->W+N, W->E+N +#define PIPE_UNARY 4 //4 directions: N, S, E, W +#define PIPE_ONEDIR 5 //1 direction: N/S/E/W +#define PIPE_UNARY_FLIPPABLE 6 //8 directions: N/S/E/W/N-flipped/S-flipped/E-flipped/W-flipped //Disposal pipe relative connection directions -#define DISP_DIR_BASE 0 -#define DISP_DIR_LEFT 1 -#define DISP_DIR_RIGHT 2 -#define DISP_DIR_FLIP 4 -#define DISP_DIR_NONE 8 +#define DISP_DIR_BASE 0 +#define DISP_DIR_LEFT 1 +#define DISP_DIR_RIGHT 2 +#define DISP_DIR_FLIP 4 +#define DISP_DIR_NONE 8 //Transit tubes -#define TRANSIT_TUBE_STRAIGHT 0 -#define TRANSIT_TUBE_STRAIGHT_CROSSING 1 -#define TRANSIT_TUBE_CURVED 2 -#define TRANSIT_TUBE_DIAGONAL 3 -#define TRANSIT_TUBE_DIAGONAL_CROSSING 4 -#define TRANSIT_TUBE_JUNCTION 5 -#define TRANSIT_TUBE_STATION 6 -#define TRANSIT_TUBE_TERMINUS 7 -#define TRANSIT_TUBE_POD 8 +#define TRANSIT_TUBE_STRAIGHT 0 +#define TRANSIT_TUBE_STRAIGHT_CROSSING 1 +#define TRANSIT_TUBE_CURVED 2 +#define TRANSIT_TUBE_DIAGONAL 3 +#define TRANSIT_TUBE_DIAGONAL_CROSSING 4 +#define TRANSIT_TUBE_JUNCTION 5 +#define TRANSIT_TUBE_STATION 6 +#define TRANSIT_TUBE_TERMINUS 7 +#define TRANSIT_TUBE_POD 8 //the open status of the transit tube station -#define STATION_TUBE_OPEN 0 -#define STATION_TUBE_OPENING 1 -#define STATION_TUBE_CLOSED 2 -#define STATION_TUBE_CLOSING 3 +#define STATION_TUBE_OPEN 0 +#define STATION_TUBE_OPENING 1 +#define STATION_TUBE_CLOSED 2 +#define STATION_TUBE_CLOSING 3 diff --git a/code/__DEFINES/power.dm b/code/__DEFINES/power.dm index fa145bbea1b..7c5c2d0a82d 100644 --- a/code/__DEFINES/power.dm +++ b/code/__DEFINES/power.dm @@ -1,8 +1,8 @@ -#define CABLE_LAYER_1 1 -#define CABLE_LAYER_2 2 -#define CABLE_LAYER_3 4 +#define CABLE_LAYER_1 1 +#define CABLE_LAYER_2 2 +#define CABLE_LAYER_3 4 -#define MACHINERY_LAYER_1 1 +#define MACHINERY_LAYER_1 1 #define SOLAR_TRACK_OFF 0 #define SOLAR_TRACK_TIMED 1 diff --git a/code/__DEFINES/preferences.dm b/code/__DEFINES/preferences.dm index d0d5c29fc9e..e4218e149c4 100644 --- a/code/__DEFINES/preferences.dm +++ b/code/__DEFINES/preferences.dm @@ -1,45 +1,45 @@ //Preference toggles -#define SOUND_ADMINHELP (1<<0) -#define SOUND_MIDI (1<<1) -#define SOUND_AMBIENCE (1<<2) -#define SOUND_LOBBY (1<<3) -#define MEMBER_PUBLIC (1<<4) -#define INTENT_STYLE (1<<5) -#define MIDROUND_ANTAG (1<<6) -#define SOUND_INSTRUMENTS (1<<7) -#define SOUND_SHIP_AMBIENCE (1<<8) -#define SOUND_PRAYERS (1<<9) -#define ANNOUNCE_LOGIN (1<<10) -#define SOUND_ANNOUNCEMENTS (1<<11) -#define DISABLE_DEATHRATTLE (1<<12) -#define DISABLE_ARRIVALRATTLE (1<<13) -#define COMBOHUD_LIGHTING (1<<14) -#define DEADMIN_ALWAYS (1<<15) -#define DEADMIN_ANTAGONIST (1<<16) -#define DEADMIN_POSITION_HEAD (1<<17) -#define DEADMIN_POSITION_SECURITY (1<<18) -#define DEADMIN_POSITION_SILICON (1<<19) -#define SOUND_ENDOFROUND (1<<20) -#define ADMIN_IGNORE_CULT_GHOST (1<<21) -#define SOUND_COMBATMODE (1<<22) +#define SOUND_ADMINHELP (1<<0) +#define SOUND_MIDI (1<<1) +#define SOUND_AMBIENCE (1<<2) +#define SOUND_LOBBY (1<<3) +#define MEMBER_PUBLIC (1<<4) +#define INTENT_STYLE (1<<5) +#define MIDROUND_ANTAG (1<<6) +#define SOUND_INSTRUMENTS (1<<7) +#define SOUND_SHIP_AMBIENCE (1<<8) +#define SOUND_PRAYERS (1<<9) +#define ANNOUNCE_LOGIN (1<<10) +#define SOUND_ANNOUNCEMENTS (1<<11) +#define DISABLE_DEATHRATTLE (1<<12) +#define DISABLE_ARRIVALRATTLE (1<<13) +#define COMBOHUD_LIGHTING (1<<14) +#define DEADMIN_ALWAYS (1<<15) +#define DEADMIN_ANTAGONIST (1<<16) +#define DEADMIN_POSITION_HEAD (1<<17) +#define DEADMIN_POSITION_SECURITY (1<<18) +#define DEADMIN_POSITION_SILICON (1<<19) +#define SOUND_ENDOFROUND (1<<20) +#define ADMIN_IGNORE_CULT_GHOST (1<<21) +#define SOUND_COMBATMODE (1<<22) #define TOGGLES_DEFAULT (SOUND_ADMINHELP|SOUND_MIDI|SOUND_AMBIENCE|SOUND_LOBBY|SOUND_ENDOFROUND|MEMBER_PUBLIC|INTENT_STYLE|MIDROUND_ANTAG|SOUND_INSTRUMENTS|SOUND_SHIP_AMBIENCE|SOUND_PRAYERS|SOUND_ANNOUNCEMENTS|SOUND_COMBATMODE) //Chat toggles -#define CHAT_OOC (1<<0) -#define CHAT_DEAD (1<<1) -#define CHAT_GHOSTEARS (1<<2) -#define CHAT_GHOSTSIGHT (1<<3) -#define CHAT_PRAYER (1<<4) -#define CHAT_RADIO (1<<5) -#define CHAT_PULLR (1<<6) -#define CHAT_GHOSTWHISPER (1<<7) -#define CHAT_GHOSTPDA (1<<8) -#define CHAT_GHOSTRADIO (1<<9) +#define CHAT_OOC (1<<0) +#define CHAT_DEAD (1<<1) +#define CHAT_GHOSTEARS (1<<2) +#define CHAT_GHOSTSIGHT (1<<3) +#define CHAT_PRAYER (1<<4) +#define CHAT_RADIO (1<<5) +#define CHAT_PULLR (1<<6) +#define CHAT_GHOSTWHISPER (1<<7) +#define CHAT_GHOSTPDA (1<<8) +#define CHAT_GHOSTRADIO (1<<9) #define CHAT_BANKCARD (1<<10) -#define CHAT_GHOSTLAWS (1<<11) -#define CHAT_LOGIN_LOGOUT (1<<12) +#define CHAT_GHOSTLAWS (1<<11) +#define CHAT_LOGIN_LOGOUT (1<<12) #define TOGGLES_DEFAULT_CHAT (CHAT_OOC|CHAT_DEAD|CHAT_GHOSTEARS|CHAT_GHOSTSIGHT|CHAT_PRAYER|CHAT_RADIO|CHAT_PULLR|CHAT_GHOSTWHISPER|CHAT_GHOSTPDA|CHAT_GHOSTRADIO|CHAT_BANKCARD|CHAT_GHOSTLAWS|CHAT_LOGIN_LOGOUT) @@ -71,20 +71,20 @@ #define SEC_DEPT_SUPPLY "Supply" // Playtime tracking system, see jobs_exp.dm -#define EXP_TYPE_LIVING "Living" -#define EXP_TYPE_CREW "Crew" -#define EXP_TYPE_COMMAND "Command" -#define EXP_TYPE_ENGINEERING "Engineering" -#define EXP_TYPE_MEDICAL "Medical" -#define EXP_TYPE_SCIENCE "Science" -#define EXP_TYPE_SUPPLY "Supply" -#define EXP_TYPE_SECURITY "Security" -#define EXP_TYPE_SILICON "Silicon" -#define EXP_TYPE_SERVICE "Service" -#define EXP_TYPE_ANTAG "Antag" -#define EXP_TYPE_SPECIAL "Special" -#define EXP_TYPE_GHOST "Ghost" -#define EXP_TYPE_ADMIN "Admin" +#define EXP_TYPE_LIVING "Living" +#define EXP_TYPE_CREW "Crew" +#define EXP_TYPE_COMMAND "Command" +#define EXP_TYPE_ENGINEERING "Engineering" +#define EXP_TYPE_MEDICAL "Medical" +#define EXP_TYPE_SCIENCE "Science" +#define EXP_TYPE_SUPPLY "Supply" +#define EXP_TYPE_SECURITY "Security" +#define EXP_TYPE_SILICON "Silicon" +#define EXP_TYPE_SERVICE "Service" +#define EXP_TYPE_ANTAG "Antag" +#define EXP_TYPE_SPECIAL "Special" +#define EXP_TYPE_GHOST "Ghost" +#define EXP_TYPE_ADMIN "Admin" //Flags in the players table in the db #define DB_FLAG_EXEMPT 1 diff --git a/code/__DEFINES/projectiles.dm b/code/__DEFINES/projectiles.dm index 74ed3910d94..d3a9cf3fb5c 100644 --- a/code/__DEFINES/projectiles.dm +++ b/code/__DEFINES/projectiles.dm @@ -1,59 +1,59 @@ // check_pierce() return values /// Default behavior: hit and delete self -#define PROJECTILE_PIERCE_NONE 0 +#define PROJECTILE_PIERCE_NONE 0 /// Hit the thing but go through without deleting. Causes on_hit to be called with pierced = TRUE -#define PROJECTILE_PIERCE_HIT 1 +#define PROJECTILE_PIERCE_HIT 1 /// Entirely phase through the thing without ever hitting. -#define PROJECTILE_PIERCE_PHASE 2 +#define PROJECTILE_PIERCE_PHASE 2 // Delete self without hitting -#define PROJECTILE_DELETE_WITHOUT_HITTING 3 +#define PROJECTILE_DELETE_WITHOUT_HITTING 3 // Caliber defines: (current count stands at 24) /// The caliber used by the [L6 SAW][/obj/item/gun/ballistic/automatic/l6_saw]. -#define CALIBER_712X82MM "mm71282" +#define CALIBER_712X82MM "mm71282" /// The caliber used by the [security auto-rifle][/obj/item/gun/ballistic/automatic/wt550]. -#define CALIBER_46X30MM "4.6x30mm" +#define CALIBER_46X30MM "4.6x30mm" /// The caliber used by the [plastikov SMG][/obj/item/gun/ballistic/automatic/plastikov]. -#define CALIBER_9X19MM "9x19mm" +#define CALIBER_9X19MM "9x19mm" /// The caliber used by the Nanotrasen Saber SMG, and Type U3 Uzi. Also used as the default caliber for pistols but only the stechkin APS machine pistol doesn't override it. -#define CALIBER_9MM "9mm" +#define CALIBER_9MM "9mm" /// The caliber used as the default for ballistic guns. Only not overridden for the [surplus rifle][/obj/item/gun/ballistic/automatic/surplus]. -#define CALIBER_10MM "10mm" +#define CALIBER_10MM "10mm" /// The caliber used by most revolver variants. -#define CALIBER_357 ".357" +#define CALIBER_357 ".357" /// The caliber used by the detective's revolver. -#define CALIBER_38 ".38" +#define CALIBER_38 ".38" /// The caliber used by the C-20r SMG, the tommygun, and the M1911 pistol. -#define CALIBER_45 ".45" +#define CALIBER_45 ".45" /// The caliber used by sniper rifles and the desert eagle. -#define CALIBER_50 ".50" +#define CALIBER_50 ".50" /// The caliber used by the gyrojet pistol. -#define CALIBER_75 ".75" +#define CALIBER_75 ".75" /// The caliber used by [one revolver variant][/obj/item/gun/ballistic/revolver/nagant]. -#define CALIBER_N762 "n762" +#define CALIBER_N762 "n762" /// The caliber used by the the M-90gl Carbine, and NT-ARG 'Boarder'. -#define CALIBER_A556 "a556" +#define CALIBER_A556 "a556" /// The caliber used by bolt action rifles. -#define CALIBER_A762 "a762" +#define CALIBER_A762 "a762" /// The caliber used by shotguns. -#define CALIBER_SHOTGUN "shotgun" +#define CALIBER_SHOTGUN "shotgun" /// The caliber used by grenade launchers. -#define CALIBER_40MM "40mm" +#define CALIBER_40MM "40mm" /// The caliber used by rocket launchers. -#define CALIBER_84MM "84mm" +#define CALIBER_84MM "84mm" /// The caliber used by laser guns. -#define CALIBER_LASER "laser" +#define CALIBER_LASER "laser" /// The caliber used by most energy guns. -#define CALIBER_ENERGY "energy" +#define CALIBER_ENERGY "energy" /// The caliber used by the laser minigun. -#define CALIBER_GATLING "gatling" +#define CALIBER_GATLING "gatling" /// The acliber used by foam force and donksoft toy guns. -#define CALIBER_FOAM "foam_force" +#define CALIBER_FOAM "foam_force" /// The caliber used by the bow and arrow. -#define CALIBER_ARROW "arrow" +#define CALIBER_ARROW "arrow" /// The caliber used by the harpoon gun. -#define CALIBER_HARPOON "harpoon" +#define CALIBER_HARPOON "harpoon" /// The caliber used by the meat hook. -#define CALIBER_HOOK "hook" +#define CALIBER_HOOK "hook" /// The caliber used by the changeling tentacle mutation. -#define CALIBER_TENTACLE "tentacle" +#define CALIBER_TENTACLE "tentacle" diff --git a/code/__DEFINES/qdel.dm b/code/__DEFINES/qdel.dm index 0d156b8fb7c..ef770532bd4 100644 --- a/code/__DEFINES/qdel.dm +++ b/code/__DEFINES/qdel.dm @@ -3,15 +3,15 @@ //! These can be given as a return in [/atom/proc/Destroy] or by calling [/proc/qdel]. /// `qdel` should queue the object for deletion. -#define QDEL_HINT_QUEUE 0 +#define QDEL_HINT_QUEUE 0 /// `qdel` should let the object live after calling [/atom/proc/Destroy]. -#define QDEL_HINT_LETMELIVE 1 +#define QDEL_HINT_LETMELIVE 1 /// Functionally the same as the above. `qdel` should assume the object will gc on its own, and not check it. -#define QDEL_HINT_IWILLGC 2 +#define QDEL_HINT_IWILLGC 2 /// Qdel should assume this object won't GC, and queue a hard delete using a hard reference. -#define QDEL_HINT_HARDDEL 3 +#define QDEL_HINT_HARDDEL 3 // Qdel should assume this object won't gc, and hard delete it posthaste. -#define QDEL_HINT_HARDDEL_NOW 4 +#define QDEL_HINT_HARDDEL_NOW 4 //! Defines for the [gc_destroyed][/datum/var/gc_destroyed] var. @@ -20,7 +20,7 @@ * * Functionally identical to [QDEL_HINT_QUEUE] if [GC_FAILURE_HARD_LOOKUP] is not enabled in _compiler_options.dm. */ -#define QDEL_HINT_FINDREFERENCE 5 +#define QDEL_HINT_FINDREFERENCE 5 /// Behavior as [QDEL_HINT_FINDREFERENCE], but only if the GC fails and a hard delete is forced. #define QDEL_HINT_IFFAIL_FINDREFERENCE 6 #endif diff --git a/code/__DEFINES/radiation.dm b/code/__DEFINES/radiation.dm index 9c5003e9332..69d6efa72f8 100644 --- a/code/__DEFINES/radiation.dm +++ b/code/__DEFINES/radiation.dm @@ -4,52 +4,52 @@ Changes here can have widespread effects: make sure you test well. Ask ninjanomnom if they're around */ -#define RAD_BACKGROUND_RADIATION 9 // How much radiation is harmless to a mob, this is also when radiation waves stop spreading +#define RAD_BACKGROUND_RADIATION 9 // How much radiation is harmless to a mob, this is also when radiation waves stop spreading // WARNING: Lowering this value significantly increases SSradiation load // apply_effect((amount*RAD_MOB_COEFFICIENT)/max(1, (radiation**2)*RAD_OVERDOSE_REDUCTION), IRRADIATE, blocked) -#define RAD_MOB_COEFFICIENT 0.20 // Radiation applied is multiplied by this +#define RAD_MOB_COEFFICIENT 0.20 // Radiation applied is multiplied by this #define RAD_MOB_SKIN_PROTECTION ((1/RAD_MOB_COEFFICIENT)+RAD_BACKGROUND_RADIATION) #define RAD_LOSS_PER_TICK 0.5 -#define RAD_TOX_COEFFICIENT 0.08 // Toxin damage per tick coefficient -#define RAD_OVERDOSE_REDUCTION 0.000001 // Coefficient to the reduction in applied rads once the thing, usualy mob, has too much radiation +#define RAD_TOX_COEFFICIENT 0.08 // Toxin damage per tick coefficient +#define RAD_OVERDOSE_REDUCTION 0.000001 // Coefficient to the reduction in applied rads once the thing, usualy mob, has too much radiation // WARNING: This number is highly sensitive to change, graph is first for best results -#define RAD_BURN_THRESHOLD 1000 // Applied radiation must be over this to burn +#define RAD_BURN_THRESHOLD 1000 // Applied radiation must be over this to burn //Holy shit test after you tweak anything it's said like 6 times in here //You probably want to plot any tweaks you make so you can see the curves visually #define RAD_BURN_LOG_BASE 1.1 #define RAD_BURN_LOG_GRADIENT 10000 #define RAD_BURN_CURVE(X) log(1+((X-RAD_BURN_THRESHOLD)/RAD_BURN_LOG_GRADIENT))/log(RAD_BURN_LOG_BASE) -#define RAD_MOB_SAFE 500 // How much stored radiation in a mob with no ill effects +#define RAD_MOB_SAFE 500 // How much stored radiation in a mob with no ill effects -#define RAD_MOB_HAIRLOSS 800 // How much stored radiation to check for hair loss +#define RAD_MOB_HAIRLOSS 800 // How much stored radiation to check for hair loss -#define RAD_MOB_MUTATE 1250 // How much stored radiation to check for mutation +#define RAD_MOB_MUTATE 1250 // How much stored radiation to check for mutation -#define RAD_MOB_VOMIT 2000 // The amount of radiation to check for vomitting -#define RAD_MOB_VOMIT_PROB 1 // Chance per tick of vomitting +#define RAD_MOB_VOMIT 2000 // The amount of radiation to check for vomitting +#define RAD_MOB_VOMIT_PROB 1 // Chance per tick of vomitting -#define RAD_MOB_KNOCKDOWN 2000 // How much stored radiation to check for stunning -#define RAD_MOB_KNOCKDOWN_PROB 1 // Chance of knockdown per tick when over threshold -#define RAD_MOB_KNOCKDOWN_AMOUNT 3 // Amount of knockdown when it occurs +#define RAD_MOB_KNOCKDOWN 2000 // How much stored radiation to check for stunning +#define RAD_MOB_KNOCKDOWN_PROB 1 // Chance of knockdown per tick when over threshold +#define RAD_MOB_KNOCKDOWN_AMOUNT 3 // Amount of knockdown when it occurs -#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_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_HEAVY_INSULATION 0.6 // What reinforced walls have -#define RAD_EXTREME_INSULATION 0.5 // What rad collectors have -#define RAD_FULL_INSULATION 0 // Unused +#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 // Unused // WARNING: The defines below could have disastrous consequences if tweaked incorrectly. See: The great SM purge of Oct.6.2017 -// contamination_strength = (strength-RAD_MINIMUM_CONTAMINATION) * RAD_CONTAMINATION_STR_COEFFICIENT -#define RAD_MINIMUM_CONTAMINATION 350 // How strong does a radiation wave have to be to contaminate objects -#define RAD_CONTAMINATION_STR_COEFFICIENT 0.25 // Higher means higher strength scaling contamination strength -#define RAD_DISTANCE_COEFFICIENT 1 // Lower means further rad spread +// contamination_strength = (strength-RAD_MINIMUM_CONTAMINATION) * RAD_CONTAMINATION_STR_COEFFICIENT +#define RAD_MINIMUM_CONTAMINATION 350 // How strong does a radiation wave have to be to contaminate objects +#define RAD_CONTAMINATION_STR_COEFFICIENT 0.25 // Higher means higher strength scaling contamination strength +#define RAD_DISTANCE_COEFFICIENT 1 // Lower means further rad spread -#define RAD_HALF_LIFE 90 // The half-life of contaminated objects +#define RAD_HALF_LIFE 90 // The half-life of contaminated objects -#define RAD_GEIGER_RC 4 // RC-constant for the LP filter for geiger counters. See #define LPFILTER for more info. +#define RAD_GEIGER_RC 4 // RC-constant for the LP filter for geiger counters. See #define LPFILTER for more info. #define RAD_GEIGER_GRACE_PERIOD 4 // How many seconds after we last detect a radiation pulse until we stop blipping diff --git a/code/__DEFINES/radio.dm b/code/__DEFINES/radio.dm index d3190b8fa20..3dd8ac75d4e 100644 --- a/code/__DEFINES/radio.dm +++ b/code/__DEFINES/radio.dm @@ -106,11 +106,11 @@ #define DEFAULT_SIGNALER_CODE 30 //Requests Console -#define REQ_NO_NEW_MESSAGE 0 -#define REQ_NORMAL_MESSAGE_PRIORITY 1 -#define REQ_HIGH_MESSAGE_PRIORITY 2 -#define REQ_EXTREME_MESSAGE_PRIORITY 3 +#define REQ_NO_NEW_MESSAGE 0 +#define REQ_NORMAL_MESSAGE_PRIORITY 1 +#define REQ_HIGH_MESSAGE_PRIORITY 2 +#define REQ_EXTREME_MESSAGE_PRIORITY 3 -#define REQ_DEP_TYPE_ASSISTANCE (1<<0) -#define REQ_DEP_TYPE_SUPPLIES (1<<1) -#define REQ_DEP_TYPE_INFORMATION (1<<2) +#define REQ_DEP_TYPE_ASSISTANCE (1<<0) +#define REQ_DEP_TYPE_SUPPLIES (1<<1) +#define REQ_DEP_TYPE_INFORMATION (1<<2) diff --git a/code/__DEFINES/reactions.dm b/code/__DEFINES/reactions.dm index 62a34200de5..4124be1e251 100644 --- a/code/__DEFINES/reactions.dm +++ b/code/__DEFINES/reactions.dm @@ -1,56 +1,56 @@ //Defines used in atmos gas reactions. Used to be located in ..\modules\atmospherics\gasmixtures\reactions.dm, but were moved here because fusion added so fucking many. //Plasma fire properties -#define OXYGEN_BURN_RATE_BASE 1.4 -#define PLASMA_BURN_RATE_DELTA 9 -#define HYDROGEN_BURN_RATE_DELTA 8 -#define PLASMA_MINIMUM_OXYGEN_NEEDED 2 -#define PLASMA_MINIMUM_OXYGEN_PLASMA_RATIO 30 -#define FIRE_CARBON_ENERGY_RELEASED 100000 //Amount of heat released per mole of burnt carbon into the tile -#define FIRE_HYDROGEN_ENERGY_RELEASED 2800000 //Amount of heat released per mole of burnt hydrogen and/or tritium(hydrogen isotope) +#define OXYGEN_BURN_RATE_BASE 1.4 +#define PLASMA_BURN_RATE_DELTA 9 +#define HYDROGEN_BURN_RATE_DELTA 8 +#define PLASMA_MINIMUM_OXYGEN_NEEDED 2 +#define PLASMA_MINIMUM_OXYGEN_PLASMA_RATIO 30 +#define FIRE_CARBON_ENERGY_RELEASED 100000 //Amount of heat released per mole of burnt carbon into the tile +#define FIRE_HYDROGEN_ENERGY_RELEASED 2800000 //Amount of heat released per mole of burnt hydrogen and/or tritium(hydrogen isotope) #define FIRE_HYDROGEN_ENERGY_WEAK 280000 -#define FIRE_PLASMA_ENERGY_RELEASED 3000000 //Amount of heat released per mole of burnt plasma into the tile +#define FIRE_PLASMA_ENERGY_RELEASED 3000000 //Amount of heat released per mole of burnt plasma into the tile //General assmos defines. -#define WATER_VAPOR_FREEZE 200 +#define WATER_VAPOR_FREEZE 200 //freon reaction -#define FREON_BURN_RATE_DELTA 4 -#define FIRE_FREON_ENERGY_RELEASED -300000 //amount of heat absorbed per mole of burnt freon in the tile +#define FREON_BURN_RATE_DELTA 4 +#define FIRE_FREON_ENERGY_RELEASED -300000 //amount of heat absorbed per mole of burnt freon in the tile -#define N2O_DECOMPOSITION_MIN_ENERGY 1400 -#define N2O_DECOMPOSITION_ENERGY_RELEASED 200000 +#define N2O_DECOMPOSITION_MIN_ENERGY 1400 +#define N2O_DECOMPOSITION_ENERGY_RELEASED 200000 -#define NITRYL_DECOMPOSITION_ENERGY 30000 -#define NITRYL_FORMATION_ENERGY 100000 -#define NITROUS_FORMATION_ENERGY 10000 +#define NITRYL_DECOMPOSITION_ENERGY 30000 +#define NITRYL_FORMATION_ENERGY 100000 +#define NITROUS_FORMATION_ENERGY 10000 //tritium reaction -#define TRITIUM_BURN_OXY_FACTOR 100 -#define TRITIUM_BURN_TRIT_FACTOR 10 -#define TRITIUM_BURN_RADIOACTIVITY_FACTOR 50000 //The neutrons gotta go somewhere. Completely arbitrary number. -#define TRITIUM_MINIMUM_RADIATION_ENERGY 0.1 //minimum 0.01 moles trit or 10 moles oxygen to start producing rads -#define MINIMUM_TRIT_OXYBURN_ENERGY 2000000 //This is calculated to help prevent singlecap bombs(Overpowered tritium/oxygen single tank bombs) +#define TRITIUM_BURN_OXY_FACTOR 100 +#define TRITIUM_BURN_TRIT_FACTOR 10 +#define TRITIUM_BURN_RADIOACTIVITY_FACTOR 50000 //The neutrons gotta go somewhere. Completely arbitrary number. +#define TRITIUM_MINIMUM_RADIATION_ENERGY 0.1 //minimum 0.01 moles trit or 10 moles oxygen to start producing rads +#define MINIMUM_TRIT_OXYBURN_ENERGY 2000000 //This is calculated to help prevent singlecap bombs(Overpowered tritium/oxygen single tank bombs) //hydrogen reaction -#define HYDROGEN_BURN_OXY_FACTOR 100 -#define HYDROGEN_BURN_H2_FACTOR 10 -#define MINIMUM_H2_OXYBURN_ENERGY 2000000 //This is calculated to help prevent singlecap bombs(Overpowered hydrogen/oxygen single tank bombs) +#define HYDROGEN_BURN_OXY_FACTOR 100 +#define HYDROGEN_BURN_H2_FACTOR 10 +#define MINIMUM_H2_OXYBURN_ENERGY 2000000 //This is calculated to help prevent singlecap bombs(Overpowered hydrogen/oxygen single tank bombs) //ammonia reaction -#define AMMONIA_FORMATION_FACTOR 250 -#define AMMONIA_FORMATION_ENERGY 1000 +#define AMMONIA_FORMATION_FACTOR 250 +#define AMMONIA_FORMATION_ENERGY 1000 //metal hydrogen -#define METAL_HYDROGEN_MINIMUM_HEAT 1e7 -#define METAL_HYDROGEN_MINIMUM_PRESSURE 1e7 -#define METAL_HYDROGEN_FORMATION_ENERGY 20000000 -#define SUPER_SATURATION_THRESHOLD 96 -#define STIMULUM_HEAT_SCALE 100000 -#define STIMULUM_FIRST_RISE 0.65 -#define STIMULUM_FIRST_DROP 0.065 -#define STIMULUM_SECOND_RISE 0.0009 -#define STIMULUM_ABSOLUTE_DROP 0.00000335 -#define REACTION_OPPRESSION_THRESHOLD 5 -#define NOBLIUM_FORMATION_ENERGY 2e7 -#define STIM_BALL_GAS_AMOUNT 5 +#define METAL_HYDROGEN_MINIMUM_HEAT 1e7 +#define METAL_HYDROGEN_MINIMUM_PRESSURE 1e7 +#define METAL_HYDROGEN_FORMATION_ENERGY 20000000 +#define SUPER_SATURATION_THRESHOLD 96 +#define STIMULUM_HEAT_SCALE 100000 +#define STIMULUM_FIRST_RISE 0.65 +#define STIMULUM_FIRST_DROP 0.065 +#define STIMULUM_SECOND_RISE 0.0009 +#define STIMULUM_ABSOLUTE_DROP 0.00000335 +#define REACTION_OPPRESSION_THRESHOLD 5 +#define NOBLIUM_FORMATION_ENERGY 2e7 +#define STIM_BALL_GAS_AMOUNT 5 //Research point amounts -#define NOBLIUM_RESEARCH_AMOUNT 30 -#define BZ_RESEARCH_SCALE 4 -#define BZ_RESEARCH_MAX_AMOUNT 400 -#define METAL_HYDROGEN_RESEARCH_MAX_AMOUNT 3000 -#define STIMULUM_RESEARCH_AMOUNT 50 +#define NOBLIUM_RESEARCH_AMOUNT 30 +#define BZ_RESEARCH_SCALE 4 +#define BZ_RESEARCH_MAX_AMOUNT 400 +#define METAL_HYDROGEN_RESEARCH_MAX_AMOUNT 3000 +#define STIMULUM_RESEARCH_AMOUNT 50 diff --git a/code/__DEFINES/reagents.dm b/code/__DEFINES/reagents.dm index 37256214753..0c593ebea55 100644 --- a/code/__DEFINES/reagents.dm +++ b/code/__DEFINES/reagents.dm @@ -1,33 +1,33 @@ -#define SOLID 1 -#define LIQUID 2 -#define GAS 3 +#define SOLID 1 +#define LIQUID 2 +#define GAS 3 -#define INJECTABLE (1<<0) // Makes it possible to add reagents through droppers and syringes. -#define DRAWABLE (1<<1) // Makes it possible to remove reagents through syringes. +#define INJECTABLE (1<<0) // Makes it possible to add reagents through droppers and syringes. +#define DRAWABLE (1<<1) // Makes it possible to remove reagents through syringes. -#define REFILLABLE (1<<2) // Makes it possible to add reagents through any reagent container. -#define DRAINABLE (1<<3) // Makes it possible to remove reagents through any reagent container. -#define DUNKABLE (1<<4) // Allows items to be dunked into this container for transfering reagents. Used in conjunction with the dunkable component. +#define REFILLABLE (1<<2) // Makes it possible to add reagents through any reagent container. +#define DRAINABLE (1<<3) // Makes it possible to remove reagents through any reagent container. +#define DUNKABLE (1<<4) // Allows items to be dunked into this container for transfering reagents. Used in conjunction with the dunkable component. -#define TRANSPARENT (1<<5) // Used on containers which you want to be able to see the reagents off. -#define AMOUNT_VISIBLE (1<<6) // For non-transparent containers that still have the general amount of reagents in them visible. -#define NO_REACT (1<<7) // Applied to a reagent holder, the contents will not react with each other. +#define TRANSPARENT (1<<5) // Used on containers which you want to be able to see the reagents off. +#define AMOUNT_VISIBLE (1<<6) // For non-transparent containers that still have the general amount of reagents in them visible. +#define NO_REACT (1<<7) // Applied to a reagent holder, the contents will not react with each other. #define REAGENT_HOLDER_INSTANT_REACT (1<<8) // Applied to a reagent holder, all of the reactions in the reagents datum will be instant. Meant to be used for things like smoke effects where reactions aren't meant to occur // Is an open container for all intents and purposes. -#define OPENCONTAINER (REFILLABLE | DRAINABLE | TRANSPARENT) +#define OPENCONTAINER (REFILLABLE | DRAINABLE | TRANSPARENT) // Reagent exposure methods. /// Used for splashing. -#define TOUCH (1<<0) +#define TOUCH (1<<0) /// Used for ingesting the reagents. Food, drinks, inhaling smoke. -#define INGEST (1<<1) +#define INGEST (1<<1) /// Used by foams, sprays, and blob attacks. -#define VAPOR (1<<2) +#define VAPOR (1<<2) /// Used by medical patches and gels. -#define PATCH (1<<3) +#define PATCH (1<<3) /// Used for direct injection of reagents. -#define INJECT (1<<4) +#define INJECT (1<<4) #define MIMEDRINK_SILENCE_DURATION 30 //ends up being 60 seconds given 1 tick every 2 seconds ///Health threshold for synthflesh and rezadone to unhusk someone @@ -57,11 +57,11 @@ //reagent bitflags, used for altering how they works ///allows on_mob_dead() if present in a dead body -#define REAGENT_DEAD_PROCESS (1<<0) +#define REAGENT_DEAD_PROCESS (1<<0) ///Do not split the chem at all during processing - ignores all purity effects -#define REAGENT_DONOTSPLIT (1<<1) +#define REAGENT_DONOTSPLIT (1<<1) ///Doesn't appear on handheld health analyzers. -#define REAGENT_INVISIBLE (1<<2) +#define REAGENT_INVISIBLE (1<<2) ///When inverted, the inverted chem uses the name of the original chem #define REAGENT_SNEAKYNAME (1<<3) ///Retains initial volume of chem when splitting for purity effects @@ -75,7 +75,7 @@ ///Convert into inverse on reaction completion when purity is low enough #define REACTION_CLEAR_INVERSE (1<<1) ///Clear converted chems retain their purities/inverted purities. Requires 1 or both of the above. -#define REACTION_CLEAR_RETAIN (1<<2) +#define REACTION_CLEAR_RETAIN (1<<2) ///Used to create instant reactions #define REACTION_INSTANT (1<<3) ///Used to force reactions to create a specific amount of heat per 1u created. So if thermic_constant = 5, for 1u of reagent produced, the heat will be forced up arbitarily by 5 irresepective of other reagents. If you use this, keep in mind standard thermic_constant values are 100x what it should be with this enabled. diff --git a/code/__DEFINES/reagents_specific_heat.dm b/code/__DEFINES/reagents_specific_heat.dm index 90a379d7de5..4a7d95c9556 100644 --- a/code/__DEFINES/reagents_specific_heat.dm +++ b/code/__DEFINES/reagents_specific_heat.dm @@ -1,3 +1,3 @@ -#define SPECIFIC_HEAT_DEFAULT 200 +#define SPECIFIC_HEAT_DEFAULT 200 -#define SPECIFIC_HEAT_PLASMA 500 +#define SPECIFIC_HEAT_PLASMA 500 diff --git a/code/__DEFINES/research.dm b/code/__DEFINES/research.dm index f7e3bcbaf47..f674c97466c 100644 --- a/code/__DEFINES/research.dm +++ b/code/__DEFINES/research.dm @@ -39,12 +39,12 @@ #define RESEARCH_FABRICATOR_SCREEN_CATEGORYVIEW 5 //! Department flags for techwebs. Defines which department can print what from each protolathe so Cargo can't print guns, etc. -#define DEPARTMENTAL_FLAG_SECURITY (1<<0) -#define DEPARTMENTAL_FLAG_MEDICAL (1<<1) -#define DEPARTMENTAL_FLAG_CARGO (1<<2) -#define DEPARTMENTAL_FLAG_SCIENCE (1<<3) -#define DEPARTMENTAL_FLAG_ENGINEERING (1<<4) -#define DEPARTMENTAL_FLAG_SERVICE (1<<5) +#define DEPARTMENTAL_FLAG_SECURITY (1<<0) +#define DEPARTMENTAL_FLAG_MEDICAL (1<<1) +#define DEPARTMENTAL_FLAG_CARGO (1<<2) +#define DEPARTMENTAL_FLAG_SCIENCE (1<<3) +#define DEPARTMENTAL_FLAG_ENGINEERING (1<<4) +#define DEPARTMENTAL_FLAG_SERVICE (1<<5) /// For instances where we don't want a design showing up due to it being for debug/sanity purposes #define DESIGN_ID_IGNORE "IGNORE_THIS_DESIGN" @@ -64,7 +64,7 @@ ) /// R&D point value for a maxcap bomb. Can be adjusted if need be. Current Value Cap Radius: 100 -#define TECHWEB_BOMB_POINTCAP 50000 +#define TECHWEB_BOMB_POINTCAP 50000 //! Research point values for slime extracts, see: [xenobio_camera][code/modules/research/xenobiology/xenobio_camera.dm] #define SLIME_RESEARCH_TIER_0 100 diff --git a/code/__DEFINES/research/anomalies.dm b/code/__DEFINES/research/anomalies.dm index 2b23ca24c42..e29254f8378 100644 --- a/code/__DEFINES/research/anomalies.dm +++ b/code/__DEFINES/research/anomalies.dm @@ -1,18 +1,18 @@ // Anomaly core types /// Bluespace cores -#define ANOMALY_CORE_BLUESPACE /obj/item/assembly/signaler/anomaly/bluespace +#define ANOMALY_CORE_BLUESPACE /obj/item/assembly/signaler/anomaly/bluespace /// Gravitational cores -#define ANOMALY_CORE_GRAVITATIONAL /obj/item/assembly/signaler/anomaly/grav +#define ANOMALY_CORE_GRAVITATIONAL /obj/item/assembly/signaler/anomaly/grav /// Flux -#define ANOMALY_CORE_FLUX /obj/item/assembly/signaler/anomaly/flux +#define ANOMALY_CORE_FLUX /obj/item/assembly/signaler/anomaly/flux /// Vortex -#define ANOMALY_CORE_VORTEX /obj/item/assembly/signaler/anomaly/vortex +#define ANOMALY_CORE_VORTEX /obj/item/assembly/signaler/anomaly/vortex /// Pyro -#define ANOMALY_CORE_PYRO /obj/item/assembly/signaler/anomaly/pyro +#define ANOMALY_CORE_PYRO /obj/item/assembly/signaler/anomaly/pyro // Max amounts of cores you can make -#define MAX_CORES_BLUESPACE 8 -#define MAX_CORES_GRAVITATIONAL 8 -#define MAX_CORES_FLUX 8 -#define MAX_CORES_VORTEX 8 -#define MAX_CORES_PYRO 8 +#define MAX_CORES_BLUESPACE 8 +#define MAX_CORES_GRAVITATIONAL 8 +#define MAX_CORES_FLUX 8 +#define MAX_CORES_VORTEX 8 +#define MAX_CORES_PYRO 8 diff --git a/code/__DEFINES/robots.dm b/code/__DEFINES/robots.dm index eec5123ae5b..9233f458c32 100644 --- a/code/__DEFINES/robots.dm +++ b/code/__DEFINES/robots.dm @@ -6,51 +6,51 @@ #define BOT_STEP_DELAY 4 //Delay between movemements #define BOT_STEP_MAX_RETRIES 5 //Maximum times a bot will retry to step from its position -#define DEFAULT_SCAN_RANGE 7 //default view range for finding targets. +#define DEFAULT_SCAN_RANGE 7 //default view range for finding targets. //Mode defines. If you add a new one make sure you update mode_name in /mob/living/simple_animal/bot -#define BOT_IDLE 0 // idle -#define BOT_HUNT 1 // found target, hunting -#define BOT_PREP_ARREST 2 // at target, preparing to arrest -#define BOT_ARREST 3 // arresting target -#define BOT_START_PATROL 4 // start patrol -#define BOT_PATROL 5 // patrolling -#define BOT_SUMMON 6 // summoned by PDA -#define BOT_CLEANING 7 // cleaning (cleanbots) -#define BOT_REPAIRING 8 // repairing hull breaches (floorbots) -#define BOT_MOVING 9 // for clean/floor/med bots, when moving. -#define BOT_HEALING 10 // healing people (medbots) -#define BOT_RESPONDING 11 // responding to a call from the AI -#define BOT_DELIVER 12 // moving to deliver -#define BOT_GO_HOME 13 // returning to home -#define BOT_BLOCKED 14 // blocked -#define BOT_NAV 15 // computing navigation -#define BOT_WAIT_FOR_NAV 16 // waiting for nav computation -#define BOT_NO_ROUTE 17 // no destination beacon found (or no route) -#define BOT_SHOWERSTANCE 18 // cleaning unhygienic humans -#define BOT_TIPPED 19 // someone tipped a medibot over ;_; +#define BOT_IDLE 0 // idle +#define BOT_HUNT 1 // found target, hunting +#define BOT_PREP_ARREST 2 // at target, preparing to arrest +#define BOT_ARREST 3 // arresting target +#define BOT_START_PATROL 4 // start patrol +#define BOT_PATROL 5 // patrolling +#define BOT_SUMMON 6 // summoned by PDA +#define BOT_CLEANING 7 // cleaning (cleanbots) +#define BOT_REPAIRING 8 // repairing hull breaches (floorbots) +#define BOT_MOVING 9 // for clean/floor/med bots, when moving. +#define BOT_HEALING 10 // healing people (medbots) +#define BOT_RESPONDING 11 // responding to a call from the AI +#define BOT_DELIVER 12 // moving to deliver +#define BOT_GO_HOME 13 // returning to home +#define BOT_BLOCKED 14 // blocked +#define BOT_NAV 15 // computing navigation +#define BOT_WAIT_FOR_NAV 16 // waiting for nav computation +#define BOT_NO_ROUTE 17 // no destination beacon found (or no route) +#define BOT_SHOWERSTANCE 18 // cleaning unhygienic humans +#define BOT_TIPPED 19 // someone tipped a medibot over ;_; //Bot types -#define SEC_BOT (1<<0) // Secutritrons (Beepsky) and ED-209s -#define MULE_BOT (1<<1) // MULEbots -#define FLOOR_BOT (1<<2) // Floorbots -#define CLEAN_BOT (1<<3) // Cleanbots -#define MED_BOT (1<<4) // Medibots -#define HONK_BOT (1<<5) // Honkbots & ED-Honks -#define FIRE_BOT (1<<6) // Firebots -#define HYGIENE_BOT (1<<7) // Hygienebots -#define VIBE_BOT (1<<8) // Vibe bots +#define SEC_BOT (1<<0) // Secutritrons (Beepsky) and ED-209s +#define MULE_BOT (1<<1) // MULEbots +#define FLOOR_BOT (1<<2) // Floorbots +#define CLEAN_BOT (1<<3) // Cleanbots +#define MED_BOT (1<<4) // Medibots +#define HONK_BOT (1<<5) // Honkbots & ED-Honks +#define FIRE_BOT (1<<6) // Firebots +#define HYGIENE_BOT (1<<7) // Hygienebots +#define VIBE_BOT (1<<8) // Vibe bots //AI notification defines -#define NEW_BORG 1 -#define NEW_MODEL 2 -#define RENAME 3 -#define AI_SHELL 4 -#define DISCONNECT 5 +#define NEW_BORG 1 +#define NEW_MODEL 2 +#define RENAME 3 +#define AI_SHELL 4 +#define DISCONNECT 5 //Assembly defines -#define ASSEMBLY_FIRST_STEP 0 -#define ASSEMBLY_SECOND_STEP 1 +#define ASSEMBLY_FIRST_STEP 0 +#define ASSEMBLY_SECOND_STEP 1 #define ASSEMBLY_THIRD_STEP 2 #define ASSEMBLY_FOURTH_STEP 3 #define ASSEMBLY_FIFTH_STEP 4 @@ -63,6 +63,6 @@ #define BORG_MODULE_THREE_DISABLED (1<<2) /// Defines for borg module selection -#define BORG_CHOOSE_MODULE_ONE 1 -#define BORG_CHOOSE_MODULE_TWO 2 +#define BORG_CHOOSE_MODULE_ONE 1 +#define BORG_CHOOSE_MODULE_TWO 2 #define BORG_CHOOSE_MODULE_THREE 3 diff --git a/code/__DEFINES/role_preferences.dm b/code/__DEFINES/role_preferences.dm index b6f4b4f8984..5d8273db0fd 100644 --- a/code/__DEFINES/role_preferences.dm +++ b/code/__DEFINES/role_preferences.dm @@ -6,43 +6,43 @@ //These are synced with the Database, if you change the values of the defines //then you MUST update the database! -#define ROLE_SYNDICATE "Syndicate" -#define ROLE_TRAITOR "Traitor" -#define ROLE_OPERATIVE "Operative" -#define ROLE_CHANGELING "Changeling" -#define ROLE_WIZARD "Wizard" -#define ROLE_MALF "Malf AI" -#define ROLE_REV "Revolutionary" -#define ROLE_REV_HEAD "Head Revolutionary" -#define ROLE_REV_SUCCESSFUL "Victorious Revolutionary" -#define ROLE_ALIEN "Xenomorph" -#define ROLE_PAI "pAI" -#define ROLE_CULTIST "Cultist" -#define ROLE_HERETIC "Heretic" -#define ROLE_BLOB "Blob" -#define ROLE_NINJA "Space Ninja" -#define ROLE_MONKEY "Monkey" -#define ROLE_MONKEY_HELMET "Monkey Mind Magnification Helmet" -#define ROLE_ABDUCTOR "Abductor" -#define ROLE_REVENANT "Revenant" -#define ROLE_BROTHER "Blood Brother" -#define ROLE_BRAINWASHED "Brainwashed Victim" -#define ROLE_OVERTHROW "Syndicate Mutineer" //Role removed, left here for safety. -#define ROLE_HIVE "Hivemind Host" //Role removed, left here for safety. -#define ROLE_OBSESSED "Obsessed" -#define ROLE_SPACE_DRAGON "Space Dragon" -#define ROLE_SENTIENCE "Sentience Potion Spawn" -#define ROLE_PYROCLASTIC_SLIME "Pyroclastic Anomaly Slime" -#define ROLE_MIND_TRANSFER "Mind Transfer Potion" -#define ROLE_POSIBRAIN "Posibrain" -#define ROLE_DRONE "Drone" -#define ROLE_DEATHSQUAD "Deathsquad" -#define ROLE_LAVALAND "Lavaland" -#define ROLE_INTERNAL_AFFAIRS "Internal Affairs Agent" -#define ROLE_FAMILIES "Familes Antagonists" -#define ROLE_SYNDICATE_CYBERSUN "Cybersun Space Syndicate" //Ghost role syndi from Forgottenship ruin -#define ROLE_SYNDICATE_CYBERSUN_CAPTAIN "Cybersun Space Syndicate Captain" //Forgottenship captain syndie -#define ROLE_ASSAULTOP "Assault Operatives" //SKYRAT EDIT ADDITION - ASSAULTOPS +#define ROLE_SYNDICATE "Syndicate" +#define ROLE_TRAITOR "Traitor" +#define ROLE_OPERATIVE "Operative" +#define ROLE_CHANGELING "Changeling" +#define ROLE_WIZARD "Wizard" +#define ROLE_MALF "Malf AI" +#define ROLE_REV "Revolutionary" +#define ROLE_REV_HEAD "Head Revolutionary" +#define ROLE_REV_SUCCESSFUL "Victorious Revolutionary" +#define ROLE_ALIEN "Xenomorph" +#define ROLE_PAI "pAI" +#define ROLE_CULTIST "Cultist" +#define ROLE_HERETIC "Heretic" +#define ROLE_BLOB "Blob" +#define ROLE_NINJA "Space Ninja" +#define ROLE_MONKEY "Monkey" +#define ROLE_MONKEY_HELMET "Monkey Mind Magnification Helmet" +#define ROLE_ABDUCTOR "Abductor" +#define ROLE_REVENANT "Revenant" +#define ROLE_BROTHER "Blood Brother" +#define ROLE_BRAINWASHED "Brainwashed Victim" +#define ROLE_OVERTHROW "Syndicate Mutineer" //Role removed, left here for safety. +#define ROLE_HIVE "Hivemind Host" //Role removed, left here for safety. +#define ROLE_OBSESSED "Obsessed" +#define ROLE_SPACE_DRAGON "Space Dragon" +#define ROLE_SENTIENCE "Sentience Potion Spawn" +#define ROLE_PYROCLASTIC_SLIME "Pyroclastic Anomaly Slime" +#define ROLE_MIND_TRANSFER "Mind Transfer Potion" +#define ROLE_POSIBRAIN "Posibrain" +#define ROLE_DRONE "Drone" +#define ROLE_DEATHSQUAD "Deathsquad" +#define ROLE_LAVALAND "Lavaland" +#define ROLE_INTERNAL_AFFAIRS "Internal Affairs Agent" +#define ROLE_FAMILIES "Familes Antagonists" +#define ROLE_SYNDICATE_CYBERSUN "Cybersun Space Syndicate" //Ghost role syndi from Forgottenship ruin +#define ROLE_SYNDICATE_CYBERSUN_CAPTAIN "Cybersun Space Syndicate Captain" //Forgottenship captain syndie +#define ROLE_ASSAULTOP "Assault Operatives" //SKYRAT EDIT ADDITION - ASSAULTOPS //Missing assignment means it's not a gamemode specific role, IT'S NOT A BUG OR ERROR. //The gamemode specific ones are just so the gamemodes can query whether a player is old enough @@ -73,6 +73,6 @@ GLOBAL_LIST_INIT(special_roles, list( )) //Job defines for what happens when you fail to qualify for any job during job selection -#define BEOVERFLOW 1 -#define BERANDOMJOB 2 -#define RETURNTOLOBBY 3 +#define BEOVERFLOW 1 +#define BERANDOMJOB 2 +#define RETURNTOLOBBY 3 diff --git a/code/__DEFINES/say.dm b/code/__DEFINES/say.dm index 65cee0029ae..acc421f4a08 100644 --- a/code/__DEFINES/say.dm +++ b/code/__DEFINES/say.dm @@ -68,9 +68,9 @@ #define SPAN_TAPE_RECORDER "tape_recorder" //bitflag #defines for return value of the radio() proc. -#define ITALICS (1<<0) -#define REDUCE_RANGE (1<<1) -#define NOPASS (1<<2) +#define ITALICS (1<<0) +#define REDUCE_RANGE (1<<1) +#define NOPASS (1<<2) //Eavesdropping #define EAVESDROP_EXTRA_RANGE 1 //how much past the specified message_range does the message get starred, whispering only @@ -84,10 +84,10 @@ #define FOLLOW_OR_TURF_LINK(alice, bob, turfy) "(F)" //Don't set this very much higher then 1024 unless you like inviting people in to dos your server with message spam -#define MAX_MESSAGE_LEN 2048 //SKYRAT EDIT CHANGE - ORIGINAL 1024 - I SAID DOUBLE IT!! FUCK THE WARNING! -#define MAX_NAME_LEN 42 -#define MAX_BROADCAST_LEN 512 -#define MAX_CHARTER_LEN 80 +#define MAX_MESSAGE_LEN 2048 //SKYRAT EDIT CHANGE - ORIGINAL 1024 - I SAID DOUBLE IT!! FUCK THE WARNING! +#define MAX_NAME_LEN 42 +#define MAX_BROADCAST_LEN 512 +#define MAX_CHARTER_LEN 80 // Is something in the IC chat filter? This is config dependent. #define CHAT_FILTER_CHECK(T) (config.ic_filter_regex && findtext(T, config.ic_filter_regex)) diff --git a/code/__DEFINES/shuttles.dm b/code/__DEFINES/shuttles.dm index b4eb66f3c51..5b906d97bf3 100644 --- a/code/__DEFINES/shuttles.dm +++ b/code/__DEFINES/shuttles.dm @@ -1,15 +1,15 @@ //shuttle mode defines -#define SHUTTLE_IDLE "idle" -#define SHUTTLE_IGNITING "igniting" -#define SHUTTLE_RECALL "recalled" -#define SHUTTLE_CALL "called" -#define SHUTTLE_DOCKED "docked" -#define SHUTTLE_STRANDED "stranded" -#define SHUTTLE_DISABLED "disabled" -#define SHUTTLE_ESCAPE "escape" -#define SHUTTLE_ENDGAME "endgame: game over" -#define SHUTTLE_RECHARGING "recharging" -#define SHUTTLE_PREARRIVAL "landing" +#define SHUTTLE_IDLE "idle" +#define SHUTTLE_IGNITING "igniting" +#define SHUTTLE_RECALL "recalled" +#define SHUTTLE_CALL "called" +#define SHUTTLE_DOCKED "docked" +#define SHUTTLE_STRANDED "stranded" +#define SHUTTLE_DISABLED "disabled" +#define SHUTTLE_ESCAPE "escape" +#define SHUTTLE_ENDGAME "endgame: game over" +#define SHUTTLE_RECHARGING "recharging" +#define SHUTTLE_PREARRIVAL "landing" #define EMERGENCY_IDLE_OR_RECALLED (SSshuttle.emergency && ((SSshuttle.emergency.mode == SHUTTLE_IDLE) || (SSshuttle.emergency.mode == SHUTTLE_RECALL))) #define EMERGENCY_ESCAPED_OR_ENDGAMED (SSshuttle.emergency && ((SSshuttle.emergency.mode == SHUTTLE_ESCAPE) || (SSshuttle.emergency.mode == SHUTTLE_ENDGAME))) @@ -61,12 +61,12 @@ #define ENGINE_DEFAULT_MAXSPEED_ENGINES 5 //Docking error flags -#define DOCKING_SUCCESS 0 -#define DOCKING_BLOCKED (1<<0) -#define DOCKING_IMMOBILIZED (1<<1) -#define DOCKING_AREA_EMPTY (1<<2) -#define DOCKING_NULL_DESTINATION (1<<3) -#define DOCKING_NULL_SOURCE (1<<4) +#define DOCKING_SUCCESS 0 +#define DOCKING_BLOCKED (1<<0) +#define DOCKING_IMMOBILIZED (1<<1) +#define DOCKING_AREA_EMPTY (1<<2) +#define DOCKING_NULL_DESTINATION (1<<3) +#define DOCKING_NULL_SOURCE (1<<4) //Docking turf movements #define MOVE_TURF 1 @@ -74,9 +74,9 @@ #define MOVE_CONTENTS 4 //Rotation params -#define ROTATE_DIR 1 -#define ROTATE_SMOOTH 2 -#define ROTATE_OFFSET 4 +#define ROTATE_DIR 1 +#define ROTATE_SMOOTH 2 +#define ROTATE_OFFSET 4 #define SHUTTLE_DOCKER_LANDING_CLEAR 1 #define SHUTTLE_DOCKER_BLOCKED_BY_HIDDEN_PORT 2 diff --git a/code/__DEFINES/sight.dm b/code/__DEFINES/sight.dm index 5cac2900823..a0ce649dd04 100644 --- a/code/__DEFINES/sight.dm +++ b/code/__DEFINES/sight.dm @@ -17,19 +17,19 @@ #define INVISIBILITY_ABSTRACT 101 //only used for abstract objects (e.g. spacevine_controller), things that are not really there. -#define BORGMESON (1<<0) -#define BORGTHERM (1<<1) -#define BORGXRAY (1<<2) -#define BORGMATERIAL (1<<3) +#define BORGMESON (1<<0) +#define BORGTHERM (1<<1) +#define BORGXRAY (1<<2) +#define BORGMATERIAL (1<<3) //for clothing visor toggles, these determine which vars to toggle -#define VISOR_FLASHPROTECT (1<<0) -#define VISOR_TINT (1<<1) -#define VISOR_VISIONFLAGS (1<<2) //all following flags only matter for glasses -#define VISOR_DARKNESSVIEW (1<<3) -#define VISOR_INVISVIEW (1<<4) +#define VISOR_FLASHPROTECT (1<<0) +#define VISOR_TINT (1<<1) +#define VISOR_VISIONFLAGS (1<<2) //all following flags only matter for glasses +#define VISOR_DARKNESSVIEW (1<<3) +#define VISOR_INVISVIEW (1<<4) //for whether AI eyes see static, and whether it is mouse-opaque or not -#define USE_STATIC_NONE 0 -#define USE_STATIC_TRANSPARENT 1 -#define USE_STATIC_OPAQUE 2 +#define USE_STATIC_NONE 0 +#define USE_STATIC_TRANSPARENT 1 +#define USE_STATIC_OPAQUE 2 diff --git a/code/__DEFINES/skills.dm b/code/__DEFINES/skills.dm index c5a82a1a4f7..6329989b3c8 100644 --- a/code/__DEFINES/skills.dm +++ b/code/__DEFINES/skills.dm @@ -32,5 +32,5 @@ #define GetSkillRef(A) (SSskills.all_skills[A]) //number defines -#define CLEAN_SKILL_BEAUTY_ADJUSTMENT -15//It's a denominator so no 0. Higher number = less cleaning xp per cleanable. Negative value means cleanables with negative beauty give xp. -#define CLEAN_SKILL_GENERIC_WASH_XP 1.5//Value. Higher number = more XP when cleaning non-cleanables (walls/floors/lips) +#define CLEAN_SKILL_BEAUTY_ADJUSTMENT -15//It's a denominator so no 0. Higher number = less cleaning xp per cleanable. Negative value means cleanables with negative beauty give xp. +#define CLEAN_SKILL_GENERIC_WASH_XP 1.5//Value. Higher number = more XP when cleaning non-cleanables (walls/floors/lips) diff --git a/code/__DEFINES/sound.dm b/code/__DEFINES/sound.dm index 8f607b4c7b0..b4a9873163b 100644 --- a/code/__DEFINES/sound.dm +++ b/code/__DEFINES/sound.dm @@ -102,19 +102,19 @@ ///Announcer audio keys -#define ANNOUNCER_AIMALF "announcer_aimalf" -#define ANNOUNCER_ALIENS "announcer_aliens" -#define ANNOUNCER_ANIMES "announcer_animes" -#define ANNOUNCER_GRANOMALIES "announcer_granomalies" -#define ANNOUNCER_INTERCEPT "announcer_animes" -#define ANNOUNCER_IONSTORM "announcer_ionstorm" -#define ANNOUNCER_METEORS "announcer_meteors" -#define ANNOUNCER_OUTBREAK5 "announcer_outbreak5" -#define ANNOUNCER_OUTBREAK7 "announcer_outbreak7" -#define ANNOUNCER_POWEROFF "announcer_poweroff" -#define ANNOUNCER_POWERON "announcer_poweron" -#define ANNOUNCER_RADIATION "announcer_radiation" -#define ANNOUNCER_SHUTTLECALLED "announcer_shuttlecalled" -#define ANNOUNCER_SHUTTLEDOCK "announcer_shuttledock" -#define ANNOUNCER_SHUTTLERECALLED "announcer_shuttlerecalled" -#define ANNOUNCER_SPANOMALIES "announcer_spanomalies" +#define ANNOUNCER_AIMALF "announcer_aimalf" +#define ANNOUNCER_ALIENS "announcer_aliens" +#define ANNOUNCER_ANIMES "announcer_animes" +#define ANNOUNCER_GRANOMALIES "announcer_granomalies" +#define ANNOUNCER_INTERCEPT "announcer_animes" +#define ANNOUNCER_IONSTORM "announcer_ionstorm" +#define ANNOUNCER_METEORS "announcer_meteors" +#define ANNOUNCER_OUTBREAK5 "announcer_outbreak5" +#define ANNOUNCER_OUTBREAK7 "announcer_outbreak7" +#define ANNOUNCER_POWEROFF "announcer_poweroff" +#define ANNOUNCER_POWERON "announcer_poweron" +#define ANNOUNCER_RADIATION "announcer_radiation" +#define ANNOUNCER_SHUTTLECALLED "announcer_shuttlecalled" +#define ANNOUNCER_SHUTTLEDOCK "announcer_shuttledock" +#define ANNOUNCER_SHUTTLERECALLED "announcer_shuttlerecalled" +#define ANNOUNCER_SPANOMALIES "announcer_spanomalies" diff --git a/code/__DEFINES/stat.dm b/code/__DEFINES/stat.dm index 10a6ab98c5c..b180c7b3349 100644 --- a/code/__DEFINES/stat.dm +++ b/code/__DEFINES/stat.dm @@ -3,20 +3,20 @@ */ //mob/var/stat things -#define CONSCIOUS 0 -#define SOFT_CRIT 1 -#define UNCONSCIOUS 2 -#define HARD_CRIT 3 -#define DEAD 4 +#define CONSCIOUS 0 +#define SOFT_CRIT 1 +#define UNCONSCIOUS 2 +#define HARD_CRIT 3 +#define DEAD 4 //Maximum healthiness an individual can have #define MAX_SATIETY 600 // bitflags for machine stat variable -#define BROKEN (1<<0) -#define NOPOWER (1<<1) -#define MAINT (1<<2) // under maintaince -#define EMPED (1<<3) // temporary broken by EMP pulse +#define BROKEN (1<<0) +#define NOPOWER (1<<1) +#define MAINT (1<<2) // under maintaince +#define EMPED (1<<3) // temporary broken by EMP pulse //ai power requirement defines #define POWER_REQ_ALL 1 diff --git a/code/__DEFINES/status_effects.dm b/code/__DEFINES/status_effects.dm index 3e9b3fd1eff..fa52b9ae5d5 100644 --- a/code/__DEFINES/status_effects.dm +++ b/code/__DEFINES/status_effects.dm @@ -70,10 +70,10 @@ #define STATUS_EFFECT_CONVULSING /datum/status_effect/convulsing #define STATUS_EFFECT_NECROPOLIS_CURSE /datum/status_effect/necropolis_curse -#define CURSE_BLINDING 1 //makes the edges of the target's screen obscured -#define CURSE_SPAWNING 2 //spawns creatures that attack the target only -#define CURSE_WASTING 4 //causes gradual damage -#define CURSE_GRASPING 8 //hands reach out from the sides of the screen, doing damage and stunning if they hit the target +#define CURSE_BLINDING 1 //makes the edges of the target's screen obscured +#define CURSE_SPAWNING 2 //spawns creatures that attack the target only +#define CURSE_WASTING 4 //causes gradual damage +#define CURSE_GRASPING 8 //hands reach out from the sides of the screen, doing damage and stunning if they hit the target #define STATUS_EFFECT_GONBOLAPACIFY /datum/status_effect/gonbola_pacify //Gives the user gondola traits while the gonbola is attached to them. diff --git a/code/__DEFINES/subsystems.dm b/code/__DEFINES/subsystems.dm index 3bdfedbc96b..84c86a075a3 100644 --- a/code/__DEFINES/subsystems.dm +++ b/code/__DEFINES/subsystems.dm @@ -30,10 +30,10 @@ * if the arguments to addtimer are the same as an existing timer, it doesn't create a new timer, * and returns the id of the existing timer */ -#define TIMER_UNIQUE (1<<0) +#define TIMER_UNIQUE (1<<0) ///For unique timers: Replace the old timer rather then not start this one -#define TIMER_OVERRIDE (1<<1) +#define TIMER_OVERRIDE (1<<1) /** * Timing should be based on how timing progresses on clients, not the server. @@ -42,23 +42,23 @@ * should only be used in conjuction with things that have to progress client side, such as * animate() or sound() */ -#define TIMER_CLIENT_TIME (1<<2) +#define TIMER_CLIENT_TIME (1<<2) ///Timer can be stopped using deltimer() -#define TIMER_STOPPABLE (1<<3) +#define TIMER_STOPPABLE (1<<3) ///prevents distinguishing identical timers with the wait variable /// ///To be used with TIMER_UNIQUE -#define TIMER_NO_HASH_WAIT (1<<4) +#define TIMER_NO_HASH_WAIT (1<<4) ///Loops the timer repeatedly until qdeleted /// ///In most cases you want a subsystem instead, so don't use this unless you have a good reason -#define TIMER_LOOP (1<<5) +#define TIMER_LOOP (1<<5) ///Delete the timer on parent datum Destroy() and when deltimer'd -#define TIMER_DELETE_ME (1<<6) +#define TIMER_DELETE_ME (1<<6) ///Empty ID define #define TIMER_ID_NULL -1 @@ -101,89 +101,89 @@ // Subsystems shutdown in the reverse of the order they initialize in // The numbers just define the ordering, they are meaningless otherwise. -#define INIT_ORDER_PROFILER 101 -#define INIT_ORDER_TITLE 100 -#define INIT_ORDER_GARBAGE 99 -#define INIT_ORDER_DBCORE 95 -#define INIT_ORDER_BLACKBOX 94 -#define INIT_ORDER_SERVER_MAINT 93 -#define INIT_ORDER_INPUT 85 -#define INIT_ORDER_SOUNDS 83 -#define INIT_ORDER_INSTRUMENTS 82 -#define INIT_ORDER_VIS 80 -#define INIT_ORDER_ACHIEVEMENTS 77 -#define INIT_ORDER_RESEARCH 75 -#define INIT_ORDER_STATION 74 //This is high priority because it manipulates a lot of the subsystems that will initialize after it. -#define INIT_ORDER_EVENTS 70 -#define INIT_ORDER_JOBS 65 -#define INIT_ORDER_QUIRKS 60 -#define INIT_ORDER_TICKER 55 -#define INIT_ORDER_TCG 55 -#define INIT_ORDER_REAGENTS 55 //HAS to be before mapping - mapping creates objects, which creates reagents, which relies on lists made in this subsystem -#define INIT_ORDER_MAPPING 50 -#define INIT_ORDER_TIMETRACK 47 -#define INIT_ORDER_NETWORKS 45 -#define INIT_ORDER_ECONOMY 40 -#define INIT_ORDER_OUTPUTS 35 -#define INIT_ORDER_ATOMS 30 -#define INIT_ORDER_LANGUAGE 25 -#define INIT_ORDER_MACHINES 20 -#define INIT_ORDER_SKILLS 15 -#define INIT_ORDER_TIMER 1 -#define INIT_ORDER_DEFAULT 0 -#define INIT_ORDER_AIR -1 -#define INIT_ORDER_PERSISTENCE -2 //before assets because some assets take data from SSPersistence -#define INIT_ORDER_ASSETS -4 -#define INIT_ORDER_ICON_SMOOTHING -5 -#define INIT_ORDER_OVERLAY -6 -#define INIT_ORDER_XKEYSCORE -10 -#define INIT_ORDER_STICKY_BAN -10 -#define INIT_ORDER_LIGHTING -20 -#define INIT_ORDER_SHUTTLE -21 -#define INIT_ORDER_MINOR_MAPPING -40 -#define INIT_ORDER_PATH -50 -#define INIT_ORDER_DISCORD -60 -#define INIT_ORDER_EXPLOSIONS -69 -#define INIT_ORDER_STATPANELS -98 -#define INIT_ORDER_DEMO -99 // o avoid a bunch of changes related to initialization being written, do this last -#define INIT_ORDER_CHAT -100 //Should be last to ensure chat remains smooth during init. +#define INIT_ORDER_PROFILER 101 +#define INIT_ORDER_TITLE 100 +#define INIT_ORDER_GARBAGE 99 +#define INIT_ORDER_DBCORE 95 +#define INIT_ORDER_BLACKBOX 94 +#define INIT_ORDER_SERVER_MAINT 93 +#define INIT_ORDER_INPUT 85 +#define INIT_ORDER_SOUNDS 83 +#define INIT_ORDER_INSTRUMENTS 82 +#define INIT_ORDER_VIS 80 +#define INIT_ORDER_ACHIEVEMENTS 77 +#define INIT_ORDER_RESEARCH 75 +#define INIT_ORDER_STATION 74 //This is high priority because it manipulates a lot of the subsystems that will initialize after it. +#define INIT_ORDER_EVENTS 70 +#define INIT_ORDER_JOBS 65 +#define INIT_ORDER_QUIRKS 60 +#define INIT_ORDER_TICKER 55 +#define INIT_ORDER_TCG 55 +#define INIT_ORDER_REAGENTS 55 //HAS to be before mapping - mapping creates objects, which creates reagents, which relies on lists made in this subsystem +#define INIT_ORDER_MAPPING 50 +#define INIT_ORDER_TIMETRACK 47 +#define INIT_ORDER_NETWORKS 45 +#define INIT_ORDER_ECONOMY 40 +#define INIT_ORDER_OUTPUTS 35 +#define INIT_ORDER_ATOMS 30 +#define INIT_ORDER_LANGUAGE 25 +#define INIT_ORDER_MACHINES 20 +#define INIT_ORDER_SKILLS 15 +#define INIT_ORDER_TIMER 1 +#define INIT_ORDER_DEFAULT 0 +#define INIT_ORDER_AIR -1 +#define INIT_ORDER_PERSISTENCE -2 //before assets because some assets take data from SSPersistence +#define INIT_ORDER_ASSETS -4 +#define INIT_ORDER_ICON_SMOOTHING -5 +#define INIT_ORDER_OVERLAY -6 +#define INIT_ORDER_XKEYSCORE -10 +#define INIT_ORDER_STICKY_BAN -10 +#define INIT_ORDER_LIGHTING -20 +#define INIT_ORDER_SHUTTLE -21 +#define INIT_ORDER_MINOR_MAPPING -40 +#define INIT_ORDER_PATH -50 +#define INIT_ORDER_DISCORD -60 +#define INIT_ORDER_EXPLOSIONS -69 +#define INIT_ORDER_STATPANELS -98 +#define INIT_ORDER_DEMO -99 // o avoid a bunch of changes related to initialization being written, do this last +#define INIT_ORDER_CHAT -100 //Should be last to ensure chat remains smooth during init. // Subsystem fire priority, from lowest to highest priority // If the subsystem isn't listed here it's either DEFAULT or PROCESS (if it's a processing subsystem child) -#define FIRE_PRIORITY_IDLE_NPC 10 -#define FIRE_PRIORITY_SERVER_MAINT 10 -#define FIRE_PRIORITY_RESEARCH 10 -#define FIRE_PRIORITY_VIS 10 -#define FIRE_PRIORITY_AMBIENCE 10 -#define FIRE_PRIORITY_GARBAGE 15 -#define FIRE_PRIORITY_WET_FLOORS 20 -#define FIRE_PRIORITY_AIR 20 -#define FIRE_PRIORITY_NPC 20 -#define FIRE_PRIORITY_PROCESS 25 -#define FIRE_PRIORITY_THROWING 25 -#define FIRE_PRIORITY_REAGENTS 26 -#define FIRE_PRIORITY_SPACEDRIFT 30 -#define FIRE_PRIORITY_FIELDS 30 -#define FIRE_PRIOTITY_SMOOTHING 35 -#define FIRE_PRIORITY_NETWORKS 40 -#define FIRE_PRIORITY_OBJ 40 -#define FIRE_PRIORITY_ACID 40 -#define FIRE_PRIOTITY_BURNING 40 -#define FIRE_PRIORITY_DEFAULT 50 -#define FIRE_PRIORITY_PARALLAX 65 -#define FIRE_PRIORITY_INSTRUMENTS 80 -#define FIRE_PRIORITY_MOBS 100 -#define FIRE_PRIORITY_TGUI 110 -#define FIRE_PRIORITY_TICKER 200 -#define FIRE_PRIORITY_ATMOS_ADJACENCY 300 -#define FIRE_PRIORITY_STATPANEL 390 -#define FIRE_PRIORITY_CHAT 400 -#define FIRE_PRIORITY_RUNECHAT 410 -#define FIRE_PRIORITY_OVERLAYS 500 -#define FIRE_PRIORITY_EXPLOSIONS 666 -#define FIRE_PRIORITY_TIMER 700 -#define FIRE_PRIORITY_INPUT 1000 // This must always always be the max highest priority. Player input must never be lost. +#define FIRE_PRIORITY_IDLE_NPC 10 +#define FIRE_PRIORITY_SERVER_MAINT 10 +#define FIRE_PRIORITY_RESEARCH 10 +#define FIRE_PRIORITY_VIS 10 +#define FIRE_PRIORITY_AMBIENCE 10 +#define FIRE_PRIORITY_GARBAGE 15 +#define FIRE_PRIORITY_WET_FLOORS 20 +#define FIRE_PRIORITY_AIR 20 +#define FIRE_PRIORITY_NPC 20 +#define FIRE_PRIORITY_PROCESS 25 +#define FIRE_PRIORITY_THROWING 25 +#define FIRE_PRIORITY_REAGENTS 26 +#define FIRE_PRIORITY_SPACEDRIFT 30 +#define FIRE_PRIORITY_FIELDS 30 +#define FIRE_PRIOTITY_SMOOTHING 35 +#define FIRE_PRIORITY_NETWORKS 40 +#define FIRE_PRIORITY_OBJ 40 +#define FIRE_PRIORITY_ACID 40 +#define FIRE_PRIOTITY_BURNING 40 +#define FIRE_PRIORITY_DEFAULT 50 +#define FIRE_PRIORITY_PARALLAX 65 +#define FIRE_PRIORITY_INSTRUMENTS 80 +#define FIRE_PRIORITY_MOBS 100 +#define FIRE_PRIORITY_TGUI 110 +#define FIRE_PRIORITY_TICKER 200 +#define FIRE_PRIORITY_ATMOS_ADJACENCY 300 +#define FIRE_PRIORITY_STATPANEL 390 +#define FIRE_PRIORITY_CHAT 400 +#define FIRE_PRIORITY_RUNECHAT 410 +#define FIRE_PRIORITY_OVERLAYS 500 +#define FIRE_PRIORITY_EXPLOSIONS 666 +#define FIRE_PRIORITY_TIMER 700 +#define FIRE_PRIORITY_INPUT 1000 // This must always always be the max highest priority. Player input must never be lost. // SS runlevels diff --git a/code/__DEFINES/time.dm b/code/__DEFINES/time.dm index 6cad79b8c0a..19acf4bd7aa 100644 --- a/code/__DEFINES/time.dm +++ b/code/__DEFINES/time.dm @@ -1,28 +1,28 @@ -#define MIDNIGHT_ROLLOVER 864000 //number of deciseconds in a day +#define MIDNIGHT_ROLLOVER 864000 //number of deciseconds in a day -#define JANUARY 1 -#define FEBRUARY 2 -#define MARCH 3 -#define APRIL 4 -#define MAY 5 -#define JUNE 6 -#define JULY 7 -#define AUGUST 8 -#define SEPTEMBER 9 -#define OCTOBER 10 -#define NOVEMBER 11 -#define DECEMBER 12 +#define JANUARY 1 +#define FEBRUARY 2 +#define MARCH 3 +#define APRIL 4 +#define MAY 5 +#define JUNE 6 +#define JULY 7 +#define AUGUST 8 +#define SEPTEMBER 9 +#define OCTOBER 10 +#define NOVEMBER 11 +#define DECEMBER 12 //Select holiday names -- If you test for a holiday in the code, make the holiday's name a define and test for that instead -#define NEW_YEAR "New Year" -#define VALENTINES "Valentine's Day" -#define APRIL_FOOLS "April Fool's Day" -#define EASTER "Easter" -#define HALLOWEEN "Halloween" -#define CHRISTMAS "Christmas" -#define FESTIVE_SEASON "Festive Season" -#define GARBAGEDAY "Garbage Day" -#define MONKEYDAY "Monkey Day" +#define NEW_YEAR "New Year" +#define VALENTINES "Valentine's Day" +#define APRIL_FOOLS "April Fool's Day" +#define EASTER "Easter" +#define HALLOWEEN "Halloween" +#define CHRISTMAS "Christmas" +#define FESTIVE_SEASON "Festive Season" +#define GARBAGEDAY "Garbage Day" +#define MONKEYDAY "Monkey Day" /* Days of the week to make it easier to reference them. @@ -31,13 +31,13 @@ When using time2text(), please use "DDD" to find the weekday. Refrain from using */ -#define MONDAY "Mon" -#define TUESDAY "Tue" -#define WEDNESDAY "Wed" -#define THURSDAY "Thu" -#define FRIDAY "Fri" -#define SATURDAY "Sat" -#define SUNDAY "Sun" +#define MONDAY "Mon" +#define TUESDAY "Tue" +#define WEDNESDAY "Wed" +#define THURSDAY "Thu" +#define FRIDAY "Fri" +#define SATURDAY "Sat" +#define SUNDAY "Sun" #define SECONDS *10 diff --git a/code/__DEFINES/tools.dm b/code/__DEFINES/tools.dm index 040d3a4fbbf..78905562690 100644 --- a/code/__DEFINES/tools.dm +++ b/code/__DEFINES/tools.dm @@ -1,23 +1,23 @@ // Tool types, if you add new ones please add them to /obj/item/debug/omnitool in code/game/objects/items/debug_items.dm -#define TOOL_CROWBAR "crowbar" -#define TOOL_MULTITOOL "multitool" -#define TOOL_SCREWDRIVER "screwdriver" -#define TOOL_WIRECUTTER "wirecutter" -#define TOOL_WRENCH "wrench" -#define TOOL_WELDER "welder" -#define TOOL_ANALYZER "analyzer" -#define TOOL_MINING "mining" -#define TOOL_SHOVEL "shovel" -#define TOOL_RETRACTOR "retractor" -#define TOOL_HEMOSTAT "hemostat" -#define TOOL_CAUTERY "cautery" -#define TOOL_DRILL "drill" -#define TOOL_SCALPEL "scalpel" -#define TOOL_SAW "saw" -#define TOOL_BONESET "bonesetter" -#define TOOL_KNIFE "knife" -#define TOOL_BLOODFILTER "bloodfilter" -#define TOOL_ROLLINGPIN "rollingpin" +#define TOOL_CROWBAR "crowbar" +#define TOOL_MULTITOOL "multitool" +#define TOOL_SCREWDRIVER "screwdriver" +#define TOOL_WIRECUTTER "wirecutter" +#define TOOL_WRENCH "wrench" +#define TOOL_WELDER "welder" +#define TOOL_ANALYZER "analyzer" +#define TOOL_MINING "mining" +#define TOOL_SHOVEL "shovel" +#define TOOL_RETRACTOR "retractor" +#define TOOL_HEMOSTAT "hemostat" +#define TOOL_CAUTERY "cautery" +#define TOOL_DRILL "drill" +#define TOOL_SCALPEL "scalpel" +#define TOOL_SAW "saw" +#define TOOL_BONESET "bonesetter" +#define TOOL_KNIFE "knife" +#define TOOL_BLOODFILTER "bloodfilter" +#define TOOL_ROLLINGPIN "rollingpin" // If delay between the start and the end of tool operation is less than MIN_TOOL_SOUND_DELAY, // tool sound is only played when op is started. If not, it's played twice. diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm index 283e49cad2b..beaff0b1adf 100644 --- a/code/__DEFINES/traits.dm +++ b/code/__DEFINES/traits.dm @@ -101,97 +101,97 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai //mob traits /// Forces the user to stay unconscious. -#define TRAIT_KNOCKEDOUT "knockedout" +#define TRAIT_KNOCKEDOUT "knockedout" /// Prevents voluntary movement. -#define TRAIT_IMMOBILIZED "immobilized" +#define TRAIT_IMMOBILIZED "immobilized" /// Prevents voluntary standing or staying up on its own. -#define TRAIT_FLOORED "floored" +#define TRAIT_FLOORED "floored" /// Forces user to stay standing -#define TRAIT_FORCED_STANDING "forcedstanding" +#define TRAIT_FORCED_STANDING "forcedstanding" /// Prevents usage of manipulation appendages (picking, holding or using items, manipulating storage). -#define TRAIT_HANDS_BLOCKED "handsblocked" +#define TRAIT_HANDS_BLOCKED "handsblocked" /// Inability to access UI hud elements. Turned into a trait from [MOBILITY_UI] to be able to track sources. -#define TRAIT_UI_BLOCKED "uiblocked" +#define TRAIT_UI_BLOCKED "uiblocked" /// Inability to pull things. Turned into a trait from [MOBILITY_PULL] to be able to track sources. -#define TRAIT_PULL_BLOCKED "pullblocked" +#define TRAIT_PULL_BLOCKED "pullblocked" /// Abstract condition that prevents movement if being pulled and might be resisted against. Handcuffs and straight jackets, basically. -#define TRAIT_RESTRAINED "restrained" +#define TRAIT_RESTRAINED "restrained" /// Doesn't miss attacks #define TRAIT_PERFECT_ATTACKER "perfect_attacker" -#define TRAIT_INCAPACITATED "incapacitated" -#define TRAIT_CRITICAL_CONDITION "critical-condition" //In some kind of critical condition. Is able to succumb. -#define TRAIT_BLIND "blind" -#define TRAIT_MUTE "mute" -#define TRAIT_EMOTEMUTE "emotemute" -#define TRAIT_DEAF "deaf" -#define TRAIT_NEARSIGHT "nearsighted" -#define TRAIT_FAT "fat" -#define TRAIT_HUSK "husk" -#define TRAIT_BADDNA "baddna" -#define TRAIT_CLUMSY "clumsy" -#define TRAIT_CHUNKYFINGERS "chunkyfingers" //means that you can't use weapons with normal trigger guards. -#define TRAIT_DUMB "dumb" -#define TRAIT_ADVANCEDTOOLUSER "advancedtooluser" //Whether a mob is dexterous enough to use machines and certain items or not. -#define TRAIT_MONKEYLIKE "monkeylike" //Antagonizes the above. -#define TRAIT_PACIFISM "pacifism" -#define TRAIT_IGNORESLOWDOWN "ignoreslow" +#define TRAIT_INCAPACITATED "incapacitated" +#define TRAIT_CRITICAL_CONDITION "critical-condition" //In some kind of critical condition. Is able to succumb. +#define TRAIT_BLIND "blind" +#define TRAIT_MUTE "mute" +#define TRAIT_EMOTEMUTE "emotemute" +#define TRAIT_DEAF "deaf" +#define TRAIT_NEARSIGHT "nearsighted" +#define TRAIT_FAT "fat" +#define TRAIT_HUSK "husk" +#define TRAIT_BADDNA "baddna" +#define TRAIT_CLUMSY "clumsy" +#define TRAIT_CHUNKYFINGERS "chunkyfingers" //means that you can't use weapons with normal trigger guards. +#define TRAIT_DUMB "dumb" +#define TRAIT_ADVANCEDTOOLUSER "advancedtooluser" //Whether a mob is dexterous enough to use machines and certain items or not. +#define TRAIT_MONKEYLIKE "monkeylike" //Antagonizes the above. +#define TRAIT_PACIFISM "pacifism" +#define TRAIT_IGNORESLOWDOWN "ignoreslow" #define TRAIT_IGNOREDAMAGESLOWDOWN "ignoredamageslowdown" -#define TRAIT_DEATHCOMA "deathcoma" //Causes death-like unconsciousness -#define TRAIT_FAKEDEATH "fakedeath" //Makes the owner appear as dead to most forms of medical examination -#define TRAIT_DISFIGURED "disfigured" -#define TRAIT_XENO_HOST "xeno_host" //Tracks whether we're gonna be a baby alien's mummy. -#define TRAIT_STUNIMMUNE "stun_immunity" +#define TRAIT_DEATHCOMA "deathcoma" //Causes death-like unconsciousness +#define TRAIT_FAKEDEATH "fakedeath" //Makes the owner appear as dead to most forms of medical examination +#define TRAIT_DISFIGURED "disfigured" +#define TRAIT_XENO_HOST "xeno_host" //Tracks whether we're gonna be a baby alien's mummy. +#define TRAIT_STUNIMMUNE "stun_immunity" #define TRAIT_STUNRESISTANCE "stun_resistance" -#define TRAIT_IWASBATONED "iwasbatoned" //Anti Dual-baton cooldown bypass exploit. -#define TRAIT_SLEEPIMMUNE "sleep_immunity" -#define TRAIT_PUSHIMMUNE "push_immunity" -#define TRAIT_SHOCKIMMUNE "shock_immunity" -#define TRAIT_TESLA_SHOCKIMMUNE "tesla_shock_immunity" -#define TRAIT_STABLEHEART "stable_heart" -#define TRAIT_STABLELIVER "stable_liver" -#define TRAIT_RESISTHEAT "resist_heat" -#define TRAIT_RESISTHEATHANDS "resist_heat_handsonly" //For when you want to be able to touch hot things, but still want fire to be an issue. -#define TRAIT_RESISTCOLD "resist_cold" -#define TRAIT_RESISTHIGHPRESSURE "resist_high_pressure" -#define TRAIT_RESISTLOWPRESSURE "resist_low_pressure" -#define TRAIT_BOMBIMMUNE "bomb_immunity" -#define TRAIT_RADIMMUNE "rad_immunity" -#define TRAIT_GENELESS "geneless" -#define TRAIT_VIRUSIMMUNE "virus_immunity" -#define TRAIT_PIERCEIMMUNE "pierce_immunity" -#define TRAIT_NODISMEMBER "dismember_immunity" -#define TRAIT_NOFIRE "nonflammable" -#define TRAIT_NOGUNS "no_guns" -#define TRAIT_NOHUNGER "no_hunger" -#define TRAIT_NOMETABOLISM "no_metabolism" -#define TRAIT_NOCLONELOSS "no_cloneloss" -#define TRAIT_TOXIMMUNE "toxin_immune" -#define TRAIT_EASYDISMEMBER "easy_dismember" -#define TRAIT_LIMBATTACHMENT "limb_attach" -#define TRAIT_NOLIMBDISABLE "no_limb_disable" -#define TRAIT_EASILY_WOUNDED "easy_limb_wound" -#define TRAIT_HARDLY_WOUNDED "hard_limb_wound" -#define TRAIT_NEVER_WOUNDED "never_wounded" -#define TRAIT_TOXINLOVER "toxinlover" -#define TRAIT_NOBREATH "no_breath" -#define TRAIT_ANTIMAGIC "anti_magic" -#define TRAIT_HOLY "holy" -#define TRAIT_DEPRESSION "depression" -#define TRAIT_JOLLY "jolly" -#define TRAIT_NOCRITDAMAGE "no_crit" -#define TRAIT_NOSLIPWATER "noslip_water" -#define TRAIT_NOSLIPALL "noslip_all" -#define TRAIT_NODEATH "nodeath" -#define TRAIT_NOHARDCRIT "nohardcrit" -#define TRAIT_NOSOFTCRIT "nosoftcrit" -#define TRAIT_MINDSHIELD "mindshield" -#define TRAIT_DISSECTED "dissected" -#define TRAIT_SIXTHSENSE "sixth_sense" //I can hear dead people -#define TRAIT_FEARLESS "fearless" -#define TRAIT_PARALYSIS_L_ARM "para-l-arm" //These are used for brain-based paralysis, where replacing the limb won't fix it -#define TRAIT_PARALYSIS_R_ARM "para-r-arm" -#define TRAIT_PARALYSIS_L_LEG "para-l-leg" -#define TRAIT_PARALYSIS_R_LEG "para-r-leg" +#define TRAIT_IWASBATONED "iwasbatoned" //Anti Dual-baton cooldown bypass exploit. +#define TRAIT_SLEEPIMMUNE "sleep_immunity" +#define TRAIT_PUSHIMMUNE "push_immunity" +#define TRAIT_SHOCKIMMUNE "shock_immunity" +#define TRAIT_TESLA_SHOCKIMMUNE "tesla_shock_immunity" +#define TRAIT_STABLEHEART "stable_heart" +#define TRAIT_STABLELIVER "stable_liver" +#define TRAIT_RESISTHEAT "resist_heat" +#define TRAIT_RESISTHEATHANDS "resist_heat_handsonly" //For when you want to be able to touch hot things, but still want fire to be an issue. +#define TRAIT_RESISTCOLD "resist_cold" +#define TRAIT_RESISTHIGHPRESSURE "resist_high_pressure" +#define TRAIT_RESISTLOWPRESSURE "resist_low_pressure" +#define TRAIT_BOMBIMMUNE "bomb_immunity" +#define TRAIT_RADIMMUNE "rad_immunity" +#define TRAIT_GENELESS "geneless" +#define TRAIT_VIRUSIMMUNE "virus_immunity" +#define TRAIT_PIERCEIMMUNE "pierce_immunity" +#define TRAIT_NODISMEMBER "dismember_immunity" +#define TRAIT_NOFIRE "nonflammable" +#define TRAIT_NOGUNS "no_guns" +#define TRAIT_NOHUNGER "no_hunger" +#define TRAIT_NOMETABOLISM "no_metabolism" +#define TRAIT_NOCLONELOSS "no_cloneloss" +#define TRAIT_TOXIMMUNE "toxin_immune" +#define TRAIT_EASYDISMEMBER "easy_dismember" +#define TRAIT_LIMBATTACHMENT "limb_attach" +#define TRAIT_NOLIMBDISABLE "no_limb_disable" +#define TRAIT_EASILY_WOUNDED "easy_limb_wound" +#define TRAIT_HARDLY_WOUNDED "hard_limb_wound" +#define TRAIT_NEVER_WOUNDED "never_wounded" +#define TRAIT_TOXINLOVER "toxinlover" +#define TRAIT_NOBREATH "no_breath" +#define TRAIT_ANTIMAGIC "anti_magic" +#define TRAIT_HOLY "holy" +#define TRAIT_DEPRESSION "depression" +#define TRAIT_JOLLY "jolly" +#define TRAIT_NOCRITDAMAGE "no_crit" +#define TRAIT_NOSLIPWATER "noslip_water" +#define TRAIT_NOSLIPALL "noslip_all" +#define TRAIT_NODEATH "nodeath" +#define TRAIT_NOHARDCRIT "nohardcrit" +#define TRAIT_NOSOFTCRIT "nosoftcrit" +#define TRAIT_MINDSHIELD "mindshield" +#define TRAIT_DISSECTED "dissected" +#define TRAIT_SIXTHSENSE "sixth_sense" //I can hear dead people +#define TRAIT_FEARLESS "fearless" +#define TRAIT_PARALYSIS_L_ARM "para-l-arm" //These are used for brain-based paralysis, where replacing the limb won't fix it +#define TRAIT_PARALYSIS_R_ARM "para-r-arm" +#define TRAIT_PARALYSIS_L_LEG "para-l-leg" +#define TRAIT_PARALYSIS_R_LEG "para-r-leg" #define TRAIT_CANNOT_OPEN_PRESENTS "cannot-open-presents" #define TRAIT_PRESENT_VISION "present-vision" #define TRAIT_DISK_VERIFIER "disk-verifier" @@ -201,49 +201,49 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai #define TRAIT_ABDUCTOR_TRAINING "abductor-training" #define TRAIT_ABDUCTOR_SCIENTIST_TRAINING "abductor-scientist-training" #define TRAIT_SURGEON "surgeon" -#define TRAIT_STRONG_GRABBER "strong_grabber" -#define TRAIT_MAGIC_CHOKE "magic_choke" +#define TRAIT_STRONG_GRABBER "strong_grabber" +#define TRAIT_MAGIC_CHOKE "magic_choke" #define TRAIT_SOOTHED_THROAT "soothed-throat" #define TRAIT_BOOZE_SLIDER "booze-slider" -#define TRAIT_QUICK_CARRY "quick-carry" //We place people into a fireman carry quicker than standard -#define TRAIT_QUICKER_CARRY "quicker-carry" //We place people into a fireman carry especially quickly compared to quick_carry -#define TRAIT_QUICK_BUILD "quick-build" +#define TRAIT_QUICK_CARRY "quick-carry" //We place people into a fireman carry quicker than standard +#define TRAIT_QUICKER_CARRY "quicker-carry" //We place people into a fireman carry especially quickly compared to quick_carry +#define TRAIT_QUICK_BUILD "quick-build" #define TRAIT_UNINTELLIGIBLE_SPEECH "unintelligible-speech" -#define TRAIT_UNSTABLE "unstable" -#define TRAIT_OIL_FRIED "oil_fried" -#define TRAIT_MEDICAL_HUD "med_hud" -#define TRAIT_SECURITY_HUD "sec_hud" -#define TRAIT_DIAGNOSTIC_HUD "diag_hud" //for something granting you a diagnostic hud +#define TRAIT_UNSTABLE "unstable" +#define TRAIT_OIL_FRIED "oil_fried" +#define TRAIT_MEDICAL_HUD "med_hud" +#define TRAIT_SECURITY_HUD "sec_hud" +#define TRAIT_DIAGNOSTIC_HUD "diag_hud" //for something granting you a diagnostic hud #define TRAIT_MEDIBOTCOMINGTHROUGH "medbot" //Is a medbot healing you -#define TRAIT_PASSTABLE "passtable" -#define TRAIT_NOFLASH "noflash" //Makes you immune to flashes -#define TRAIT_XENO_IMMUNE "xeno_immune"//prevents xeno huggies implanting skeletons -#define TRAIT_FLASH_SENSITIVE "flash_sensitive"//Makes you flashable from any direction -#define TRAIT_NAIVE "naive" -#define TRAIT_PRIMITIVE "primitive" -#define TRAIT_GUNFLIP "gunflip" -#define TRAIT_SPECIAL_TRAUMA_BOOST "special_trauma_boost" ///Increases chance of getting special traumas, makes them harder to cure -#define TRAIT_BLOODCRAWL_EAT "bloodcrawl_eat" -#define TRAIT_SPACEWALK "spacewalk" -#define TRAIT_GAMERGOD "gamer-god" //double arcade prizes -#define TRAIT_GIANT "giant" -#define TRAIT_DWARF "dwarf" -#define TRAIT_SILENT_FOOTSTEPS "silent_footsteps" //makes your footsteps completely silent -#define TRAIT_NICE_SHOT "nice_shot" //hnnnnnnnggggg..... you're pretty good.... -#define TRAIT_TUMOR_SUPPRESSED "brain_tumor_suppressed" //prevents the damage done by a brain tumor -#define TRAIT_PERMANENTLY_ONFIRE "permanently_onfire" //overrides the update_fire proc to always add fire (for lava) -#define TRAIT_SIGN_LANG "sign_language" //Galactic Common Sign Language -#define TRAIT_NANITE_MONITORING "nanite_monitoring" //The mob's nanites are sending a monitoring signal visible on diag HUD +#define TRAIT_PASSTABLE "passtable" +#define TRAIT_NOFLASH "noflash" //Makes you immune to flashes +#define TRAIT_XENO_IMMUNE "xeno_immune"//prevents xeno huggies implanting skeletons +#define TRAIT_FLASH_SENSITIVE "flash_sensitive"//Makes you flashable from any direction +#define TRAIT_NAIVE "naive" +#define TRAIT_PRIMITIVE "primitive" +#define TRAIT_GUNFLIP "gunflip" +#define TRAIT_SPECIAL_TRAUMA_BOOST "special_trauma_boost" ///Increases chance of getting special traumas, makes them harder to cure +#define TRAIT_BLOODCRAWL_EAT "bloodcrawl_eat" +#define TRAIT_SPACEWALK "spacewalk" +#define TRAIT_GAMERGOD "gamer-god" //double arcade prizes +#define TRAIT_GIANT "giant" +#define TRAIT_DWARF "dwarf" +#define TRAIT_SILENT_FOOTSTEPS "silent_footsteps" //makes your footsteps completely silent +#define TRAIT_NICE_SHOT "nice_shot" //hnnnnnnnggggg..... you're pretty good.... +#define TRAIT_TUMOR_SUPPRESSED "brain_tumor_suppressed" //prevents the damage done by a brain tumor +#define TRAIT_PERMANENTLY_ONFIRE "permanently_onfire" //overrides the update_fire proc to always add fire (for lava) +#define TRAIT_SIGN_LANG "sign_language" //Galactic Common Sign Language +#define TRAIT_NANITE_MONITORING "nanite_monitoring" //The mob's nanites are sending a monitoring signal visible on diag HUD #define TRAIT_MARTIAL_ARTS_IMMUNE "martial_arts_immune" // nobody can use martial arts on this mob #define TRAIT_DUFFEL_CURSED "duffel_cursed" //You've been cursed with a living duffelbag, and can't have more added /// Prevents mob from riding mobs when buckled onto something -#define TRAIT_CANT_RIDE "cant_ride" -#define TRAIT_BLOODY_MESS "bloody_mess" //from heparin, makes open bleeding wounds rapidly spill more blood -#define TRAIT_COAGULATING "coagulating" //from coagulant reagents, this doesn't affect the bleeding itself but does affect the bleed warning messages +#define TRAIT_CANT_RIDE "cant_ride" +#define TRAIT_BLOODY_MESS "bloody_mess" //from heparin, makes open bleeding wounds rapidly spill more blood +#define TRAIT_COAGULATING "coagulating" //from coagulant reagents, this doesn't affect the bleeding itself but does affect the bleed warning messages /// The holder of this trait has antennae or whatever that hurt a ton when noogied -#define TRAIT_ANTENNAE "antennae" +#define TRAIT_ANTENNAE "antennae" /// Blowing kisses actually does damage to the victim -#define TRAIT_KISS_OF_DEATH "kiss_of_death" +#define TRAIT_KISS_OF_DEATH "kiss_of_death" #define TRAIT_NOBLEED "nobleed" //This carbon doesn't bleed @@ -294,65 +294,65 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai #define TRAIT_ENTRAILS_READER "entrails_reader" ///Movement type traits for movables. See elements/movetype_handler.dm -#define TRAIT_MOVE_GROUND "move_ground" -#define TRAIT_MOVE_FLYING "move_flying" -#define TRAIT_MOVE_VENTCRAWLING "move_ventcrawling" -#define TRAIT_MOVE_FLOATING "move_floating" -#define TRAIT_MOVE_PHASING "move_phasing" +#define TRAIT_MOVE_GROUND "move_ground" +#define TRAIT_MOVE_FLYING "move_flying" +#define TRAIT_MOVE_VENTCRAWLING "move_ventcrawling" +#define TRAIT_MOVE_FLOATING "move_floating" +#define TRAIT_MOVE_PHASING "move_phasing" /// Disables the floating animation. See above. -#define TRAIT_NO_FLOATING_ANIM "no-floating-animation" +#define TRAIT_NO_FLOATING_ANIM "no-floating-animation" //non-mob traits /// Used for limb-based paralysis, where replacing the limb will fix it. -#define TRAIT_PARALYSIS "paralysis" +#define TRAIT_PARALYSIS "paralysis" /// Used for limbs. -#define TRAIT_DISABLED_BY_WOUND "disabled-by-wound" +#define TRAIT_DISABLED_BY_WOUND "disabled-by-wound" ///Used for managing KEEP_TOGETHER in [/atom/var/appearance_flags] -#define TRAIT_KEEP_TOGETHER "keep-together" +#define TRAIT_KEEP_TOGETHER "keep-together" ///Marks the item as having been transmuted. Functionally blacklists the item from being recycled or sold for materials. -#define TRAIT_MAT_TRANSMUTED "transmuted" +#define TRAIT_MAT_TRANSMUTED "transmuted" // item traits -#define TRAIT_NODROP "nodrop" -#define TRAIT_NO_STORAGE_INSERT "no_storage_insert" //cannot be inserted in a storage. -#define TRAIT_T_RAY_VISIBLE "t-ray-visible" // Visible on t-ray scanners if the atom/var/level == 1 -#define TRAIT_NO_TELEPORT "no-teleport" //you just can't -#define TRAIT_FOOD_GRILLED "food_grilled" -#define TRAIT_NEEDS_TWO_HANDS "needstwohands" //The items needs two hands to be carried +#define TRAIT_NODROP "nodrop" +#define TRAIT_NO_STORAGE_INSERT "no_storage_insert" //cannot be inserted in a storage. +#define TRAIT_T_RAY_VISIBLE "t-ray-visible" // Visible on t-ray scanners if the atom/var/level == 1 +#define TRAIT_NO_TELEPORT "no-teleport" //you just can't +#define TRAIT_FOOD_GRILLED "food_grilled" +#define TRAIT_NEEDS_TWO_HANDS "needstwohands" //The items needs two hands to be carried #define TRAIT_FISH_SAFE_STORAGE "fish_case" //Fish in this won't die #define TRAIT_FISH_CASE_COMPATIBILE "fish_case_compatibile" //Stuff that can go inside fish cases //quirk traits -#define TRAIT_ALCOHOL_TOLERANCE "alcohol_tolerance" -#define TRAIT_AGEUSIA "ageusia" -#define TRAIT_HEAVY_SLEEPER "heavy_sleeper" -#define TRAIT_NIGHT_VISION "night_vision" -#define TRAIT_LIGHT_STEP "light_step" -#define TRAIT_SPIRITUAL "spiritual" -#define TRAIT_FAN_CLOWN "fan_clown" -#define TRAIT_FAN_MIME "fan_mime" -#define TRAIT_VORACIOUS "voracious" -#define TRAIT_SELF_AWARE "self_aware" -#define TRAIT_FREERUNNING "freerunning" -#define TRAIT_SKITTISH "skittish" -#define TRAIT_POOR_AIM "poor_aim" -#define TRAIT_PROSOPAGNOSIA "prosopagnosia" -#define TRAIT_DRUNK_HEALING "drunk_healing" -#define TRAIT_TAGGER "tagger" -#define TRAIT_PHOTOGRAPHER "photographer" -#define TRAIT_MUSICIAN "musician" -#define TRAIT_LIGHT_DRINKER "light_drinker" -#define TRAIT_EMPATH "empath" -#define TRAIT_FRIENDLY "friendly" -#define TRAIT_GRABWEAKNESS "grab_weakness" -#define TRAIT_SNOB "snob" -#define TRAIT_BALD "bald" -#define TRAIT_BADTOUCH "bad_touch" -#define TRAIT_EXTROVERT "extrovert" -#define TRAIT_INTROVERT "introvert" -#define TRAIT_ANXIOUS "anxious" +#define TRAIT_ALCOHOL_TOLERANCE "alcohol_tolerance" +#define TRAIT_AGEUSIA "ageusia" +#define TRAIT_HEAVY_SLEEPER "heavy_sleeper" +#define TRAIT_NIGHT_VISION "night_vision" +#define TRAIT_LIGHT_STEP "light_step" +#define TRAIT_SPIRITUAL "spiritual" +#define TRAIT_FAN_CLOWN "fan_clown" +#define TRAIT_FAN_MIME "fan_mime" +#define TRAIT_VORACIOUS "voracious" +#define TRAIT_SELF_AWARE "self_aware" +#define TRAIT_FREERUNNING "freerunning" +#define TRAIT_SKITTISH "skittish" +#define TRAIT_POOR_AIM "poor_aim" +#define TRAIT_PROSOPAGNOSIA "prosopagnosia" +#define TRAIT_DRUNK_HEALING "drunk_healing" +#define TRAIT_TAGGER "tagger" +#define TRAIT_PHOTOGRAPHER "photographer" +#define TRAIT_MUSICIAN "musician" +#define TRAIT_LIGHT_DRINKER "light_drinker" +#define TRAIT_EMPATH "empath" +#define TRAIT_FRIENDLY "friendly" +#define TRAIT_GRABWEAKNESS "grab_weakness" +#define TRAIT_SNOB "snob" +#define TRAIT_BALD "bald" +#define TRAIT_BADTOUCH "bad_touch" +#define TRAIT_EXTROVERT "extrovert" +#define TRAIT_INTROVERT "introvert" +#define TRAIT_ANXIOUS "anxious" ///Trait for dryable items #define TRAIT_DRYABLE "trait_dryable" ///Trait for dried items @@ -519,7 +519,7 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai ///Traits given by station traits #define STATION_TRAIT_BANANIUM_SHIPMENTS "station_trait_bananium_shipments" #define STATION_TRAIT_UNNATURAL_ATMOSPHERE "station_trait_unnatural_atmosphere" -#define STATION_TRAIT_UNIQUE_AI "station_trait_unique_ai" +#define STATION_TRAIT_UNIQUE_AI "station_trait_unique_ai" #define STATION_TRAIT_CARP_INFESTATION "station_trait_carp_infestation" #define STATION_TRAIT_PREMIUM_INTERNALS "station_trait_premium_internals" #define STATION_TRAIT_LATE_ARRIVALS "station_trait_late_arrivals" diff --git a/code/__DEFINES/turfs.dm b/code/__DEFINES/turfs.dm index 0fae3f8738d..048c81f12c1 100644 --- a/code/__DEFINES/turfs.dm +++ b/code/__DEFINES/turfs.dm @@ -1,7 +1,7 @@ -#define CHANGETURF_DEFER_CHANGE 1 -#define CHANGETURF_IGNORE_AIR 2 // This flag prevents changeturf from gathering air from nearby turfs to fill the new turf with an approximation of local air -#define CHANGETURF_FORCEOP 4 -#define CHANGETURF_SKIP 8 // A flag for PlaceOnTop to just instance the new turf instead of calling ChangeTurf. Used for uninitialized turfs NOTHING ELSE +#define CHANGETURF_DEFER_CHANGE 1 +#define CHANGETURF_IGNORE_AIR 2 // This flag prevents changeturf from gathering air from nearby turfs to fill the new turf with an approximation of local air +#define CHANGETURF_FORCEOP 4 +#define CHANGETURF_SKIP 8 // A flag for PlaceOnTop to just instance the new turf instead of calling ChangeTurf. Used for uninitialized turfs NOTHING ELSE #define CHANGETURF_INHERIT_AIR 16 // Inherit air from previous turf. Implies CHANGETURF_IGNORE_AIR #define CHANGETURF_RECALC_ADJACENT 32 //Immediately recalc adjacent atmos turfs instead of queuing. diff --git a/code/__DEFINES/vehicles.dm b/code/__DEFINES/vehicles.dm index c55ef502cbd..f627528dd0f 100644 --- a/code/__DEFINES/vehicles.dm +++ b/code/__DEFINES/vehicles.dm @@ -9,7 +9,7 @@ /// Does our vehicle require arms to operate? Also used for piggybacking on humans to reserve arms on the rider #define RIDER_NEEDS_ARMS (1<<0) // As above but only used for riding cyborgs, and only reserves 1 arm instead of 2 -#define RIDER_NEEDS_ARM (1<<1) +#define RIDER_NEEDS_ARM (1<<1) /// Do we need legs to ride this (checks against TRAIT_FLOORED) #define RIDER_NEEDS_LEGS (1<<2) /// If the rider is disabled or loses their needed limbs, do they fall off? diff --git a/code/__DEFINES/vv.dm b/code/__DEFINES/vv.dm index a8aca196bd3..d3fde025cb8 100644 --- a/code/__DEFINES/vv.dm +++ b/code/__DEFINES/vv.dm @@ -30,14 +30,14 @@ #define VV_SPECIAL_LIST_NO_EXPAND_THRESHOLD 150 //#define IS_VALID_ASSOC_KEY(V) (istext(V) || ispath(V) || isdatum(V) || islist(V)) -#define IS_VALID_ASSOC_KEY(V) (!isnum(V)) //hhmmm.. +#define IS_VALID_ASSOC_KEY(V) (!isnum(V)) //hhmmm.. //General helpers #define VV_HREF_TARGET_INTERNAL(target, href_key) "?_src_=vars;[HrefToken()];[href_key]=TRUE;[VV_HK_TARGET]=[REF(target)]" #define VV_HREF_TARGETREF_INTERNAL(targetref, href_key) "?_src_=vars;[HrefToken()];[href_key]=TRUE;[VV_HK_TARGET]=[targetref]" #define VV_HREF_TARGET(target, href_key, text) "[text]" #define VV_HREF_TARGETREF(targetref, href_key, text) "[text]" -#define VV_HREF_TARGET_1V(target, href_key, text, varname) "[text]" //for stuff like basic varedits, one variable +#define VV_HREF_TARGET_1V(target, href_key, text, varname) "[text]" //for stuff like basic varedits, one variable #define VV_HREF_TARGETREF_1V(targetref, href_key, text, varname) "[text]" #define GET_VV_TARGET locate(href_list[VV_HK_TARGET]) @@ -51,7 +51,7 @@ // VV HREF KEYS #define VV_HK_TARGET "target" -#define VV_HK_VARNAME "targetvar" //name or index of var for 1 variable targetting hrefs. +#define VV_HK_VARNAME "targetvar" //name or index of var for 1 variable targetting hrefs. // vv_do_list() keys #define VV_HK_LIST_ADD "listadd" diff --git a/code/__DEFINES/wires.dm b/code/__DEFINES/wires.dm index 1058c61f41d..51495577156 100644 --- a/code/__DEFINES/wires.dm +++ b/code/__DEFINES/wires.dm @@ -1,7 +1,7 @@ //retvals for attempt_wires_interaction #define WIRE_INTERACTION_FAIL 0 #define WIRE_INTERACTION_SUCCESSFUL 1 -#define WIRE_INTERACTION_BLOCK 2 //don't do anything else rather than open wires and whatever else. +#define WIRE_INTERACTION_BLOCK 2 //don't do anything else rather than open wires and whatever else. #define WIRE_DUD_PREFIX "__dud" #define WIRE_ACTIVATE "Activate" diff --git a/code/__DEFINES/wounds.dm b/code/__DEFINES/wounds.dm index 985dc7a1801..057cff3a69d 100644 --- a/code/__DEFINES/wounds.dm +++ b/code/__DEFINES/wounds.dm @@ -1,37 +1,37 @@ // ~wound damage/rolling defines /// the cornerstone of the wound threshold system, your base wound roll for any attack is rand(1, damage^this), after armor reduces said damage. See [/obj/item/bodypart/proc/check_wounding] -#define WOUND_DAMAGE_EXPONENT 1.4 +#define WOUND_DAMAGE_EXPONENT 1.4 /// any damage dealt over this is ignored for damage rolls unless the target has the frail quirk (35^1.4=145, for reference) -#define WOUND_MAX_CONSIDERED_DAMAGE 35 +#define WOUND_MAX_CONSIDERED_DAMAGE 35 /// an attack must do this much damage after armor in order to roll for being a wound (so pressure damage/being on fire doesn't proc it) -#define WOUND_MINIMUM_DAMAGE 5 +#define WOUND_MINIMUM_DAMAGE 5 /// an attack must do this much damage after armor in order to be eliigible to dismember a suitably mushed bodypart -#define DISMEMBER_MINIMUM_DAMAGE 10 +#define DISMEMBER_MINIMUM_DAMAGE 10 /// If an attack rolls this high with their wound (including mods), we try to outright dismember the limb. Note 250 is high enough that with a perfect max roll of 145 (see max cons'd damage), you'd need +100 in mods to do this -#define WOUND_DISMEMBER_OUTRIGHT_THRESH 250 +#define WOUND_DISMEMBER_OUTRIGHT_THRESH 250 /// set wound_bonus on an item or attack to this to disable checking wounding for the attack #define CANT_WOUND -100 // ~wound severities /// for jokey/meme wounds like stubbed toe, no standard messages/sounds or second winds -#define WOUND_SEVERITY_TRIVIAL 0 -#define WOUND_SEVERITY_MODERATE 1 -#define WOUND_SEVERITY_SEVERE 2 -#define WOUND_SEVERITY_CRITICAL 3 +#define WOUND_SEVERITY_TRIVIAL 0 +#define WOUND_SEVERITY_MODERATE 1 +#define WOUND_SEVERITY_SEVERE 2 +#define WOUND_SEVERITY_CRITICAL 3 /// outright dismemberment of limb -#define WOUND_SEVERITY_LOSS 4 +#define WOUND_SEVERITY_LOSS 4 // ~wound categories /// any brute weapon/attack that doesn't have sharpness. rolls for blunt bone wounds -#define WOUND_BLUNT 1 +#define WOUND_BLUNT 1 /// any brute weapon/attack with sharpness = SHARP_EDGED. rolls for slash wounds -#define WOUND_SLASH 2 +#define WOUND_SLASH 2 /// any brute weapon/attack with sharpness = SHARP_POINTY. rolls for piercing wounds -#define WOUND_PIERCE 3 +#define WOUND_PIERCE 3 /// any concentrated burn attack (lasers really). rolls for burning wounds -#define WOUND_BURN 4 +#define WOUND_BURN 4 //SKYRAT EDIT ADDITION BEGIN - MEDICAL /// any brute attacks, rolled on a chance #define WOUND_MUSCLE 5 @@ -40,15 +40,15 @@ // ~determination second wind defines // How much determination reagent to add each time someone gains a new wound in [/datum/wound/proc/second_wind] -#define WOUND_DETERMINATION_MODERATE 1 -#define WOUND_DETERMINATION_SEVERE 2.5 -#define WOUND_DETERMINATION_CRITICAL 5 -#define WOUND_DETERMINATION_LOSS 7.5 +#define WOUND_DETERMINATION_MODERATE 1 +#define WOUND_DETERMINATION_SEVERE 2.5 +#define WOUND_DETERMINATION_CRITICAL 5 +#define WOUND_DETERMINATION_LOSS 7.5 /// the max amount of determination you can have -#define WOUND_DETERMINATION_MAX 10 +#define WOUND_DETERMINATION_MAX 10 /// While someone has determination in their system, their bleed rate is slightly reduced -#define WOUND_DETERMINATION_BLEED_MOD 0.85 +#define WOUND_DETERMINATION_BLEED_MOD 0.85 // ~wound global lists // list in order of highest severity to lowest @@ -69,99 +69,98 @@ GLOBAL_LIST_INIT(global_all_wound_types, list(/datum/wound/blunt/critical, /datu // ~burn wound infection defines // Thresholds for infection for burn wounds, once infestation hits each threshold, things get steadily worse /// below this has no ill effects from infection -#define WOUND_INFECTION_MODERATE 4 +#define WOUND_INFECTION_MODERATE 4 /// then below here, you ooze some pus and suffer minor tox damage, but nothing serious -#define WOUND_INFECTION_SEVERE 8 +#define WOUND_INFECTION_SEVERE 8 /// then below here, your limb occasionally locks up from damage and infection and briefly becomes disabled. Things are getting really bad -#define WOUND_INFECTION_CRITICAL 12 +#define WOUND_INFECTION_CRITICAL 12 /// below here, your skin is almost entirely falling off and your limb locks up more frequently. You are within a stone's throw of septic paralysis and losing the limb -#define WOUND_INFECTION_SEPTIC 20 +#define WOUND_INFECTION_SEPTIC 20 // above WOUND_INFECTION_SEPTIC, your limb is completely putrid and you start rolling to lose the entire limb by way of paralyzation. After 3 failed rolls (~4-5% each probably), the limb is paralyzed // ~random wound balance defines /// how quickly sanitization removes infestation and decays per tick -#define WOUND_BURN_SANITIZATION_RATE 0.15 +#define WOUND_BURN_SANITIZATION_RATE 0.15 /// how much blood you can lose per tick per slash max. 8 is a LOT of blood for one cut so don't worry about hitting it easily -#define WOUND_SLASH_MAX_BLOODFLOW 8 +#define WOUND_SLASH_MAX_BLOODFLOW 8 /// dead people don't bleed, but they can clot! this is the minimum amount of clotting per tick on dead people, so even critical cuts will slowly clot in dead people -#define WOUND_SLASH_DEAD_CLOT_MIN 0.05 +#define WOUND_SLASH_DEAD_CLOT_MIN 0.05 /// if we suffer a bone wound to the head that creates brain traumas, the timer for the trauma cycle is +/- by this percent (0-100) -#define WOUND_BONE_HEAD_TIME_VARIANCE 20 +#define WOUND_BONE_HEAD_TIME_VARIANCE 20 // ~mangling defines // With the wounds pt. 2 update, general dismemberment now requires 2 things for a limb to be dismemberable (bone only creatures just need the second): -// 1. Skin is mangled: A critical slash or pierce wound on that limb -// 2. Bone is mangled: At least a severe bone wound on that limb +// 1. Skin is mangled: A critical slash or pierce wound on that limb +// 2. Bone is mangled: At least a severe bone wound on that limb // see [/obj/item/bodypart/proc/get_mangled_state] for more information -#define BODYPART_MANGLED_NONE 0 -#define BODYPART_MANGLED_BONE 1 -#define BODYPART_MANGLED_FLESH 2 -#define BODYPART_MANGLED_BOTH 3 +#define BODYPART_MANGLED_NONE 0 +#define BODYPART_MANGLED_BONE 1 +#define BODYPART_MANGLED_FLESH 2 +#define BODYPART_MANGLED_BOTH 3 // ~biology defines // What kind of biology we have, and what wounds we can suffer, mostly relies on the HAS_FLESH and HAS_BONE species traits on human species /// golems and androids, cannot suffer any wounds -#define BIO_INORGANIC 0 +#define BIO_INORGANIC 0 /// skeletons and plasmemes, can only suffer bone wounds, only needs mangled bone to be able to dismember -#define BIO_JUST_BONE 1 +#define BIO_JUST_BONE 1 /// nothing right now, maybe slimepeople in the future, can only suffer slashing, piercing, and burn wounds -#define BIO_JUST_FLESH 2 +#define BIO_JUST_FLESH 2 /// standard humanoids, can suffer all wounds, needs mangled bone and flesh to dismember. conveniently, what you get when you combine BIO_JUST_BONE and BIO_JUST_FLESH -#define BIO_FLESH_BONE 3 +#define BIO_FLESH_BONE 3 // ~wound flag defines /// If this wound requires having the HAS_FLESH flag for humanoids -#define FLESH_WOUND (1<<0) +#define FLESH_WOUND (1<<0) /// If this wound requires having the HAS_BONE flag for humanaoids -#define BONE_WOUND (1<<1) +#define BONE_WOUND (1<<1) /// If having this wound counts as mangled flesh for dismemberment -#define MANGLES_FLESH (1<<2) +#define MANGLES_FLESH (1<<2) /// If having this wound counts as mangled bone for dismemberment -#define MANGLES_BONE (1<<3) +#define MANGLES_BONE (1<<3) /// If this wound marks the limb as being allowed to have gauze applied -#define ACCEPTS_GAUZE (1<<4) +#define ACCEPTS_GAUZE (1<<4) //SKYRAT EDIT ADDITION BEGIN - MEDICAL /// If this wound marks the limb as being allowed to have splints applied -#define ACCEPTS_SPLINT (1<<5) +#define ACCEPTS_SPLINT (1<<5) //SKYRAT EDIT ADDITION END - // ~scar persistence defines // The following are the order placements for persistent scar save formats /// The version number of the scar we're saving, any scars being loaded below this number will be discarded, see SCAR_CURRENT_VERSION below -#define SCAR_SAVE_VERS 1 +#define SCAR_SAVE_VERS 1 /// The body_zone we're applying to on granting -#define SCAR_SAVE_ZONE 2 +#define SCAR_SAVE_ZONE 2 /// The description we're loading -#define SCAR_SAVE_DESC 3 +#define SCAR_SAVE_DESC 3 /// The precise location we're loading -#define SCAR_SAVE_PRECISE_LOCATION 4 +#define SCAR_SAVE_PRECISE_LOCATION 4 /// The severity the scar had -#define SCAR_SAVE_SEVERITY 5 +#define SCAR_SAVE_SEVERITY 5 /// Whether this is a BIO_JUST_BONE scar, a BIO_JUST_FLESH scar, or a BIO_FLESH_BONE scar (so you can't load fleshy human scars on a plasmaman character) -#define SCAR_SAVE_BIOLOGY 6 +#define SCAR_SAVE_BIOLOGY 6 /// Which character slot this was saved to -#define SCAR_SAVE_CHAR_SLOT 7 +#define SCAR_SAVE_CHAR_SLOT 7 ///how many fields we save for each scar (so the number of above fields) -#define SCAR_SAVE_LENGTH 7 +#define SCAR_SAVE_LENGTH 7 /// saved scars with a version lower than this will be discarded, increment when you update the persistent scarring format in a way that invalidates previous saved scars (new fields, reordering, etc) -#define SCAR_CURRENT_VERSION 3 +#define SCAR_CURRENT_VERSION 3 /// how many scar slots, per character slot, we have to cycle through for persistent scarring, if enabled in character prefs -#define PERSISTENT_SCAR_SLOTS 3 +#define PERSISTENT_SCAR_SLOTS 3 // ~blood_flow rates of change, these are used by [/datum/wound/proc/get_bleed_rate_of_change] from [/mob/living/carbon/proc/bleed_warn] to let the player know if their bleeding is getting better/worse/the same /// Our wound is clotting and will eventually stop bleeding if this continues -#define BLOOD_FLOW_DECREASING -1 +#define BLOOD_FLOW_DECREASING -1 /// Our wound is bleeding but is holding steady at the same rate. -#define BLOOD_FLOW_STEADY 0 +#define BLOOD_FLOW_STEADY 0 /// Our wound is bleeding and actively getting worse, like if we're a critical slash or if we're afflicted with heparin -#define BLOOD_FLOW_INCREASING 1 +#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 diff --git a/code/__HELPERS/AStar.dm b/code/__HELPERS/AStar.dm index cab2536d346..606fa4cef14 100644 --- a/code/__HELPERS/AStar.dm +++ b/code/__HELPERS/AStar.dm @@ -36,11 +36,11 @@ Actual Adjacent procs : /datum/pathnode var/turf/source //turf associated with the PathNode var/datum/pathnode/prevNode //link to the parent PathNode - var/f //A* Node weight (f = g + h) - var/g //A* movement cost variable - var/h //A* heuristic variable - var/nt //count the number of Nodes traversed - var/bf //bitflag for dir to expand.Some sufficiently advanced motherfuckery + var/f //A* Node weight (f = g + h) + var/g //A* movement cost variable + var/h //A* heuristic variable + var/nt //count the number of Nodes traversed + var/bf //bitflag for dir to expand.Some sufficiently advanced motherfuckery /datum/pathnode/New(s,p,pg,ph,pnt,_bf) source = s diff --git a/code/__HELPERS/_lists.dm b/code/__HELPERS/_lists.dm index 2d3b9865d2d..2501a1e8b7a 100644 --- a/code/__HELPERS/_lists.dm +++ b/code/__HELPERS/_lists.dm @@ -1,8 +1,8 @@ /* * Holds procs to help with list operations * Contains groups: - * Misc - * Sorting + * Misc + * Sorting */ /* @@ -242,7 +242,7 @@ if(L.len) var/picked = rand(1,L.len) . = L[picked] - L.Cut(picked,picked+1) //Cut is far more efficient that Remove() + L.Cut(picked,picked+1) //Cut is far more efficient that Remove() //Returns the top(last) element from the list and removes it from the list (typical stack function) /proc/pop(list/L) @@ -376,10 +376,10 @@ //fromIndex and toIndex must be in the range [1,L.len+1] //This will preserve associations ~Carnie /proc/moveElement(list/L, fromIndex, toIndex) - if(fromIndex == toIndex || fromIndex+1 == toIndex) //no need to move + if(fromIndex == toIndex || fromIndex+1 == toIndex) //no need to move return if(fromIndex > toIndex) - ++fromIndex //since a null will be inserted before fromIndex, the index needs to be nudged right by one + ++fromIndex //since a null will be inserted before fromIndex, the index needs to be nudged right by one L.Insert(toIndex, null) L.Swap(fromIndex, toIndex) @@ -391,10 +391,10 @@ //This will preserve associations ~Carnie /proc/moveRange(list/L, fromIndex, toIndex, len=1) var/distance = abs(toIndex - fromIndex) - if(len >= distance) //there are more elements to be moved than the distance to be moved. Therefore the same result can be achieved (with fewer operations) by moving elements between where we are and where we are going. The result being, our range we are moving is shifted left or right by dist elements + if(len >= distance) //there are more elements to be moved than the distance to be moved. Therefore the same result can be achieved (with fewer operations) by moving elements between where we are and where we are going. The result being, our range we are moving is shifted left or right by dist elements if(fromIndex <= toIndex) - return //no need to move - fromIndex += len //we want to shift left instead of right + return //no need to move + fromIndex += len //we want to shift left instead of right for(var/i=0, i distance) //there is an overlap, therefore swapping each element will require more swaps than inserting new elements + if(len > distance) //there is an overlap, therefore swapping each element will require more swaps than inserting new elements if(fromIndex < toIndex) toIndex += len else diff --git a/code/__HELPERS/cmp.dm b/code/__HELPERS/cmp.dm index 7cdb951990f..1ef29c62e3d 100644 --- a/code/__HELPERS/cmp.dm +++ b/code/__HELPERS/cmp.dm @@ -43,7 +43,7 @@ GLOBAL_VAR_INIT(cmp_field, "name") return sorttext(a.ckey, b.ckey) /proc/cmp_subsystem_init(datum/controller/subsystem/a, datum/controller/subsystem/b) - return initial(b.init_order) - initial(a.init_order) //uses initial() so it can be used on types + return initial(b.init_order) - initial(a.init_order) //uses initial() so it can be used on types /proc/cmp_subsystem_display(datum/controller/subsystem/a, datum/controller/subsystem/b) return sorttext(b.name, a.name) diff --git a/code/__HELPERS/dates.dm b/code/__HELPERS/dates.dm index 240ff87b9d6..fdc0cdf5c7d 100644 --- a/code/__HELPERS/dates.dm +++ b/code/__HELPERS/dates.dm @@ -6,9 +6,9 @@ //etc. Between 1583 and 4099 //Adapted from a free algorithm written in BASIC (https://www.assa.org.au/edm#Computer) /proc/EasterDate(y) - var/FirstDig, Remain19, temp //Intermediate Results - var/tA, tB, tC, tD, tE //Table A-E results - var/d, m //Day and Month returned + var/FirstDig, Remain19, temp //Intermediate Results + var/tA, tB, tC, tD, tE //Table A-E results + var/d, m //Day and Month returned FirstDig = round((y / 100)) Remain19 = y % 19 diff --git a/code/__HELPERS/files.dm b/code/__HELPERS/files.dm index b4c8fecf54a..27be78c31db 100644 --- a/code/__HELPERS/files.dm +++ b/code/__HELPERS/files.dm @@ -22,7 +22,7 @@ continue path += choice - if(copytext_char(path, -1) != "/") //didn't choose a directory, no need to iterate again + if(copytext_char(path, -1) != "/") //didn't choose a directory, no need to iterate again break var/extensions for(var/i in valid_extensions) @@ -36,13 +36,13 @@ return path -#define FTPDELAY 200 //200 tick delay to discourage spam -#define ADMIN_FTPDELAY_MODIFIER 0.5 //Admins get to spam files faster since we ~trust~ them! -/* This proc is a failsafe to prevent spamming of file requests. +#define FTPDELAY 200 //200 tick delay to discourage spam +#define ADMIN_FTPDELAY_MODIFIER 0.5 //Admins get to spam files faster since we ~trust~ them! +/* This proc is a failsafe to prevent spamming of file requests. It is just a timer that only permits a download every [FTPDELAY] ticks. This can be changed by modifying FTPDELAY's value above. - PLEASE USE RESPONSIBLY, Some log files can reach sizes of 4MB! */ + PLEASE USE RESPONSIBLY, Some log files can reach sizes of 4MB! */ /client/proc/file_spam_check() var/time_to_wait = GLOB.fileaccess_timer - world.time if(time_to_wait > 0) diff --git a/code/__HELPERS/game.dm b/code/__HELPERS/game.dm index 355eb7fe5b0..e9b2316c5c6 100644 --- a/code/__HELPERS/game.dm +++ b/code/__HELPERS/game.dm @@ -149,7 +149,7 @@ turfs += T return turfs -/proc/circleviewturfs(center=usr,radius=3) //Is there even a diffrence between this proc and circlerangeturfs()? +/proc/circleviewturfs(center=usr,radius=3) //Is there even a diffrence between this proc and circlerangeturfs()? var/turf/centerturf = get_turf(center) var/list/turfs = new/list() @@ -180,8 +180,8 @@ * inputs: O (object to start with) * outputs: * description: A pseudo-recursive loop based off of the recursive mob check, this check looks for any organs held - * within 'O', toggling their frozen flag. This check excludes items held within other safe organ - * storage units, so that only the lowest level of container dictates whether we do or don't decompose + * within 'O', toggling their frozen flag. This check excludes items held within other safe organ + * storage units, so that only the lowest level of container dictates whether we do or don't decompose */ /proc/recursive_organ_check(atom/O) @@ -204,7 +204,7 @@ found_organ = organ found_organ.organ_flags ^= ORGAN_FROZEN - for(var/atom/B in A) //objects held within other objects are added to the processing list, unless that object is something that can hold organs safely + for(var/atom/B in A) //objects held within other objects are added to the processing list, unless that object is something that can hold organs safely if(!processed_list[B] && !istype(B, /obj/structure/closet/crate/freezer) && !istype(B, /obj/structure/closet/secure_closet/freezer)) processing_list+= B diff --git a/code/__HELPERS/icon_smoothing.dm b/code/__HELPERS/icon_smoothing.dm index 17e9adf93f1..a9dcc6cc4a8 100644 --- a/code/__HELPERS/icon_smoothing.dm +++ b/code/__HELPERS/icon_smoothing.dm @@ -25,14 +25,14 @@ */ //Redefinitions of the diagonal directions so they can be stored in one var without conflicts -#define NORTH_JUNCTION NORTH //(1<<0) -#define SOUTH_JUNCTION SOUTH //(1<<1) -#define EAST_JUNCTION EAST //(1<<2) -#define WEST_JUNCTION WEST //(1<<3) -#define NORTHEAST_JUNCTION (1<<4) -#define SOUTHEAST_JUNCTION (1<<5) -#define SOUTHWEST_JUNCTION (1<<6) -#define NORTHWEST_JUNCTION (1<<7) +#define NORTH_JUNCTION NORTH //(1<<0) +#define SOUTH_JUNCTION SOUTH //(1<<1) +#define EAST_JUNCTION EAST //(1<<2) +#define WEST_JUNCTION WEST //(1<<3) +#define NORTHEAST_JUNCTION (1<<4) +#define SOUTHEAST_JUNCTION (1<<5) +#define SOUTHWEST_JUNCTION (1<<6) +#define NORTHWEST_JUNCTION (1<<7) DEFINE_BITFIELD(smoothing_junction, list( "NORTH_JUNCTION" = NORTH_JUNCTION, @@ -50,8 +50,8 @@ DEFINE_BITFIELD(smoothing_junction, list( #define ADJ_FOUND 1 #define NULLTURF_BORDER 2 -#define DEFAULT_UNDERLAY_ICON 'icons/turf/floors.dmi' -#define DEFAULT_UNDERLAY_ICON_STATE "plating" +#define DEFAULT_UNDERLAY_ICON 'icons/turf/floors.dmi' +#define DEFAULT_UNDERLAY_ICON_STATE "plating" #define SET_ADJ_IN_DIR(source, junction, direction, direction_flag) \ diff --git a/code/__HELPERS/icons.dm b/code/__HELPERS/icons.dm index eeee92400a3..62782f09825 100644 --- a/code/__HELPERS/icons.dm +++ b/code/__HELPERS/icons.dm @@ -272,7 +272,7 @@ world // Change a grayscale icon into a white icon where the original color becomes the alpha // I.e., black -> transparent, gray -> translucent white, white -> solid white /icon/proc/BecomeAlphaMask() - SwapColor(null, "#000000ff") // don't let transparent become gray + SwapColor(null, "#000000ff") // don't let transparent become gray MapColors(0,0,0,0.3, 0,0,0,0.59, 0,0,0,0.11, 0,0,0,0, 1,1,1,0) /icon/proc/UseAlphaMask(mask) @@ -770,7 +770,7 @@ world noIcon = TRUE // Do not render this object. var/curdir - var/base_icon_dir //We'll use this to get the icon state to display if not null BUT NOT pass it to overlays as the dir we have + var/base_icon_dir //We'll use this to get the icon state to display if not null BUT NOT pass it to overlays as the dir we have //These should use the parent's direction (most likely) if(!A.dir || A.dir == SOUTH) @@ -783,7 +783,7 @@ world if(!noIcon && curdir != SOUTH) var/exist = FALSE var/static/list/checkdirs = list(NORTH, EAST, WEST) - for(var/i in checkdirs) //Not using GLOB for a reason. + for(var/i in checkdirs) //Not using GLOB for a reason. if(length(icon_states(icon(curicon, curstate, i)))) exist = TRUE break @@ -794,7 +794,7 @@ world if(!base_icon_dir) base_icon_dir = curdir - ASSERT(!BLEND_DEFAULT) //I might just be stupid but lets make sure this define is 0. + ASSERT(!BLEND_DEFAULT) //I might just be stupid but lets make sure this define is 0. var/curblend = A.blend_mode || defblend @@ -891,7 +891,7 @@ world . = cleaned else . = icon(flat, "", SOUTH) - else //There's no overlays. + else //There's no overlays. if(!noIcon) SET_SELF(.) @@ -1289,4 +1289,4 @@ GLOBAL_LIST_EMPTY(transformation_animation_objects) if(filters && length(filters) >= filter_index) filters -= filters[filter_index] //else - // filters = null + // filters = null diff --git a/code/__HELPERS/roundend.dm b/code/__HELPERS/roundend.dm index 61a053fbd18..9c1dc969b48 100644 --- a/code/__HELPERS/roundend.dm +++ b/code/__HELPERS/roundend.dm @@ -1,6 +1,6 @@ -#define POPCOUNT_SURVIVORS "survivors" //Not dead at roundend -#define POPCOUNT_ESCAPEES "escapees" //Not dead and on centcom/shuttles marked as escaped -#define POPCOUNT_SHUTTLE_ESCAPEES "shuttle_escapees" //Emergency shuttle only. +#define POPCOUNT_SURVIVORS "survivors" //Not dead at roundend +#define POPCOUNT_ESCAPEES "escapees" //Not dead and on centcom/shuttles marked as escaped +#define POPCOUNT_SHUTTLE_ESCAPEES "shuttle_escapees" //Emergency shuttle only. #define PERSONAL_LAST_ROUND "personal last round" #define SERVER_LAST_ROUND "server last round" diff --git a/code/__HELPERS/sanitize_values.dm b/code/__HELPERS/sanitize_values.dm index 32300cf7ff5..0ca4f690528 100644 --- a/code/__HELPERS/sanitize_values.dm +++ b/code/__HELPERS/sanitize_values.dm @@ -68,11 +68,11 @@ char = color[i] i += length(char) switch(text2ascii(char)) - if(48 to 57) //numbers 0 to 9 + if(48 to 57) //numbers 0 to 9 . += char - if(97 to 102) //letters a to f + if(97 to 102) //letters a to f . += char - if(65 to 70) //letters A to F + if(65 to 70) //letters A to F char = lowertext(char) . += char else diff --git a/code/__HELPERS/sorts/__main.dm b/code/__HELPERS/sorts/__main.dm index 54c34085a0c..8a60c4143f4 100644 --- a/code/__HELPERS/sorts/__main.dm +++ b/code/__HELPERS/sorts/__main.dm @@ -20,7 +20,7 @@ GLOBAL_DATUM_INIT(sortInstance, /datum/sort_instance, new()) //whether we are sorting list keys (0: L[i]) or associated values (1: L[L[i]]) var/associative = 0 - //This controls when we get *into* galloping mode. It is initialized to MIN_GALLOP. + //This controls when we get *into* galloping mode. It is initialized to MIN_GALLOP. //The mergeLo and mergeHi methods nudge it higher for random data, and lower for highly structured data. var/minGallop = MIN_GALLOP @@ -92,9 +92,9 @@ GLOBAL_DATUM_INIT(sortInstance, /datum/sort_instance, new()) this method can take advantage of it: the method assumes that the elements in range [lo,start) are already sorted - lo the index of the first element in the range to be sorted - hi the index after the last element in the range to be sorted - start the index of the first element in the range that is not already known to be sorted + lo the index of the first element in the range to be sorted + hi the index after the last element in the range to be sorted + start the index of the first element in the range that is not already known to be sorted */ /datum/sort_instance/proc/binarySort(lo, hi, start) //ASSERT(lo <= start && start <= hi) @@ -112,14 +112,14 @@ GLOBAL_DATUM_INIT(sortInstance, /datum/sort_instance, new()) //[lo, left) elements <= pivot < [right, start) elements //in other words, find where the pivot element should go using bisection search while(left < right) - var/mid = (left + right) >> 1 //round((left+right)/2) + var/mid = (left + right) >> 1 //round((left+right)/2) if(call(cmp)(fetchElement(L,mid), pivot) > 0) right = mid else left = mid+1 //ASSERT(left == right) - moveElement(L, start, left) //move pivot element to correct location in the sorted range + moveElement(L, start, left) //move pivot element to correct location in the sorted range /* Returns the length of the run beginning at the specified position and reverses the run if it is back-to-front @@ -165,15 +165,15 @@ GLOBAL_DATUM_INIT(sortInstance, /datum/sort_instance, new()) //Natural runs shorter than this will be extended with binarySort /datum/sort_instance/proc/minRunLength(n) //ASSERT(n >= 0) - var/r = 0 //becomes 1 if any bits are shifted off + var/r = 0 //becomes 1 if any bits are shifted off while(n >= MIN_MERGE) r |= (n & 1) n >>= 1 return n + r //Examines the stack of runs waiting to be merged and merges adjacent runs until the stack invariants are reestablished: - // runLen[i-3] > runLen[i-2] + runLen[i-1] - // runLen[i-2] > runLen[i-1] + // runLen[i-3] > runLen[i-2] + runLen[i-1] + // runLen[i-2] > runLen[i-1] //This method is called each time a new run is pushed onto the stack. //So the invariants are guaranteed to hold for i 0 * @param hint the index at which to begin the search, 0 <= hint < n. - * The closer hint is to the result, the faster this method will run. + * The closer hint is to the result, the faster this method will run. * @param c the comparator used to order the range, and to search * @return the int k, 0 <= k <= n such that `a[b + k - 1] <= key < a[b + k]` */ @@ -320,11 +320,11 @@ GLOBAL_DATUM_INIT(sortInstance, /datum/sort_instance, new()) var/offset = 1 var/lastOffset = 0 - if(call(cmp)(key, fetchElement(L,base+hint)) < 0) //key <= L[base+hint] - var/maxOffset = hint + 1 //therefore we want to insert somewhere in the range [base,base+hint] = [base+,base+(hint+1)) - while(offset < maxOffset && call(cmp)(key, fetchElement(L,base+hint-offset)) < 0) //we are iterating backwards + if(call(cmp)(key, fetchElement(L,base+hint)) < 0) //key <= L[base+hint] + var/maxOffset = hint + 1 //therefore we want to insert somewhere in the range [base,base+hint] = [base+,base+(hint+1)) + while(offset < maxOffset && call(cmp)(key, fetchElement(L,base+hint-offset)) < 0) //we are iterating backwards lastOffset = offset - offset = (offset << 1) + 1 //1 3 7 15 + offset = (offset << 1) + 1 //1 3 7 15 if(offset > maxOffset) offset = maxOffset @@ -333,8 +333,8 @@ GLOBAL_DATUM_INIT(sortInstance, /datum/sort_instance, new()) lastOffset = hint - offset offset = hint - temp - else //key > L[base+hint] - var/maxOffset = len - hint //therefore we want to insert somewhere in the range (base+hint,base+len) = [base+hint+1, base+hint+(len-hint)) + else //key > L[base+hint] + var/maxOffset = len - hint //therefore we want to insert somewhere in the range (base+hint,base+len) = [base+hint+1, base+hint+(len-hint)) while(offset < maxOffset && call(cmp)(key, fetchElement(L,base+hint+offset)) >= 0) lastOffset = offset offset = (offset << 1) + 1 @@ -351,9 +351,9 @@ GLOBAL_DATUM_INIT(sortInstance, /datum/sort_instance, new()) while(lastOffset < offset) var/m = lastOffset + ((offset - lastOffset) >> 1) - if(call(cmp)(key, fetchElement(L,base+m)) < 0) //key <= L[base+m] + if(call(cmp)(key, fetchElement(L,base+m)) < 0) //key <= L[base+m] offset = m - else //key > L[base+m] + else //key > L[base+m] lastOffset = m + 1 //ASSERT(lastOffset == offset) @@ -385,8 +385,8 @@ GLOBAL_DATUM_INIT(sortInstance, /datum/sort_instance, new()) outer: while(1) - var/count1 = 0 //# of times in a row that first run won - var/count2 = 0 // " " " " " " second run won + var/count1 = 0 //# of times in a row that first run won + var/count2 = 0 // " " " " " " second run won //do the straightfoward thin until one run starts winning consistently @@ -468,7 +468,7 @@ GLOBAL_DATUM_INIT(sortInstance, /datum/sort_instance, new()) /datum/sort_instance/proc/mergeHi(base1, len1, base2, len2) //ASSERT(len1 > 0 && len2 > 0 && base1 + len1 == base2) - var/cursor1 = base1 + len1 - 1 //start at end of sublists + var/cursor1 = base1 + len1 - 1 //start at end of sublists var/cursor2 = base2 + len2 - 1 //degenerate cases @@ -485,8 +485,8 @@ GLOBAL_DATUM_INIT(sortInstance, /datum/sort_instance, new()) outer: while(1) - var/count1 = 0 //# of times in a row that first run won - var/count2 = 0 // " " " " " " second run won + var/count1 = 0 //# of times in a row that first run won + var/count2 = 0 // " " " " " " second run won //do the straightfoward thing until one run starts winning consistently do @@ -516,11 +516,11 @@ GLOBAL_DATUM_INIT(sortInstance, /datum/sort_instance, new()) do //ASSERT(len1 > 0 && len2 > 1) - count1 = len1 - gallopRight(fetchElement(L,cursor2), base1, len1, len1-1) //should cursor1 be base1? + count1 = len1 - gallopRight(fetchElement(L,cursor2), base1, len1, len1-1) //should cursor1 be base1? if(count1) cursor1 -= count1 - moveRange(L, cursor1+1, cursor2+1, count1) //cursor1+1 == cursor2 by definition + moveRange(L, cursor1+1, cursor2+1, count1) //cursor1+1 == cursor2 by definition cursor2 -= count1 len1 -= count1 @@ -552,7 +552,7 @@ GLOBAL_DATUM_INIT(sortInstance, /datum/sort_instance, new()) if(minGallop < 0) minGallop = 0 - minGallop += 2 // Penalize for leaving gallop mode + minGallop += 2 // Penalize for leaving gallop mode if(len2 == 1) //ASSERT(len1 > 0) @@ -599,7 +599,7 @@ GLOBAL_DATUM_INIT(sortInstance, /datum/sort_instance, new()) else if(runLens[n] <= runLens[n+1]) mergeAt2(n) else - break //Invariant is established + break //Invariant is established while(runBases.len >= 2) var/n = runBases.len - 1 diff --git a/code/__HELPERS/string_lists.dm b/code/__HELPERS/string_lists.dm index 5aca19b6f83..0e64ff7e0cc 100644 --- a/code/__HELPERS/string_lists.dm +++ b/code/__HELPERS/string_lists.dm @@ -17,7 +17,7 @@ GLOBAL_LIST_EMPTY(string_lists) /proc/baseturfs_string_list(list/values, turf/baseturf_holder) if(!islist(values)) return values //baseturf things - // return values + // return values if(length(values) > 10) stack_trace("The baseturfs list of [baseturf_holder] at [baseturf_holder.x], [baseturf_holder.y], [baseturf_holder.x] is [length(values)], it should never be this long, investigate. I've set baseturfs to a flashing wall as a visual queue") return string_list(list(/turf/closed/indestructible/baseturfs_ded)) //I want this reported god damn it diff --git a/code/__HELPERS/text.dm b/code/__HELPERS/text.dm index 48904e465fe..7a01ac95da3 100644 --- a/code/__HELPERS/text.dm +++ b/code/__HELPERS/text.dm @@ -1,11 +1,11 @@ /* * Holds procs designed to help with filtering text * Contains groups: - * SQL sanitization/formating - * Text sanitization - * Text searches - * Text modification - * Misc + * SQL sanitization/formating + * Text sanitization + * Text searches + * Text modification + * Misc */ @@ -115,7 +115,7 @@ else non_whitespace = TRUE if(non_whitespace) - return text //only accepts the text if it has some non-spaces + return text //only accepts the text if it has some non-spaces /// Used to get a properly sanitized input, of max_length /// no_trim is self explanatory but it prevents the input from being trimed if you intend to parse newlines or whitespace. @@ -169,19 +169,19 @@ switch(text2ascii(char)) // A .. Z - if(65 to 90) //Uppercase Letters + if(65 to 90) //Uppercase Letters number_of_alphanumeric++ last_char_group = LETTERS_DETECTED // a .. z - if(97 to 122) //Lowercase Letters + if(97 to 122) //Lowercase Letters if(last_char_group == NO_CHARS_DETECTED || last_char_group == SPACES_DETECTED || last_char_group == SYMBOLS_DETECTED) //start of a word char = uppertext(char) number_of_alphanumeric++ last_char_group = LETTERS_DETECTED // 0 .. 9 - if(48 to 57) //Numbers + if(48 to 57) //Numbers if(last_char_group == NO_CHARS_DETECTED || !allow_numbers) //suppress at start of string if(strict) return @@ -190,7 +190,7 @@ last_char_group = NUMBERS_DETECTED // ' - . - if(39,45,46) //Common name punctuation + if(39,45,46) //Common name punctuation if(last_char_group == NO_CHARS_DETECTED) if(strict) return @@ -198,7 +198,7 @@ last_char_group = SYMBOLS_DETECTED // ~ | @ : # $ % & * + - if(126,124,64,58,35,36,37,38,42,43) //Other symbols that we'll allow (mainly for AI) + if(126,124,64,58,35,36,37,38,42,43) //Other symbols that we'll allow (mainly for AI) if(last_char_group == NO_CHARS_DETECTED || !allow_numbers) //suppress at start of string if(strict) return @@ -228,14 +228,14 @@ break if(number_of_alphanumeric < 2) - return //protects against tiny names like "A" and also names like "' ' ' ' ' ' ' '" + return //protects against tiny names like "A" and also names like "' ' ' ' ' ' ' '" if(last_char_group == SPACES_DETECTED) t_out = copytext_char(t_out, 1, -1) //removes the last character (in this case a space) - for(var/bad_name in list("space","floor","wall","r-wall","monkey","unknown","inactive ai")) //prevents these common metagamey names + for(var/bad_name in list("space","floor","wall","r-wall","monkey","unknown","inactive ai")) //prevents these common metagamey names if(cmptext(t_out,bad_name)) - return //(not case sensitive) + return //(not case sensitive) // Protects against names containing IC chat prohibited words. if(CHAT_FILTER_CHECK(t_out)) @@ -749,7 +749,7 @@ GLOBAL_LIST_INIT(binary, list("0","1")) if(!next_space) next_space = leng - next_backslash - if(!next_space) //trailing bs + if(!next_space) //trailing bs return string var/base = next_backslash == 1 ? "" : copytext(string, 1, next_backslash) diff --git a/code/__HELPERS/time.dm b/code/__HELPERS/time.dm index d9a6b5bf905..a47a3aab017 100644 --- a/code/__HELPERS/time.dm +++ b/code/__HELPERS/time.dm @@ -21,7 +21,7 @@ if(isnum(force_set)) SSticker.gametime_offset = force_set return - SSticker.gametime_offset = rand(0, 864000) //hours in day * minutes in hour * seconds in minute * deciseconds in second + SSticker.gametime_offset = rand(0, 864000) //hours in day * minutes in hour * seconds in minute * deciseconds in second if(prob(50)) SSticker.gametime_offset = FLOOR(SSticker.gametime_offset, 3600) else diff --git a/code/__HELPERS/type2type.dm b/code/__HELPERS/type2type.dm index 46719b900a2..e9f65ab369a 100644 --- a/code/__HELPERS/type2type.dm +++ b/code/__HELPERS/type2type.dm @@ -1,11 +1,11 @@ /* * Holds procs designed to change one type of value, into another. * Contains: - * file2list - * angle2dir - * angle2text - * worldtime2text - * text2dir_extended & dir2text_short + * file2list + * angle2dir + * angle2text + * worldtime2text + * text2dir_extended & dir2text_short */ @@ -341,7 +341,7 @@ GLOBAL_LIST_INIT(modulo_angle_to_dir, list(NORTH,NORTHEAST,EAST,SOUTHEAST,SOUTH, . = max(0, min(255, 138.5177312231 * log(temp - 10) - 305.0447927307)) -/proc/color2hex(color) //web colors +/proc/color2hex(color) //web colors if(!color) return "#000000" diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm index 4e8c5f57945..63bf5f6e4d1 100644 --- a/code/__HELPERS/unsorted.dm +++ b/code/__HELPERS/unsorted.dm @@ -147,25 +147,25 @@ Turf and target are separate in case you want to teleport some distance from a t * Uses the ultra-fast [Bresenham Line-Drawing Algorithm](https://en.wikipedia.org/wiki/Bresenham%27s_line_algorithm). */ /proc/getline(atom/M,atom/N) - var/px=M.x //starting x + var/px=M.x //starting x var/py=M.y var/line[] = list(locate(px,py,M.z)) - var/dx=N.x-px //x distance + var/dx=N.x-px //x distance var/dy=N.y-py var/dxabs = abs(dx)//Absolute value of x distance var/dyabs = abs(dy) - var/sdx = SIGN(dx) //Sign of x distance (+ or -) + var/sdx = SIGN(dx) //Sign of x distance (+ or -) var/sdy = SIGN(dy) - var/x=dxabs>>1 //Counters for steps taken, setting to distance/2 - var/y=dyabs>>1 //Bit-shifting makes me l33t. It also makes getline() unnessecarrily fast. - var/j //Generic integer for counting - if(dxabs>=dyabs) //x distance is greater than y + var/x=dxabs>>1 //Counters for steps taken, setting to distance/2 + var/y=dyabs>>1 //Bit-shifting makes me l33t. It also makes getline() unnessecarrily fast. + var/j //Generic integer for counting + if(dxabs>=dyabs) //x distance is greater than y for(j=0;j=dxabs) //Every dyabs steps, step once in y direction + if(y>=dxabs) //Every dyabs steps, step once in y direction y-=dxabs py+=sdy - px+=sdx //Step on in x direction + px+=sdx //Step on in x direction line+=locate(px,py,M.z)//Add the turf to the list else for(j=0;j>1)&46811) - ((bitfield>>2)&37449) //0133333 and 0111111 respectively - temp = ((temp + (temp>>3))&29127) % 63 //070707 + temp = ((temp + (temp>>3))&29127) % 63 //070707 return temp //returns a GUID like identifier (using a mostly made up record format) //guids are not on their own suitable for access or security tokens, as most of their bits are predictable. -// (But may make a nice salt to one) +// (But may make a nice salt to one) /proc/GUID() var/const/GUID_VERSION = "b" var/const/GUID_VARIANT = "d" @@ -1314,12 +1314,12 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new) return var/datum/D = list_or_datum if(IsAdminAdvancedProcCall()) - D.vv_edit_var(var_name, var_value) //same result generally, unless badmemes + D.vv_edit_var(var_name, var_value) //same result generally, unless badmemes else D.vars[var_name] = var_value -#define TRAIT_CALLBACK_ADD(target, trait, source) CALLBACK(GLOBAL_PROC, /proc/___TraitAdd, ##target, ##trait, ##source) -#define TRAIT_CALLBACK_REMOVE(target, trait, source) CALLBACK(GLOBAL_PROC, /proc/___TraitRemove, ##target, ##trait, ##source) +#define TRAIT_CALLBACK_ADD(target, trait, source) CALLBACK(GLOBAL_PROC, /proc/___TraitAdd, ##target, ##trait, ##source) +#define TRAIT_CALLBACK_REMOVE(target, trait, source) CALLBACK(GLOBAL_PROC, /proc/___TraitRemove, ##target, ##trait, ##source) ///DO NOT USE ___TraitAdd OR ___TraitRemove as a replacement for ADD_TRAIT / REMOVE_TRAIT defines. To be used explicitly for callback. /proc/___TraitAdd(target,trait,source) diff --git a/code/_compile_options.dm b/code/_compile_options.dm index e4ac1b2b099..7d24254b2d0 100644 --- a/code/_compile_options.dm +++ b/code/_compile_options.dm @@ -1,7 +1,7 @@ -//#define TESTING //By using the testing("message") proc you can create debug-feedback for people with this +//#define TESTING //By using the testing("message") proc you can create debug-feedback for people with this //uncommented, but not visible in the release version) -//#define DATUMVAR_DEBUGGING_MODE //Enables the ability to cache datum vars and retrieve later for debugging which vars changed. +//#define DATUMVAR_DEBUGGING_MODE //Enables the ability to cache datum vars and retrieve later for debugging which vars changed. // Comment this out if you are debugging problems that might be obscured by custom error handling in world/Error #ifdef DEBUG @@ -30,16 +30,16 @@ #endif //ifdef REFERENCE_TRACKING -#define VISUALIZE_ACTIVE_TURFS //Highlights atmos active turfs in green -#define TRACK_MAX_SHARE //Allows max share tracking, for use in the atmos debugging ui +#define VISUALIZE_ACTIVE_TURFS //Highlights atmos active turfs in green +#define TRACK_MAX_SHARE //Allows max share tracking, for use in the atmos debugging ui #endif //ifdef TESTING -//#define UNIT_TESTS //If this is uncommented, we do a single run though of the game setup and tear down process with unit tests in between +//#define UNIT_TESTS //If this is uncommented, we do a single run though of the game setup and tear down process with unit tests in between -#ifndef PRELOAD_RSC //set to: -#define PRELOAD_RSC 2 // 0 to allow using external resources or on-demand behaviour; -#endif // 1 to use the default behaviour; - // 2 for preloading absolutely everything; +#ifndef PRELOAD_RSC //set to: +#define PRELOAD_RSC 2 // 0 to allow using external resources or on-demand behaviour; +#endif // 1 to use the default behaviour; + // 2 for preloading absolutely everything; #ifdef LOWMEMORYMODE #define FORCE_MAP "_maps/runtimestation.json" diff --git a/code/_globalvars/bitfields.dm b/code/_globalvars/bitfields.dm index 48bab000193..73874b4a276 100644 --- a/code/_globalvars/bitfields.dm +++ b/code/_globalvars/bitfields.dm @@ -89,7 +89,7 @@ DEFINE_BITFIELD(datum_flags, list( )) DEFINE_BITFIELD(disease_flags, list( - "CAN_CARRY" = CAN_CARRY, + "CAN_CARRY" = CAN_CARRY, "CAN_RESIST" = CAN_RESIST, "CURABLE" = CURABLE, )) @@ -170,14 +170,14 @@ DEFINE_BITFIELD(item_flags, list( DEFINE_BITFIELD(machine_stat, list( "BROKEN" = BROKEN, "EMPED" = EMPED, - "MAINT" = MAINT, + "MAINT" = MAINT, "NOPOWER" = NOPOWER, )) DEFINE_BITFIELD(mat_container_flags, list( "MATCONTAINER_EXAMINE" = MATCONTAINER_EXAMINE, "MATCONTAINER_NO_INSERT" = MATCONTAINER_NO_INSERT, - "MATCONTAINER_ANY_INTENT" = MATCONTAINER_ANY_INTENT, + "MATCONTAINER_ANY_INTENT" = MATCONTAINER_ANY_INTENT, "MATCONTAINER_SILENT" = MATCONTAINER_SILENT, "BREAKDOWN_ALLOYS" = BREAKDOWN_ALLOYS, )) @@ -185,14 +185,14 @@ DEFINE_BITFIELD(mat_container_flags, list( DEFINE_BITFIELD(internal_damage, list( "MECHA_INT_FIRE" = MECHA_INT_FIRE, "MECHA_INT_TEMP_CONTROL" = MECHA_INT_TEMP_CONTROL, - "MECHA_INT_TANK_BREACH" = MECHA_INT_TANK_BREACH, + "MECHA_INT_TANK_BREACH" = MECHA_INT_TANK_BREACH, "MECHA_INT_CONTROL_LOST" = MECHA_INT_CONTROL_LOST, )) DEFINE_BITFIELD(mecha_flags, list( "ADDING_ACCESS_POSSIBLE" = ADDING_ACCESS_POSSIBLE, "ADDING_MAINT_ACCESS_POSSIBLE" = ADDING_MAINT_ACCESS_POSSIBLE, - "CANSTRAFE" = CANSTRAFE, + "CANSTRAFE" = CANSTRAFE, "LIGHTS_ON" = LIGHTS_ON, "SILICON_PILOT" = SILICON_PILOT, "IS_ENCLOSED" = IS_ENCLOSED, diff --git a/code/_globalvars/configuration.dm b/code/_globalvars/configuration.dm index 7301fcf3586..052252a0323 100644 --- a/code/_globalvars/configuration.dm +++ b/code/_globalvars/configuration.dm @@ -8,7 +8,7 @@ GLOBAL_VAR_INIT(game_version, "/tg/Station 13") GLOBAL_VAR_INIT(changelog_hash, "") GLOBAL_VAR_INIT(hub_visibility, FALSE) -GLOBAL_VAR_INIT(ooc_allowed, TRUE) // used with admin verbs to disable ooc - not a config option apparently +GLOBAL_VAR_INIT(ooc_allowed, TRUE) // used with admin verbs to disable ooc - not a config option apparently GLOBAL_VAR_INIT(dooc_allowed, TRUE) GLOBAL_VAR_INIT(enter_allowed, TRUE) GLOBAL_VAR_INIT(shuttle_frozen, FALSE) @@ -18,7 +18,7 @@ GLOBAL_VAR_INIT(tinted_weldhelh, TRUE) // Debug is used exactly once (in living.dm) but is commented out in a lot of places. It is not set anywhere and only checked. // Debug2 is used in conjunction with a lot of admin verbs and therefore is actually legit. -GLOBAL_VAR_INIT(Debug, FALSE) // global debug switch +GLOBAL_VAR_INIT(Debug, FALSE) // global debug switch GLOBAL_VAR_INIT(Debug2, FALSE) //This was a define, but I changed it to a variable so it can be changed in-game.(kept the all-caps definition because... code...) -Errorage diff --git a/code/_globalvars/lists/admin.dm b/code/_globalvars/lists/admin.dm index 22e4f293468..f2e08ec085d 100644 --- a/code/_globalvars/lists/admin.dm +++ b/code/_globalvars/lists/admin.dm @@ -1,4 +1,4 @@ -GLOBAL_LIST_EMPTY(stickybanadminexemptions) //stores a list of ckeys exempted from a stickyban (workaround for a bug) +GLOBAL_LIST_EMPTY(stickybanadminexemptions) //stores a list of ckeys exempted from a stickyban (workaround for a bug) GLOBAL_LIST_EMPTY(stickybanadmintexts) //stores the entire stickyban list temporarily GLOBAL_VAR(stickbanadminexemptiontimerid) //stores the timerid of the callback that restores all stickybans after an admin joins diff --git a/code/_globalvars/lists/flavor_misc.dm b/code/_globalvars/lists/flavor_misc.dm index 0a104dd3101..0df92aed94d 100644 --- a/code/_globalvars/lists/flavor_misc.dm +++ b/code/_globalvars/lists/flavor_misc.dm @@ -1,21 +1,21 @@ //Preferences stuff //Hairstyles -GLOBAL_LIST_EMPTY(hairstyles_list) //stores /datum/sprite_accessory/hair indexed by name -GLOBAL_LIST_EMPTY(hairstyles_male_list) //stores only hair names -GLOBAL_LIST_EMPTY(hairstyles_female_list) //stores only hair names -GLOBAL_LIST_EMPTY(facial_hairstyles_list) //stores /datum/sprite_accessory/facial_hair indexed by name -GLOBAL_LIST_EMPTY(facial_hairstyles_male_list) //stores only hair names -GLOBAL_LIST_EMPTY(facial_hairstyles_female_list) //stores only hair names +GLOBAL_LIST_EMPTY(hairstyles_list) //stores /datum/sprite_accessory/hair indexed by name +GLOBAL_LIST_EMPTY(hairstyles_male_list) //stores only hair names +GLOBAL_LIST_EMPTY(hairstyles_female_list) //stores only hair names +GLOBAL_LIST_EMPTY(facial_hairstyles_list) //stores /datum/sprite_accessory/facial_hair indexed by name +GLOBAL_LIST_EMPTY(facial_hairstyles_male_list) //stores only hair names +GLOBAL_LIST_EMPTY(facial_hairstyles_female_list) //stores only hair names //Underwear -GLOBAL_LIST_EMPTY(underwear_list) //stores /datum/sprite_accessory/underwear indexed by name -GLOBAL_LIST_EMPTY(underwear_m) //stores only underwear name -GLOBAL_LIST_EMPTY(underwear_f) //stores only underwear name +GLOBAL_LIST_EMPTY(underwear_list) //stores /datum/sprite_accessory/underwear indexed by name +GLOBAL_LIST_EMPTY(underwear_m) //stores only underwear name +GLOBAL_LIST_EMPTY(underwear_f) //stores only underwear name //Undershirts -GLOBAL_LIST_EMPTY(undershirt_list) //stores /datum/sprite_accessory/undershirt indexed by name -GLOBAL_LIST_EMPTY(undershirt_m) //stores only undershirt name -GLOBAL_LIST_EMPTY(undershirt_f) //stores only undershirt name +GLOBAL_LIST_EMPTY(undershirt_list) //stores /datum/sprite_accessory/undershirt indexed by name +GLOBAL_LIST_EMPTY(undershirt_m) //stores only undershirt name +GLOBAL_LIST_EMPTY(undershirt_f) //stores only undershirt name //Socks -GLOBAL_LIST_EMPTY(socks_list) //stores /datum/sprite_accessory/socks indexed by name +GLOBAL_LIST_EMPTY(socks_list) //stores /datum/sprite_accessory/socks indexed by name //Lizard Bits (all datum lists indexed by name) //SKYRAT EDIT REMOVAL - CUSTOMIZATION /* @@ -168,9 +168,9 @@ GLOBAL_LIST_INIT(backpacklist, list(DBACKPACK, DSATCHEL, DDUFFELBAG, GBACKPACK, GLOBAL_LIST_INIT(jumpsuitlist, list(PREF_SUIT, PREF_SKIRT)) //Uplink spawn loc -#define UPLINK_PDA "PDA" -#define UPLINK_RADIO "Radio" -#define UPLINK_PEN "Pen" //like a real spy! +#define UPLINK_PDA "PDA" +#define UPLINK_RADIO "Radio" +#define UPLINK_PEN "Pen" //like a real spy! #define UPLINK_IMPLANT "Implant" GLOBAL_LIST_INIT(uplink_spawn_loc_list, list(UPLINK_PDA, UPLINK_RADIO, UPLINK_PEN, UPLINK_IMPLANT)) diff --git a/code/_globalvars/lists/maintenance_loot.dm b/code/_globalvars/lists/maintenance_loot.dm index 3525c157f07..1c8cb08a44c 100644 --- a/code/_globalvars/lists/maintenance_loot.dm +++ b/code/_globalvars/lists/maintenance_loot.dm @@ -238,7 +238,7 @@ GLOBAL_LIST_INIT(uncommon_loot, list(//uncommon: useful items ) = 8, list(//fakeout items, keep this list at low relative weight - /obj/item/dice/d20 = 1, //To balance out the stealth die of fates in oddities + /obj/item/dice/d20 = 1, //To balance out the stealth die of fates in oddities /obj/item/clothing/shoes/jackboots = 1, ) = 1, )) @@ -308,8 +308,8 @@ GLOBAL_LIST_INIT(oddity_loot, list(//oddity: strange or crazy items /obj/item/spear/grey_tide = 1, /obj/item/shadowcloak = 1, /obj/item/clothing/head/helmet/abductor = 1, - /obj/item/dice/d20/fate/stealth/one_use = 1, //Looks like a d20, keep the d20 in the uncommon pool. - /obj/item/dice/d20/fate/stealth/cursed = 1, //Only rolls 1 + /obj/item/dice/d20/fate/stealth/one_use = 1, //Looks like a d20, keep the d20 in the uncommon pool. + /obj/item/dice/d20/fate/stealth/cursed = 1, //Only rolls 1 /obj/item/clothing/shoes/jackboots/fast = 1, /obj/item/clothing/suit/armor/reactive/table = 1, /obj/item/storage/box/donkpockets/donkpocketgondola = 1 diff --git a/code/_globalvars/lists/mapping.dm b/code/_globalvars/lists/mapping.dm index 03c0540b0fe..028e45bb9f3 100644 --- a/code/_globalvars/lists/mapping.dm +++ b/code/_globalvars/lists/mapping.dm @@ -12,24 +12,24 @@ GLOBAL_LIST_INIT(alldirs_multiz, list( DOWN, DOWN|NORTH, DOWN|SOUTH, DOWN|EAST, DOWN|WEST, DOWN|NORTHEAST, DOWN|NORTHWEST, DOWN|SOUTHEAST, DOWN|SOUTHWEST)) GLOBAL_LIST_INIT(alldirs, list(NORTH, SOUTH, EAST, WEST, NORTHEAST, NORTHWEST, SOUTHEAST, SOUTHWEST)) -GLOBAL_LIST_EMPTY(landmarks_list) //list of all landmarks created -GLOBAL_LIST_EMPTY(start_landmarks_list) //list of all spawn points created -GLOBAL_LIST_EMPTY(department_security_spawns) //list of all department security spawns -GLOBAL_LIST_EMPTY(generic_event_spawns) //handles clockwork portal+eminence teleport destinations -GLOBAL_LIST_EMPTY(jobspawn_overrides) //These will take precedence over normal spawnpoints if created. +GLOBAL_LIST_EMPTY(landmarks_list) //list of all landmarks created +GLOBAL_LIST_EMPTY(start_landmarks_list) //list of all spawn points created +GLOBAL_LIST_EMPTY(department_security_spawns) //list of all department security spawns +GLOBAL_LIST_EMPTY(generic_event_spawns) //handles clockwork portal+eminence teleport destinations +GLOBAL_LIST_EMPTY(jobspawn_overrides) //These will take precedence over normal spawnpoints if created. GLOBAL_LIST_EMPTY(wizardstart) GLOBAL_LIST_EMPTY(nukeop_start) GLOBAL_LIST_EMPTY(nukeop_leader_start) GLOBAL_LIST_EMPTY(newplayer_start) -GLOBAL_LIST_EMPTY(prisonwarp) //admin prisoners go to these -GLOBAL_LIST_EMPTY(holdingfacility) //captured people go here (ninja energy net) +GLOBAL_LIST_EMPTY(prisonwarp) //admin prisoners go to these +GLOBAL_LIST_EMPTY(holdingfacility) //captured people go here (ninja energy net) GLOBAL_LIST_EMPTY(xeno_spawn)//aliens, morphs and nightmares spawn at these GLOBAL_LIST_EMPTY(tdome1) GLOBAL_LIST_EMPTY(tdome2) GLOBAL_LIST_EMPTY(tdomeobserve) GLOBAL_LIST_EMPTY(tdomeadmin) -GLOBAL_LIST_EMPTY(prisonwarped) //list of players already warped +GLOBAL_LIST_EMPTY(prisonwarped) //list of players already warped GLOBAL_LIST_EMPTY(blobstart) //stationloving objects, blobs, santa GLOBAL_LIST_EMPTY(secequipment) //sec equipment lockers that scale with the number of sec players GLOBAL_LIST_EMPTY(deathsquadspawn) diff --git a/code/_globalvars/lists/mobs.dm b/code/_globalvars/lists/mobs.dm index 1683c3a26f2..664f957687c 100644 --- a/code/_globalvars/lists/mobs.dm +++ b/code/_globalvars/lists/mobs.dm @@ -1,10 +1,10 @@ -GLOBAL_LIST_EMPTY(clients) //all clients -GLOBAL_LIST_EMPTY(admins) //all clients whom are admins +GLOBAL_LIST_EMPTY(clients) //all clients +GLOBAL_LIST_EMPTY(admins) //all clients whom are admins GLOBAL_PROTECT(admins) -GLOBAL_LIST_EMPTY(deadmins) //all ckeys who have used the de-admin verb. +GLOBAL_LIST_EMPTY(deadmins) //all ckeys who have used the de-admin verb. -GLOBAL_LIST_EMPTY(directory) //all ckeys with associated client -GLOBAL_LIST_EMPTY(stealthminID) //reference list with IDs that store ckeys, for stealthmins +GLOBAL_LIST_EMPTY(directory) //all ckeys with associated client +GLOBAL_LIST_EMPTY(stealthminID) //reference list with IDs that store ckeys, for stealthmins GLOBAL_LIST_INIT(dangerous_turfs, typecacheof(list( /turf/open/lava, @@ -16,29 +16,29 @@ GLOBAL_LIST_INIT(dangerous_turfs, typecacheof(list( //Since it didn't really belong in any other category, I'm putting this here //This is for procs to replace all the goddamn 'in world's that are chilling around the code -GLOBAL_LIST_EMPTY(player_list) //all mobs **with clients attached**. -GLOBAL_LIST_EMPTY(mob_list) //all mobs, including clientless -GLOBAL_LIST_EMPTY(mob_directory) //mob_id -> mob -GLOBAL_LIST_EMPTY(alive_mob_list) //all alive mobs, including clientless. Excludes /mob/dead/new_player -GLOBAL_LIST_EMPTY(suicided_mob_list) //contains a list of all mobs that suicided, including their associated ghosts. +GLOBAL_LIST_EMPTY(player_list) //all mobs **with clients attached**. +GLOBAL_LIST_EMPTY(mob_list) //all mobs, including clientless +GLOBAL_LIST_EMPTY(mob_directory) //mob_id -> mob +GLOBAL_LIST_EMPTY(alive_mob_list) //all alive mobs, including clientless. Excludes /mob/dead/new_player +GLOBAL_LIST_EMPTY(suicided_mob_list) //contains a list of all mobs that suicided, including their associated ghosts. GLOBAL_LIST_EMPTY(drones_list) -GLOBAL_LIST_EMPTY(dead_mob_list) //all dead mobs, including clientless. Excludes /mob/dead/new_player -GLOBAL_LIST_EMPTY(joined_player_list) //all clients that have joined the game at round-start or as a latejoin. -GLOBAL_LIST_EMPTY(new_player_list) //all /mob/dead/new_player, in theory all should have clients and those that don't are in the process of spawning and get deleted when done. -GLOBAL_LIST_EMPTY(pre_setup_antags) //minds that have been picked as antag by the gamemode. removed as antag datums are set. -GLOBAL_LIST_EMPTY(silicon_mobs) //all silicon mobs -GLOBAL_LIST_EMPTY(mob_living_list) //all instances of /mob/living and subtypes -GLOBAL_LIST_EMPTY(carbon_list) //all instances of /mob/living/carbon and subtypes, notably does not contain brains or simple animals -GLOBAL_LIST_EMPTY(human_list) //all instances of /mob/living/carbon/human and subtypes +GLOBAL_LIST_EMPTY(dead_mob_list) //all dead mobs, including clientless. Excludes /mob/dead/new_player +GLOBAL_LIST_EMPTY(joined_player_list) //all clients that have joined the game at round-start or as a latejoin. +GLOBAL_LIST_EMPTY(new_player_list) //all /mob/dead/new_player, in theory all should have clients and those that don't are in the process of spawning and get deleted when done. +GLOBAL_LIST_EMPTY(pre_setup_antags) //minds that have been picked as antag by the gamemode. removed as antag datums are set. +GLOBAL_LIST_EMPTY(silicon_mobs) //all silicon mobs +GLOBAL_LIST_EMPTY(mob_living_list) //all instances of /mob/living and subtypes +GLOBAL_LIST_EMPTY(carbon_list) //all instances of /mob/living/carbon and subtypes, notably does not contain brains or simple animals +GLOBAL_LIST_EMPTY(human_list) //all instances of /mob/living/carbon/human and subtypes GLOBAL_LIST_EMPTY(ai_list) GLOBAL_LIST_EMPTY(pai_list) GLOBAL_LIST_EMPTY(available_ai_shells) GLOBAL_LIST_INIT(simple_animals, list(list(),list(),list(),list())) // One for each AI_* status define -GLOBAL_LIST_EMPTY(spidermobs) //all sentient spider mobs +GLOBAL_LIST_EMPTY(spidermobs) //all sentient spider mobs GLOBAL_LIST_EMPTY(bots_list) GLOBAL_LIST_EMPTY(aiEyes) -GLOBAL_LIST_EMPTY(suit_sensors_list) //all people with suit sensors on -GLOBAL_LIST_EMPTY(nanite_sensors_list) //app people with nanite monitoring program +GLOBAL_LIST_EMPTY(suit_sensors_list) //all people with suit sensors on +GLOBAL_LIST_EMPTY(nanite_sensors_list) //app people with nanite monitoring program ///underages who have been reported to security for trying to buy things they shouldn't, so they can't spam GLOBAL_LIST_EMPTY(narcd_underages) diff --git a/code/_globalvars/lists/objects.dm b/code/_globalvars/lists/objects.dm index a4519f592fb..de14dc75a84 100644 --- a/code/_globalvars/lists/objects.dm +++ b/code/_globalvars/lists/objects.dm @@ -1,35 +1,35 @@ -GLOBAL_LIST_EMPTY(cable_list) //Index for all cables, so that powernets don't have to look through the entire world all the time -GLOBAL_LIST_EMPTY(portals) //list of all /obj/effect/portal -GLOBAL_LIST_EMPTY(airlocks) //list of all airlocks -GLOBAL_LIST_EMPTY(curtains) //list of all curtains -GLOBAL_LIST_EMPTY(mechas_list) //list of all mechs. Used by hostile mobs target tracking. -GLOBAL_LIST_EMPTY(shuttle_caller_list) //list of all communication consoles and AIs, for automatic shuttle calls when there are none. -GLOBAL_LIST_EMPTY(machines) //NOTE: this is a list of ALL machines now. The processing machines list is SSmachine.processing ! -GLOBAL_LIST_EMPTY(navigation_computers) //list of all /obj/machinery/computer/camera_advanced/shuttle_docker -GLOBAL_LIST_EMPTY(syndicate_shuttle_boards) //important to keep track of for managing nukeops war declarations. -GLOBAL_LIST_EMPTY(navbeacons) //list of all bot nagivation beacons, used for patrolling. -GLOBAL_LIST_EMPTY(teleportbeacons) //list of all tracking beacons used by teleporters -GLOBAL_LIST_EMPTY(deliverybeacons) //list of all MULEbot delivery beacons. -GLOBAL_LIST_EMPTY(deliverybeacontags) //list of all tags associated with delivery beacons. -GLOBAL_LIST_EMPTY(wayfindingbeacons) //list of all navigation beacons used by wayfinding pinpointers +GLOBAL_LIST_EMPTY(cable_list) //Index for all cables, so that powernets don't have to look through the entire world all the time +GLOBAL_LIST_EMPTY(portals) //list of all /obj/effect/portal +GLOBAL_LIST_EMPTY(airlocks) //list of all airlocks +GLOBAL_LIST_EMPTY(curtains) //list of all curtains +GLOBAL_LIST_EMPTY(mechas_list) //list of all mechs. Used by hostile mobs target tracking. +GLOBAL_LIST_EMPTY(shuttle_caller_list) //list of all communication consoles and AIs, for automatic shuttle calls when there are none. +GLOBAL_LIST_EMPTY(machines) //NOTE: this is a list of ALL machines now. The processing machines list is SSmachine.processing ! +GLOBAL_LIST_EMPTY(navigation_computers) //list of all /obj/machinery/computer/camera_advanced/shuttle_docker +GLOBAL_LIST_EMPTY(syndicate_shuttle_boards) //important to keep track of for managing nukeops war declarations. +GLOBAL_LIST_EMPTY(navbeacons) //list of all bot nagivation beacons, used for patrolling. +GLOBAL_LIST_EMPTY(teleportbeacons) //list of all tracking beacons used by teleporters +GLOBAL_LIST_EMPTY(deliverybeacons) //list of all MULEbot delivery beacons. +GLOBAL_LIST_EMPTY(deliverybeacontags) //list of all tags associated with delivery beacons. +GLOBAL_LIST_EMPTY(wayfindingbeacons) //list of all navigation beacons used by wayfinding pinpointers GLOBAL_LIST_EMPTY(nuke_list) -GLOBAL_LIST_EMPTY(alarmdisplay) //list of all machines or programs that can display station alerts +GLOBAL_LIST_EMPTY(alarmdisplay) //list of all machines or programs that can display station alerts GLOBAL_LIST_EMPTY_TYPED(singularities, /datum/component/singularity) //list of all singularities on the station -GLOBAL_LIST_EMPTY(mechpad_list) //list of all /obj/machinery/mechpad +GLOBAL_LIST_EMPTY(mechpad_list) //list of all /obj/machinery/mechpad -GLOBAL_LIST(chemical_reactions_list) //list of all /datum/chemical_reaction datums. Used during chemical reactions -GLOBAL_LIST(chemical_reagents_list) //list of all /datum/reagent datums indexed by reagent id. Used by chemistry stuff -GLOBAL_LIST_EMPTY(tech_list) //list of all /datum/tech datums indexed by id. -GLOBAL_LIST_EMPTY(surgeries_list) //list of all surgeries by name, associated with their path. -GLOBAL_LIST_EMPTY(crafting_recipes) //list of all table craft recipes -GLOBAL_LIST_EMPTY(rcd_list) //list of Rapid Construction Devices. -GLOBAL_LIST_EMPTY(apcs_list) //list of all Area Power Controller machines, separate from machines for powernet speeeeeeed. -GLOBAL_LIST_EMPTY(tracked_implants) //list of all current implants that are tracked to work out what sort of trek everyone is on. Sadly not on lavaworld not implemented... -GLOBAL_LIST_EMPTY(tracked_chem_implants) //list of implants the prisoner console can track and send inject commands too -GLOBAL_LIST_EMPTY(poi_list) //list of points of interest for observe/follow -GLOBAL_LIST_EMPTY(pinpointer_list) //list of all pinpointers. Used to change stuff they are pointing to all at once. -GLOBAL_LIST_EMPTY(zombie_infection_list) // A list of all zombie_infection organs, for any mass "animation" -GLOBAL_LIST_EMPTY(meteor_list) // List of all meteors. +GLOBAL_LIST(chemical_reactions_list) //list of all /datum/chemical_reaction datums. Used during chemical reactions +GLOBAL_LIST(chemical_reagents_list) //list of all /datum/reagent datums indexed by reagent id. Used by chemistry stuff +GLOBAL_LIST_EMPTY(tech_list) //list of all /datum/tech datums indexed by id. +GLOBAL_LIST_EMPTY(surgeries_list) //list of all surgeries by name, associated with their path. +GLOBAL_LIST_EMPTY(crafting_recipes) //list of all table craft recipes +GLOBAL_LIST_EMPTY(rcd_list) //list of Rapid Construction Devices. +GLOBAL_LIST_EMPTY(apcs_list) //list of all Area Power Controller machines, separate from machines for powernet speeeeeeed. +GLOBAL_LIST_EMPTY(tracked_implants) //list of all current implants that are tracked to work out what sort of trek everyone is on. Sadly not on lavaworld not implemented... +GLOBAL_LIST_EMPTY(tracked_chem_implants) //list of implants the prisoner console can track and send inject commands too +GLOBAL_LIST_EMPTY(poi_list) //list of points of interest for observe/follow +GLOBAL_LIST_EMPTY(pinpointer_list) //list of all pinpointers. Used to change stuff they are pointing to all at once. +GLOBAL_LIST_EMPTY(zombie_infection_list) // A list of all zombie_infection organs, for any mass "animation" +GLOBAL_LIST_EMPTY(meteor_list) // List of all meteors. GLOBAL_LIST_EMPTY(active_jammers) // List of active radio jammers GLOBAL_LIST_EMPTY(ladders) GLOBAL_LIST_EMPTY(trophy_cases) @@ -41,8 +41,8 @@ GLOBAL_LIST_EMPTY(wire_name_directory) GLOBAL_LIST_EMPTY(ai_status_displays) -GLOBAL_LIST_EMPTY(mob_spawners) // All mob_spawn objects -GLOBAL_LIST_EMPTY(alert_consoles) // Station alert consoles, /obj/machinery/computer/station_alert +GLOBAL_LIST_EMPTY(mob_spawners) // All mob_spawn objects +GLOBAL_LIST_EMPTY(alert_consoles) // Station alert consoles, /obj/machinery/computer/station_alert -GLOBAL_LIST_EMPTY(air_scrub_names) // Name list of all air scrubbers -GLOBAL_LIST_EMPTY(air_vent_names) // Name list of all air vents +GLOBAL_LIST_EMPTY(air_scrub_names) // Name list of all air scrubbers +GLOBAL_LIST_EMPTY(air_vent_names) // Name list of all air vents diff --git a/code/_globalvars/logging.dm b/code/_globalvars/logging.dm index 20dd6b6df87..1b49f8522db 100644 --- a/code/_globalvars/logging.dm +++ b/code/_globalvars/logging.dm @@ -57,7 +57,7 @@ GLOBAL_LIST_EMPTY(bombers) GLOBAL_PROTECT(bombers) GLOBAL_LIST_EMPTY(admin_log) GLOBAL_PROTECT(admin_log) -GLOBAL_LIST_EMPTY(lastsignalers) //keeps last 100 signals here in format: "[src] used [REF(src)] @ location [src.loc]: [freq]/[code]" +GLOBAL_LIST_EMPTY(lastsignalers) //keeps last 100 signals here in format: "[src] used [REF(src)] @ location [src.loc]: [freq]/[code]" GLOBAL_PROTECT(lastsignalers) GLOBAL_LIST_EMPTY(lawchanges) //Stores who uploaded laws to which silicon-based lifeform, and what the law was GLOBAL_PROTECT(lawchanges) diff --git a/code/_globalvars/misc.dm b/code/_globalvars/misc.dm index de0a65f9b55..66f306a8619 100644 --- a/code/_globalvars/misc.dm +++ b/code/_globalvars/misc.dm @@ -16,9 +16,9 @@ GLOBAL_VAR_INIT(CHARGELEVEL, 0.001) // Cap for how fast cells charge, as a perce GLOBAL_LIST_EMPTY(powernets) -GLOBAL_VAR_INIT(bsa_unlock, FALSE) //BSA unlocked by head ID swipes +GLOBAL_VAR_INIT(bsa_unlock, FALSE) //BSA unlocked by head ID swipes -GLOBAL_LIST_EMPTY(player_details) // ckey -> /datum/player_details +GLOBAL_LIST_EMPTY(player_details) // ckey -> /datum/player_details ///All currently running polls held as datums GLOBAL_LIST_EMPTY(polls) diff --git a/code/_onclick/adjacent.dm b/code/_onclick/adjacent.dm index ddf6e6f41e7..1939ec7517d 100644 --- a/code/_onclick/adjacent.dm +++ b/code/_onclick/adjacent.dm @@ -41,8 +41,8 @@ // Diagonal case var/in_dir = get_dir(T0,src) // eg. northwest (1+8) = 9 (00001001) - var/d1 = in_dir&3 // eg. north (1+8)&3 (0000 0011) = 1 (0000 0001) - var/d2 = in_dir&12 // eg. west (1+8)&12 (0000 1100) = 8 (0000 1000) + var/d1 = in_dir&3 // eg. north (1+8)&3 (0000 0011) = 1 (0000 0001) + var/d2 = in_dir&12 // eg. west (1+8)&12 (0000 1100) = 8 (0000 1000) for(var/d in list(d1,d2)) if(!T0.ClickCross(d, border_only = 1, target_atom = target, mover = mover)) @@ -99,7 +99,7 @@ if( O.flags_1&ON_BORDER_1) // windows are on border, check them first if( O.dir & target_dir || O.dir & (O.dir-1) ) // full tile windows are just diagonals mechanically - return FALSE //O.dir&(O.dir-1) is false for any cardinal direction, but true for diagonal ones + return FALSE //O.dir&(O.dir-1) is false for any cardinal direction, but true for diagonal ones else if( !border_only ) // dense, not on border, cannot pass over return FALSE return TRUE diff --git a/code/_onclick/ai.dm b/code/_onclick/ai.dm index 2aa2899bdbd..b80d002c626 100644 --- a/code/_onclick/ai.dm +++ b/code/_onclick/ai.dm @@ -84,7 +84,7 @@ /* AI has no need for the UnarmedAttack() and RangedAttack() procs, - because the AI code is not generic; attack_ai() is used instead. + because the AI code is not generic; attack_ai() is used instead. The below is only really for safety, or you can alter the way it functions and re-insert it above. */ diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm index 3dd56955317..864dfce20df 100644 --- a/code/_onclick/click.dm +++ b/code/_onclick/click.dm @@ -5,7 +5,7 @@ // 1 decisecond click delay (above and beyond mob/next_move) //This is mainly modified by click code, to modify click delays elsewhere, use next_move and changeNext_move() -/mob/var/next_click = 0 +/mob/var/next_click = 0 // THESE DO NOT EFFECT THE BASE 1 DECISECOND DELAY OF NEXT_CLICK /mob/var/next_move_adjust = 0 //Amount to adjust action/click delays by, + or - @@ -430,7 +430,7 @@ screen_loc = "CENTER" #define MAX_SAFE_BYOND_ICON_SCALE_TILES (MAX_SAFE_BYOND_ICON_SCALE_PX / world.icon_size) -#define MAX_SAFE_BYOND_ICON_SCALE_PX (33 * 32) //Not using world.icon_size on purpose. +#define MAX_SAFE_BYOND_ICON_SCALE_PX (33 * 32) //Not using world.icon_size on purpose. /atom/movable/screen/click_catcher/proc/UpdateGreed(view_size_x = 15, view_size_y = 15) var/icon/newicon = icon('icons/hud/screen_gen.dmi', "catcher") diff --git a/code/_onclick/drag_drop.dm b/code/_onclick/drag_drop.dm index 8c6a6328790..88858abe7fc 100644 --- a/code/_onclick/drag_drop.dm +++ b/code/_onclick/drag_drop.dm @@ -8,7 +8,7 @@ /atom/MouseDrop(atom/over, src_location, over_location, src_control, over_control, params) if(!usr || !over) return - if(SEND_SIGNAL(src, COMSIG_MOUSEDROP_ONTO, over, usr) & COMPONENT_NO_MOUSEDROP) //Whatever is receiving will verify themselves for adjacency. + if(SEND_SIGNAL(src, COMSIG_MOUSEDROP_ONTO, over, usr) & COMPONENT_NO_MOUSEDROP) //Whatever is receiving will verify themselves for adjacency. return if(over == src) return usr.client.Click(src, src_location, src_control, params) diff --git a/code/_onclick/hud/_defines.dm b/code/_onclick/hud/_defines.dm index 47df75473b5..d85f610a3dc 100644 --- a/code/_onclick/hud/_defines.dm +++ b/code/_onclick/hud/_defines.dm @@ -55,8 +55,8 @@ #define ui_acti "EAST-3:24,SOUTH:5" #define ui_combat_toggle "EAST-3:24,SOUTH:5" #define ui_zonesel "EAST-1:28,SOUTH:5" -#define ui_acti_alt "EAST-1:28,SOUTH:5" //alternative intent switcher for when the interface is hidden (F12) -#define ui_crafting "EAST-4:22,SOUTH:5" +#define ui_acti_alt "EAST-1:28,SOUTH:5" //alternative intent switcher for when the interface is hidden (F12) +#define ui_crafting "EAST-4:22,SOUTH:5" #define ui_building "EAST-4:22,SOUTH:21" #define ui_language_menu "EAST-4:6,SOUTH:21" #define ui_skill_menu "EAST-4:22,SOUTH:5" diff --git a/code/_onclick/hud/drones.dm b/code/_onclick/hud/drones.dm index 06d6e239df7..0128e2970c2 100644 --- a/code/_onclick/hud/drones.dm +++ b/code/_onclick/hud/drones.dm @@ -6,7 +6,7 @@ inv_box.name = "internal storage" inv_box.icon = ui_style inv_box.icon_state = "suit_storage" -// inv_box.icon_full = "template" +// inv_box.icon_full = "template" inv_box.screen_loc = ui_drone_storage inv_box.slot_id = ITEM_SLOT_DEX_STORAGE inv_box.hud = src @@ -16,7 +16,7 @@ inv_box.name = "head/mask" inv_box.icon = ui_style inv_box.icon_state = "mask" -// inv_box.icon_full = "template" +// inv_box.icon_full = "template" inv_box.screen_loc = ui_drone_head inv_box.slot_id = ITEM_SLOT_HEAD inv_box.hud = src diff --git a/code/_onclick/hud/hud.dm b/code/_onclick/hud/hud.dm index 2da1931b9de..50a2e1e042d 100644 --- a/code/_onclick/hud/hud.dm +++ b/code/_onclick/hud/hud.dm @@ -21,10 +21,10 @@ GLOBAL_LIST_INIT(available_ui_styles, list( /datum/hud var/mob/mymob - var/hud_shown = TRUE //Used for the HUD toggle (F12) - var/hud_version = HUD_STYLE_STANDARD //Current displayed version of the HUD - var/inventory_shown = FALSE //Equipped item inventory - var/hotkey_ui_hidden = FALSE //This is to hide the buttons that can be used via hotkeys. (hotkeybuttons list of buttons) + var/hud_shown = TRUE //Used for the HUD toggle (F12) + var/hud_version = HUD_STYLE_STANDARD //Current displayed version of the HUD + var/inventory_shown = FALSE //Equipped item inventory + var/hotkey_ui_hidden = FALSE //This is to hide the buttons that can be used via hotkeys. (hotkeybuttons list of buttons) var/atom/movable/screen/ling/chems/lingchemdisplay var/atom/movable/screen/ling/sting/lingstingdisplay @@ -147,14 +147,14 @@ GLOBAL_LIST_INIT(available_ui_styles, list( screenmob.client.apply_clickcatcher() var/display_hud_version = version - if(!display_hud_version) //If 0 or blank, display the next hud version + if(!display_hud_version) //If 0 or blank, display the next hud version display_hud_version = hud_version + 1 - if(display_hud_version > HUD_VERSIONS) //If the requested version number is greater than the available versions, reset back to the first version + if(display_hud_version > HUD_VERSIONS) //If the requested version number is greater than the available versions, reset back to the first version display_hud_version = 1 switch(display_hud_version) - if(HUD_STYLE_STANDARD) //Default HUD - hud_shown = TRUE //Governs behavior of other procs + if(HUD_STYLE_STANDARD) //Default HUD + hud_shown = TRUE //Governs behavior of other procs if(static_inventory.len) screenmob.client.screen += static_inventory if(toggleable_inventory.len && screenmob.hud_used && screenmob.hud_used.inventory_shown) @@ -169,8 +169,8 @@ GLOBAL_LIST_INIT(available_ui_styles, list( if(action_intent) action_intent.screen_loc = initial(action_intent.screen_loc) //Restore intent selection to the original position - if(HUD_STYLE_REDUCED) //Reduced HUD - hud_shown = FALSE //Governs behavior of other procs + if(HUD_STYLE_REDUCED) //Reduced HUD + hud_shown = FALSE //Governs behavior of other procs if(static_inventory.len) screenmob.client.screen -= static_inventory if(toggleable_inventory.len) @@ -186,11 +186,11 @@ GLOBAL_LIST_INIT(available_ui_styles, list( if(hand) screenmob.client.screen += hand if(action_intent) - screenmob.client.screen += action_intent //we want the intent switcher visible - action_intent.screen_loc = ui_acti_alt //move this to the alternative position, where zone_select usually is. + screenmob.client.screen += action_intent //we want the intent switcher visible + action_intent.screen_loc = ui_acti_alt //move this to the alternative position, where zone_select usually is. - if(HUD_STYLE_NOHUD) //No HUD - hud_shown = FALSE //Governs behavior of other procs + if(HUD_STYLE_NOHUD) //No HUD + hud_shown = FALSE //Governs behavior of other procs if(static_inventory.len) screenmob.client.screen -= static_inventory if(toggleable_inventory.len) diff --git a/code/_onclick/hud/human.dm b/code/_onclick/hud/human.dm index c9fa6b39d3f..18d720c3394 100644 --- a/code/_onclick/hud/human.dm +++ b/code/_onclick/hud/human.dm @@ -257,7 +257,7 @@ inv_box.name = "belt" inv_box.icon = ui_style inv_box.icon_state = "belt" -// inv_box.icon_full = "template_small" +// inv_box.icon_full = "template_small" inv_box.screen_loc = ui_belt inv_box.slot_id = ITEM_SLOT_BELT inv_box.hud = src @@ -373,15 +373,15 @@ H.head.screen_loc = ui_head screenmob.client.screen += H.head else - if(H.shoes) screenmob.client.screen -= H.shoes - if(H.gloves) screenmob.client.screen -= H.gloves - if(H.ears) screenmob.client.screen -= H.ears - if(H.glasses) screenmob.client.screen -= H.glasses - if(H.w_uniform) screenmob.client.screen -= H.w_uniform - if(H.wear_suit) screenmob.client.screen -= H.wear_suit - if(H.wear_mask) screenmob.client.screen -= H.wear_mask - if(H.wear_neck) screenmob.client.screen -= H.wear_neck - if(H.head) screenmob.client.screen -= H.head + if(H.shoes) screenmob.client.screen -= H.shoes + if(H.gloves) screenmob.client.screen -= H.gloves + if(H.ears) screenmob.client.screen -= H.ears + if(H.glasses) screenmob.client.screen -= H.glasses + if(H.w_uniform) screenmob.client.screen -= H.w_uniform + if(H.wear_suit) screenmob.client.screen -= H.wear_suit + if(H.wear_mask) screenmob.client.screen -= H.wear_mask + if(H.wear_neck) screenmob.client.screen -= H.wear_neck + if(H.head) screenmob.client.screen -= H.head diff --git a/code/_onclick/hud/movable_screen_objects.dm b/code/_onclick/hud/movable_screen_objects.dm index 4dfc76fb622..0b85f459261 100644 --- a/code/_onclick/hud/movable_screen_objects.dm +++ b/code/_onclick/hud/movable_screen_objects.dm @@ -1,7 +1,7 @@ ////////////////////////// //Movable Screen Objects// -// By RemieRichards // +// By RemieRichards // ////////////////////////// diff --git a/code/_onclick/hud/parallax.dm b/code/_onclick/hud/parallax.dm index e9b85acc3c1..5a499e1108c 100755 --- a/code/_onclick/hud/parallax.dm +++ b/code/_onclick/hud/parallax.dm @@ -230,7 +230,7 @@ if(M?.client && M.hud_used && length(M.client.parallax_layers)) M.hud_used.update_parallax() -/mob/proc/update_parallax_teleport() //used for arrivals shuttle +/mob/proc/update_parallax_teleport() //used for arrivals shuttle if(client?.eye && hud_used && length(client.parallax_layers)) var/area/areaobj = get_area(client.eye) hud_used.set_parallax_movedir(areaobj.parallax_movedir, TRUE) diff --git a/code/_onclick/hud/robot.dm b/code/_onclick/hud/robot.dm index 1ac04e3c68f..cffffd605b9 100644 --- a/code/_onclick/hud/robot.dm +++ b/code/_onclick/hud/robot.dm @@ -217,7 +217,7 @@ if(R.shown_robot_modules && screenmob.hud_used.hud_shown) //Modules display is shown - screenmob.client.screen += module_store_icon //"store" icon + screenmob.client.screen += module_store_icon //"store" icon if(!R.model.modules) to_chat(usr, "Selected model has no modules to select!") @@ -230,7 +230,7 @@ R.robot_modules_background.screen_loc = "CENTER-4:16,SOUTH+1:7 to CENTER+3:16,SOUTH+[display_rows]:7" screenmob.client.screen += R.robot_modules_background - var/x = -4 //Start at CENTER-4,SOUTH+1 + var/x = -4 //Start at CENTER-4,SOUTH+1 var/y = 1 for(var/atom/movable/A in R.model.get_inactive_modules()) @@ -250,7 +250,7 @@ else //Modules display is hidden - screenmob.client.screen -= module_store_icon //"store" icon + screenmob.client.screen -= module_store_icon //"store" icon for(var/atom/A in R.model.get_inactive_modules()) //Module is not currently active diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm index 52e81c65c2d..93c90fd49d1 100644 --- a/code/_onclick/item_attack.dm +++ b/code/_onclick/item_attack.dm @@ -232,7 +232,7 @@ I.add_mob_blood(src) var/turf/location = get_turf(src) add_splatter_floor(location) - if(get_dist(user, src) <= 1) //people with TK won't get smeared with blood + if(get_dist(user, src) <= 1) //people with TK won't get smeared with blood user.add_mob_blood(src) return TRUE //successful attack diff --git a/code/_onclick/observer.dm b/code/_onclick/observer.dm index a3bf4c021f9..e10c02fedda 100644 --- a/code/_onclick/observer.dm +++ b/code/_onclick/observer.dm @@ -4,8 +4,8 @@ if(can_reenter_corpse && mind?.current) if(A == mind.current || (mind.current in A)) // double click your corpse or whatever holds it - reenter_corpse() // (body bag, closet, mech, etc) - return // seems legit. + reenter_corpse() // (body bag, closet, mech, etc) + return // seems legit. // Things you might plausibly want to follow if(ismovable(A)) diff --git a/code/_onclick/other_mobs.dm b/code/_onclick/other_mobs.dm index a90805416b4..a89a9a81585 100644 --- a/code/_onclick/other_mobs.dm +++ b/code/_onclick/other_mobs.dm @@ -59,7 +59,7 @@ //Return a non FALSE value to cancel whatever called this from propagating, if it respects it. /atom/proc/_try_interact(mob/user) - if(isAdminGhostAI(user)) //admin abuse + if(isAdminGhostAI(user)) //admin abuse return interact(user) if(can_interact(user)) return interact(user) diff --git a/code/controllers/configuration/config_entry.dm b/code/controllers/configuration/config_entry.dm index ecd32faab0c..602e381f5d6 100644 --- a/code/controllers/configuration/config_entry.dm +++ b/code/controllers/configuration/config_entry.dm @@ -6,19 +6,19 @@ #define KEY_MODE_TYPE 1 /datum/config_entry - var/name //read-only, this is determined by the last portion of the derived entry type + var/name //read-only, this is determined by the last portion of the derived entry type var/config_entry_value - var/default //read-only, just set value directly + var/default //read-only, just set value directly - var/resident_file //the file which this was loaded from, if any - var/modified = FALSE //set to TRUE if the default has been overridden by a config entry + var/resident_file //the file which this was loaded from, if any + var/modified = FALSE //set to TRUE if the default has been overridden by a config entry - var/deprecated_by //the /datum/config_entry type that supercedes this one + var/deprecated_by //the /datum/config_entry type that supercedes this one var/protection = NONE - var/abstract_type = /datum/config_entry //do not instantiate if type matches this + var/abstract_type = /datum/config_entry //do not instantiate if type matches this - var/vv_VAS = TRUE //Force validate and set on VV. VAS proccall guard will run regardless. + var/vv_VAS = TRUE //Force validate and set on VV. VAS proccall guard will run regardless. var/dupes_allowed = FALSE @@ -156,7 +156,7 @@ abstract_type = /datum/config_entry/keyed_list config_entry_value = list() dupes_allowed = TRUE - vv_VAS = FALSE //VAS will not allow things like deleting from lists, it'll just bug horribly. + vv_VAS = FALSE //VAS will not allow things like deleting from lists, it'll just bug horribly. var/key_mode var/value_mode var/splitter = " " diff --git a/code/controllers/configuration/configuration.dm b/code/controllers/configuration/configuration.dm index cedcd15e504..93235a96101 100644 --- a/code/controllers/configuration/configuration.dm +++ b/code/controllers/configuration/configuration.dm @@ -4,16 +4,16 @@ var/directory = "config" var/warned_deprecated_configs = FALSE - var/hiding_entries_by_type = TRUE //Set for readability, admins can set this to FALSE if they want to debug it + var/hiding_entries_by_type = TRUE //Set for readability, admins can set this to FALSE if they want to debug it var/list/entries var/list/entries_by_type var/list/maplist var/datum/map_config/defaultmap - var/list/modes // allowed modes + var/list/modes // allowed modes var/list/gamemode_cache - var/list/votable_modes // votable modes + var/list/votable_modes // votable modes var/list/mode_names var/list/mode_reports var/list/mode_false_report_weight @@ -35,7 +35,7 @@ Load(world.params[OVERRIDE_CONFIG_DIRECTORY_PARAMETER]) /datum/controller/configuration/proc/Load(_directory) - if(IsAdminAdvancedProcCall()) //If admin proccall is detected down the line it will horribly break everything. + if(IsAdminAdvancedProcCall()) //If admin proccall is detected down the line it will horribly break everything. return if(_directory) directory = _directory @@ -83,7 +83,7 @@ var/list/_entries_by_type = list() entries_by_type = _entries_by_type - for(var/I in typesof(/datum/config_entry)) //typesof is faster in this case + for(var/I in typesof(/datum/config_entry)) //typesof is faster in this case var/datum/config_entry/E = I if(initial(E.abstract_type) == I) continue @@ -235,7 +235,7 @@ var/datum/game_mode/M = new T() if(M.config_tag) - if(!(M.config_tag in modes)) // ensure each mode is added only once + if(!(M.config_tag in modes)) // ensure each mode is added only once modes += M.config_tag mode_names[M.config_tag] = M.name probabilities[M.config_tag] = M.probability diff --git a/code/controllers/configuration/entries/dbconfig.dm b/code/controllers/configuration/entries/dbconfig.dm index 517d5b1a6c0..185f07ab4cc 100644 --- a/code/controllers/configuration/entries/dbconfig.dm +++ b/code/controllers/configuration/entries/dbconfig.dm @@ -1,4 +1,4 @@ -/datum/config_entry/flag/sql_enabled // for sql switching +/datum/config_entry/flag/sql_enabled // for sql switching protection = CONFIG_ENTRY_LOCKED /datum/config_entry/string/address diff --git a/code/controllers/configuration/entries/game_options.dm b/code/controllers/configuration/entries/game_options.dm index 37948ccada6..66b54040a4c 100644 --- a/code/controllers/configuration/entries/game_options.dm +++ b/code/controllers/configuration/entries/game_options.dm @@ -21,14 +21,14 @@ /datum/config_entry/keyed_list/min_pop/ValidateListEntry(key_name, key_value) return key_name in config.modes -/datum/config_entry/keyed_list/continuous // which roundtypes continue if all antagonists die +/datum/config_entry/keyed_list/continuous // which roundtypes continue if all antagonists die key_mode = KEY_MODE_TEXT value_mode = VALUE_MODE_FLAG /datum/config_entry/keyed_list/continuous/ValidateListEntry(key_name, key_value) return key_name in config.modes -/datum/config_entry/keyed_list/midround_antag // which roundtypes use the midround antagonist system +/datum/config_entry/keyed_list/midround_antag // which roundtypes use the midround antagonist system key_mode = KEY_MODE_TEXT value_mode = VALUE_MODE_FLAG @@ -39,10 +39,10 @@ config_entry_value = 1 integer = FALSE -/datum/config_entry/number/minimal_access_threshold //If the number of players is larger than this threshold, minimal access will be turned on. +/datum/config_entry/number/minimal_access_threshold //If the number of players is larger than this threshold, minimal access will be turned on. min_val = 0 -/datum/config_entry/flag/jobs_have_minimal_access //determines whether jobs use minimal access or expanded access. +/datum/config_entry/flag/jobs_have_minimal_access //determines whether jobs use minimal access or expanded access. /datum/config_entry/flag/assistants_have_maint_access @@ -50,45 +50,45 @@ /datum/config_entry/flag/everyone_has_maint_access -/datum/config_entry/flag/sec_start_brig //makes sec start in brig instead of dept sec posts +/datum/config_entry/flag/sec_start_brig //makes sec start in brig instead of dept sec posts /datum/config_entry/flag/force_random_names /datum/config_entry/flag/humans_need_surnames -/datum/config_entry/flag/allow_ai // allow ai job +/datum/config_entry/flag/allow_ai // allow ai job -/datum/config_entry/flag/allow_ai_multicam // allow ai multicamera mode +/datum/config_entry/flag/allow_ai_multicam // allow ai multicamera mode /datum/config_entry/flag/disable_human_mood -/datum/config_entry/flag/disable_secborg // disallow secborg model to be chosen. +/datum/config_entry/flag/disable_secborg // disallow secborg model to be chosen. /datum/config_entry/flag/disable_peaceborg /datum/config_entry/flag/disable_warops -/datum/config_entry/number/traitor_scaling_coeff //how much does the amount of players get divided by to determine traitors +/datum/config_entry/number/traitor_scaling_coeff //how much does the amount of players get divided by to determine traitors config_entry_value = 6 integer = FALSE min_val = 0 -/datum/config_entry/number/brother_scaling_coeff //how many players per brother team +/datum/config_entry/number/brother_scaling_coeff //how many players per brother team config_entry_value = 25 integer = FALSE min_val = 0 -/datum/config_entry/number/changeling_scaling_coeff //how much does the amount of players get divided by to determine changelings +/datum/config_entry/number/changeling_scaling_coeff //how much does the amount of players get divided by to determine changelings config_entry_value = 6 integer = FALSE min_val = 0 -/datum/config_entry/number/ecult_scaling_coeff //how much does the amount of players get divided by to determine e_cult +/datum/config_entry/number/ecult_scaling_coeff //how much does the amount of players get divided by to determine e_cult config_entry_value = 6 integer = FALSE min_val = 0 -/datum/config_entry/number/security_scaling_coeff //how much does the amount of players get divided by to determine open security officer positions +/datum/config_entry/number/security_scaling_coeff //how much does the amount of players get divided by to determine open security officer positions config_entry_value = 8 integer = FALSE min_val = 0 @@ -101,15 +101,15 @@ config_entry_value = 2 min_val = 0 -/datum/config_entry/flag/reactionary_explosions //If we use reactionary explosions, explosions that react to walls and doors +/datum/config_entry/flag/reactionary_explosions //If we use reactionary explosions, explosions that react to walls and doors -/datum/config_entry/flag/protect_roles_from_antagonist //If security and such can be traitor/cult/other +/datum/config_entry/flag/protect_roles_from_antagonist //If security and such can be traitor/cult/other -/datum/config_entry/flag/protect_assistant_from_antagonist //If assistants can be traitor/cult/other +/datum/config_entry/flag/protect_assistant_from_antagonist //If assistants can be traitor/cult/other -/datum/config_entry/flag/enforce_human_authority //If non-human species are barred from joining as a head of staff +/datum/config_entry/flag/enforce_human_authority //If non-human species are barred from joining as a head of staff -/datum/config_entry/flag/allow_latejoin_antagonists // If late-joining players can be traitor/changeling +/datum/config_entry/flag/allow_latejoin_antagonists // If late-joining players can be traitor/changeling /datum/config_entry/flag/use_antag_rep // see game_options.txt for details @@ -128,12 +128,12 @@ integer = FALSE min_val = 0 -/datum/config_entry/number/midround_antag_time_check // How late (in minutes you want the midround antag system to stay on, setting this to 0 will disable the system) +/datum/config_entry/number/midround_antag_time_check // How late (in minutes you want the midround antag system to stay on, setting this to 0 will disable the system) config_entry_value = 60 integer = FALSE min_val = 0 -/datum/config_entry/number/midround_antag_life_check // A ratio of how many people need to be alive in order for the round not to immediately end in midround antagonist +/datum/config_entry/number/midround_antag_life_check // A ratio of how many people need to be alive in order for the round not to immediately end in midround antagonist config_entry_value = 0.7 integer = FALSE min_val = 0 @@ -144,9 +144,9 @@ integer = FALSE min_val = 0 -/datum/config_entry/flag/show_game_type_odds //if set this allows players to see the odds of each roundtype on the get revision screen +/datum/config_entry/flag/show_game_type_odds //if set this allows players to see the odds of each roundtype on the get revision screen -/datum/config_entry/keyed_list/roundstart_races //races you can play as from the get go. +/datum/config_entry/keyed_list/roundstart_races //races you can play as from the get go. key_mode = KEY_MODE_TEXT value_mode = VALUE_MODE_FLAG @@ -154,24 +154,24 @@ key_mode = KEY_MODE_TEXT value_mode = VALUE_MODE_FLAG -/datum/config_entry/flag/join_with_mutant_humans //players can pick mutant bodyparts for humans before joining the game +/datum/config_entry/flag/join_with_mutant_humans //players can pick mutant bodyparts for humans before joining the game -/datum/config_entry/flag/no_summon_guns //No +/datum/config_entry/flag/no_summon_guns //No -/datum/config_entry/flag/no_summon_magic //Fun +/datum/config_entry/flag/no_summon_magic //Fun -/datum/config_entry/flag/no_summon_events //Allowed +/datum/config_entry/flag/no_summon_events //Allowed -/datum/config_entry/flag/no_intercept_report //Whether or not to send a communications intercept report roundstart. This may be overridden by gamemodes. +/datum/config_entry/flag/no_intercept_report //Whether or not to send a communications intercept report roundstart. This may be overridden by gamemodes. -/datum/config_entry/number/arrivals_shuttle_dock_window //Time from when a player late joins on the arrivals shuttle to when the shuttle docks on the station +/datum/config_entry/number/arrivals_shuttle_dock_window //Time from when a player late joins on the arrivals shuttle to when the shuttle docks on the station config_entry_value = 55 integer = FALSE min_val = 30 -/datum/config_entry/flag/arrivals_shuttle_require_undocked //Require the arrivals shuttle to be undocked before latejoiners can join +/datum/config_entry/flag/arrivals_shuttle_require_undocked //Require the arrivals shuttle to be undocked before latejoiners can join -/datum/config_entry/flag/arrivals_shuttle_require_safe_latejoin //Require the arrivals shuttle to be operational in order for latejoiners to join +/datum/config_entry/flag/arrivals_shuttle_require_safe_latejoin //Require the arrivals shuttle to be operational in order for latejoiners to join /datum/config_entry/string/alert_green config_entry_value = "All threats to the station have passed. Security may not have weapons visible, privacy laws are once again fully enforced." @@ -213,7 +213,7 @@ /datum/config_entry/keyed_list/multiplicative_movespeed key_mode = KEY_MODE_TYPE value_mode = VALUE_MODE_NUM - config_entry_value = list( //DEFAULTS + config_entry_value = list( //DEFAULTS /mob/living/simple_animal = 1, /mob/living/silicon/pai = 1, /mob/living/carbon/alien/humanoid/hunter = -1, @@ -231,7 +231,7 @@ if(. && (var_name == NAMEOF(src, config_entry_value))) update_config_movespeed_type_lookup(TRUE) -/datum/config_entry/number/movedelay //Used for modifying movement speed for mobs. +/datum/config_entry/number/movedelay //Used for modifying movement speed for mobs. abstract_type = /datum/config_entry/number/movedelay /datum/config_entry/number/movedelay/ValidateAndSet() @@ -282,11 +282,11 @@ movedelay_type = /mob/living/simple_animal ///////////////////////////////////////////////// -/datum/config_entry/flag/virtual_reality //Will virtual reality be loaded +/datum/config_entry/flag/virtual_reality //Will virtual reality be loaded -/datum/config_entry/flag/roundstart_away //Will random away mission be loaded. +/datum/config_entry/flag/roundstart_away //Will random away mission be loaded. -/datum/config_entry/number/gateway_delay //How long the gateway takes before it activates. Default is half an hour. Only matters if roundstart_away is enabled. +/datum/config_entry/number/gateway_delay //How long the gateway takes before it activates. Default is half an hour. Only matters if roundstart_away is enabled. config_entry_value = 18000 integer = FALSE min_val = 0 @@ -298,7 +298,7 @@ /datum/config_entry/flag/silent_ai /datum/config_entry/flag/silent_borg -/datum/config_entry/flag/sandbox_autoclose // close the sandbox panel after spawning an item, potentially reducing griff +/datum/config_entry/flag/sandbox_autoclose // close the sandbox panel after spawning an item, potentially reducing griff /datum/config_entry/number/default_laws //Controls what laws the AI spawns with. config_entry_value = 0 @@ -346,9 +346,9 @@ integer = FALSE min_val = 0 -/datum/config_entry/flag/allow_random_events // Enables random events mid-round when set +/datum/config_entry/flag/allow_random_events // Enables random events mid-round when set -/datum/config_entry/number/events_min_time_mul // Multipliers for random events minimal starting time and minimal players amounts +/datum/config_entry/number/events_min_time_mul // Multipliers for random events minimal starting time and minimal players amounts config_entry_value = 1 min_val = 0 integer = FALSE diff --git a/code/controllers/configuration/entries/general.dm b/code/controllers/configuration/entries/general.dm index afa8bd15a53..69c56dc79ee 100644 --- a/code/controllers/configuration/entries/general.dm +++ b/code/controllers/configuration/entries/general.dm @@ -1,7 +1,7 @@ /datum/config_entry/flag/autoadmin // if autoadmin is enabled protection = CONFIG_ENTRY_LOCKED -/datum/config_entry/string/autoadmin_rank // the rank for autoadmins +/datum/config_entry/string/autoadmin_rank // the rank for autoadmins config_entry_value = "Game Master" protection = CONFIG_ENTRY_LOCKED @@ -25,92 +25,92 @@ protection = CONFIG_ENTRY_LOCKED -/datum/config_entry/string/servername // server name (the name of the game window) +/datum/config_entry/string/servername // server name (the name of the game window) -/datum/config_entry/string/serversqlname // short form server name used for the DB +/datum/config_entry/string/serversqlname // short form server name used for the DB -/datum/config_entry/string/stationname // station name (the name of the station in-game) +/datum/config_entry/string/stationname // station name (the name of the station in-game) -/datum/config_entry/number/lobby_countdown // In between round countdown. +/datum/config_entry/number/lobby_countdown // In between round countdown. config_entry_value = 120 integer = FALSE min_val = 0 -/datum/config_entry/number/round_end_countdown // Post round murder death kill countdown +/datum/config_entry/number/round_end_countdown // Post round murder death kill countdown config_entry_value = 25 integer = FALSE min_val = 0 -/datum/config_entry/flag/hub // if the game appears on the hub or not +/datum/config_entry/flag/hub // if the game appears on the hub or not /datum/config_entry/number/max_hub_pop //At what pop to take hub off the server config_entry_value = 0 //0 means disabled integer = TRUE min_val = 0 -/datum/config_entry/flag/log_ooc // log OOC channel +/datum/config_entry/flag/log_ooc // log OOC channel -/datum/config_entry/flag/log_access // log login/logout +/datum/config_entry/flag/log_access // log login/logout -/datum/config_entry/flag/log_say // log client say +/datum/config_entry/flag/log_say // log client say -/datum/config_entry/flag/log_admin // log admin actions +/datum/config_entry/flag/log_admin // log admin actions protection = CONFIG_ENTRY_LOCKED -/datum/config_entry/flag/log_prayer // log prayers +/datum/config_entry/flag/log_prayer // log prayers -/datum/config_entry/flag/log_law // log lawchanges +/datum/config_entry/flag/log_law // log lawchanges -/datum/config_entry/flag/log_game // log game events +/datum/config_entry/flag/log_game // log game events -/datum/config_entry/flag/log_mecha // log mech data +/datum/config_entry/flag/log_mecha // log mech data -/datum/config_entry/flag/log_virus // log virology data +/datum/config_entry/flag/log_virus // log virology data /datum/config_entry/flag/log_cloning // log cloning actions. -/datum/config_entry/flag/log_vote // log voting +/datum/config_entry/flag/log_vote // log voting -/datum/config_entry/flag/log_whisper // log client whisper +/datum/config_entry/flag/log_whisper // log client whisper -/datum/config_entry/flag/log_attack // log attack messages +/datum/config_entry/flag/log_attack // log attack messages -/datum/config_entry/flag/log_emote // log emotes +/datum/config_entry/flag/log_emote // log emotes /datum/config_entry/flag/log_subtler // log subtler emotes //SKYRAT EDIT ADDITION -/datum/config_entry/flag/log_econ // log economy actions +/datum/config_entry/flag/log_econ // log economy actions -/datum/config_entry/flag/log_adminchat // log admin chat messages +/datum/config_entry/flag/log_adminchat // log admin chat messages protection = CONFIG_ENTRY_LOCKED -/datum/config_entry/flag/log_pda // log pda messages +/datum/config_entry/flag/log_pda // log pda messages -/datum/config_entry/flag/log_uplink // log uplink/spellbook/codex ciatrix purchases and refunds +/datum/config_entry/flag/log_uplink // log uplink/spellbook/codex ciatrix purchases and refunds -/datum/config_entry/flag/log_telecomms // log telecomms messages +/datum/config_entry/flag/log_telecomms // log telecomms messages -/datum/config_entry/flag/log_twitter // log certain expliotable parrots and other such fun things in a JSON file of twitter valid phrases. +/datum/config_entry/flag/log_twitter // log certain expliotable parrots and other such fun things in a JSON file of twitter valid phrases. -/datum/config_entry/flag/log_world_topic // log all world.Topic() calls +/datum/config_entry/flag/log_world_topic // log all world.Topic() calls -/datum/config_entry/flag/log_manifest // log crew manifest to seperate file +/datum/config_entry/flag/log_manifest // log crew manifest to seperate file -/datum/config_entry/flag/log_job_debug // log roundstart divide occupations debug information to a file +/datum/config_entry/flag/log_job_debug // log roundstart divide occupations debug information to a file /datum/config_entry/flag/log_shuttle // log shuttle related actions, ie shuttle computers, shuttle manipulator, emergency console -/datum/config_entry/flag/allow_admin_ooccolor // Allows admins with relevant permissions to have their own ooc colour +/datum/config_entry/flag/allow_admin_ooccolor // Allows admins with relevant permissions to have their own ooc colour /datum/config_entry/flag/allow_admin_asaycolor //Allows admins with relevant permissions to have a personalized asay color -/datum/config_entry/flag/allow_vote_restart // allow votes to restart +/datum/config_entry/flag/allow_vote_restart // allow votes to restart -/datum/config_entry/flag/allow_vote_mode // allow votes to change mode +/datum/config_entry/flag/allow_vote_mode // allow votes to change mode -/datum/config_entry/flag/allow_vote_map // allow votes to change map +/datum/config_entry/flag/allow_vote_map // allow votes to change map -/datum/config_entry/number/vote_delay // minimum time between voting sessions (deciseconds, 10 minute default) +/datum/config_entry/number/vote_delay // minimum time between voting sessions (deciseconds, 10 minute default) config_entry_value = 6000 integer = FALSE min_val = 0 @@ -120,11 +120,11 @@ integer = FALSE min_val = 0 -/datum/config_entry/flag/default_no_vote // vote does not default to nochange/norestart +/datum/config_entry/flag/default_no_vote // vote does not default to nochange/norestart -/datum/config_entry/flag/no_dead_vote // dead people can't vote +/datum/config_entry/flag/no_dead_vote // dead people can't vote -/datum/config_entry/flag/popup_admin_pm // adminPMs to non-admins show in a pop-up 'reply' window when set +/datum/config_entry/flag/popup_admin_pm // adminPMs to non-admins show in a pop-up 'reply' window when set /datum/config_entry/number/fps config_entry_value = 20 @@ -146,7 +146,7 @@ integer = FALSE var/sync_validate = FALSE -/datum/config_entry/number/ticklag/New() //ticklag weirdly just mirrors fps +/datum/config_entry/number/ticklag/New() //ticklag weirdly just mirrors fps var/datum/config_entry/CE = /datum/config_entry/number/fps config_entry_value = 10 / initial(CE.config_entry_value) ..() @@ -162,24 +162,24 @@ /datum/config_entry/flag/allow_holidays -/datum/config_entry/number/tick_limit_mc_init //SSinitialization throttling +/datum/config_entry/number/tick_limit_mc_init //SSinitialization throttling config_entry_value = TICK_LIMIT_MC_INIT_DEFAULT min_val = 0 //oranges warned us integer = FALSE -/datum/config_entry/flag/admin_legacy_system //Defines whether the server uses the legacy admin system with admins.txt or the SQL system +/datum/config_entry/flag/admin_legacy_system //Defines whether the server uses the legacy admin system with admins.txt or the SQL system protection = CONFIG_ENTRY_LOCKED -/datum/config_entry/flag/protect_legacy_admins //Stops any admins loaded by the legacy system from having their rank edited by the permissions panel +/datum/config_entry/flag/protect_legacy_admins //Stops any admins loaded by the legacy system from having their rank edited by the permissions panel protection = CONFIG_ENTRY_LOCKED -/datum/config_entry/flag/protect_legacy_ranks //Stops any ranks loaded by the legacy system from having their flags edited by the permissions panel +/datum/config_entry/flag/protect_legacy_ranks //Stops any ranks loaded by the legacy system from having their flags edited by the permissions panel protection = CONFIG_ENTRY_LOCKED -/datum/config_entry/flag/enable_localhost_rank //Gives the !localhost! rank to any client connecting from 127.0.0.1 or ::1 +/datum/config_entry/flag/enable_localhost_rank //Gives the !localhost! rank to any client connecting from 127.0.0.1 or ::1 protection = CONFIG_ENTRY_LOCKED -/datum/config_entry/flag/load_legacy_ranks_only //Loads admin ranks only from legacy admin_ranks.txt, while enabled ranks are mirrored to the database +/datum/config_entry/flag/load_legacy_ranks_only //Loads admin ranks only from legacy admin_ranks.txt, while enabled ranks are mirrored to the database protection = CONFIG_ENTRY_LOCKED /datum/config_entry/string/hostedby @@ -188,9 +188,9 @@ /datum/config_entry/flag/usewhitelist -/datum/config_entry/flag/use_age_restriction_for_jobs //Do jobs use account age restrictions? --requires database +/datum/config_entry/flag/use_age_restriction_for_jobs //Do jobs use account age restrictions? --requires database -/datum/config_entry/flag/use_account_age_for_jobs //Uses the time they made the account for the job restriction stuff. New player joining alerts should be unaffected. +/datum/config_entry/flag/use_account_age_for_jobs //Uses the time they made the account for the job restriction stuff. New player joining alerts should be unaffected. /datum/config_entry/flag/use_exp_tracking @@ -237,7 +237,7 @@ integer = FALSE min_val = 0 -/datum/config_entry/number/inactivity_period //time in ds until a player is considered inactive +/datum/config_entry/number/inactivity_period //time in ds until a player is considered inactive config_entry_value = 3000 integer = FALSE min_val = 0 @@ -247,7 +247,7 @@ if(.) config_entry_value *= 10 //documented as seconds in config.txt -/datum/config_entry/number/afk_period //time in ds until a player is considered inactive +/datum/config_entry/number/afk_period //time in ds until a player is considered inactive config_entry_value = 3000 integer = FALSE min_val = 0 @@ -257,20 +257,20 @@ if(.) config_entry_value *= 10 //documented as seconds in config.txt -/datum/config_entry/flag/kick_inactive //force disconnect for inactive players +/datum/config_entry/flag/kick_inactive //force disconnect for inactive players /datum/config_entry/flag/load_jobs_from_txt /datum/config_entry/flag/forbid_singulo_possession -/datum/config_entry/flag/automute_on //enables automuting/spam prevention +/datum/config_entry/flag/automute_on //enables automuting/spam prevention /datum/config_entry/string/panic_server_name /datum/config_entry/string/panic_server_name/ValidateAndSet(str_val) return str_val != "\[Put the name here\]" && ..() -/datum/config_entry/string/panic_server_address //Reconnect a player this linked server if this server isn't accepting new players +/datum/config_entry/string/panic_server_address //Reconnect a player this linked server if this server isn't accepting new players /datum/config_entry/string/panic_server_address/ValidateAndSet(str_val) return str_val != "byond://address:port" && ..() @@ -280,7 +280,7 @@ /datum/config_entry/flag/show_irc_name -/datum/config_entry/flag/see_own_notes //Can players see their own admin notes +/datum/config_entry/flag/see_own_notes //Can players see their own admin notes /datum/config_entry/number/note_fresh_days config_entry_value = null @@ -317,7 +317,7 @@ /datum/config_entry/flag/byond_member_bypass_popcap -/datum/config_entry/flag/panic_bunker // prevents people the server hasn't seen before from connecting +/datum/config_entry/flag/panic_bunker // prevents people the server hasn't seen before from connecting /datum/config_entry/number/panic_bunker_living // living time in minutes that a player needs to pass the panic bunker @@ -327,13 +327,13 @@ /datum/config_entry/string/panic_bunker_message config_entry_value = "Sorry but the server is currently not accepting connections from never before seen players." -/datum/config_entry/number/notify_new_player_age // how long do we notify admins of a new player +/datum/config_entry/number/notify_new_player_age // how long do we notify admins of a new player min_val = -1 -/datum/config_entry/number/notify_new_player_account_age // how long do we notify admins of a new byond account +/datum/config_entry/number/notify_new_player_account_age // how long do we notify admins of a new byond account min_val = 0 -/datum/config_entry/flag/irc_first_connection_alert // do we notify the irc channel when somebody is connecting for the first time? +/datum/config_entry/flag/irc_first_connection_alert // do we notify the irc channel when somebody is connecting for the first time? /datum/config_entry/flag/check_randomizer @@ -363,7 +363,7 @@ /datum/config_entry/flag/aggressive_changelog -/datum/config_entry/flag/autoconvert_notes //if all connecting player's notes should attempt to be converted to the database +/datum/config_entry/flag/autoconvert_notes //if all connecting player's notes should attempt to be converted to the database protection = CONFIG_ENTRY_LOCKED /datum/config_entry/flag/allow_webclient @@ -418,19 +418,19 @@ config_entry_value = 15 min_val = 0 -/datum/config_entry/number/error_cooldown // The "cooldown" time for each occurrence of a unique error +/datum/config_entry/number/error_cooldown // The "cooldown" time for each occurrence of a unique error config_entry_value = 600 integer = FALSE min_val = 0 -/datum/config_entry/number/error_limit // How many occurrences before the next will silence them +/datum/config_entry/number/error_limit // How many occurrences before the next will silence them config_entry_value = 50 -/datum/config_entry/number/error_silence_time // How long a unique error will be silenced for +/datum/config_entry/number/error_silence_time // How long a unique error will be silenced for config_entry_value = 6000 integer = FALSE -/datum/config_entry/number/error_msg_delay // How long to wait between messaging admins about occurrences of a unique error +/datum/config_entry/number/error_msg_delay // How long to wait between messaging admins about occurrences of a unique error config_entry_value = 50 integer = FALSE @@ -438,7 +438,7 @@ deprecated_by = /datum/config_entry/string/chat_announce_new_game /datum/config_entry/flag/irc_announce_new_game/DeprecationUpdate(value) - return "" //default broadcast + return "" //default broadcast /datum/config_entry/string/chat_announce_new_game config_entry_value = null @@ -503,7 +503,7 @@ /datum/config_entry/flag/auto_profile -/datum/config_entry/string/centcom_ban_db // URL for the CentCom Galactic Ban DB API +/datum/config_entry/string/centcom_ban_db // URL for the CentCom Galactic Ban DB API /datum/config_entry/string/centcom_source_whitelist diff --git a/code/controllers/failsafe.dm b/code/controllers/failsafe.dm index 0a6b4baebac..3abd4b04ae8 100644 --- a/code/controllers/failsafe.dm +++ b/code/controllers/failsafe.dm @@ -15,7 +15,7 @@ GLOBAL_REAL(Failsafe, /datum/controller/failsafe) // The alert level. For every failed poke, we drop a DEFCON level. Once we hit DEFCON 1, restart the MC. var/defcon = 5 //the world.time of the last check, so the mc can restart US if we hang. - // (Real friends look out for *eachother*) + // (Real friends look out for *eachother*) var/lasttick = 0 // Track the MC iteration to make sure its still on track. diff --git a/code/controllers/globals.dm b/code/controllers/globals.dm index 21f022acfd0..7b5cc94d362 100644 --- a/code/controllers/globals.dm +++ b/code/controllers/globals.dm @@ -14,7 +14,7 @@ GLOBAL_REAL(GLOB, /datum/controller/global_vars) var/datum/controller/exclude_these = new gvars_datum_in_built_vars = exclude_these.vars + list(NAMEOF(src, gvars_datum_protected_varlist), NAMEOF(src, gvars_datum_in_built_vars), NAMEOF(src, gvars_datum_init_order)) - QDEL_IN(exclude_these, 0) //signal logging isn't ready + QDEL_IN(exclude_these, 0) //signal logging isn't ready log_world("[vars.len - gvars_datum_in_built_vars.len] global variables") diff --git a/code/controllers/master.dm b/code/controllers/master.dm index 920dcd231ff..e7eb8148076 100644 --- a/code/controllers/master.dm +++ b/code/controllers/master.dm @@ -45,7 +45,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new /// makes the mc main loop runtime var/make_runtime = FALSE - var/initializations_finished_with_no_players_logged_in //I wonder what this could be? + var/initializations_finished_with_no_players_logged_in //I wonder what this could be? /// The type of the last subsystem to be fire()'d. var/last_type_processed @@ -54,9 +54,9 @@ GLOBAL_REAL(Master, /datum/controller/master) = new var/datum/controller/subsystem/queue_tail //!End of queue linked list (used for appending to the list) var/queue_priority_count = 0 //Running total so that we don't have to loop thru the queue each run to split up the tick var/queue_priority_count_bg = 0 //Same, but for background subsystems - var/map_loading = FALSE //!Are we loading in a new map? + var/map_loading = FALSE //!Are we loading in a new map? - var/current_runlevel //!for scheduling different subsystems for different stages of the round + var/current_runlevel //!for scheduling different subsystems for different stages of the round var/sleep_offline_after_initializations = TRUE var/static/restart_clear = 0 @@ -113,7 +113,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new log_world("Shutdown complete") // Returns 1 if we created a new mc, 0 if we couldn't due to a recent restart, -// -1 if we encountered a runtime trying to recreate it +// -1 if we encountered a runtime trying to recreate it /proc/Recreate_MC() . = -1 //so if we runtime, things know we failed if (world.time < Master.restart_timeout) @@ -165,7 +165,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new if (istype(Master.subsystems)) if(FireHim) - Master.subsystems += new BadBoy.type //NEW_SS_GLOBAL will remove the old one + Master.subsystems += new BadBoy.type //NEW_SS_GLOBAL will remove the old one subsystems = Master.subsystems current_runlevel = Master.current_runlevel StartProcessing(10) @@ -175,7 +175,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new // Please don't stuff random bullshit here, -// Make a subsystem, give it the SS_NO_FIRE flag, and do your work in it's Initialize() +// Make a subsystem, give it the SS_NO_FIRE flag, and do your work in it's Initialize() /datum/controller/master/Initialize(delay, init_sss, tgs_prime) set waitfor = 0 @@ -259,11 +259,11 @@ GLOBAL_REAL(Master, /datum/controller/master) = new /datum/controller/master/proc/Loop() . = -1 //Prep the loop (most of this is because we want MC restarts to reset as much state as we can, and because - // local vars rock + // local vars rock //all this shit is here so that flag edits can be refreshed by restarting the MC. (and for speed) var/list/tickersubsystems = list() - var/list/runlevel_sorted_subsystems = list(list()) //ensure we always have at least one runlevel + var/list/runlevel_sorted_subsystems = list(list()) //ensure we always have at least one runlevel var/timer = world.time for (var/thing in subsystems) var/datum/controller/subsystem/SS = thing @@ -325,7 +325,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new //Anti-tick-contention heuristics: //if there are mutiple sleeping procs running before us hogging the cpu, we have to run later. - // (because sleeps are processed in the order received, longer sleeps are more likely to run first) + // (because sleeps are processed in the order received, longer sleeps are more likely to run first) if (starting_tick_usage > TICK_LIMIT_MC) //if there isn't enough time to bother doing anything this tick, sleep a bit. sleep_delta *= 2 current_ticklimit = TICK_LIMIT_RUNNING * 0.5 @@ -452,7 +452,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new var/tick_usage //keep running while we have stuff to run and we haven't gone over a tick - // this is so subsystems paused eariler can use tick time that later subsystems never used + // this is so subsystems paused eariler can use tick time that later subsystems never used while (ran && queue_head && TICK_USAGE < TICK_LIMIT_MC) ran = FALSE bg_calc = FALSE @@ -471,7 +471,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new //if we can't run them this tick (without going over a tick) //we bump up their priority and attempt to run them next tick //(unless we haven't even ran anything this tick, since its unlikely they will ever be able run - // in those cases, so we just let them run) + // in those cases, so we just let them run) if (queue_node_flags & SS_NO_TICK_CHECK) if (queue_node.tick_usage > TICK_LIMIT_RUNNING - TICK_USAGE && ran_non_ticker) if (!(queue_node_flags & SS_BACKGROUND)) @@ -562,7 +562,7 @@ GLOBAL_REAL(Master, /datum/controller/master) = new . = 1 //resets the queue, and all subsystems, while filtering out the subsystem lists -// called if any mc's queue procs runtime or exit improperly. +// called if any mc's queue procs runtime or exit improperly. /datum/controller/master/proc/SoftReset(list/ticker_SS, list/runlevel_SS) . = 0 log_world("MC: SoftReset called, resetting MC queue state.") diff --git a/code/controllers/subsystem.dm b/code/controllers/subsystem.dm index 7b70b5e1eb9..091d495d3c4 100644 --- a/code/controllers/subsystem.dm +++ b/code/controllers/subsystem.dm @@ -29,11 +29,11 @@ var/initialized = FALSE /// Set to 0 to prevent fire() calls, mostly for admin use or subsystems that may be resumed later - /// use the [SS_NO_FIRE] flag instead for systems that never fire to keep it from even being added to list that is checked every tick + /// use the [SS_NO_FIRE] flag instead for systems that never fire to keep it from even being added to list that is checked every tick var/can_fire = TRUE ///Bitmap of what game states can this subsystem fire at. See [RUNLEVELS_DEFAULT] for more details. - var/runlevels = RUNLEVELS_DEFAULT //points of the game at which the SS can fire + var/runlevels = RUNLEVELS_DEFAULT //points of the game at which the SS can fire /* * The following variables are managed by the MC and should not be modified directly. @@ -126,8 +126,8 @@ return ..() //Queue it to run. -// (we loop thru a linked list until we get to the end or find the right point) -// (this lets us sort our run order correctly without having to re-sort the entire already sorted list) +// (we loop thru a linked list until we get to the end or find the right point) +// (this lets us sort our run order correctly without having to re-sort the entire already sorted list) /datum/controller/subsystem/proc/enqueue() var/SS_priority = priority var/SS_flags = flags diff --git a/code/controllers/subsystem/air.dm b/code/controllers/subsystem/air.dm index dd0ad3267fe..dcc6e7aa453 100644 --- a/code/controllers/subsystem/air.dm +++ b/code/controllers/subsystem/air.dm @@ -502,8 +502,8 @@ SUBSYSTEM_DEF(air) CHECK_TICK //this can't be done with setup_atmos_machinery() because -// all atmos machinery has to initalize before the first -// pipenet can be built. +// all atmos machinery has to initalize before the first +// pipenet can be built. /datum/controller/subsystem/air/proc/setup_pipenets() for (var/obj/machinery/atmospherics/AM in atmos_machinery) AM.build_network() diff --git a/code/controllers/subsystem/atoms.dm b/code/controllers/subsystem/atoms.dm index d9cbd82cf2e..064e1d60885 100644 --- a/code/controllers/subsystem/atoms.dm +++ b/code/controllers/subsystem/atoms.dm @@ -92,7 +92,7 @@ SUBSYSTEM_DEF(atoms) if(result != INITIALIZE_HINT_NORMAL) switch(result) if(INITIALIZE_HINT_LATELOAD) - if(arguments[1]) //mapload + if(arguments[1]) //mapload late_loaders += A else A.LateInitialize() @@ -102,7 +102,7 @@ SUBSYSTEM_DEF(atoms) else BadInitializeCalls[the_type] |= BAD_INIT_NO_HINT - if(!A) //possible harddel + if(!A) //possible harddel qdeleted = TRUE else if(!(A.flags_1 & INITIALIZED_1)) BadInitializeCalls[the_type] |= BAD_INIT_DIDNT_INIT diff --git a/code/controllers/subsystem/blackbox.dm b/code/controllers/subsystem/blackbox.dm index b214d71ba83..5d236045fd9 100644 --- a/code/controllers/subsystem/blackbox.dm +++ b/code/controllers/subsystem/blackbox.dm @@ -5,10 +5,10 @@ SUBSYSTEM_DEF(blackbox) runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME init_order = INIT_ORDER_BLACKBOX - var/list/feedback = list() //list of datum/feedback_variable + var/list/feedback = list() //list of datum/feedback_variable var/list/first_death = list() //the first death of this round, assoc. vars keep track of different things var/triggertime = 0 - var/sealed = FALSE //time to stop tracking stats? + var/sealed = FALSE //time to stop tracking stats? var/list/versions = list("antagonists" = 3, "admin_secrets_fun_used" = 2, "explosion" = 2, @@ -28,12 +28,12 @@ SUBSYSTEM_DEF(blackbox) //poll population /datum/controller/subsystem/blackbox/fire() - set waitfor = FALSE //for population query + set waitfor = FALSE //for population query CheckPlayerCount() if(CONFIG_GET(flag/use_exp_tracking)) - if((triggertime < 0) || (world.time > (triggertime +3000))) //subsystem fires once at roundstart then once every 10 minutes. a 5 min check skips the first fire. The <0 is midnight rollover check + if((triggertime < 0) || (world.time > (triggertime +3000))) //subsystem fires once at roundstart then once every 10 minutes. a 5 min check skips the first fire. The <0 is midnight rollover check update_exp(10,FALSE) /datum/controller/subsystem/blackbox/proc/CheckPlayerCount() @@ -171,13 +171,13 @@ feedback data can be recorded in 5 formats: used for simple single-string records i.e. the current map further calls to the same key will append saved data unless the overwrite argument is true or it already exists when encoded calls made with overwrite will lack square brackets - calls: SSblackbox.record_feedback("text", "example", 1, "sample text") + calls: SSblackbox.record_feedback("text", "example", 1, "sample text") SSblackbox.record_feedback("text", "example", 1, "other text") json: {"data":["sample text","other text"]} "amount" used to record simple counts of data i.e. the number of ahelps received further calls to the same key will add or subtract (if increment argument is a negative) from the saved amount - calls: SSblackbox.record_feedback("amount", "example", 8) + calls: SSblackbox.record_feedback("amount", "example", 8) SSblackbox.record_feedback("amount", "example", 2) json: {"data":10} "tally" @@ -185,7 +185,7 @@ feedback data can be recorded in 5 formats: further calls to the same key will: add or subtract from the saved value of the data key if it already exists append the key and it's value if it doesn't exist - calls: SSblackbox.record_feedback("tally", "example", 1, "sample data") + calls: SSblackbox.record_feedback("tally", "example", 1, "sample data") SSblackbox.record_feedback("tally", "example", 4, "sample data") SSblackbox.record_feedback("tally", "example", 2, "other data") json: {"data":{"sample data":5,"other data":2}} @@ -197,19 +197,19 @@ feedback data can be recorded in 5 formats: further calls to the same key will: add or subtract from the saved value of the data key if it already exists in the same multi-dimensional position append the key and it's value if it doesn't exist - calls: SSblackbox.record_feedback("nested tally", "example", 1, list("fruit", "orange", "apricot")) + calls: SSblackbox.record_feedback("nested tally", "example", 1, list("fruit", "orange", "apricot")) SSblackbox.record_feedback("nested tally", "example", 2, list("fruit", "orange", "orange")) SSblackbox.record_feedback("nested tally", "example", 3, list("fruit", "orange", "apricot")) SSblackbox.record_feedback("nested tally", "example", 10, list("fruit", "red", "apple")) SSblackbox.record_feedback("nested tally", "example", 1, list("vegetable", "orange", "carrot")) json: {"data":{"fruit":{"orange":{"apricot":4,"orange":2},"red":{"apple":10}},"vegetable":{"orange":{"carrot":1}}}} tracking values associated with a number can't merge with a nesting value, trying to do so will append the list - call: SSblackbox.record_feedback("nested tally", "example", 3, list("fruit", "orange")) + call: SSblackbox.record_feedback("nested tally", "example", 3, list("fruit", "orange")) json: {"data":{"fruit":{"orange":{"apricot":4,"orange":2},"red":{"apple":10},"orange":3},"vegetable":{"orange":{"carrot":1}}}} "associative" used to record text that's associated with a value i.e. coordinates further calls to the same key will append a new list to existing data - calls: SSblackbox.record_feedback("associative", "example", 1, list("text" = "example", "path" = /obj/item, "number" = 4)) + calls: SSblackbox.record_feedback("associative", "example", 1, list("text" = "example", "path" = /obj/item, "number" = 4)) SSblackbox.record_feedback("associative", "example", 1, list("number" = 7, "text" = "example", "other text" = "sample")) json: {"data":{"1":{"text":"example","path":"/obj/item","number":"4"},"2":{"number":"7","text":"example","other text":"sample"}}} diff --git a/code/controllers/subsystem/blackmarket.dm b/code/controllers/subsystem/blackmarket.dm index 2905453280d..a61c11aaeb2 100644 --- a/code/controllers/subsystem/blackmarket.dm +++ b/code/controllers/subsystem/blackmarket.dm @@ -1,7 +1,7 @@ SUBSYSTEM_DEF(blackmarket) - name = "Blackmarket" - flags = SS_BACKGROUND - init_order = INIT_ORDER_DEFAULT + name = "Blackmarket" + flags = SS_BACKGROUND + init_order = INIT_ORDER_DEFAULT /// Descriptions for each shipping methods. var/shipping_method_descriptions = list( @@ -11,11 +11,11 @@ SUBSYSTEM_DEF(blackmarket) ) /// List of all existing markets. - var/list/datum/blackmarket_market/markets = list() + var/list/datum/blackmarket_market/markets = list() /// List of existing ltsrbts. - var/list/obj/machinery/ltsrbt/telepads = list() + var/list/obj/machinery/ltsrbt/telepads = list() /// Currently queued purchases. - var/list/queued_purchases = list() + var/list/queued_purchases = list() /datum/controller/subsystem/blackmarket/Initialize(timeofday) for(var/market in subtypesof(/datum/blackmarket_market)) diff --git a/code/controllers/subsystem/dbcore.dm b/code/controllers/subsystem/dbcore.dm index b6b750fbf4b..97220fe249f 100644 --- a/code/controllers/subsystem/dbcore.dm +++ b/code/controllers/subsystem/dbcore.dm @@ -67,7 +67,7 @@ SUBSYSTEM_DEF(dbcore) if(failed_connection_timeout <= world.time) //it's been more than 5 seconds since we failed to connect, reset the counter failed_connections = 0 - if(failed_connections > 5) //If it failed to establish a connection more than 5 times in a row, don't bother attempting to connect for 5 seconds. + if(failed_connections > 5) //If it failed to establish a connection more than 5 times in a row, don't bother attempting to connect for 5 seconds. failed_connection_timeout = world.time + 50 return FALSE diff --git a/code/controllers/subsystem/events.dm b/code/controllers/subsystem/events.dm index c8ff2a46961..d144016d2b1 100644 --- a/code/controllers/subsystem/events.dm +++ b/code/controllers/subsystem/events.dm @@ -3,25 +3,25 @@ SUBSYSTEM_DEF(events) init_order = INIT_ORDER_EVENTS runlevels = RUNLEVEL_GAME - var/list/control = list() //list of all datum/round_event_control. Used for selecting events based on weight and occurrences. - var/list/running = list() //list of all existing /datum/round_event + var/list/control = list() //list of all datum/round_event_control. Used for selecting events based on weight and occurrences. + var/list/running = list() //list of all existing /datum/round_event var/list/currentrun = list() - var/scheduled = 0 //The next world.time that a naturally occuring random event can be selected. - //var/frequency_lower = 1800 //3 minutes lower bound. //ORIGINAL + var/scheduled = 0 //The next world.time that a naturally occuring random event can be selected. + //var/frequency_lower = 1800 //3 minutes lower bound. //ORIGINAL var/frequency_lower = 3000 //5 minutes //SKYRAT EDIT CHANGE - EVENTS - //var/frequency_upper = 6000 //10 minutes upper bound. Basically an event will happen every 3 to 10 minutes. //ORIGINAL + //var/frequency_upper = 6000 //10 minutes upper bound. Basically an event will happen every 3 to 10 minutes. //ORIGINAL var/frequency_upper = 9000 //15 minutes. So you get events inbetween 5 and 15 minutes. //SKYRAT EDIT CHANGE - EVENTS - var/list/holidays //List of all holidays occuring today or null if no holidays + var/list/holidays //List of all holidays occuring today or null if no holidays var/wizardmode = FALSE /datum/controller/subsystem/events/Initialize(time, zlevel) for(var/type in typesof(/datum/round_event_control)) var/datum/round_event_control/E = new type() if(!E.typepath) - continue //don't want this one! leave it for the garbage collector - control += E //add it to the list of all events (controls) + continue //don't want this one! leave it for the garbage collector + control += E //add it to the list of all events (controls) reschedule() getHoliday() return ..() @@ -57,7 +57,7 @@ SUBSYSTEM_DEF(events) //selects a random event based on whether it can occur and it's 'weight'(probability) /datum/controller/subsystem/events/proc/spawnEvent() - set waitfor = FALSE //for the admin prompt + set waitfor = FALSE //for the admin prompt if(!CONFIG_GET(flag/allow_random_events)) return @@ -69,22 +69,22 @@ SUBSYSTEM_DEF(events) for(var/datum/round_event_control/E in control) if(!E.canSpawnEvent(players_amt, gamemode)) continue - if(E.weight < 0) //for round-start events etc. + if(E.weight < 0) //for round-start events etc. var/res = TriggerEvent(E) if(res == EVENT_INTERRUPTED) - continue //like it never happened + continue //like it never happened if(res == EVENT_CANT_RUN) return sum_of_weights += E.weight - sum_of_weights = rand(0,sum_of_weights) //reusing this variable. It now represents the 'weight' we want to select + sum_of_weights = rand(0,sum_of_weights) //reusing this variable. It now represents the 'weight' we want to select for(var/datum/round_event_control/E in control) if(!E.canSpawnEvent(players_amt, gamemode)) continue sum_of_weights -= E.weight - if(sum_of_weights <= 0) //we've hit our goal + if(sum_of_weights <= 0) //we've hit our goal if(TriggerEvent(E)) return @@ -110,18 +110,18 @@ SUBSYSTEM_DEF(events) holder.forceEvent() /datum/admins/proc/forceEvent() - var/dat = "" - var/normal = "" - var/magic = "" + var/dat = "" + var/normal = "" + var/magic = "" var/holiday = "" for(var/datum/round_event_control/E in SSevents.control) dat = "
[E]" if(E.holidayID) - holiday += dat + holiday += dat else if(E.wizardevent) - magic += dat + magic += dat else - normal += dat + normal += dat dat = normal + "
" + magic + "
" + holiday @@ -154,12 +154,12 @@ SUBSYSTEM_DEF(events) //sets up the holidays and holidays list /datum/controller/subsystem/events/proc/getHoliday() if(!CONFIG_GET(flag/allow_holidays)) - return // Holiday stuff was not enabled in the config! + return // Holiday stuff was not enabled in the config! var/YYYY = text2num(time2text(world.timeofday, "YYYY")) // get the current year - var/MM = text2num(time2text(world.timeofday, "MM")) // get the current month - var/DD = text2num(time2text(world.timeofday, "DD")) // get the current day - var/DDD = time2text(world.timeofday, "DDD") // get the current weekday + var/MM = text2num(time2text(world.timeofday, "MM")) // get the current month + var/DD = text2num(time2text(world.timeofday, "DD")) // get the current day + var/DDD = time2text(world.timeofday, "DDD") // get the current weekday for(var/H in subtypesof(/datum/holiday)) var/datum/holiday/holiday = new H() diff --git a/code/controllers/subsystem/garbage.dm b/code/controllers/subsystem/garbage.dm index b35ae5716d2..f59433cfc8a 100644 --- a/code/controllers/subsystem/garbage.dm +++ b/code/controllers/subsystem/garbage.dm @@ -29,11 +29,11 @@ SUBSYSTEM_DEF(garbage) runlevels = RUNLEVELS_DEFAULT | RUNLEVEL_LOBBY init_order = INIT_ORDER_GARBAGE - var/list/collection_timeout = list(2 MINUTES, 10 SECONDS) // deciseconds to wait before moving something up in the queue to the next level + var/list/collection_timeout = list(2 MINUTES, 10 SECONDS) // deciseconds to wait before moving something up in the queue to the next level //Stat tracking - var/delslasttick = 0 // number of del()'s we've done this tick - var/gcedlasttick = 0 // number of things that gc'ed last tick + var/delslasttick = 0 // number of del()'s we've done this tick + var/gcedlasttick = 0 // number of things that gc'ed last tick var/totaldels = 0 var/totalgcs = 0 @@ -43,7 +43,7 @@ SUBSYSTEM_DEF(garbage) var/list/pass_counts var/list/fail_counts - var/list/items = list() // Holds our qdel_item statistics datums + var/list/items = list() // Holds our qdel_item statistics datums //Queue var/list/queues @@ -162,7 +162,7 @@ SUBSYSTEM_DEF(garbage) ++totalgcs pass_counts[level]++ #ifdef REFERENCE_TRACKING - reference_find_on_fail -= refID //It's deleted we don't care anymore. + reference_find_on_fail -= refID //It's deleted we don't care anymore. #endif if (MC_TICK_CHECK) return @@ -261,14 +261,14 @@ SUBSYSTEM_DEF(garbage) /datum/qdel_item var/name = "" - var/qdels = 0 //Total number of times it's passed thru qdel. - var/destroy_time = 0 //Total amount of milliseconds spent processing this type's Destroy() - var/failures = 0 //Times it was queued for soft deletion but failed to soft delete. - var/hard_deletes = 0 //Different from failures because it also includes QDEL_HINT_HARDDEL deletions + var/qdels = 0 //Total number of times it's passed thru qdel. + var/destroy_time = 0 //Total amount of milliseconds spent processing this type's Destroy() + var/failures = 0 //Times it was queued for soft deletion but failed to soft delete. + var/hard_deletes = 0 //Different from failures because it also includes QDEL_HINT_HARDDEL deletions var/hard_delete_time = 0//Total amount of milliseconds spent hard deleting this type. var/no_respect_force = 0//Number of times it's not respected force=TRUE - var/no_hint = 0 //Number of times it's not even bother to give a qdel hint - var/slept_destroy = 0 //Number of times it's slept in its destroy + var/no_hint = 0 //Number of times it's not even bother to give a qdel hint + var/slept_destroy = 0 //Number of times it's slept in its destroy /datum/qdel_item/New(mytype) name = "[mytype]" @@ -302,12 +302,12 @@ SUBSYSTEM_DEF(garbage) if(!D) return switch(hint) - if (QDEL_HINT_QUEUE) //qdel should queue the object for deletion. + if (QDEL_HINT_QUEUE) //qdel should queue the object for deletion. SSgarbage.Queue(D) if (QDEL_HINT_IWILLGC) D.gc_destroyed = world.time return - if (QDEL_HINT_LETMELIVE) //qdel should let the object live after calling destory. + if (QDEL_HINT_LETMELIVE) //qdel should let the object live after calling destory. if(!force) D.gc_destroyed = null //clear the gc variable (important!) return @@ -324,9 +324,9 @@ SUBSYSTEM_DEF(garbage) I.no_respect_force++ SSgarbage.Queue(D) - if (QDEL_HINT_HARDDEL) //qdel should assume this object won't gc, and queue a hard delete + if (QDEL_HINT_HARDDEL) //qdel should assume this object won't gc, and queue a hard delete SSgarbage.Queue(D, GC_QUEUE_HARDDELETE) - if (QDEL_HINT_HARDDEL_NOW) //qdel should assume this object won't gc, and hard del it post haste. + if (QDEL_HINT_HARDDEL_NOW) //qdel should assume this object won't gc, and hard del it post haste. SSgarbage.HardDelete(D) #ifdef REFERENCE_TRACKING if (QDEL_HINT_FINDREFERENCE) //qdel will, if REFERENCE_TRACKING is enabled, display all references to this object, then queue the object for deletion. diff --git a/code/controllers/subsystem/job.dm b/code/controllers/subsystem/job.dm index c0aa6ddce5d..14bab19b42e 100644 --- a/code/controllers/subsystem/job.dm +++ b/code/controllers/subsystem/job.dm @@ -3,14 +3,14 @@ SUBSYSTEM_DEF(job) init_order = INIT_ORDER_JOBS flags = SS_NO_FIRE - var/list/occupations = list() //List of all jobs - var/list/datum/job/name_occupations = list() //Dict of all jobs, keys are titles - var/list/type_occupations = list() //Dict of all jobs, keys are types - var/list/unassigned = list() //Players who need jobs - var/initial_players_to_assign = 0 //used for checking against population caps + var/list/occupations = list() //List of all jobs + var/list/datum/job/name_occupations = list() //Dict of all jobs, keys are titles + var/list/type_occupations = list() //Dict of all jobs, keys are types + var/list/unassigned = list() //Players who need jobs + var/initial_players_to_assign = 0 //used for checking against population caps var/list/prioritized_jobs = list() - var/list/latejoin_trackers = list() //Don't read this list, use GetLateJoinTurfs() instead + var/list/latejoin_trackers = list() //Don't read this list, use GetLateJoinTurfs() instead var/overflow_role = "Assistant" @@ -57,7 +57,7 @@ SUBSYSTEM_DEF(job) continue if(!job.config_check()) continue - if(!job.map_check()) //Even though we initialize before mapping, this is fine because the config is loaded at new + if(!job.map_check()) //Even though we initialize before mapping, this is fine because the config is loaded at new testing("Removed [job.type] due to map config") continue occupations += job diff --git a/code/controllers/subsystem/mapping.dm b/code/controllers/subsystem/mapping.dm index 0975619b4bd..515e94a6634 100644 --- a/code/controllers/subsystem/mapping.dm +++ b/code/controllers/subsystem/mapping.dm @@ -28,9 +28,9 @@ SUBSYSTEM_DEF(mapping) var/list/areas_in_z = list() var/loading_ruins = FALSE - var/list/turf/unused_turfs = list() //Not actually unused turfs they're unused but reserved for use for whatever requests them. "[zlevel_of_turf]" = list(turfs) - var/list/datum/turf_reservations //list of turf reservations - var/list/used_turfs = list() //list of turf = datum/turf_reservation + var/list/turf/unused_turfs = list() //Not actually unused turfs they're unused but reserved for use for whatever requests them. "[zlevel_of_turf]" = list(turfs) + var/list/datum/turf_reservations //list of turf reservations + var/list/used_turfs = list() //list of turf = datum/turf_reservation var/list/reservation_ready = list() var/clearing_reserved_turfs = FALSE @@ -68,7 +68,7 @@ SUBSYSTEM_DEF(mapping) initialize_biomes() loadWorld() repopulate_sorted_areas() - process_teleport_locs() //Sets up the wizard teleport locations + process_teleport_locs() //Sets up the wizard teleport locations preloadTemplates() run_map_generation() @@ -129,7 +129,7 @@ SUBSYSTEM_DEF(mapping) return ..() /datum/controller/subsystem/mapping/proc/wipe_reservations(wipe_safety_delay = 100) - if(clearing_reserved_turfs || !initialized) //in either case this is just not needed. + if(clearing_reserved_turfs || !initialized) //in either case this is just not needed. return clearing_reserved_turfs = TRUE SSshuttle.transit_requesters.Cut() @@ -279,7 +279,7 @@ Used by the AI doomsday and the self-destruct nuke. INIT_ANNOUNCE("WARNING: An unknown minetype '[config.minetype]' was set! This is being ignored! Update the maploader code!") #endif - if(LAZYLEN(FailedZs)) //but seriously, unless the server's filesystem is messed up this will never happen + if(LAZYLEN(FailedZs)) //but seriously, unless the server's filesystem is messed up this will never happen var/msg = "RED ALERT! The following map files failed to load: [FailedZs[1]]" if(FailedZs.len > 1) for(var/I in 2 to FailedZs.len) @@ -529,8 +529,8 @@ GLOBAL_LIST_EMPTY(the_station_areas) //This is not for wiping reserved levels, use wipe_reservations() for that. /datum/controller/subsystem/mapping/proc/initialize_reserved_level(z) - UNTIL(!clearing_reserved_turfs) //regardless, lets add a check just in case. - clearing_reserved_turfs = TRUE //This operation will likely clear any existing reservations, so lets make sure nothing tries to make one while we're doing it. + UNTIL(!clearing_reserved_turfs) //regardless, lets add a check just in case. + clearing_reserved_turfs = TRUE //This operation will likely clear any existing reservations, so lets make sure nothing tries to make one while we're doing it. if(!level_trait(z,ZTRAIT_RESERVED)) clearing_reserved_turfs = FALSE CRASH("Invalid z level prepared for reservations.") @@ -559,17 +559,17 @@ GLOBAL_LIST_EMPTY(the_station_areas) //DO NOT CALL THIS PROC DIRECTLY, CALL wipe_reservations(). /datum/controller/subsystem/mapping/proc/do_wipe_turf_reservations() PRIVATE_PROC(TRUE) - UNTIL(initialized) //This proc is for AFTER init, before init turf reservations won't even exist and using this will likely break things. + UNTIL(initialized) //This proc is for AFTER init, before init turf reservations won't even exist and using this will likely break things. for(var/i in turf_reservations) var/datum/turf_reservation/TR = i if(!QDELETED(TR)) qdel(TR, TRUE) UNSETEMPTY(turf_reservations) var/list/clearing = list() - for(var/l in unused_turfs) //unused_turfs is an assoc list by z = list(turfs) + for(var/l in unused_turfs) //unused_turfs is an assoc list by z = list(turfs) if(islist(unused_turfs[l])) clearing |= unused_turfs[l] - clearing |= used_turfs //used turfs is an associative list, BUT, reserve_turfs() can still handle it. If the code above works properly, this won't even be needed as the turfs would be freed already. + clearing |= used_turfs //used turfs is an associative list, BUT, reserve_turfs() can still handle it. If the code above works properly, this won't even be needed as the turfs would be freed already. unused_turfs.Cut() used_turfs.Cut() reserve_turfs(clearing) diff --git a/code/controllers/subsystem/nightshift.dm b/code/controllers/subsystem/nightshift.dm index ca9979076a8..e8608c2a669 100644 --- a/code/controllers/subsystem/nightshift.dm +++ b/code/controllers/subsystem/nightshift.dm @@ -4,8 +4,8 @@ SUBSYSTEM_DEF(nightshift) flags = SS_NO_TICK_CHECK var/nightshift_active = FALSE - var/nightshift_start_time = 702000 //7:30 PM, station time - var/nightshift_end_time = 270000 //7:30 AM, station time + var/nightshift_start_time = 702000 //7:30 PM, station time + var/nightshift_end_time = 270000 //7:30 AM, station time var/nightshift_first_check = 30 SECONDS var/high_security_mode = FALSE diff --git a/code/controllers/subsystem/overlays.dm b/code/controllers/subsystem/overlays.dm index 74b60783c30..a319b0806be 100644 --- a/code/controllers/subsystem/overlays.dm +++ b/code/controllers/subsystem/overlays.dm @@ -164,7 +164,7 @@ SUBSYSTEM_DEF(overlays) if(NOT_QUEUED_ALREADY && fa_len != a_len) QUEUE_FOR_COMPILE -/atom/proc/copy_overlays(atom/other, cut_old) //copys our_overlays from another atom +/atom/proc/copy_overlays(atom/other, cut_old) //copys our_overlays from another atom if(!other) if(cut_old) cut_overlays() diff --git a/code/controllers/subsystem/parallax.dm b/code/controllers/subsystem/parallax.dm index c15addc3de9..c9573fbaa57 100644 --- a/code/controllers/subsystem/parallax.dm +++ b/code/controllers/subsystem/parallax.dm @@ -14,7 +14,7 @@ SUBSYSTEM_DEF(parallax) //These are cached per client so needs to be done asap so people joining at roundstart do not miss these. /datum/controller/subsystem/parallax/PreInit() . = ..() - if(prob(70)) //70% chance to pick a special extra layer + if(prob(70)) //70% chance to pick a special extra layer random_layer = pick(/atom/movable/screen/parallax_layer/random/space_gas, /atom/movable/screen/parallax_layer/random/asteroids) random_parallax_color = pick(COLOR_TEAL, COLOR_GREEN, COLOR_SILVER, COLOR_YELLOW, COLOR_CYAN, COLOR_ORANGE, COLOR_PURPLE)//Special color for random_layer1. Has to be done here so everyone sees the same color. planet_y_offset = rand(100, 160) diff --git a/code/controllers/subsystem/persistence.dm b/code/controllers/subsystem/persistence.dm index b126a76616c..9e6c0475b35 100644 --- a/code/controllers/subsystem/persistence.dm +++ b/code/controllers/subsystem/persistence.dm @@ -176,7 +176,7 @@ SUBSYSTEM_DEF(persistence) CollectTrophies() CollectRoundtype() CollectMaps() - SavePhotoPersistence() //THIS IS PERSISTENCE, NOT THE LOGGING PORTION. + SavePhotoPersistence() //THIS IS PERSISTENCE, NOT THE LOGGING PORTION. if(CONFIG_GET(flag/use_antag_rep)) CollectAntagReputation() SaveRandomizedRecipes() @@ -324,10 +324,10 @@ SUBSYSTEM_DEF(persistence) var/ANTAG_REP_MAXIMUM = CONFIG_GET(number/antag_rep_maximum) for(var/p_ckey in antag_rep_change) -// var/start = antag_rep[p_ckey] +// var/start = antag_rep[p_ckey] antag_rep[p_ckey] = max(0, min(antag_rep[p_ckey]+antag_rep_change[p_ckey], ANTAG_REP_MAXIMUM)) -// WARNING("AR_DEBUG: [p_ckey]: Committed [antag_rep_change[p_ckey]] reputation, going from [start] to [antag_rep[p_ckey]]") +// WARNING("AR_DEBUG: [p_ckey]: Committed [antag_rep_change[p_ckey]] reputation, going from [start] to [antag_rep[p_ckey]]") antag_rep_change = list() diff --git a/code/controllers/subsystem/processing/networks.dm b/code/controllers/subsystem/processing/networks.dm index 23dccd22fba..0030552e848 100644 --- a/code/controllers/subsystem/processing/networks.dm +++ b/code/controllers/subsystem/processing/networks.dm @@ -31,11 +31,11 @@ SUBSYSTEM_DEF(networks) // Why not list? Because its a Copy() every time we add a packet, and thats stupid. var/datum/netdata/first = null // start of the queue. Pulled off in fire. - var/datum/netdata/last = null // end of the queue. pushed on by transmit + var/datum/netdata/last = null // end of the queue. pushed on by transmit var/packet_count = 0 // packet stats var/count_broadcasts_packets = 0 // count of broadcast packets sent - var/count_failed_packets = 0 // count of message fails + var/count_failed_packets = 0 // count of message fails var/count_good_packets = 0 // Logs moved here // Amount of logs the system tries to keep in memory. Keep below 999 to prevent byond from acting weirdly. @@ -152,10 +152,10 @@ SUBSYSTEM_DEF(networks) _process_packet(current.receiver_id, current) // single target POP_PACKET(current) else // ok so lets find the network to send it too - var/datum/ntnet/net = networks[current.network_id] // get the sending network - net = net?.networks[current.receiver_id] // find the target network to broadcast - if(net) // we found it - current.receiver_id = net.collect_interfaces() // make a list of all the sending targets + var/datum/ntnet/net = networks[current.network_id] // get the sending network + net = net?.networks[current.receiver_id] // find the target network to broadcast + if(net) // we found it + current.receiver_id = net.collect_interfaces() // make a list of all the sending targets else // We got an error, the network is bad so send a NAK target_interface = interfaces_by_hardware_id[current.sender_id] @@ -188,7 +188,7 @@ SUBSYSTEM_DEF(networks) return NETWORK_ERROR_OK -/datum/controller/subsystem/networks/proc/check_relay_operation(zlevel=0) //can be expanded later but right now it's true/false. +/datum/controller/subsystem/networks/proc/check_relay_operation(zlevel=0) //can be expanded later but right now it's true/false. for(var/i in relays) var/obj/machinery/ntnet_relay/n = i if(zlevel && n.z != zlevel) @@ -284,8 +284,8 @@ SUBSYSTEM_DEF(networks) * be put in the object.area * * An example on what the area.network_root_id does/ - * Before Init: obj.network_id = "ATMOS.SCRUBBER" area.network_root_id="SS13_STATION" area.network_area_id = "BRIDGE" - * After Init: obj.network_id = "SS13_STATION.ATMOS.SCRUBBER" also obj.network_id = "SS13_STATION.AREA.BRIDGE" + * Before Init: obj.network_id = "ATMOS.SCRUBBER" area.network_root_id="SS13_STATION" area.network_area_id = "BRIDGE" + * After Init: obj.network_id = "SS13_STATION.ATMOS.SCRUBBER" also obj.network_id = "SS13_STATION.AREA.BRIDGE" * * Arguments: * * area - Area to modify the root id. @@ -299,12 +299,12 @@ SUBSYSTEM_DEF(networks) /// If we are a ruin or a shuttle, we get our own network if(M) /// if we have a template, try to get the network id from the template - if(M.station_id && M.station_id != LIMBO_NETWORK_ROOT) // check if the template specifies it + if(M.station_id && M.station_id != LIMBO_NETWORK_ROOT) // check if the template specifies it A.network_root_id = simple_network_name_fix(M.station_id) - else if(istype(M, /datum/map_template/shuttle)) // if not, then check if its a shuttle type - var/datum/map_template/shuttle/T = M // we are a shuttle so use shuttle id + else if(istype(M, /datum/map_template/shuttle)) // if not, then check if its a shuttle type + var/datum/map_template/shuttle/T = M // we are a shuttle so use shuttle id A.network_root_id = simple_network_name_fix(T.shuttle_id) - else if(istype(M,/datum/map_template/ruin)) // if not again, check if its a ruin type + else if(istype(M,/datum/map_template/ruin)) // if not again, check if its a ruin type var/datum/map_template/ruin/R = M A.network_root_id = simple_network_name_fix(R.id) @@ -312,7 +312,7 @@ SUBSYSTEM_DEF(networks) // Anything in Centcom is completely isolated // Special case for holodecks. if(istype(A,/area/holodeck)) - A.network_root_id = "HOLODECK" // isolated from the station network + A.network_root_id = "HOLODECK" // isolated from the station network else if(SSmapping.level_trait(A.z, ZTRAIT_CENTCOM)) A.network_root_id = CENTCOM_NETWORK_ROOT // Otherwise the default is the station @@ -327,9 +327,9 @@ SUBSYSTEM_DEF(networks) // finally set the network area id, bit copy paste from area Initialize // This is done in case we have more than one area type, each area instance has its own network name if(!A.network_area_id) - A.network_area_id = A.network_root_id + ".AREA." + simple_network_name_fix(A.name) // Make the string + A.network_area_id = A.network_root_id + ".AREA." + simple_network_name_fix(A.name) // Make the string if(!(A.area_flags & UNIQUE_AREA)) // if we aren't a unique area, make sure our name is different - A.network_area_id = SSnetworks.assign_random_name(5, A.network_area_id + "_") // tack on some garbage incase there are two area types + A.network_area_id = SSnetworks.assign_random_name(5, A.network_area_id + "_") // tack on some garbage incase there are two area types /datum/controller/subsystem/networks/proc/assign_areas_root_ids(list/areas, datum/map_template/M=null) for(var/area/A in areas) @@ -489,8 +489,8 @@ SUBSYSTEM_DEF(networks) var/string = md5("[num2text(rand(HID_RESTRICTED_END, 999999999), 12)]") if(!string) log_runtime("Could not generagea m5 hash from address, problem with md5?") - return //errored - . = "[copytext_char(string, 1, 9)]" //16 ^ 8 possibilities I think. + return //errored + . = "[copytext_char(string, 1, 9)]" //16 ^ 8 possibilities I think. while(interfaces_by_hardware_id[.]) /** diff --git a/code/controllers/subsystem/processing/projectiles.dm b/code/controllers/subsystem/processing/projectiles.dm index ba62f0cca65..48d465dd0fd 100644 --- a/code/controllers/subsystem/processing/projectiles.dm +++ b/code/controllers/subsystem/processing/projectiles.dm @@ -11,7 +11,7 @@ PROCESSING_SUBSYSTEM_DEF(projectiles) global_pixel_speed = new_speed for(var/i in processing) var/obj/projectile/P = i - if(istype(P)) //there's non projectiles on this too. + if(istype(P)) //there's non projectiles on this too. P.set_pixel_speed(new_speed) /datum/controller/subsystem/processing/projectiles/vv_edit_var(var_name, var_value) diff --git a/code/controllers/subsystem/processing/quirks.dm b/code/controllers/subsystem/processing/quirks.dm index 7d690cf3d3f..b76a962dc0d 100644 --- a/code/controllers/subsystem/processing/quirks.dm +++ b/code/controllers/subsystem/processing/quirks.dm @@ -9,9 +9,9 @@ PROCESSING_SUBSYSTEM_DEF(quirks) runlevels = RUNLEVEL_GAME wait = 1 SECONDS - var/list/quirks = list() //Assoc. list of all roundstart quirk datum types; "name" = /path/ - var/list/quirk_points = list() //Assoc. list of quirk names and their "point cost"; positive numbers are good traits, and negative ones are bad - var/list/quirk_objects = list() //A list of all quirk objects in the game, since some may process + var/list/quirks = list() //Assoc. list of all roundstart quirk datum types; "name" = /path/ + var/list/quirk_points = list() //Assoc. list of quirk names and their "point cost"; positive numbers are good traits, and negative ones are bad + var/list/quirk_objects = list() //A list of all quirk objects in the game, since some may process var/list/quirk_blacklist = list() //A list of quirks that can not be used with each other. Format: list(quirk1,quirk2),list(quirk3,quirk4) ///An assoc list of quirks that can be obtained as a hardcore character, and their hardcore value. var/list/hardcore_quirks = list() diff --git a/code/controllers/subsystem/research.dm b/code/controllers/subsystem/research.dm index a47cf8575d7..bce3168049e 100644 --- a/code/controllers/subsystem/research.dm +++ b/code/controllers/subsystem/research.dm @@ -5,32 +5,32 @@ SUBSYSTEM_DEF(research) wait = 10 init_order = INIT_ORDER_RESEARCH //TECHWEB STATIC - var/list/techweb_nodes = list() //associative id = node datum - var/list/techweb_designs = list() //associative id = node datum + var/list/techweb_nodes = list() //associative id = node datum + var/list/techweb_designs = list() //associative id = node datum var/list/datum/techweb/techwebs = list() var/datum/techweb/science/science_tech var/datum/techweb/admin/admin_tech - var/datum/techweb_node/error_node/error_node //These two are what you get if a node/design is deleted and somehow still stored in a console. + var/datum/techweb_node/error_node/error_node //These two are what you get if a node/design is deleted and somehow still stored in a console. var/datum/design/error_design/error_design //ERROR LOGGING - var/list/invalid_design_ids = list() //associative id = number of times - var/list/invalid_node_ids = list() //associative id = number of times - var/list/invalid_node_boost = list() //associative id = error message + var/list/invalid_design_ids = list() //associative id = number of times + var/list/invalid_node_ids = list() //associative id = number of times + var/list/invalid_node_boost = list() //associative id = error message var/list/obj/machinery/rnd/server/servers = list() - var/list/techweb_nodes_starting = list() //associative id = TRUE - var/list/techweb_categories = list() //category name = list(node.id = TRUE) - var/list/techweb_boost_items = list() //associative double-layer path = list(id = list(point_type = point_discount)) - var/list/techweb_nodes_hidden = list() //Node ids that should be hidden by default. - var/list/techweb_nodes_experimental = list() //Node ids that are exclusive to the BEPIS. - var/list/techweb_point_items = list( //path = list(point type = value) + var/list/techweb_nodes_starting = list() //associative id = TRUE + var/list/techweb_categories = list() //category name = list(node.id = TRUE) + var/list/techweb_boost_items = list() //associative double-layer path = list(id = list(point_type = point_discount)) + var/list/techweb_nodes_hidden = list() //Node ids that should be hidden by default. + var/list/techweb_nodes_experimental = list() //Node ids that are exclusive to the BEPIS. + var/list/techweb_point_items = list( //path = list(point type = value) /obj/item/assembly/signaler/anomaly = list(TECHWEB_POINT_TYPE_GENERIC = 10000) ) var/list/errored_datums = list() - var/list/point_types = list() //typecache style type = TRUE list - var/list/slime_already_researched = list() //Slime cores that have already been researched + var/list/point_types = list() //typecache style type = TRUE list + var/list/slime_already_researched = list() //Slime cores that have already been researched //---------------------------------------------- var/list/single_server_income = list(TECHWEB_POINT_TYPE_GENERIC = TECHWEB_SINGLE_SERVER_INCOME) var/multiserver_calculation = FALSE @@ -68,7 +68,7 @@ SUBSYSTEM_DEF(research) if(multiserver_calculation) var/eff = calculate_server_coefficient() for(var/obj/machinery/rnd/server/miner in servers) - var/list/result = (miner.mine()) //SLAVE AWAY, SLAVE. + var/list/result = (miner.mine()) //SLAVE AWAY, SLAVE. for(var/i in result) result[i] *= eff bitcoins[i] = bitcoins[i]? bitcoins[i] + result[i] : result[i] @@ -76,7 +76,7 @@ SUBSYSTEM_DEF(research) for(var/obj/machinery/rnd/server/miner in servers) if(miner.working) bitcoins = single_server_income.Copy() - break //Just need one to work. + break //Just need one to work. if (!isnull(last_income)) var/income_time_difference = world.time - last_income science_tech.last_bitcoins = bitcoins // Doesn't take tick drift into account @@ -85,7 +85,7 @@ SUBSYSTEM_DEF(research) science_tech.add_point_list(bitcoins) last_income = world.time -/datum/controller/subsystem/research/proc/calculate_server_coefficient() //Diminishing returns. +/datum/controller/subsystem/research/proc/calculate_server_coefficient() //Diminishing returns. var/amt = servers.len if(!amt) return 0 @@ -145,11 +145,11 @@ SUBSYSTEM_DEF(research) var/datum/techweb_node/TN = techweb_nodes[id] TN.Initialize() techweb_nodes = returned - if (!verify_techweb_nodes()) //Verify all nodes have ids and such. + if (!verify_techweb_nodes()) //Verify all nodes have ids and such. stack_trace("Invalid techweb nodes detected") calculate_techweb_nodes() calculate_techweb_boost_list() - if (!verify_techweb_nodes()) //Verify nodes and designs have been crosslinked properly. + if (!verify_techweb_nodes()) //Verify nodes and designs have been crosslinked properly. CRASH("Invalid techweb nodes detected") /datum/controller/subsystem/research/proc/initialize_all_techweb_designs(clearall = FALSE) @@ -267,7 +267,7 @@ SUBSYSTEM_DEF(research) generate_techweb_unlock_linking() /datum/controller/subsystem/research/proc/generate_techweb_unlock_linking() - for(var/node_id in techweb_nodes) //Clear all unlock links to avoid duplication. + for(var/node_id in techweb_nodes) //Clear all unlock links to avoid duplication. var/datum/techweb_node/node = techweb_nodes[node_id] node.unlock_ids = list() for(var/node_id in techweb_nodes) diff --git a/code/controllers/subsystem/server_maint.dm b/code/controllers/subsystem/server_maint.dm index b29c71563e8..76d6b5ea331 100644 --- a/code/controllers/subsystem/server_maint.dm +++ b/code/controllers/subsystem/server_maint.dm @@ -82,7 +82,7 @@ SUBSYSTEM_DEF(server_maint) continue var/client/C = thing C?.tgui_panel?.send_roundrestart() - if(server) //if you set a server location in config.txt, it sends you there instead of trying to reconnect to the same world address. -- NeoFite + if(server) //if you set a server location in config.txt, it sends you there instead of trying to reconnect to the same world address. -- NeoFite C << link("byond://[server]") var/datum/tgs_version/tgsversion = world.TgsVersion() if(tgsversion) diff --git a/code/controllers/subsystem/shuttle.dm b/code/controllers/subsystem/shuttle.dm index 0846b430523..51039e88260 100644 --- a/code/controllers/subsystem/shuttle.dm +++ b/code/controllers/subsystem/shuttle.dm @@ -23,11 +23,11 @@ SUBSYSTEM_DEF(shuttle) var/obj/docking_port/mobile/emergency/emergency var/obj/docking_port/mobile/arrivals/arrivals var/obj/docking_port/mobile/emergency/backup/backup_shuttle - var/emergencyCallTime = 6000 //time taken for emergency shuttle to reach the station when called (in deciseconds) - var/emergencyDockTime = 1800 //time taken for emergency shuttle to leave again once it has docked (in deciseconds) - var/emergencyEscapeTime = 1200 //time taken for emergency shuttle to reach a safe distance after leaving station (in deciseconds) + var/emergencyCallTime = 6000 //time taken for emergency shuttle to reach the station when called (in deciseconds) + var/emergencyDockTime = 1800 //time taken for emergency shuttle to leave again once it has docked (in deciseconds) + var/emergencyEscapeTime = 1200 //time taken for emergency shuttle to reach a safe distance after leaving station (in deciseconds) var/area/emergencyLastCallLoc - var/emergencyCallAmount = 0 //how many times the escape shuttle was called + var/emergencyCallAmount = 0 //how many times the escape shuttle was called var/emergencyNoEscape var/emergencyNoRecall = FALSE var/adminEmergencyNoRecall = FALSE @@ -39,10 +39,10 @@ SUBSYSTEM_DEF(shuttle) //supply shuttle stuff var/obj/docking_port/mobile/supply/supply - var/ordernum = 1 //order number given to next order - var/points = 5000 //number of trade-points we have - var/centcom_message = "" //Remarks from CentCom on how well you checked the last order. - var/list/discoveredPlants = list() //Typepaths for unusual plants we've already sent CentCom, associated with their potencies + var/ordernum = 1 //order number given to next order + var/points = 5000 //number of trade-points we have + var/centcom_message = "" //Remarks from CentCom on how well you checked the last order. + var/list/discoveredPlants = list() //Typepaths for unusual plants we've already sent CentCom, associated with their potencies var/list/supply_packs = list() var/list/shoppinglist = list() @@ -57,7 +57,7 @@ SUBSYSTEM_DEF(shuttle) var/shuttle_purchased = SHUTTLEPURCHASE_PURCHASABLE //If the station has purchased a replacement escape shuttle this round var/list/shuttle_purchase_requirements_met = list() //For keeping track of ingame events that would unlock new shuttles, such as defeating a boss or discovering a secret item - var/lockdown = FALSE //disallow transit after nuke goes off + var/lockdown = FALSE //disallow transit after nuke goes off var/datum/map_template/shuttle/selected @@ -421,7 +421,7 @@ SUBSYSTEM_DEF(shuttle) else if(M.initiate_docking(getDock(destination)) != DOCKING_SUCCESS) return 2 - return 0 //dock successful + return 0 //dock successful /datum/controller/subsystem/shuttle/proc/moveShuttle(shuttleId, dockId, timed) @@ -436,7 +436,7 @@ SUBSYSTEM_DEF(shuttle) else if(M.initiate_docking(D) != DOCKING_SUCCESS) return 2 - return 0 //dock successful + return 0 //dock successful /datum/controller/subsystem/shuttle/proc/request_transit_dock(obj/docking_port/mobile/M) if(!istype(M)) diff --git a/code/controllers/subsystem/sounds.dm b/code/controllers/subsystem/sounds.dm index fa9ba3c4728..7d94a3d21d7 100644 --- a/code/controllers/subsystem/sounds.dm +++ b/code/controllers/subsystem/sounds.dm @@ -4,7 +4,7 @@ SUBSYSTEM_DEF(sounds) name = "Sounds" flags = SS_NO_FIRE init_order = INIT_ORDER_SOUNDS - var/static/using_channels_max = CHANNEL_HIGHEST_AVAILABLE //BYOND max channels + var/static/using_channels_max = CHANNEL_HIGHEST_AVAILABLE //BYOND max channels /// Amount of channels to reserve for random usage rather than reservations being allowed to reserve all channels. Also a nice safeguard for when someone screws up. var/static/random_channels_min = 50 @@ -42,7 +42,7 @@ SUBSYSTEM_DEF(sounds) var/text_channel = num2text(channel) var/using = using_channels[text_channel] using_channels -= text_channel - if(using != TRUE) // datum channel + if(using != TRUE) // datum channel using_channels_by_datum[using] -= channel if(!length(using_channels_by_datum[using])) using_channels_by_datum -= using @@ -65,7 +65,7 @@ SUBSYSTEM_DEF(sounds) /// NO AUTOMATIC CLEANUP - If you use this, you better manually free it later! Returns an integer for channel. /datum/controller/subsystem/sounds/proc/reserve_sound_channel_datumless() . = reserve_channel() - if(!.) //oh no.. + if(!.) //oh no.. return FALSE var/text_channel = num2text(.) using_channels[text_channel] = DATUMLESS @@ -74,7 +74,7 @@ SUBSYSTEM_DEF(sounds) /// Reserves a channel for a datum. Automatic cleanup only when the datum is deleted. Returns an integer for channel. /datum/controller/subsystem/sounds/proc/reserve_sound_channel(datum/D) - if(!D) //i don't like typechecks but someone will fuck it up + if(!D) //i don't like typechecks but someone will fuck it up CRASH("Attempted to reserve sound channel without datum using the managed proc.") .= reserve_channel() if(!.) @@ -89,7 +89,7 @@ SUBSYSTEM_DEF(sounds) */ /datum/controller/subsystem/sounds/proc/reserve_channel() PRIVATE_PROC(TRUE) - if(channel_reserve_high <= random_channels_min) // out of channels + if(channel_reserve_high <= random_channels_min) // out of channels return var/channel = channel_list[channel_reserve_high] reserved_channels[num2text(channel)] = channel_reserve_high-- @@ -112,7 +112,7 @@ SUBSYSTEM_DEF(sounds) // now, an existing reserved channel will likely (exception: unreserving last reserved channel) be at index // get it, and update position. var/text_reserved = num2text(channel_list[index]) - if(!reserved_channels[text_reserved]) //if it isn't already reserved make sure we don't accidently mistakenly put it on reserved list! + if(!reserved_channels[text_reserved]) //if it isn't already reserved make sure we don't accidently mistakenly put it on reserved list! return reserved_channels[text_reserved] = index diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index 43e313d12a3..e2aa99ef26c 100755 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -8,8 +8,8 @@ SUBSYSTEM_DEF(ticker) flags = SS_KEEP_TIMING runlevels = RUNLEVEL_LOBBY | RUNLEVEL_SETUP | RUNLEVEL_GAME - var/current_state = GAME_STATE_STARTUP //state of current round (used by process()) Use the defines GAME_STATE_* ! - var/force_ending = 0 //Round was ended by admin intervention + var/current_state = GAME_STATE_STARTUP //state of current round (used by process()) Use the defines GAME_STATE_* ! + var/force_ending = 0 //Round was ended by admin intervention // If true, there is no lobby phase, the game starts immediately. var/start_immediately = FALSE var/setup_done = FALSE //All game setup done including mode post setup and @@ -17,35 +17,35 @@ SUBSYSTEM_DEF(ticker) var/hide_mode = FALSE var/datum/game_mode/mode = null - var/login_music //music played in pregame lobby - var/round_end_sound //music/jingle played when the world reboots - var/round_end_sound_sent = TRUE //If all clients have loaded it + var/login_music //music played in pregame lobby + var/round_end_sound //music/jingle played when the world reboots + var/round_end_sound_sent = TRUE //If all clients have loaded it - var/list/datum/mind/minds = list() //The characters in the game. Used for objective tracking. + var/list/datum/mind/minds = list() //The characters in the game. Used for objective tracking. - var/delay_end = FALSE //if set true, the round will not restart on it's own - var/admin_delay_notice = "" //a message to display to anyone who tries to restart the world after a delay - var/ready_for_reboot = FALSE //all roundend preparation done with, all that's left is reboot + var/delay_end = FALSE //if set true, the round will not restart on it's own + var/admin_delay_notice = "" //a message to display to anyone who tries to restart the world after a delay + var/ready_for_reboot = FALSE //all roundend preparation done with, all that's left is reboot ///If set to an anonymous theme datum then people spawn with said themed anon name (see anonymousnames.dm) var/datum/anonymous_theme/anonymousnames ///Boolean to see if the game needs to set up a triumvirate ai (see tripAI.dm) var/triai = FALSE - var/tipped = FALSE //Did we broadcast the tip of the day yet? - var/selected_tip // What will be the tip of the day? + var/tipped = FALSE //Did we broadcast the tip of the day yet? + var/selected_tip // What will be the tip of the day? - var/timeLeft //pregame timer + var/timeLeft //pregame timer var/start_at - var/gametime_offset = 432000 //Deciseconds to add to world.time for station time. - var/station_time_rate_multiplier = 12 //factor of station time progressal vs real time. + var/gametime_offset = 432000 //Deciseconds to add to world.time for station time. + var/station_time_rate_multiplier = 12 //factor of station time progressal vs real time. - var/totalPlayers = 0 //used for pregame stats on statpanel - var/totalPlayersReady = 0 //used for pregame stats on statpanel + var/totalPlayers = 0 //used for pregame stats on statpanel + var/totalPlayersReady = 0 //used for pregame stats on statpanel var/queue_delay = 0 - var/list/queued_players = list() //used for join queues when the server exceeds the hard population cap + var/list/queued_players = list() //used for join queues when the server exceeds the hard population cap var/news_report @@ -129,7 +129,7 @@ SUBSYSTEM_DEF(ticker) if(!GLOB.syndicate_code_phrase) - GLOB.syndicate_code_phrase = generate_code_phrase(return_list=TRUE) + GLOB.syndicate_code_phrase = generate_code_phrase(return_list=TRUE) var/codewords = jointext(GLOB.syndicate_code_phrase, "|") var/regex/codeword_match = new("([codewords])", "ig") @@ -236,7 +236,7 @@ SUBSYSTEM_DEF(ticker) to_chat(world, "Unable to choose playable game mode. Reverting to pre-game lobby.") return FALSE mode = pickweight(runnable_modes) - if(!mode) //too few roundtypes all run too recently + if(!mode) //too few roundtypes all run too recently mode = pick(runnable_modes) else @@ -251,9 +251,9 @@ SUBSYSTEM_DEF(ticker) CHECK_TICK //Configure mode and assign player to special mode stuff var/can_continue = 0 - can_continue = src.mode.pre_setup() //Choose antagonists + can_continue = src.mode.pre_setup() //Choose antagonists CHECK_TICK - can_continue = can_continue && SSjob.DivideOccupations(mode.required_jobs) //Distribute jobs + can_continue = can_continue && SSjob.DivideOccupations(mode.required_jobs) //Distribute jobs CHECK_TICK if(!GLOB.Debug2) @@ -287,7 +287,7 @@ SUBSYSTEM_DEF(ticker) GLOB.data_core.manifest() - transfer_characters() //transfer keys to the new mobs + transfer_characters() //transfer keys to the new mobs for(var/I in round_start_events) var/datum/callback/cb = I @@ -327,7 +327,7 @@ SUBSYSTEM_DEF(ticker) for(var/i in GLOB.start_landmarks_list) var/obj/effect/landmark/start/S = i - if(istype(S)) //we can not runtime here. not in this important of a proc. + if(istype(S)) //we can not runtime here. not in this important of a proc. S.after_round_start() else stack_trace("[S] [S.type] found in start landmarks list, which isn't a start landmark!") @@ -362,7 +362,7 @@ SUBSYSTEM_DEF(ticker) LAZYADD(round_end_events, cb) /datum/controller/subsystem/ticker/proc/station_explosion_detonation(atom/bomb) - if(bomb) //BOOM + if(bomb) //BOOM qdel(bomb) /datum/controller/subsystem/ticker/proc/create_characters() @@ -599,7 +599,7 @@ SUBSYSTEM_DEF(ticker) return timeLeft /datum/controller/subsystem/ticker/proc/SetTimeLeft(newtime) - if(newtime >= 0 && isnull(timeLeft)) //remember, negative means delayed + if(newtime >= 0 && isnull(timeLeft)) //remember, negative means delayed start_at = world.time + newtime else timeLeft = newtime @@ -656,7 +656,7 @@ SUBSYSTEM_DEF(ticker) to_chat(world, "Rebooting World in [DisplayTimeText(delay)]. [reason]") var/start_wait = world.time - UNTIL(round_end_sound_sent || (world.time - start_wait) > (delay * 2)) //don't wait forever + UNTIL(round_end_sound_sent || (world.time - start_wait) > (delay * 2)) //don't wait forever sleep(delay - (world.time - start_wait)) if(delay_end && !skip_delay) diff --git a/code/controllers/subsystem/traumas.dm b/code/controllers/subsystem/traumas.dm index d261768b263..6b258b58405 100644 --- a/code/controllers/subsystem/traumas.dm +++ b/code/controllers/subsystem/traumas.dm @@ -34,7 +34,7 @@ SUBSYSTEM_DEF(traumas) "birds" = construct_phobia_regex("birds"), "falling" = construct_phobia_regex("falling"), "anime" = construct_phobia_regex("anime"), - "insects" = construct_phobia_regex("insects"), + "insects" = construct_phobia_regex("insects"), ) phobia_mobs = list("spiders" = typecacheof(list(/mob/living/simple_animal/hostile/poison/giant_spider)), diff --git a/code/controllers/subsystem/vote.dm b/code/controllers/subsystem/vote.dm index 2a4c44108ad..6db22e30e47 100644 --- a/code/controllers/subsystem/vote.dm +++ b/code/controllers/subsystem/vote.dm @@ -16,7 +16,7 @@ SUBSYSTEM_DEF(vote) var/list/voting = list() var/list/generated_actions = list() -/datum/controller/subsystem/vote/fire() //called by master_controller +/datum/controller/subsystem/vote/fire() //called by master_controller if(mode) time_remaining = round((started_time + CONFIG_GET(number/vote_period) - world.time)/10) @@ -154,7 +154,7 @@ SUBSYSTEM_DEF(vote) active_admins = TRUE break if(!active_admins) - SSticker.Reboot("Restart vote successful.", "restart vote", 1) //no delay in case the restart is due to lag + SSticker.Reboot("Restart vote successful.", "restart vote", 1) //no delay in case the restart is due to lag else to_chat(world, "Notice:Restart vote will not restart the server automatically because there are active admins on.") message_admins("A restart vote has passed, but there are active admins on with +server, so it has been canceled. If you wish, you may restart the server.") @@ -168,7 +168,7 @@ SUBSYSTEM_DEF(vote) if(!(usr.ckey in voted)) if(vote && 1<=vote && vote<=choices.len) voted += usr.ckey - choices[choices[vote]]++ //check this + choices[choices[vote]]++ //check this return vote return FALSE @@ -324,7 +324,7 @@ SUBSYSTEM_DEF(vote) /datum/controller/subsystem/vote/Topic(href,href_list[],hsrc) if(!usr || !usr.client) - return //not necessary but meh...just in-case somebody does something stupid + return //not necessary but meh...just in-case somebody does something stupid var/trialmin = FALSE if(usr.client.holder) diff --git a/code/datums/ai/monkey/monkey_behaviors.dm b/code/datums/ai/monkey/monkey_behaviors.dm index 567d7f751e6..841ab617b7f 100644 --- a/code/datums/ai/monkey/monkey_behaviors.dm +++ b/code/datums/ai/monkey/monkey_behaviors.dm @@ -138,7 +138,7 @@ if(!target || target.stat != CONSCIOUS) finish_action(controller, TRUE) //Target == owned - if(living_pawn.Adjacent(target) && isturf(target.loc) && !IS_DEAD_OR_INCAP(living_pawn)) // if right next to perp + if(living_pawn.Adjacent(target) && isturf(target.loc) && !IS_DEAD_OR_INCAP(living_pawn)) // if right next to perp // check if target has a weapon var/obj/item/W for(var/obj/item/I in target.held_items) diff --git a/code/datums/atmosphere/_atmosphere.dm b/code/datums/atmosphere/_atmosphere.dm index fb1dcbb8345..8f6040289d3 100644 --- a/code/datums/atmosphere/_atmosphere.dm +++ b/code/datums/atmosphere/_atmosphere.dm @@ -45,8 +45,8 @@ if(!HAS_TRAIT(SSstation, STATION_TRAIT_UNNATURAL_ATMOSPHERE) && gaslist[gastype]) continue - amount *= rand(50, 200) / 100 // Randomly modifes the amount from half to double the base for some variety - amount *= pressure_scalar // If we pick a really small target pressure we want roughly the same mix but less of it all + amount *= rand(50, 200) / 100 // Randomly modifes the amount from half to double the base for some variety + amount *= pressure_scalar // If we pick a really small target pressure we want roughly the same mix but less of it all amount = CEILING(amount, 0.1) ASSERT_GAS(gastype, gasmix) diff --git a/code/datums/brain_damage/split_personality.dm b/code/datums/brain_damage/split_personality.dm index eaa960981c1..89835809504 100644 --- a/code/datums/brain_damage/split_personality.dm +++ b/code/datums/brain_damage/split_personality.dm @@ -14,7 +14,7 @@ /datum/brain_trauma/severe/split_personality/on_gain() var/mob/living/M = owner - if(M.stat == DEAD || !M.client) //No use assigning people to a corpse or braindead + if(M.stat == DEAD || !M.client) //No use assigning people to a corpse or braindead qdel(src) return ..() diff --git a/code/datums/browser.dm b/code/datums/browser.dm index 49226c8ae97..813238fac67 100644 --- a/code/datums/browser.dm +++ b/code/datums/browser.dm @@ -94,7 +94,7 @@ "} /datum/browser/proc/open(use_onclose = TRUE) - if(isnull(window_id)) //null check because this can potentially nuke goonchat + if(isnull(window_id)) //null check because this can potentially nuke goonchat WARNING("Browser [title] tried to open with a null ID") to_chat(user, "The [title] browser you tried to open failed a sanity check! Please report this on github!") return @@ -431,8 +431,8 @@ // e.g. canisters, timers, etc. // // windowid should be the specified window name -// e.g. code is : user << browse(text, "window=fred") -// then use : onclose(user, "fred") +// e.g. code is : user << browse(text, "window=fred") +// then use : onclose(user, "fred") // // Optionally, specify the "ref" parameter as the controlled atom (usually src) // to pass a "close=1" parameter to the atom's Topic() proc for special handling. @@ -455,16 +455,16 @@ // otherwise, just reset the client mob's machine var. // /client/verb/windowclose(atomref as text) - set hidden = TRUE // hide this verb from the user's panel - set name = ".windowclose" // no autocomplete on cmd line + set hidden = TRUE // hide this verb from the user's panel + set name = ".windowclose" // no autocomplete on cmd line - if(atomref!="null") // if passed a real atomref - var/hsrc = locate(atomref) // find the reffed atom + if(atomref!="null") // if passed a real atomref + var/hsrc = locate(atomref) // find the reffed atom var/href = "close=1" if(hsrc) usr = src.mob - src.Topic(href, params2list(href), hsrc) // this will direct to the atom's - return // Topic() proc via client.Topic() + src.Topic(href, params2list(href), hsrc) // this will direct to the atom's + return // Topic() proc via client.Topic() // no atomref specified (or not found) // so just reset the user mob's machine var diff --git a/code/datums/chatmessage.dm b/code/datums/chatmessage.dm index 24f7d4048c6..2827c08364d 100644 --- a/code/datums/chatmessage.dm +++ b/code/datums/chatmessage.dm @@ -1,27 +1,27 @@ /// 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 +#define CHAT_MESSAGE_EXP_DECAY 0.7 /// Factor of how much height will account to exponential decay -#define CHAT_MESSAGE_HEIGHT_DECAY 0.9 +#define CHAT_MESSAGE_HEIGHT_DECAY 0.9 /// Approximate height in pixels of an 'average' line, used for height decay -#define CHAT_MESSAGE_APPROX_LHEIGHT 11 +#define CHAT_MESSAGE_APPROX_LHEIGHT 11 /// Max width of chat message in pixels -#define CHAT_MESSAGE_WIDTH 96 +#define CHAT_MESSAGE_WIDTH 96 /// Max length of chat message in characters -#define CHAT_MESSAGE_MAX_LENGTH 110 +#define CHAT_MESSAGE_MAX_LENGTH 110 /// Maximum precision of float before rounding errors occur (in this context) -#define CHAT_LAYER_Z_STEP 0.0001 +#define CHAT_LAYER_Z_STEP 0.0001 /// The number of z-layer 'slices' usable by the chat message layering -#define CHAT_LAYER_MAX_Z (CHAT_LAYER_MAX - CHAT_LAYER) / CHAT_LAYER_Z_STEP +#define CHAT_LAYER_MAX_Z (CHAT_LAYER_MAX - CHAT_LAYER) / CHAT_LAYER_Z_STEP /// The dimensions of the chat message icons -#define CHAT_MESSAGE_ICON_SIZE 9 +#define CHAT_MESSAGE_ICON_SIZE 9 /// Macro from Lummox used to get height from a MeasureText proc -#define WXH_TO_HEIGHT(x) text2num(copytext(x, findtextEx(x, "x") + 1)) +#define WXH_TO_HEIGHT(x) text2num(copytext(x, findtextEx(x, "x") + 1)) /** * # Chat Message Overlay @@ -254,10 +254,10 @@ // Tweak these defines to change the available color ranges -#define CM_COLOR_SAT_MIN 0.6 -#define CM_COLOR_SAT_MAX 0.7 -#define CM_COLOR_LUM_MIN 0.65 -#define CM_COLOR_LUM_MAX 0.75 +#define CM_COLOR_SAT_MIN 0.6 +#define CM_COLOR_SAT_MAX 0.7 +#define CM_COLOR_LUM_MIN 0.65 +#define CM_COLOR_LUM_MAX 0.75 /** * Gets a color for a name, will return the same color for a given string consistently within a round.atom diff --git a/code/datums/components/_component.dm b/code/datums/components/_component.dm index cada03c4032..92cc608ca24 100644 --- a/code/datums/components/_component.dm +++ b/code/datums/components/_component.dm @@ -93,14 +93,14 @@ var/our_type = type for(var/I in _GetInverseTypeList(our_type)) var/test = dc[I] - if(test) //already another component of this type here + if(test) //already another component of this type here var/list/components_of_type if(!length(test)) components_of_type = list(test) dc[I] = components_of_type else components_of_type = test - if(I == our_type) //exact match, take priority + if(I == our_type) //exact match, take priority var/inserted = FALSE for(var/J in 1 to components_of_type.len) var/datum/component/C = components_of_type[J] @@ -110,9 +110,9 @@ break if(!inserted) components_of_type += src - else //indirect match, back of the line with ya + else //indirect match, back of the line with ya components_of_type += src - else //only component of this type, no list + else //only component of this type, no list dc[I] = src RegisterWithParent() @@ -125,13 +125,13 @@ var/list/dc = P.datum_components for(var/I in _GetInverseTypeList()) var/list/components_of_type = dc[I] - if(length(components_of_type)) // + if(length(components_of_type)) // var/list/subtracted = components_of_type - src - if(subtracted.len == 1) //only 1 guy left - dc[I] = subtracted[1] //make him special + if(subtracted.len == 1) //only 1 guy left + dc[I] = subtracted[1] //make him special else dc[I] = subtracted - else //just us + else //just us dc -= I if(!dc.len) P.datum_components = null diff --git a/code/datums/components/chasm.dm b/code/datums/components/chasm.dm index 481173731f3..3b9feb97d5f 100644 --- a/code/datums/components/chasm.dm +++ b/code/datums/components/chasm.dm @@ -74,7 +74,7 @@ //Flies right over the chasm if(ismob(AM)) var/mob/M = AM - if(M.buckled) //middle statement to prevent infinite loops just in case! + if(M.buckled) //middle statement to prevent infinite loops just in case! var/mob/buckled_to = M.buckled if((!ismob(M.buckled) || (buckled_to.buckled != M)) && !droppable(M.buckled)) return FALSE @@ -135,7 +135,7 @@ falling_atoms -= AM qdel(AM) - if(AM && !QDELETED(AM)) //It's indestructible + if(AM && !QDELETED(AM)) //It's indestructible var/atom/parent = src.parent parent.visible_message("[parent] spits out [AM]!") AM.alpha = oldalpha diff --git a/code/datums/components/crafting/crafting.dm b/code/datums/components/crafting/crafting.dm index f5069cf1237..bbcfa2f2592 100644 --- a/code/datums/components/crafting/crafting.dm +++ b/code/datums/components/crafting/crafting.dm @@ -50,7 +50,7 @@ var/display_craftable_only = FALSE var/display_compact = TRUE -/* This is what procs do: +/* This is what procs do: get_environment - gets a list of things accessable for crafting by user get_surroundings - takes a list of things and makes a list of key-types to values-amounts of said type in the list check_contents - takes a recipe and a key-type list and checks if said recipe can be done with available stuff diff --git a/code/datums/components/crafting/recipes.dm b/code/datums/components/crafting/recipes.dm index 78372ad8e2d..7bc08466f3a 100644 --- a/code/datums/components/crafting/recipes.dm +++ b/code/datums/components/crafting/recipes.dm @@ -706,13 +706,13 @@ /datum/crafting_recipe/curtain name = "Curtains" - reqs = list(/obj/item/stack/sheet/cloth = 4, /obj/item/stack/rods = 1) + reqs = list(/obj/item/stack/sheet/cloth = 4, /obj/item/stack/rods = 1) result = /obj/structure/curtain/cloth category = CAT_MISC /datum/crafting_recipe/showercurtain name = "Shower Curtains" - reqs = list(/obj/item/stack/sheet/cloth = 2, /obj/item/stack/sheet/plastic = 2, /obj/item/stack/rods = 1) + reqs = list(/obj/item/stack/sheet/cloth = 2, /obj/item/stack/sheet/plastic = 2, /obj/item/stack/rods = 1) result = /obj/structure/curtain category = CAT_MISC diff --git a/code/datums/components/food/edible.dm b/code/datums/components/food/edible.dm index 35fa2228e99..4087b71edbd 100644 --- a/code/datums/components/food/edible.dm +++ b/code/datums/components/food/edible.dm @@ -286,7 +286,7 @@ Behavior that's still missing from this component that original food items had t eater.visible_message("[eater] [eatverb]s \the [parent].", "You [eatverb] \the [parent].") else if(fullness > 500 && fullness < 600) eater.visible_message("[eater] unwillingly [eatverb]s a bit of \the [parent].", "You unwillingly [eatverb] a bit of \the [parent].") - else if(fullness > (600 * (1 + eater.overeatduration / 2000))) // The more you eat - the more you can eat + else if(fullness > (600 * (1 + eater.overeatduration / 2000))) // The more you eat - the more you can eat eater.visible_message("[eater] cannot force any more of \the [parent] to go down [eater.p_their()] throat!", "You cannot force any more of \the [parent] to go down your throat!") return else //If you're feeding it to someone else. diff --git a/code/datums/components/forensics.dm b/code/datums/components/forensics.dm index f4e13761472..b445e7c500f 100644 --- a/code/datums/components/forensics.dm +++ b/code/datums/components/forensics.dm @@ -1,12 +1,12 @@ /datum/component/forensics dupe_mode = COMPONENT_DUPE_UNIQUE can_transfer = TRUE - var/list/fingerprints //assoc print = print - var/list/hiddenprints //assoc ckey = realname/gloves/ckey - var/list/blood_DNA //assoc dna = bloodtype - var/list/fibers //assoc print = print + var/list/fingerprints //assoc print = print + var/list/hiddenprints //assoc ckey = realname/gloves/ckey + var/list/blood_DNA //assoc dna = bloodtype + var/list/fibers //assoc print = print -/datum/component/forensics/InheritComponent(datum/component/forensics/F, original) //Use of | and |= being different here is INTENTIONAL. +/datum/component/forensics/InheritComponent(datum/component/forensics/F, original) //Use of | and |= being different here is INTENTIONAL. fingerprints = fingerprints | F.fingerprints hiddenprints = hiddenprints | F.hiddenprints blood_DNA = blood_DNA | F.blood_DNA @@ -39,7 +39,7 @@ return TRUE /datum/component/forensics/proc/wipe_hiddenprints() - return //no. + return //no. /datum/component/forensics/proc/wipe_blood_DNA() blood_DNA = null @@ -63,11 +63,11 @@ wipe_fibers() . = COMPONENT_CLEANED -/datum/component/forensics/proc/add_fingerprint_list(list/_fingerprints) //list(text) +/datum/component/forensics/proc/add_fingerprint_list(list/_fingerprints) //list(text) if(!length(_fingerprints)) return LAZYINITLIST(fingerprints) - for(var/i in _fingerprints) //We use an associative list, make sure we don't just merge a non-associative list into ours. + for(var/i in _fingerprints) //We use an associative list, make sure we don't just merge a non-associative list into ours. fingerprints[i] = i return TRUE @@ -95,11 +95,11 @@ LAZYSET(fingerprints, full_print, full_print) return TRUE -/datum/component/forensics/proc/add_fiber_list(list/_fibertext) //list(text) +/datum/component/forensics/proc/add_fiber_list(list/_fibertext) //list(text) if(!length(_fibertext)) return LAZYINITLIST(fibers) - for(var/i in _fibertext) //We use an associative list, make sure we don't just merge a non-associative list into ours. + for(var/i in _fibertext) //We use an associative list, make sure we don't just merge a non-associative list into ours. fibers[i] = i return TRUE @@ -135,11 +135,11 @@ LAZYSET(fibers, fibertext, fibertext) return TRUE -/datum/component/forensics/proc/add_hiddenprint_list(list/_hiddenprints) //list(ckey = text) +/datum/component/forensics/proc/add_hiddenprint_list(list/_hiddenprints) //list(ckey = text) if(!length(_hiddenprints)) return LAZYINITLIST(hiddenprints) - for(var/i in _hiddenprints) //We use an associative list, make sure we don't just merge a non-associative list into ours. + for(var/i in _hiddenprints) //We use an associative list, make sure we don't just merge a non-associative list into ours. hiddenprints[i] = _hiddenprints[i] return TRUE @@ -166,12 +166,12 @@ var/laststamppos = findtext(LAZYACCESS(hiddenprints, M.key), " Last: ") if(laststamppos) LAZYSET(hiddenprints, M.key, copytext(hiddenprints[M.key], 1, laststamppos)) - hiddenprints[M.key] += " Last: [M.real_name]\[[current_time]\][hasgloves]. Ckey: [M.ckey]" //made sure to be existing by if(!LAZYACCESS);else + hiddenprints[M.key] += " Last: [M.real_name]\[[current_time]\][hasgloves]. Ckey: [M.ckey]" //made sure to be existing by if(!LAZYACCESS);else var/atom/A = parent A.fingerprintslast = M.ckey return TRUE -/datum/component/forensics/proc/add_blood_DNA(list/dna) //list(dna_enzymes = type) +/datum/component/forensics/proc/add_blood_DNA(list/dna) //list(dna_enzymes = type) if(!length(dna)) return LAZYINITLIST(blood_DNA) diff --git a/code/datums/components/grillable.dm b/code/datums/components/grillable.dm index 95954331336..08095c99441 100644 --- a/code/datums/components/grillable.dm +++ b/code/datums/components/grillable.dm @@ -1,5 +1,5 @@ /datum/component/grillable - dupe_mode = COMPONENT_DUPE_UNIQUE_PASSARGS // So you can change grill results with various cookstuffs + dupe_mode = COMPONENT_DUPE_UNIQUE_PASSARGS // So you can change grill results with various cookstuffs ///Result atom type of grilling this object var/atom/cook_result ///Amount of time required to cook the food diff --git a/code/datums/components/gunpoint.dm b/code/datums/components/gunpoint.dm index 6c4c5d27005..ff6d04b5f00 100644 --- a/code/datums/components/gunpoint.dm +++ b/code/datums/components/gunpoint.dm @@ -5,7 +5,7 @@ /// How long it takes from stage 2 starting to move up to stage 3 #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 +#define GUNPOINT_BASE_WOUND_BONUS 5 /// How much the damage and wound bonus mod is multiplied when you're on stage 1 #define GUNPOINT_MULT_STAGE_1 1 /// As above, for stage 2 diff --git a/code/datums/components/jousting.dm b/code/datums/components/jousting.dm index 8710c5d58e1..de14439f448 100644 --- a/code/datums/components/jousting.dm +++ b/code/datums/components/jousting.dm @@ -1,17 +1,17 @@ /datum/component/jousting var/current_direction = NONE var/max_tile_charge = 5 - var/min_tile_charge = 2 //tiles before this code gets into effect. + var/min_tile_charge = 2 //tiles before this code gets into effect. var/current_tile_charge = 0 - var/movement_reset_tolerance = 3 //deciseconds + var/movement_reset_tolerance = 3 //deciseconds var/unmounted_damage_boost_per_tile = 0 var/unmounted_knockdown_chance_per_tile = 0 var/unmounted_knockdown_time = 0 var/mounted_damage_boost_per_tile = 2 var/mounted_knockdown_chance_per_tile = 20 var/mounted_knockdown_time = 20 - var/requires_mob_riding = TRUE //whether this only works if the attacker is riding a mob, rather than anything they can buckle to. - var/requires_mount = TRUE //kinda defeats the point of jousting if you're not mounted but whatever. + var/requires_mob_riding = TRUE //whether this only works if the attacker is riding a mob, rather than anything they can buckle to. + var/requires_mount = TRUE //kinda defeats the point of jousting if you're not mounted but whatever. var/mob/current_holder var/current_timerid @@ -43,7 +43,7 @@ return var/current = current_tile_charge var/obj/item/I = parent - var/target_buckled = target.buckled ? TRUE : FALSE //we don't need the reference of what they're buckled to, just whether they are. + var/target_buckled = target.buckled ? TRUE : FALSE //we don't need the reference of what they're buckled to, just whether they are. if((requires_mount && ((requires_mob_riding && !ismob(user.buckled)) || (!user.buckled))) || !current_direction || (current_tile_charge < min_tile_charge)) return var/turf/target_turf = get_step(user, current_direction) diff --git a/code/datums/components/lockon_aiming.dm b/code/datums/components/lockon_aiming.dm index af15ffe992a..7e55754ffc8 100644 --- a/code/datums/components/lockon_aiming.dm +++ b/code/datums/components/lockon_aiming.dm @@ -9,8 +9,8 @@ var/mutable_appearance/lock_appearance var/list/image/lock_images var/list/target_typecache - var/list/immune_weakrefs //list(weakref = TRUE) - var/mob_stat_check = TRUE //if a potential target is a mob make sure it's conscious! + var/list/immune_weakrefs //list(weakref = TRUE) + var/mob_stat_check = TRUE //if a potential target is a mob make sure it's conscious! var/lock_amount = 1 var/lock_cursor_range = 5 var/list/locked_weakrefs @@ -33,7 +33,7 @@ target_typecache = typecache if(amount) lock_amount = amount - immune_weakrefs = list(WEAKREF(parent) = TRUE) //Manually take this out if you want.. + immune_weakrefs = list(WEAKREF(parent) = TRUE) //Manually take this out if you want.. if(immune) for(var/i in immune) if(isweakref(i)) @@ -63,7 +63,7 @@ var/datum/weakref/R = i var/atom/A = R.resolve() if(!A) - continue //It'll be cleared by processing. + continue //It'll be cleared by processing. var/image/I = new I.appearance = lock_appearance I.loc = A @@ -112,7 +112,7 @@ LAZYSET(immune_weakrefs, R, TRUE) /datum/component/lockon_aiming/proc/remove_immune_atom(atom/A) - if(!A.weak_reference || !immune_weakrefs) //if A doesn't have a weakref how did it get on the immunity list? + if(!A.weak_reference || !immune_weakrefs) //if A doesn't have a weakref how did it get on the immunity list? return LAZYREMOVE(immune_weakrefs, A.weak_reference) diff --git a/code/datums/components/material_container.dm b/code/datums/components/material_container.dm index 38829b111e8..4515f5ad2ae 100644 --- a/code/datums/components/material_container.dm +++ b/code/datums/components/material_container.dm @@ -205,7 +205,7 @@ if(mat in allowed_materials) return TRUE if(istype(mat) && ((mat.id in allowed_materials) || (mat.type in allowed_materials))) - allowed_materials += mat // This could get messy with passing lists by ref... but if you're doing that the list expansion is probably being taken care of elsewhere anyway... + allowed_materials += mat // This could get messy with passing lists by ref... but if you're doing that the list expansion is probably being taken care of elsewhere anyway... return TRUE if(insertion_check?.Invoke(mat)) allowed_materials += mat diff --git a/code/datums/components/nanites.dm b/code/datums/components/nanites.dm index 92dc30851a5..d79114e749d 100644 --- a/code/datums/components/nanites.dm +++ b/code/datums/components/nanites.dm @@ -4,12 +4,12 @@ dupe_mode = COMPONENT_DUPE_UNIQUE_PASSARGS var/mob/living/host_mob - var/nanite_volume = 100 //amount of nanites in the system, used as fuel for nanite programs - var/max_nanites = 500 //maximum amount of nanites in the system - var/regen_rate = 0.5 //nanites generated per second - var/safety_threshold = 50 //how low nanites will get before they stop processing/triggering - var/cloud_id = 0 //0 if not connected to the cloud, 1-100 to set a determined cloud backup to draw from - var/cloud_active = TRUE //if false, won't sync to the cloud + var/nanite_volume = 100 //amount of nanites in the system, used as fuel for nanite programs + var/max_nanites = 500 //maximum amount of nanites in the system + var/regen_rate = 0.5 //nanites generated per second + var/safety_threshold = 50 //how low nanites will get before they stop processing/triggering + var/cloud_id = 0 //0 if not connected to the cloud, 1-100 to set a determined cloud backup to draw from + var/cloud_active = TRUE //if false, won't sync to the cloud var/next_sync = 0 var/list/datum/nanite_program/programs = list() var/max_programs = NANITE_PROGRAM_LIMIT @@ -196,7 +196,7 @@ qdel(src) /** - * Handles how nanites leave the host's body if they find out that they're currently exceeding the maximum supported amount + * Handles how nanites leave the host's body if they find out that they're currently exceeding the maximum supported amount * * IC explanation: * Normally nanites simply discard excess volume by slowing replication or 'sweating' it out in imperceptible amounts, @@ -260,8 +260,8 @@ /datum/component/nanites/proc/on_emp(datum/source, severity) SIGNAL_HANDLER - nanite_volume *= (rand(60, 90) * 0.01) //Lose 10-40% of nanites - adjust_nanites(null, -(rand(5, 50))) //Lose 5-50 flat nanite volume + nanite_volume *= (rand(60, 90) * 0.01) //Lose 10-40% of nanites + adjust_nanites(null, -(rand(5, 50))) //Lose 5-50 flat nanite volume if(prob(40/severity)) cloud_id = 0 for(var/X in programs) @@ -276,8 +276,8 @@ return if(!HAS_TRAIT_NOT_FROM(host_mob, TRAIT_SHOCKIMMUNE, "nanites"))//Another shock protection must protect nanites too, but nanites protect only host - nanite_volume *= (rand(45, 80) * 0.01) //Lose 20-55% of nanites - adjust_nanites(null, -(rand(5, 50))) //Lose 5-50 flat nanite volume + nanite_volume *= (rand(45, 80) * 0.01) //Lose 20-55% of nanites + adjust_nanites(null, -(rand(5, 50))) //Lose 5-50 flat nanite volume for(var/X in programs) var/datum/nanite_program/NP = X NP.on_shock(shock_damage) @@ -285,7 +285,7 @@ /datum/component/nanites/proc/on_minor_shock(datum/source) SIGNAL_HANDLER - adjust_nanites(null, -(rand(5, 15))) //Lose 5-15 flat nanite volume + adjust_nanites(null, -(rand(5, 15))) //Lose 5-15 flat nanite volume for(var/X in programs) var/datum/nanite_program/NP = X NP.on_minor_shock() diff --git a/code/datums/components/ntnet_interface.dm b/code/datums/components/ntnet_interface.dm index 8585a39b921..8c595252e14 100644 --- a/code/datums/components/ntnet_interface.dm +++ b/code/datums/components/ntnet_interface.dm @@ -8,9 +8,9 @@ * * Arguments: * * packet_data - Either a list() or a /datum/netdata. If its netdata, the other args are ignored - * * target_id - Target hardware id or network_id for this packet. If we are a network id, then its + * * target_id - Target hardware id or network_id for this packet. If we are a network id, then its broadcasted to that network. - * * passkey - Authentication for the packet. If the target doesn't authenticate the packet is dropped + * * passkey - Authentication for the packet. If the target doesn't authenticate the packet is dropped */ /datum/proc/ntnet_send(packet_data, target_id = null, passkey = null) var/datum/netdata/data = packet_data @@ -43,11 +43,11 @@ * */ /datum/component/ntnet_interface - var/hardware_id = null // text. this is the true ID. do not change this. stuff like ID forgery can be done manually. - var/id_tag = null // named tag, mainly used to look up mapping objects - var/datum/ntnet/network = null // network we are on, we MUST be on a network or there is no point in this component + var/hardware_id = null // text. this is the true ID. do not change this. stuff like ID forgery can be done manually. + var/id_tag = null // named tag, mainly used to look up mapping objects + var/datum/ntnet/network = null // network we are on, we MUST be on a network or there is no point in this component var/list/registered_sockets = list()// list of ports opened up on devices - var/list/alias = list() // if we live in more than one network branch + var/list/alias = list() // if we live in more than one network branch /** * Initialize for the interface diff --git a/code/datums/components/pellet_cloud.dm b/code/datums/components/pellet_cloud.dm index b50e82dcc98..9ed2b2726e0 100644 --- a/code/datums/components/pellet_cloud.dm +++ b/code/datums/components/pellet_cloud.dm @@ -1,7 +1,7 @@ // the following defines are used for [/datum/component/pellet_cloud/var/list/wound_info_by_part] to store the damage, wound_bonus, and bw_bonus for each bodypart hit -#define CLOUD_POSITION_DAMAGE 1 -#define CLOUD_POSITION_W_BONUS 2 -#define CLOUD_POSITION_BW_BONUS 3 +#define CLOUD_POSITION_DAMAGE 1 +#define CLOUD_POSITION_W_BONUS 2 +#define CLOUD_POSITION_BW_BONUS 3 /* * This component is used when you want to create a bunch of shrapnel or projectiles (say, shrapnel from a fragmentation grenade, or buckshot from a shotgun) from a central point, @@ -9,11 +9,11 @@ * by signal. * * Pellet cloud currently works on two classes of sources: directed (ammo casings), and circular (grenades, landmines). - * -Directed: This means you're shooting multiple pellets, like buckshot. If an ammo casing is defined as having multiple pellets, it will automatically create a pellet cloud - * and call COMSIG_PELLET_CLOUD_INIT (see [/obj/item/ammo_casing/proc/fire_casing]). Thus, the only projectiles fired will be the ones fired here. - * The magnitude var controls how many pellets are created. - * -Circular: This results in a big spray of shrapnel flying all around the detonation point when the grenade fires COMSIG_GRENADE_DETONATE or landmine triggers COMSIG_MINE_TRIGGERED. - * The magnitude var controls how big the detonation radius is (the bigger the magnitude, the more shrapnel is created). Grenades can be covered with bodies to reduce shrapnel output. + * -Directed: This means you're shooting multiple pellets, like buckshot. If an ammo casing is defined as having multiple pellets, it will automatically create a pellet cloud + * and call COMSIG_PELLET_CLOUD_INIT (see [/obj/item/ammo_casing/proc/fire_casing]). Thus, the only projectiles fired will be the ones fired here. + * The magnitude var controls how many pellets are created. + * -Circular: This results in a big spray of shrapnel flying all around the detonation point when the grenade fires COMSIG_GRENADE_DETONATE or landmine triggers COMSIG_MINE_TRIGGERED. + * The magnitude var controls how big the detonation radius is (the bigger the magnitude, the more shrapnel is created). Grenades can be covered with bodies to reduce shrapnel output. * * Once all of the fired projectiles either hit a target or disappear due to ranging out/whatever else, we resolve the list of all the things we hit and print aggregate messages so we get * one "You're hit by 6 buckshot pellets" vs 6x "You're hit by the buckshot blah blah" messages. diff --git a/code/datums/components/plumbing/_plumbing.dm b/code/datums/components/plumbing/_plumbing.dm index ddf2661d9e8..ee90310dbba 100644 --- a/code/datums/components/plumbing/_plumbing.dm +++ b/code/datums/components/plumbing/_plumbing.dm @@ -200,8 +200,8 @@ active = TRUE var/atom/movable/AM = parent - for(var/obj/machinery/duct/D in AM.loc) //Destroy any ducts under us. Ducts also self-destruct if placed under a plumbing machine. machines disable when they get moved - if(D.anchored) //that should cover everything + for(var/obj/machinery/duct/D in AM.loc) //Destroy any ducts under us. Ducts also self-destruct if placed under a plumbing machine. machines disable when they get moved + if(D.anchored) //that should cover everything D.disconnect_duct() if(demand_connects) diff --git a/code/datums/components/pricetag.dm b/code/datums/components/pricetag.dm index 6e38d842a4d..5d56b46b5f8 100644 --- a/code/datums/components/pricetag.dm +++ b/code/datums/components/pricetag.dm @@ -5,7 +5,7 @@ var/list/payees = list() /datum/component/pricetag/Initialize(_owner,_profit_ratio) - if(!isobj(parent)) //Has to account for both objects and sellable structures like crates. + if(!isobj(parent)) //Has to account for both objects and sellable structures like crates. return COMPONENT_INCOMPATIBLE if(_profit_ratio) diff --git a/code/datums/components/riding/riding.dm b/code/datums/components/riding/riding.dm index eb01b817ab1..72db4a5a739 100644 --- a/code/datums/components/riding/riding.dm +++ b/code/datums/components/riding/riding.dm @@ -91,7 +91,7 @@ . = defaults["[dir]"] if(directional_vehicle_layers["[dir]"]) . = directional_vehicle_layers["[dir]"] - if(isnull(.)) //you can set it to null to not change it. + if(isnull(.)) //you can set it to null to not change it. . = AM.layer AM.layer = . diff --git a/code/datums/components/riding/riding_vehicle.dm b/code/datums/components/riding/riding_vehicle.dm index 46c3b11a14a..e4afcc1861a 100644 --- a/code/datums/components/riding/riding_vehicle.dm +++ b/code/datums/components/riding/riding_vehicle.dm @@ -65,7 +65,7 @@ var/turf/next = get_step(movable_parent, direction) var/turf/current = get_turf(movable_parent) if(!istype(next) || !istype(current)) - return //not happening. + return //not happening. if(!turf_check(next, current)) to_chat(user, "\The [movable_parent] can not go onto [next]!") return diff --git a/code/datums/components/rotation.dm b/code/datums/components/rotation.dm index 2756c187f57..ca478bcf197 100644 --- a/code/datums/components/rotation.dm +++ b/code/datums/components/rotation.dm @@ -1,9 +1,9 @@ -#define ROTATION_ALTCLICK (1<<0) -#define ROTATION_WRENCH (1<<1) -#define ROTATION_VERBS (1<<2) -#define ROTATION_COUNTERCLOCKWISE (1<<3) -#define ROTATION_CLOCKWISE (1<<4) -#define ROTATION_FLIP (1<<5) +#define ROTATION_ALTCLICK (1<<0) +#define ROTATION_WRENCH (1<<1) +#define ROTATION_VERBS (1<<2) +#define ROTATION_COUNTERCLOCKWISE (1<<3) +#define ROTATION_CLOCKWISE (1<<4) +#define ROTATION_FLIP (1<<5) /datum/component/simple_rotation var/datum/callback/can_user_rotate //Checks if user can rotate diff --git a/code/datums/components/sizzle.dm b/code/datums/components/sizzle.dm index 88fadb377ce..1d9b9048f1b 100644 --- a/code/datums/components/sizzle.dm +++ b/code/datums/components/sizzle.dm @@ -17,8 +17,8 @@ /datum/component/sizzle/proc/setup_sizzle() var/atom/food = parent - var/icon/grill_marks = icon(initial(food.icon), initial(food.icon_state)) //we only want to apply grill marks to the initial icon_state for each object - grill_marks.Blend("#fff", ICON_ADD) //fills the icon_state with white (except where it's transparent) + var/icon/grill_marks = icon(initial(food.icon), initial(food.icon_state)) //we only want to apply grill marks to the initial icon_state for each object + grill_marks.Blend("#fff", ICON_ADD) //fills the icon_state with white (except where it's transparent) grill_marks.Blend(icon('icons/obj/kitchen.dmi', "grillmarks"), ICON_MULTIPLY) //adds grill marks and the remaining white areas become transparent sizzling = new(grill_marks) sizzling.alpha = sizzlealpha diff --git a/code/datums/components/spooky.dm b/code/datums/components/spooky.dm index dfd06b1833c..63bf6bae4ac 100644 --- a/code/datums/components/spooky.dm +++ b/code/datums/components/spooky.dm @@ -53,7 +53,7 @@ to_chat(H, "The spooky gods forgot to ship your instrument. Better luck next unlife.") to_chat(H, "You are the spooky skeleton!") to_chat(H, "A new life and identity has begun. Help your fellow skeletons into bringing out the spooky-pocalypse. You haven't forgotten your past life, and are still beholden to past loyalties.") - change_name(H) //time for a new name! + change_name(H) //time for a new name! /datum/component/spooky/proc/change_name(mob/living/carbon/human/H) var/t = sanitize_name(stripped_input(H, "Enter your new skeleton name", H.real_name, null, MAX_NAME_LEN)) diff --git a/code/datums/components/storage/concrete/_concrete.dm b/code/datums/components/storage/concrete/_concrete.dm index d1cfb0f399d..7b0e9bbba82 100644 --- a/code/datums/components/storage/concrete/_concrete.dm +++ b/code/datums/components/storage/concrete/_concrete.dm @@ -150,7 +150,7 @@ if(. && !prevent_warning) slave.mob_item_insertion_feedback(usr, M, I) -/datum/component/storage/concrete/handle_item_insertion(obj/item/I, prevent_warning = FALSE, mob/M, datum/component/storage/remote) //Remote is null or the slave datum +/datum/component/storage/concrete/handle_item_insertion(obj/item/I, prevent_warning = FALSE, mob/M, datum/component/storage/remote) //Remote is null or the slave datum var/datum/component/storage/concrete/master = master() var/atom/parent = src.parent var/moved = FALSE @@ -160,7 +160,7 @@ if(!M.temporarilyRemoveItemFromInventory(I)) return FALSE else - moved = TRUE //At this point if the proc fails we need to manually move the object back to the turf/mob/whatever. + moved = TRUE //At this point if the proc fails we need to manually move the object back to the turf/mob/whatever. if(I.pulledby) I.pulledby.stop_pulling() if(silent) diff --git a/code/datums/components/storage/concrete/bag_of_holding.dm b/code/datums/components/storage/concrete/bag_of_holding.dm index b91fc726689..65e45392961 100644 --- a/code/datums/components/storage/concrete/bag_of_holding.dm +++ b/code/datums/components/storage/concrete/bag_of_holding.dm @@ -1,6 +1,6 @@ /datum/component/storage/concrete/bluespace/bag_of_holding/handle_item_insertion(obj/item/W, prevent_warning = FALSE, mob/living/user) var/atom/A = parent - if(A == W) //don't put yourself into yourself. + if(A == W) //don't put yourself into yourself. return var/list/obj/item/storage/backpack/holding/matching = typecache_filter_list(W.GetAllContents(), typecacheof(/obj/item/storage/backpack/holding)) matching -= A diff --git a/code/datums/components/storage/concrete/stack.dm b/code/datums/components/storage/concrete/stack.dm index 210f22ea5a3..1b09c7f53c7 100644 --- a/code/datums/components/storage/concrete/stack.dm +++ b/code/datums/components/storage/concrete/stack.dm @@ -29,7 +29,7 @@ var/can_insert = min(S.amount, remaining_space()) if(!can_insert) return FALSE - for(var/i in real_location) //combine. + for(var/i in real_location) //combine. if(QDELETED(I)) return var/obj/item/stack/_S = i @@ -59,7 +59,7 @@ . = list() for(var/i in real_location) var/obj/item/stack/I = i - if(!istype(I) || QDELETED(I)) //We're specialized stack storage, just ignore non stacks. + if(!istype(I) || QDELETED(I)) //We're specialized stack storage, just ignore non stacks. continue if(!.[I.merge_type]) .[I.merge_type] = new /datum/numbered_display(I, I.amount) diff --git a/code/datums/components/storage/food_storage.dm b/code/datums/components/storage/food_storage.dm index ffeb4725459..67925c02268 100644 --- a/code/datums/components/storage/food_storage.dm +++ b/code/datums/components/storage/food_storage.dm @@ -41,8 +41,8 @@ * Clicking on the food storage with an item will begin a do_after, which if successful inserts the item. * * Arguments - * inserted_item - the item being placed into the food - * user - the person inserting the item + * inserted_item - the item being placed into the food + * user - the person inserting the item */ /datum/component/food_storage/proc/try_inserting_item(datum/source, obj/item/inserted_item, mob/living/user, params) SIGNAL_HANDLER @@ -78,7 +78,7 @@ * Clicking on food storage on grab intent will begin a do_after, which if successful removes the stored_item. * * Arguments - * user - the person removing the item. + * user - the person removing the item. */ /datum/component/food_storage/proc/try_removing_item(datum/source, mob/user) SIGNAL_HANDLER @@ -101,7 +101,7 @@ * * Arguments * inserted_item - The item being inserted. - * user - the person inserting the item. + * user - the person inserting the item. */ /datum/component/food_storage/proc/insert_item(obj/item/inserted_item, mob/user) if(do_after(user, 1.5 SECONDS, target = parent)) diff --git a/code/datums/components/storage/storage.dm b/code/datums/components/storage/storage.dm index adf3dd34747..8eb7844cfb5 100644 --- a/code/datums/components/storage/storage.dm +++ b/code/datums/components/storage/storage.dm @@ -4,54 +4,54 @@ /datum/component/storage dupe_mode = COMPONENT_DUPE_UNIQUE - var/datum/component/storage/concrete/master //If not null, all actions act on master and this is just an access point. + var/datum/component/storage/concrete/master //If not null, all actions act on master and this is just an access point. - var/list/can_hold //if this is set, only items, and their children, will fit - var/list/cant_hold //if this is set, items, and their children, won't fit - var/list/exception_hold //if set, these items will be the exception to the max size of object that can fit. + var/list/can_hold //if this is set, only items, and their children, will fit + var/list/cant_hold //if this is set, items, and their children, won't fit + var/list/exception_hold //if set, these items will be the exception to the max size of object that can fit. /// If set can only contain stuff with this single trait present. var/list/can_hold_trait var/can_hold_description - var/list/mob/is_using //lazy list of mobs looking at the contents of this storage. + var/list/mob/is_using //lazy list of mobs looking at the contents of this storage. - var/locked = FALSE //when locked nothing can see inside or use it. + var/locked = FALSE //when locked nothing can see inside or use it. - var/max_w_class = WEIGHT_CLASS_SMALL //max size of objects that will fit. - var/max_combined_w_class = 14 //max combined sizes of objects that will fit. - var/max_items = 7 //max number of objects that will fit. + var/max_w_class = WEIGHT_CLASS_SMALL //max size of objects that will fit. + var/max_combined_w_class = 14 //max combined sizes of objects that will fit. + var/max_items = 7 //max number of objects that will fit. var/emp_shielded = FALSE - var/silent = FALSE //whether this makes a message when things are put in. - var/click_gather = FALSE //whether this can be clicked on items to pick it up rather than the other way around. - var/rustle_sound = TRUE //play rustle sound on interact. - var/allow_quick_empty = FALSE //allow empty verb which allows dumping on the floor of everything inside quickly. - var/allow_quick_gather = FALSE //allow toggle mob verb which toggles collecting all items from a tile. + var/silent = FALSE //whether this makes a message when things are put in. + var/click_gather = FALSE //whether this can be clicked on items to pick it up rather than the other way around. + var/rustle_sound = TRUE //play rustle sound on interact. + var/allow_quick_empty = FALSE //allow empty verb which allows dumping on the floor of everything inside quickly. + var/allow_quick_gather = FALSE //allow toggle mob verb which toggles collecting all items from a tile. var/collection_mode = COLLECT_EVERYTHING - var/insert_preposition = "in" //you put things "in" a bag, but "on" a tray. + var/insert_preposition = "in" //you put things "in" a bag, but "on" a tray. - var/display_numerical_stacking = FALSE //stack things of the same type and show as a single object with a number. + var/display_numerical_stacking = FALSE //stack things of the same type and show as a single object with a number. - var/atom/movable/screen/storage/boxes //storage display object - var/atom/movable/screen/close/closer //close button object + var/atom/movable/screen/storage/boxes //storage display object + var/atom/movable/screen/close/closer //close button object - var/allow_big_nesting = FALSE //allow storage objects of the same or greater size. + var/allow_big_nesting = FALSE //allow storage objects of the same or greater size. - var/attack_hand_interact = TRUE //interact on attack hand. - var/quickdraw = FALSE //altclick interact + var/attack_hand_interact = TRUE //interact on attack hand. + var/quickdraw = FALSE //altclick interact var/datum/action/item_action/storage_gather_mode/modeswitch_action //Screen variables: Do not mess with these vars unless you know what you're doing. They're not defines so storage that isn't in the same location can be supported in the future. - var/screen_max_columns = 7 //These two determine maximum screen sizes. + var/screen_max_columns = 7 //These two determine maximum screen sizes. var/screen_max_rows = INFINITY - var/screen_pixel_x = 16 //These two are pixel values for screen loc of boxes and closer + var/screen_pixel_x = 16 //These two are pixel values for screen loc of boxes and closer var/screen_pixel_y = 16 - var/screen_start_x = 4 //These two are where the storage starts being rendered, screen_loc wise. + var/screen_start_x = 4 //These two are where the storage starts being rendered, screen_loc wise. var/screen_start_y = 2 //End @@ -157,7 +157,7 @@ /datum/component/storage/proc/master() if(master == src) - return //infinite loops yo. + return //infinite loops yo. return master /datum/component/storage/proc/real_location() @@ -249,13 +249,13 @@ continue if(I.type in rejections) // To limit bag spamming: any given type only complains once continue - if(!can_be_inserted(I, stop_messages = TRUE)) // Note can_be_inserted still makes noise when the answer is no + if(!can_be_inserted(I, stop_messages = TRUE)) // Note can_be_inserted still makes noise when the answer is no if(real_location.contents.len >= max_items) break - rejections += I.type // therefore full bags are still a little spammy + rejections += I.type // therefore full bags are still a little spammy continue - handle_item_insertion(I, TRUE) //The TRUE stops the "You put the [parent] into [S]" insertion message from being displayed. + handle_item_insertion(I, TRUE) //The TRUE stops the "You put the [parent] into [S]" insertion message from being displayed. if (TICK_CHECK) progress.update(progress.goal - things.len) @@ -531,7 +531,7 @@ SEND_SIGNAL(A, COMSIG_TRY_STORAGE_RETURN_INVENTORY, ret, TRUE) return ret -/datum/component/storage/proc/contents() //ONLY USE IF YOU NEED TO COPY CONTENTS OF REAL LOCATION, COPYING IS NOT AS FAST AS DIRECT ACCESS! +/datum/component/storage/proc/contents() //ONLY USE IF YOU NEED TO COPY CONTENTS OF REAL LOCATION, COPYING IS NOT AS FAST AS DIRECT ACCESS! var/atom/real_location = real_location() return real_location.contents.Copy() @@ -604,7 +604,7 @@ if(iscarbon(M) || isdrone(M)) var/mob/living/L = M if(!L.incapacitated() && I == L.get_active_held_item()) - if(!SEND_SIGNAL(I, COMSIG_CONTAINS_STORAGE) && can_be_inserted(I, FALSE)) //If it has storage it should be trying to dump, not insert. + if(!SEND_SIGNAL(I, COMSIG_CONTAINS_STORAGE) && can_be_inserted(I, FALSE)) //If it has storage it should be trying to dump, not insert. handle_item_insertion(I, FALSE, L) //This proc return 1 if the item can be picked up and 0 if it can't. @@ -613,7 +613,7 @@ if(!istype(I) || (I.item_flags & ABSTRACT)) return FALSE //Not an item if(I == parent) - return FALSE //no paradoxes for you + return FALSE //no paradoxes for you var/atom/real_location = real_location() var/atom/host = parent if(real_location == I.loc) @@ -747,7 +747,7 @@ var/list/taking = typecache_filter_list(contents(), typecacheof(type)) if(taking.len > amount) taking.len = amount - if(inserted) //duplicated code for performance, don't bother checking retval/checking for list every item. + if(inserted) //duplicated code for performance, don't bother checking retval/checking for list every item. for(var/i in taking) if(remove_from_storage(i, destination)) inserted |= i @@ -792,7 +792,7 @@ if(ishuman(user)) var/mob/living/carbon/human/H = user - if(H.l_store == A && !H.get_active_held_item()) //Prevents opening if it's in a pocket. + if(H.l_store == A && !H.get_active_held_item()) //Prevents opening if it's in a pocket. . = COMPONENT_CANCEL_ATTACK_CHAIN INVOKE_ASYNC(H, /mob.proc/put_in_hands, A) H.l_store = null diff --git a/code/datums/components/tackle.dm b/code/datums/components/tackle.dm index 332ca967c10..5ab4d8da79d 100644 --- a/code/datums/components/tackle.dm +++ b/code/datums/components/tackle.dm @@ -5,9 +5,9 @@ * For when you want to throw a person at something and have fun stuff happen * * This component is made for carbon mobs (really, humans), and allows its parent to throw themselves and perform tackles. This is done by enabling throw mode, then clicking on your - * intended target with an empty hand. You will then launch toward your target. If you hit a carbon, you'll roll to see how hard you hit them. If you hit a solid non-mob, you'll - * roll to see how badly you just messed yourself up. If, along your journey, you hit a table, you'll slam onto it and send up to MAX_TABLE_MESSES (8) /obj/items on the table flying, - * and take a bit of extra damage and stun for each thing launched. + * intended target with an empty hand. You will then launch toward your target. If you hit a carbon, you'll roll to see how hard you hit them. If you hit a solid non-mob, you'll + * roll to see how badly you just messed yourself up. If, along your journey, you hit a table, you'll slam onto it and send up to MAX_TABLE_MESSES (8) /obj/items on the table flying, + * and take a bit of extra damage and stun for each thing launched. * * There are 2 separate """skill rolls""" involved here, which are handled and explained in [rollTackle()][/datum/component/tackler/proc/rollTackle] (for roll 1, carbons), and [splat()][/datum/component/tackler/proc/splat] (for roll 2, walls and solid objects) */ @@ -234,11 +234,11 @@ * This handles all of the modifiers for the actual carbon-on-carbon tackling, and gets its own proc because of how many there are (with plenty more in mind!) * * The base roll is between (-3, 3), with negative numbers favoring the target, and positive numbers favoring the tackler. The target and the tackler are both assessed for - * how easy they are to knock over, with clumsiness and dwarfiness being strong maluses for each, and gigantism giving a bonus for each. These numbers and ideas - * are absolutely subject to change. + * how easy they are to knock over, with clumsiness and dwarfiness being strong maluses for each, and gigantism giving a bonus for each. These numbers and ideas + * are absolutely subject to change. * In addition, after subtracting the defender's mod and adding the attacker's mod to the roll, the component's base (skill) mod is added as well. Some sources of tackles - * are better at taking people down, like the bruiser and rocket gloves, while the dolphin gloves have a malus in exchange for better mobility. + * are better at taking people down, like the bruiser and rocket gloves, while the dolphin gloves have a malus in exchange for better mobility. */ /datum/component/tackler/proc/rollTackle(mob/living/carbon/target) var/defense_mod = 0 @@ -316,27 +316,27 @@ /** * This is where we handle diving into dense atoms, generally with effects ranging from bad to REALLY bad. This works as a percentile roll that is modified in two steps as detailed below. The higher - * the roll, the more severe the result. + * the roll, the more severe the result. * * Mod 1: Speed- - * * Base tackle speed is 1, which is what normal gripper gloves use. For other sources with higher speed tackles, like dolphin and ESPECIALLY rocket gloves, we obey Newton's laws and hit things harder. - * * For every unit of speed above 1, move the lower bound of the roll up by 15. Unlike Mod 2, this only serves to raise the lower bound, so it can't be directly counteracted by anything you can control. + * * Base tackle speed is 1, which is what normal gripper gloves use. For other sources with higher speed tackles, like dolphin and ESPECIALLY rocket gloves, we obey Newton's laws and hit things harder. + * * For every unit of speed above 1, move the lower bound of the roll up by 15. Unlike Mod 2, this only serves to raise the lower bound, so it can't be directly counteracted by anything you can control. * * Mod 2: Misc- - * -Flat modifiers, these take whatever you rolled and add/subtract to it, with the end result capped between the minimum from Mod 1 and 100. Note that since we can't roll higher than 100 to start with, - * wearing a helmet should be enough to remove any chance of permanently paralyzing yourself and dramatically lessen knocking yourself unconscious, even with rocket gloves. Will expand on maybe - * * Wearing a helmet: -6 - * * Wearing riot armor: -6 - * * Clumsy: +6 + * -Flat modifiers, these take whatever you rolled and add/subtract to it, with the end result capped between the minimum from Mod 1 and 100. Note that since we can't roll higher than 100 to start with, + * wearing a helmet should be enough to remove any chance of permanently paralyzing yourself and dramatically lessen knocking yourself unconscious, even with rocket gloves. Will expand on maybe + * * Wearing a helmet: -6 + * * Wearing riot armor: -6 + * * Clumsy: +6 * * Effects: Below are the outcomes based off your roll, in order of increasing severity * - * * 1-67: Knocked down for a few seconds and a bit of brute and stamina damage - * * 68-85: Knocked silly, gain some confusion as well as the above - * * 86-92: Cranial trauma, get a concussion and more confusion, plus more damage - * * 93-96: Knocked unconscious, get a random mild brain trauma, as well as a fair amount of damage - * * 97-98: Massive head damage, probably crack your skull open, random mild brain trauma - * * 99-Infinity: Break your spinal cord, get paralyzed, take a bunch of damage too. Very unlucky! + * * 1-67: Knocked down for a few seconds and a bit of brute and stamina damage + * * 68-85: Knocked silly, gain some confusion as well as the above + * * 86-92: Cranial trauma, get a concussion and more confusion, plus more damage + * * 93-96: Knocked unconscious, get a random mild brain trauma, as well as a fair amount of damage + * * 97-98: Massive head damage, probably crack your skull open, random mild brain trauma + * * 99-Infinity: Break your spinal cord, get paralyzed, take a bunch of damage too. Very unlucky! */ /datum/component/tackler/proc/splat(mob/living/carbon/user, atom/hit) if(istype(hit, /obj/machinery/vending)) // before we do anything else- diff --git a/code/datums/components/twohanded.dm b/code/datums/components/twohanded.dm index 86d786c21e8..286fc58ba50 100644 --- a/code/datums/components/twohanded.dm +++ b/code/datums/components/twohanded.dm @@ -5,18 +5,18 @@ * */ /datum/component/two_handed - dupe_mode = COMPONENT_DUPE_UNIQUE_PASSARGS // Only one of the component can exist on an item - var/wielded = FALSE /// Are we holding the two handed item properly - var/force_multiplier = 0 /// The multiplier applied to force when wielded, does not work with force_wielded, and force_unwielded - var/force_wielded = 0 /// The force of the item when weilded - var/force_unwielded = 0 /// The force of the item when unweilded - var/wieldsound = FALSE /// Play sound when wielded - var/unwieldsound = FALSE /// Play sound when unwielded - var/attacksound = FALSE /// Play sound on attack when wielded - var/require_twohands = FALSE /// Does it have to be held in both hands - var/icon_wielded = FALSE /// The icon that will be used when wielded - var/obj/item/offhand/offhand_item = null /// Reference to the offhand created for the item - var/sharpened_increase = 0 /// The amount of increase recived from sharpening the item + dupe_mode = COMPONENT_DUPE_UNIQUE_PASSARGS // Only one of the component can exist on an item + var/wielded = FALSE /// Are we holding the two handed item properly + var/force_multiplier = 0 /// The multiplier applied to force when wielded, does not work with force_wielded, and force_unwielded + var/force_wielded = 0 /// The force of the item when weilded + var/force_unwielded = 0 /// The force of the item when unweilded + var/wieldsound = FALSE /// Play sound when wielded + var/unwieldsound = FALSE /// Play sound when unwielded + var/attacksound = FALSE /// Play sound on attack when wielded + var/require_twohands = FALSE /// Does it have to be held in both hands + var/icon_wielded = FALSE /// The icon that will be used when wielded + var/obj/item/offhand/offhand_item = null /// Reference to the offhand created for the item + var/sharpened_increase = 0 /// The amount of increase recived from sharpening the item /** * Two Handed component diff --git a/code/datums/components/uplink.dm b/code/datums/components/uplink.dm index de07e0834e0..383b2d4e512 100644 --- a/code/datums/components/uplink.dm +++ b/code/datums/components/uplink.dm @@ -98,7 +98,7 @@ SIGNAL_HANDLER if(!active) - return //no hitting everyone/everything just to try to slot tcs in! + return //no hitting everyone/everything just to try to slot tcs in! if(istype(I, /obj/item/stack/telecrystal)) LoadTC(user, I) for(var/category in uplink_items) diff --git a/code/datums/components/wet_floor.dm b/code/datums/components/wet_floor.dm index 0036a86ee39..e21750aec8d 100644 --- a/code/datums/components/wet_floor.dm +++ b/code/datums/components/wet_floor.dm @@ -2,8 +2,8 @@ dupe_mode = COMPONENT_DUPE_UNIQUE_PASSARGS can_transfer = TRUE var/highest_strength = TURF_DRY - var/lube_flags = NONE //why do we have this? - var/list/time_left_list //In deciseconds. + var/lube_flags = NONE //why do we have this? + var/list/time_left_list //In deciseconds. var/static/mutable_appearance/permafrost_overlay = mutable_appearance('icons/effects/water.dmi', "ice_floor") var/static/mutable_appearance/ice_overlay = mutable_appearance('icons/turf/overlays.dmi', "snowfloor") var/static/mutable_appearance/water_overlay = mutable_appearance('icons/effects/water.dmi', "wet_floor_static") @@ -13,11 +13,11 @@ var/last_process = 0 /datum/component/wet_floor/InheritComponent(datum/newcomp, orig, strength, duration_minimum, duration_add, duration_maximum, _permanent) - if(!newcomp) //We are getting passed the arguments of a would-be new component, but not a new component + if(!newcomp) //We are getting passed the arguments of a would-be new component, but not a new component add_wet(arglist(args.Copy(3))) - else //We are being passed in a full blown component - var/datum/component/wet_floor/WF = newcomp //Lets make an assumption - if(WF.gc()) //See if it's even valid, still. Also does LAZYLEN and stuff for us. + else //We are being passed in a full blown component + var/datum/component/wet_floor/WF = newcomp //Lets make an assumption + if(WF.gc()) //See if it's even valid, still. Also does LAZYLEN and stuff for us. CRASH("Wet floor component tried to inherit another, but the other was able to garbage collect while being inherited! What a waste of time!") for(var/i in WF.time_left_list) add_wet(text2num(i), WF.time_left_list[i]) @@ -29,7 +29,7 @@ permanent = _permanent if(!permanent) START_PROCESSING(SSwet_floors, src) - addtimer(CALLBACK(src, .proc/gc, TRUE), 1) //GC after initialization. + addtimer(CALLBACK(src, .proc/gc, TRUE), 1) //GC after initialization. last_process = world.time /datum/component/wet_floor/RegisterWithParent() @@ -43,7 +43,7 @@ STOP_PROCESSING(SSwet_floors, src) var/turf/T = parent qdel(T.GetComponent(/datum/component/slippery)) - if(istype(T)) //If this is false there is so many things wrong with it. + if(istype(T)) //If this is false there is so many things wrong with it. T.cut_overlay(current_overlay) else stack_trace("Warning: Wet floor component wasn't on a turf when being destroyed! This is really bad!") @@ -117,13 +117,13 @@ var/t = T.GetTemperature() switch(t) if(-INFINITY to T0C) - add_wet(TURF_WET_ICE, max_time_left()) //Water freezes into ice! + add_wet(TURF_WET_ICE, max_time_left()) //Water freezes into ice! if(T0C to T0C + 100) decrease = ((T.air.temperature - T0C) / SSwet_floors.temperature_coeff) * (diff / SSwet_floors.time_ratio) if(T0C + 100 to INFINITY) decrease = INFINITY decrease = max(0, decrease) - if((is_wet() & TURF_WET_ICE) && t > T0C) //Ice melts into water! + if((is_wet() & TURF_WET_ICE) && t > T0C) //Ice melts into water! for(var/obj/O in T.contents) if(O.obj_flags & FROZEN) O.make_unfrozen() @@ -134,7 +134,7 @@ last_process = world.time /datum/component/wet_floor/proc/update_strength() - highest_strength = 0 //Not bitflag. + highest_strength = 0 //Not bitflag. for(var/i in time_left_list) highest_strength = max(highest_strength, text2num(i)) diff --git a/code/datums/datacore.dm b/code/datums/datacore.dm index 289a5aebb59..f30641a6914 100644 --- a/code/datums/datacore.dm +++ b/code/datums/datacore.dm @@ -247,71 +247,71 @@ //These records should ~really~ be merged or something //General Record var/datum/data/record/G = new() - G.fields["id"] = id - G.fields["name"] = H.real_name - G.fields["rank"] = assignment - G.fields["age"] = H.age - G.fields["species"] = H.dna.species.name - G.fields["fingerprint"] = md5(H.dna.uni_identity) - G.fields["p_stat"] = "Active" - G.fields["m_stat"] = "Stable" - G.fields["gender"] = H.gender + G.fields["id"] = id + G.fields["name"] = H.real_name + G.fields["rank"] = assignment + G.fields["age"] = H.age + G.fields["species"] = H.dna.species.name + G.fields["fingerprint"] = md5(H.dna.uni_identity) + G.fields["p_stat"] = "Active" + G.fields["m_stat"] = "Stable" + G.fields["gender"] = H.gender if(H.gender == "male") G.fields["gender"] = "Male" else if(H.gender == "female") G.fields["gender"] = "Female" else G.fields["gender"] = "Other" - G.fields["photo_front"] = photo_front - G.fields["photo_side"] = photo_side + G.fields["photo_front"] = photo_front + G.fields["photo_side"] = photo_side general += G //Medical Record var/datum/data/record/M = new() - M.fields["id"] = id - M.fields["name"] = H.real_name - M.fields["blood_type"] = H.dna.blood_type - M.fields["b_dna"] = H.dna.unique_enzymes - M.fields["mi_dis"] = H.get_quirk_string(!medical, CAT_QUIRK_MINOR_DISABILITY) - M.fields["mi_dis_d"] = H.get_quirk_string(medical, CAT_QUIRK_MINOR_DISABILITY) - M.fields["ma_dis"] = H.get_quirk_string(!medical, CAT_QUIRK_MAJOR_DISABILITY) - M.fields["ma_dis_d"] = H.get_quirk_string(medical, CAT_QUIRK_MAJOR_DISABILITY) - M.fields["cdi"] = "None" - M.fields["cdi_d"] = "No diseases have been diagnosed at the moment." - M.fields["notes"] = H.get_quirk_string(!medical, CAT_QUIRK_NOTES) - M.fields["notes_d"] = H.get_quirk_string(medical, CAT_QUIRK_NOTES) + M.fields["id"] = id + M.fields["name"] = H.real_name + M.fields["blood_type"] = H.dna.blood_type + M.fields["b_dna"] = H.dna.unique_enzymes + M.fields["mi_dis"] = H.get_quirk_string(!medical, CAT_QUIRK_MINOR_DISABILITY) + M.fields["mi_dis_d"] = H.get_quirk_string(medical, CAT_QUIRK_MINOR_DISABILITY) + M.fields["ma_dis"] = H.get_quirk_string(!medical, CAT_QUIRK_MAJOR_DISABILITY) + M.fields["ma_dis_d"] = H.get_quirk_string(medical, CAT_QUIRK_MAJOR_DISABILITY) + M.fields["cdi"] = "None" + M.fields["cdi_d"] = "No diseases have been diagnosed at the moment." + M.fields["notes"] = H.get_quirk_string(!medical, CAT_QUIRK_NOTES) + M.fields["notes_d"] = H.get_quirk_string(medical, CAT_QUIRK_NOTES) medical += M //Security Record var/datum/data/record/S = new() - S.fields["id"] = id - S.fields["name"] = H.real_name - S.fields["criminal"] = "None" - S.fields["citation"] = list() - S.fields["crim"] = list() - S.fields["notes"] = "No notes." + S.fields["id"] = id + S.fields["name"] = H.real_name + S.fields["criminal"] = "None" + S.fields["citation"] = list() + S.fields["crim"] = list() + S.fields["notes"] = "No notes." security += S //Locked Record var/datum/data/record/L = new() - L.fields["id"] = md5("[H.real_name][H.mind.assigned_role]") //surely this should just be id, like the others? - L.fields["name"] = H.real_name - L.fields["rank"] = H.mind.assigned_role - L.fields["age"] = H.age - L.fields["gender"] = H.gender + L.fields["id"] = md5("[H.real_name][H.mind.assigned_role]") //surely this should just be id, like the others? + L.fields["name"] = H.real_name + L.fields["rank"] = H.mind.assigned_role + L.fields["age"] = H.age + L.fields["gender"] = H.gender if(H.gender == "male") G.fields["gender"] = "Male" else if(H.gender == "female") G.fields["gender"] = "Female" else G.fields["gender"] = "Other" - L.fields["blood_type"] = H.dna.blood_type - L.fields["b_dna"] = H.dna.unique_enzymes - L.fields["identity"] = H.dna.uni_identity - L.fields["species"] = H.dna.species.type - L.fields["features"] = H.dna.features - L.fields["image"] = image - L.fields["mindref"] = H.mind + L.fields["blood_type"] = H.dna.blood_type + L.fields["b_dna"] = H.dna.unique_enzymes + L.fields["identity"] = H.dna.uni_identity + L.fields["species"] = H.dna.species.type + L.fields["features"] = H.dna.features + L.fields["image"] = image + L.fields["mindref"] = H.mind locked += L return diff --git a/code/datums/datum.dm b/code/datums/datum.dm index 20add82b88a..699bfb80322 100644 --- a/code/datums/datum.dm +++ b/code/datums/datum.dm @@ -89,7 +89,7 @@ SHOULD_CALL_PARENT(TRUE) tag = null datum_flags &= ~DF_USE_TAG //In case something tries to REF us - weak_reference = null //ensure prompt GCing of weakref. + weak_reference = null //ensure prompt GCing of weakref. var/list/timers = active_timers active_timers = null @@ -216,7 +216,7 @@ return else if(!ispath(jsonlist["DATUM_TYPE"], target_type)) return - var/typeofdatum = jsonlist["DATUM_TYPE"] //BYOND won't directly read if this is just put in the line below, and will instead runtime because it thinks you're trying to make a new list? + var/typeofdatum = jsonlist["DATUM_TYPE"] //BYOND won't directly read if this is just put in the line below, and will instead runtime because it thinks you're trying to make a new list? var/datum/D = new typeofdatum var/datum/returned = D.deserialize_list(jsonlist, options) if(!istype(returned, /datum)) diff --git a/code/datums/datumvars.dm b/code/datums/datumvars.dm index 4c7b3827544..e4f04c7ef68 100644 --- a/code/datums/datumvars.dm +++ b/code/datums/datumvars.dm @@ -37,7 +37,7 @@ //This proc is for "high level" actions like admin heal/set species/etc/etc. The low level debugging things should go in admin/view_variables/topic_basic.dm incase this runtimes. /datum/proc/vv_do_topic(list/href_list) if(!usr || !usr.client || !usr.client.holder || !check_rights(NONE)) - return FALSE //This is VV, not to be called by anything else. + return FALSE //This is VV, not to be called by anything else. if(SEND_SIGNAL(src, COMSIG_VV_TOPIC, usr, href_list) & COMPONENT_VV_HANDLED) return FALSE if(href_list[VV_HK_MODIFY_TRAITS]) diff --git a/code/datums/diseases/_disease.dm b/code/datums/diseases/_disease.dm index 2dda77a68ca..b3613dfd835 100644 --- a/code/datums/diseases/_disease.dm +++ b/code/datums/diseases/_disease.dm @@ -164,7 +164,7 @@ return "[type]" /datum/disease/proc/remove_disease() - LAZYREMOVE(affected_mob.diseases, src) //remove the datum from the list + LAZYREMOVE(affected_mob.diseases, src) //remove the datum from the list affected_mob.med_hud_set_status() affected_mob = null diff --git a/code/datums/diseases/advance/advance.dm b/code/datums/diseases/advance/advance.dm index 11ebd65c299..1fcd77e6b5e 100644 --- a/code/datums/diseases/advance/advance.dm +++ b/code/datums/diseases/advance/advance.dm @@ -31,41 +31,41 @@ var/id = "" var/processing = FALSE var/mutable = TRUE //set to FALSE to prevent most in-game methods of altering the disease via virology - var/oldres //To prevent setting new cures unless resistance changes. + var/oldres //To prevent setting new cures unless resistance changes. // The order goes from easy to cure to hard to cure. Keep in mind that sentient diseases pick two cures from tier 6 and up, ensure they won't react away in bodies. - var/static/list/advance_cures = list( - list( // level 1 + var/static/list/advance_cures = list( + list( // level 1 /datum/reagent/copper, /datum/reagent/silver, /datum/reagent/iodine, /datum/reagent/iron, /datum/reagent/carbon ), - list( // level 2 + list( // level 2 /datum/reagent/potassium, /datum/reagent/consumable/ethanol, /datum/reagent/lithium, /datum/reagent/silicon, /datum/reagent/bromine ), - list( // level 3 + list( // level 3 /datum/reagent/consumable/salt, /datum/reagent/consumable/sugar, /datum/reagent/consumable/orangejuice, /datum/reagent/consumable/tomatojuice, /datum/reagent/consumable/milk ), - list( //level 4 + list( //level 4 /datum/reagent/medicine/spaceacillin, /datum/reagent/medicine/salglu_solution, /datum/reagent/medicine/epinephrine, /datum/reagent/medicine/c2/multiver ), - list( //level 5 + list( //level 5 /datum/reagent/fuel/oil, /datum/reagent/medicine/synaptizine, /datum/reagent/medicine/mannitol, /datum/reagent/drug/space_drugs, /datum/reagent/cryptobiolin ), - list( // level 6 + list( // level 6 /datum/reagent/phenol, /datum/reagent/medicine/inacusiate, /datum/reagent/medicine/oculine, /datum/reagent/medicine/antihol ), - list( // level 7 + list( // level 7 /datum/reagent/medicine/leporazine, /datum/reagent/toxin/mindbreaker, /datum/reagent/medicine/higadrite ), - list( // level 8 + list( // level 8 /datum/reagent/pax, /datum/reagent/drug/happiness, /datum/reagent/medicine/ephedrine ), - list( // level 9 + list( // level 9 /datum/reagent/toxin/lipolicide, /datum/reagent/medicine/sal_acid ), - list( // level 10 + list( // level 10 /datum/reagent/medicine/haloperidol, /datum/reagent/drug/aranesp, /datum/reagent/medicine/diphenhydramine ), - list( //level 11 + list( //level 11 /datum/reagent/medicine/modafinil, /datum/reagent/toxin/anacea ) ) @@ -469,7 +469,7 @@ if(!new_name) return D.Refresh() - D.AssignName(new_name) //Updates the master copy + D.AssignName(new_name) //Updates the master copy D.name = new_name //Updates our copy var/list/targets = list("Random") diff --git a/code/datums/diseases/advance/symptoms/genetics.dm b/code/datums/diseases/advance/symptoms/genetics.dm index 0cc5d6dc8c2..4512d6a8108 100644 --- a/code/datums/diseases/advance/symptoms/genetics.dm +++ b/code/datums/diseases/advance/symptoms/genetics.dm @@ -43,7 +43,7 @@ Bonus if(A.properties["stealth"] >= 5) //only give them bad mutations excludemuts = POSITIVE if(A.properties["stage_rate"] >= 10) //activate dormant mutations more often at around 1.5x the pace - symptom_delay_min = 20 + symptom_delay_min = 20 symptom_delay_max = 40 if(A.properties["resistance"] >= 8) //mutadone won't save you now mutadone_proof = (NEGATIVE | MINOR_NEGATIVE) diff --git a/code/datums/diseases/advance/symptoms/itching.dm b/code/datums/diseases/advance/symptoms/itching.dm index b31fa22ebc5..3a27df85111 100644 --- a/code/datums/diseases/advance/symptoms/itching.dm +++ b/code/datums/diseases/advance/symptoms/itching.dm @@ -49,7 +49,7 @@ BONUS var/mob/living/carbon/M = A.affected_mob var/picked_bodypart = pick(BODY_ZONE_HEAD, BODY_ZONE_CHEST, BODY_ZONE_R_ARM, BODY_ZONE_L_ARM, BODY_ZONE_R_LEG, BODY_ZONE_L_LEG) var/obj/item/bodypart/bodypart = M.get_bodypart(picked_bodypart) - if(bodypart && bodypart.status == BODYPART_ORGANIC && !bodypart.is_pseudopart) //robotic limbs will mean less scratching overall (why are golems able to damage themselves with self-scratching, but not androids? the world may never know) + if(bodypart && bodypart.status == BODYPART_ORGANIC && !bodypart.is_pseudopart) //robotic limbs will mean less scratching overall (why are golems able to damage themselves with self-scratching, but not androids? the world may never know) var/can_scratch = scratch && !M.incapacitated() M.visible_message("[can_scratch ? "[M] scratches [M.p_their()] [bodypart.name]." : ""]", "Your [bodypart.name] itches. [can_scratch ? " You scratch it." : ""]") if(can_scratch) diff --git a/code/datums/diseases/advance/symptoms/symptoms.dm b/code/datums/diseases/advance/symptoms/symptoms.dm index da0f922f333..66834fa0fa8 100644 --- a/code/datums/diseases/advance/symptoms/symptoms.dm +++ b/code/datums/diseases/advance/symptoms/symptoms.dm @@ -74,8 +74,8 @@ /datum/symptom/proc/generate_threshold_desc() return -/datum/symptom/proc/OnAdd(datum/disease/advance/A) //Overload when a symptom needs to be active before processing, like changing biotypes. +/datum/symptom/proc/OnAdd(datum/disease/advance/A) //Overload when a symptom needs to be active before processing, like changing biotypes. return -/datum/symptom/proc/OnRemove(datum/disease/advance/A) //But dont forget to remove them too. +/datum/symptom/proc/OnRemove(datum/disease/advance/A) //But dont forget to remove them too. return diff --git a/code/datums/diseases/advance/symptoms/voice_change.dm b/code/datums/diseases/advance/symptoms/voice_change.dm index 20c0a6df40d..79cf0ee9cf0 100644 --- a/code/datums/diseases/advance/symptoms/voice_change.dm +++ b/code/datums/diseases/advance/symptoms/voice_change.dm @@ -60,7 +60,7 @@ Bonus if(ishuman(M)) var/mob/living/carbon/human/H = M H.SetSpecialVoice(H.dna.species.random_name(H.gender)) - if(scramble_language && !current_language) // Last part prevents rerolling language with small amounts of cure. + if(scramble_language && !current_language) // Last part prevents rerolling language with small amounts of cure. current_language = pick(subtypesof(/datum/language) - /datum/language/common) H.add_blocked_language(subtypesof(/datum/language) - current_language, LANGUAGE_VOICECHANGE) H.grant_language(current_language, TRUE, TRUE, LANGUAGE_VOICECHANGE) @@ -72,4 +72,4 @@ Bonus H.UnsetSpecialVoice() if(scramble_language) A.affected_mob.remove_blocked_language(subtypesof(/datum/language), LANGUAGE_VOICECHANGE) - A.affected_mob.remove_all_languages(LANGUAGE_VOICECHANGE) // In case someone managed to get more than one anyway. + A.affected_mob.remove_all_languages(LANGUAGE_VOICECHANGE) // In case someone managed to get more than one anyway. diff --git a/code/datums/diseases/transformation.dm b/code/datums/diseases/transformation.dm index 00397cc6bf9..c9404e49440 100644 --- a/code/datums/diseases/transformation.dm +++ b/code/datums/diseases/transformation.dm @@ -116,12 +116,12 @@ bantype = ROLE_MONKEY - stage1 = list() - stage2 = list() - stage3 = list() - stage4 = list("Your back hurts.", "You breathe through your mouth.", + stage1 = list() + stage2 = list() + stage3 = list() + stage4 = list("Your back hurts.", "You breathe through your mouth.", "You have a craving for bananas.", "Your mind feels clouded.") - stage5 = list("You feel like monkeying around.") + stage5 = list("You feel like monkeying around.") /datum/disease/transformation/jungle_fever/do_disease_transformation(mob/living/carbon/affected_mob) if(affected_mob.mind && !is_monkey(affected_mob.mind)) @@ -172,11 +172,11 @@ desc = "This disease, actually acute nanomachine infection, converts the victim into a cyborg." severity = DISEASE_SEVERITY_BIOHAZARD visibility_flags = NONE - stage1 = list() - stage2 = list("Your joints feel stiff.", "Beep...boop..") - stage3 = list("Your joints feel very stiff.", "Your skin feels loose.", "You can feel something move...inside.") - stage4 = list("Your skin feels very loose.", "You can feel... something...inside you.") - stage5 = list("Your skin feels as if it's about to burst off!") + stage1 = list() + stage2 = list("Your joints feel stiff.", "Beep...boop..") + stage3 = list("Your joints feel very stiff.", "Your skin feels loose.", "You can feel something move...inside.") + stage4 = list("Your skin feels very loose.", "You can feel... something...inside you.") + stage5 = list("Your skin feels as if it's about to burst off!") new_form = /mob/living/silicon/robot infectable_biotypes = MOB_ORGANIC|MOB_UNDEAD|MOB_ROBOTIC bantype = "Cyborg" @@ -209,11 +209,11 @@ desc = "This disease changes the victim into a xenomorph." severity = DISEASE_SEVERITY_BIOHAZARD visibility_flags = NONE - stage1 = list() - stage2 = list("Your throat feels scratchy.", "Kill...") - stage3 = list("Your throat feels very scratchy.", "Your skin feels tight.", "You can feel something move...inside.") - stage4 = list("Your skin feels very tight.", "Your blood boils!", "You can feel... something...inside you.") - stage5 = list("Your skin feels as if it's about to burst off!") + stage1 = list() + stage2 = list("Your throat feels scratchy.", "Kill...") + stage3 = list("Your throat feels very scratchy.", "Your skin feels tight.", "You can feel something move...inside.") + stage4 = list("Your skin feels very tight.", "Your blood boils!", "You can feel... something...inside you.") + stage5 = list("Your skin feels as if it's about to burst off!") new_form = /mob/living/carbon/alien/humanoid/hunter bantype = ROLE_ALIEN @@ -242,11 +242,11 @@ desc = "This highly concentrated extract converts anything into more of itself." severity = DISEASE_SEVERITY_BIOHAZARD visibility_flags = NONE - stage1 = list("You don't feel very well.") - stage2 = list("Your skin feels a little slimy.") - stage3 = list("Your appendages are melting away.", "Your limbs begin to lose their shape.") - stage4 = list("You are turning into a slime.") - stage5 = list("You have become a slime.") + stage1 = list("You don't feel very well.") + stage2 = list("Your skin feels a little slimy.") + stage3 = list("Your appendages are melting away.", "Your limbs begin to lose their shape.") + stage4 = list("You are turning into a slime.") + stage5 = list("You have become a slime.") new_form = /mob/living/simple_animal/slime/random @@ -275,11 +275,11 @@ desc = "This disease transforms the victim into a corgi." severity = DISEASE_SEVERITY_BIOHAZARD visibility_flags = NONE - stage1 = list("BARK.") - stage2 = list("You feel the need to wear silly hats.") - stage3 = list("Must... eat... chocolate....", "YAP") - stage4 = list("Visions of washing machines assail your mind!") - stage5 = list("AUUUUUU!!!") + stage1 = list("BARK.") + stage2 = list("You feel the need to wear silly hats.") + stage3 = list("Must... eat... chocolate....", "YAP") + stage4 = list("Visions of washing machines assail your mind!") + stage5 = list("AUUUUUU!!!") new_form = /mob/living/simple_animal/pet/dog/corgi @@ -305,11 +305,11 @@ stage_prob = 20 severity = DISEASE_SEVERITY_BIOHAZARD visibility_flags = NONE - stage1 = list("Your stomach rumbles.") - stage2 = list("Your skin feels saggy.") - stage3 = list("Your appendages are melting away.", "Your limbs begin to lose their shape.") - stage4 = list("You're ravenous.") - stage5 = list("You have become a morph.") + stage1 = list("Your stomach rumbles.") + stage2 = list("Your skin feels saggy.") + stage3 = list("Your appendages are melting away.", "Your limbs begin to lose their shape.") + stage4 = list("You're ravenous.") + stage5 = list("You have become a morph.") new_form = /mob/living/simple_animal/hostile/morph infectable_biotypes = MOB_ORGANIC|MOB_MINERAL|MOB_UNDEAD //magic! transformed_antag_datum = /datum/antagonist/morph @@ -324,11 +324,11 @@ desc = "Consuming the flesh of a Gondola comes at a terrible price." severity = DISEASE_SEVERITY_BIOHAZARD visibility_flags = NONE - stage1 = list("You seem a little lighter in your step.") - stage2 = list("You catch yourself smiling for no reason.") - stage3 = list("A cruel sense of calm overcomes you.", "You can't feel your arms!", "You let go of the urge to hurt clowns.") - stage4 = list("You can't feel your arms. It does not bother you anymore.", "You forgive the clown for hurting you.") - stage5 = list("You have become a Gondola.") + stage1 = list("You seem a little lighter in your step.") + stage2 = list("You catch yourself smiling for no reason.") + stage3 = list("A cruel sense of calm overcomes you.", "You can't feel your arms!", "You let go of the urge to hurt clowns.") + stage4 = list("You can't feel your arms. It does not bother you anymore.", "You forgive the clown for hurting you.") + stage5 = list("You have become a Gondola.") new_form = /mob/living/simple_animal/pet/gondola diff --git a/code/datums/dna.dm b/code/datums/dna.dm index a104b901d94..5525e009c13 100644 --- a/code/datums/dna.dm +++ b/code/datums/dna.dm @@ -36,9 +36,9 @@ QDEL_NULL(species) //SKYRAT EDIT END - mutations.Cut() //This only references mutations, just dereference. - temporary_mutations.Cut() //^ - previous.Cut() //^ + mutations.Cut() //This only references mutations, just dereference. + temporary_mutations.Cut() //^ + previous.Cut() //^ return ..() diff --git a/code/datums/elements/decals/blood.dm b/code/datums/elements/decals/blood.dm index c5ad4a3c726..67cfeaea85c 100644 --- a/code/datums/elements/decals/blood.dm +++ b/code/datums/elements/decals/blood.dm @@ -30,8 +30,8 @@ pic = blood_splatter_appearances[index] if(!pic) - var/icon/blood_splatter_icon = icon(initial(I.icon), initial(I.icon_state), , 1) //we only want to apply blood-splatters to the initial icon_state for each object - blood_splatter_icon.Blend("#fff", ICON_ADD) //fills the icon_state with white (except where it's transparent) + var/icon/blood_splatter_icon = icon(initial(I.icon), initial(I.icon_state), , 1) //we only want to apply blood-splatters to the initial icon_state for each object + blood_splatter_icon.Blend("#fff", ICON_ADD) //fills the icon_state with white (except where it's transparent) blood_splatter_icon.Blend(icon(_icon, _icon_state), ICON_MULTIPLY) //adds blood and the remaining white areas become transparant pic = mutable_appearance(blood_splatter_icon, initial(I.icon_state)) blood_splatter_appearances[index] = pic diff --git a/code/datums/elements/embed.dm b/code/datums/elements/embed.dm index cf66e6f53db..8336dcd171f 100644 --- a/code/datums/elements/embed.dm +++ b/code/datums/elements/embed.dm @@ -137,7 +137,7 @@ * checkEmbedProjectile() is what we get when a projectile with a defined shrapnel_type impacts a target. * * If we hit a valid target, we create the shrapnel_type object and immediately call tryEmbed() on it, targeting what we impacted. That will lead - * it to call tryForceEmbed() on its own embed element (it's out of our hands here, our projectile is done), where it will run through all the checks it needs to. + * it to call tryForceEmbed() on its own embed element (it's out of our hands here, our projectile is done), where it will run through all the checks it needs to. */ /datum/element/embed/proc/checkEmbedProjectile(obj/projectile/P, atom/movable/firer, atom/hit, angle, hit_zone) SIGNAL_HANDLER diff --git a/code/datums/elements/food/dunkable.dm b/code/datums/elements/food/dunkable.dm index 8ba38a515da..4b978f5065a 100644 --- a/code/datums/elements/food/dunkable.dm +++ b/code/datums/elements/food/dunkable.dm @@ -27,7 +27,7 @@ to_chat(user, "[container] is unable to be dunked in!") return var/obj/item/I = source // the item that has the dunkable element - if(container.reagents.trans_to(I, dunk_amount, transfered_by = user)) //if reagents were transfered, show the message + if(container.reagents.trans_to(I, dunk_amount, transfered_by = user)) //if reagents were transfered, show the message to_chat(user, "You dunk \the [I] into \the [container].") return if(!container.reagents.total_volume) diff --git a/code/datums/elements/rad_insulation.dm b/code/datums/elements/rad_insulation.dm index e1dd57a9c18..d8b44936d94 100644 --- a/code/datums/elements/rad_insulation.dm +++ b/code/datums/elements/rad_insulation.dm @@ -1,7 +1,7 @@ /datum/element/rad_insulation element_flags = ELEMENT_DETACH | ELEMENT_BESPOKE id_arg_index = 2 - var/amount // Multiplier for radiation strength passing through + var/amount // Multiplier for radiation strength passing through /datum/element/rad_insulation/Attach(datum/target, _amount=RAD_MEDIUM_INSULATION, protects=TRUE, contamination_proof=TRUE) . = ..() diff --git a/code/datums/elements/undertile.dm b/code/datums/elements/undertile.dm index a2136812b9b..a6a1dddc85b 100644 --- a/code/datums/elements/undertile.dm +++ b/code/datums/elements/undertile.dm @@ -23,9 +23,9 @@ src.invisibility_trait = invisibility_trait src.invisibility_level = invisibility_level - src.tile_overlay = tile_overlay - src.use_alpha = use_alpha - src.use_anchor = use_anchor + src.tile_overlay = tile_overlay + src.use_alpha = use_alpha + src.use_anchor = use_anchor ///called when a tile has been covered or uncovered /datum/element/undertile/proc/hide(atom/movable/source, covered) diff --git a/code/datums/emotes.dm b/code/datums/emotes.dm index 26b27ea3237..2768de181c6 100644 --- a/code/datums/emotes.dm +++ b/code/datums/emotes.dm @@ -22,7 +22,7 @@ var/list/mob_type_ignore_stat_typecache var/stat_allowed = CONSCIOUS var/sound //Sound to play when emote is called - var/vary = FALSE //used for the honk borg emote + var/vary = FALSE //used for the honk borg emote var/only_forced_audio = FALSE //can only code call this event instead of the player. var/cooldown = 0.8 SECONDS //SKYRAT EDIT ADDITION BEGIN - EMOTES diff --git a/code/datums/forced_movement.dm b/code/datums/forced_movement.dm index 14aa43364ce..0ad859e953f 100644 --- a/code/datums/forced_movement.dm +++ b/code/datums/forced_movement.dm @@ -22,13 +22,13 @@ _victim.force_moving = src START_PROCESSING(SSfastprocess, src) else - qdel(src) //if you want to overwrite the current forced movement, call qdel(victim.force_moving) before creating this + qdel(src) //if you want to overwrite the current forced movement, call qdel(victim.force_moving) before creating this /datum/forced_movement/Destroy() if(victim.force_moving == src) victim.force_moving = null if(moved_at_all) - victim.forceMove(victim.loc) //get the side effects of moving here that require us to currently not be force_moving aka reslipping on ice + victim.forceMove(victim.loc) //get the side effects of moving here that require us to currently not be force_moving aka reslipping on ice STOP_PROCESSING(SSfastprocess, src) victim = null target = null @@ -54,7 +54,7 @@ if(QDELETED(src)) //Our previous step caused deletion of this datum return - var/atom/movable/vic = victim //sanic + var/atom/movable/vic = victim //sanic var/atom/tar = target if(!recursive) diff --git a/code/datums/helper_datums/events.dm b/code/datums/helper_datums/events.dm index bbd1220048d..512b5097c07 100644 --- a/code/datums/helper_datums/events.dm +++ b/code/datums/helper_datums/events.dm @@ -23,8 +23,8 @@ return TRUE return FALSE -// Arguments: event_type as text, proc_holder as datum, proc_name as text -// Returns: New event, null on error. +// Arguments: event_type as text, proc_holder as datum, proc_name as text +// Returns: New event, null on error. /datum/events/proc/addEvent(event_type as text, datum/callback/cb) if(!event_type || !cb) return diff --git a/code/datums/holocall.dm b/code/datums/holocall.dm index 652844078b0..40839dbf0b3 100644 --- a/code/datums/holocall.dm +++ b/code/datums/holocall.dm @@ -1,10 +1,10 @@ #define HOLOPAD_MAX_DIAL_TIME 200 -#define HOLORECORD_DELAY "delay" -#define HOLORECORD_SAY "say" -#define HOLORECORD_SOUND "sound" -#define HOLORECORD_LANGUAGE "lang" -#define HOLORECORD_PRESET "preset" +#define HOLORECORD_DELAY "delay" +#define HOLORECORD_SAY "say" +#define HOLORECORD_SOUND "sound" +#define HOLORECORD_LANGUAGE "lang" +#define HOLORECORD_PRESET "preset" #define HOLORECORD_RENAME "rename" #define HOLORECORD_MAX_LENGTH 200 @@ -22,14 +22,14 @@ //this datum manages it's own references /datum/holocall - var/mob/living/user //the one that called - var/obj/machinery/holopad/calling_holopad //the one that sent the call - var/obj/machinery/holopad/connected_holopad //the one that answered the call (may be null) - var/list/dialed_holopads //all things called, will be cleared out to just connected_holopad once answered + var/mob/living/user //the one that called + var/obj/machinery/holopad/calling_holopad //the one that sent the call + var/obj/machinery/holopad/connected_holopad //the one that answered the call (may be null) + var/list/dialed_holopads //all things called, will be cleared out to just connected_holopad once answered - var/mob/camera/ai_eye/remote/holo/eye //user's eye, once connected - var/obj/effect/overlay/holo_pad_hologram/hologram //user's hologram, once connected - var/datum/action/innate/end_holocall/hangup //hangup action + var/mob/camera/ai_eye/remote/holo/eye //user's eye, once connected + var/obj/effect/overlay/holo_pad_hologram/hologram //user's hologram, once connected + var/datum/action/innate/end_holocall/hangup //hangup action var/call_start_time var/head_call = FALSE //calls from a head of staff autoconnect, if the receiving pad is not secure. diff --git a/code/datums/looping_sounds/_looping_sound.dm b/code/datums/looping_sounds/_looping_sound.dm index 6af3b3c993b..33093cd4901 100644 --- a/code/datums/looping_sounds/_looping_sound.dm +++ b/code/datums/looping_sounds/_looping_sound.dm @@ -1,18 +1,18 @@ /* - output_atoms (list of atoms) The destination(s) for the sounds + output_atoms (list of atoms) The destination(s) for the sounds - mid_sounds (list or soundfile) Since this can be either a list or a single soundfile you can have random sounds. May contain further lists but must contain a soundfile at the end. - mid_length (num) The length to wait between playing mid_sounds + mid_sounds (list or soundfile) Since this can be either a list or a single soundfile you can have random sounds. May contain further lists but must contain a soundfile at the end. + mid_length (num) The length to wait between playing mid_sounds - start_sound (soundfile) Played before starting the mid_sounds loop - start_length (num) How long to wait before starting the main loop after playing start_sound + start_sound (soundfile) Played before starting the mid_sounds loop + start_length (num) How long to wait before starting the main loop after playing start_sound - end_sound (soundfile) The sound played after the main loop has concluded + end_sound (soundfile) The sound played after the main loop has concluded - chance (num) Chance per loop to play a mid_sound - volume (num) Sound output volume - max_loops (num) The max amount of loops to run for. - direct (bool) If true plays directly to provided atoms instead of from them + chance (num) Chance per loop to play a mid_sound + volume (num) Sound output volume + max_loops (num) The max amount of loops to run for. + direct (bool) If true plays directly to provided atoms instead of from them */ /datum/looping_sound var/list/atom/output_atoms diff --git a/code/datums/looping_sounds/item_sounds.dm b/code/datums/looping_sounds/item_sounds.dm index 063e4bac409..de8eadaf05c 100644 --- a/code/datums/looping_sounds/item_sounds.dm +++ b/code/datums/looping_sounds/item_sounds.dm @@ -1,4 +1,4 @@ -#define RAD_GEIGER_LOW 100 // Geiger counter sound thresholds +#define RAD_GEIGER_LOW 100 // Geiger counter sound thresholds #define RAD_GEIGER_MEDIUM 500 #define RAD_GEIGER_HIGH 1000 diff --git a/code/datums/materials/_material.dm b/code/datums/materials/_material.dm index f28e82c45af..186b656da99 100644 --- a/code/datums/materials/_material.dm +++ b/code/datums/materials/_material.dm @@ -167,7 +167,7 @@ Simple datum which is instanced once per type and is used for every object of sa RemoveElement(/datum/element/turf_z_transparency, FALSE) /** - * This proc is called when the mat is found in an item that's consumed by accident. see /obj/item/proc/on_accidental_consumption. + * This proc is called when the mat is found in an item that's consumed by accident. see /obj/item/proc/on_accidental_consumption. * Arguments * * M - person consuming the mat * * S - (optional) item the mat is contained in (NOT the item with the mat itself) diff --git a/code/datums/materials/alloys.dm b/code/datums/materials/alloys.dm index 2bdfb857e23..ffcc40ad44c 100644 --- a/code/datums/materials/alloys.dm +++ b/code/datums/materials/alloys.dm @@ -65,7 +65,7 @@ color = "#3a313a" init_flags = MATERIAL_INIT_MAPLOAD value_per_unit = 0.225 - strength_modifier = 0.9 // It's a lightweight alloy. + strength_modifier = 0.9 // It's a lightweight alloy. integrity_modifier = 1.3 armor_modifiers = list(MELEE = 1.1, BULLET = 1.1, LASER = 1.4, ENERGY = 1.4, BOMB = 1.1, BIO = 1.2, RAD = 1.1, FIRE = 1.5, ACID = 1) sheet_type = /obj/item/stack/sheet/mineral/plastitanium diff --git a/code/datums/materials/meat.dm b/code/datums/materials/meat.dm index 7fb29fb8493..1699c99e3d4 100644 --- a/code/datums/materials/meat.dm +++ b/code/datums/materials/meat.dm @@ -4,7 +4,7 @@ /datum/material/meat name = "meat" desc = "Meat" - id = /datum/material/meat // So the bespoke versions are categorized under this + id = /datum/material/meat // So the bespoke versions are categorized under this color = rgb(214, 67, 67) categories = list(MAT_CATEGORY_RIGID = TRUE, MAT_CATEGORY_BASE_RECIPES = TRUE, MAT_CATEGORY_ITEM_MATERIAL=TRUE) sheet_type = /obj/item/stack/sheet/meat diff --git a/code/datums/mind.dm b/code/datums/mind.dm index 171a65cf551..1a1a11b4ece 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -1,24 +1,24 @@ -/* Note from Carnie: +/* Note from Carnie: The way datum/mind stuff works has been changed a lot. Minds now represent IC characters rather than following a client around constantly. Guidelines for using minds properly: - - Never mind.transfer_to(ghost). The var/current and var/original of a mind must always be of type mob/living! + - Never mind.transfer_to(ghost). The var/current and var/original of a mind must always be of type mob/living! ghost.mind is however used as a reference to the ghost's corpse - - When creating a new mob for an existing IC character (e.g. cloning a dead guy or borging a brain of a human) + - When creating a new mob for an existing IC character (e.g. cloning a dead guy or borging a brain of a human) the existing mind of the old mob should be transfered to the new mob like so: mind.transfer_to(new_mob) - - You must not assign key= or ckey= after transfer_to() since the transfer_to transfers the client for you. + - You must not assign key= or ckey= after transfer_to() since the transfer_to transfers the client for you. By setting key or ckey explicitly after transferring the mind with transfer_to you will cause bugs like DCing the player. - - IMPORTANT NOTE 2, if you want a player to become a ghost, use mob.ghostize() It does all the hard work for you. + - IMPORTANT NOTE 2, if you want a player to become a ghost, use mob.ghostize() It does all the hard work for you. - - When creating a new mob which will be a new IC character (e.g. putting a shade in a construct or randomly selecting + - When creating a new mob which will be a new IC character (e.g. putting a shade in a construct or randomly selecting a ghost to become a xeno during an event). Simply assign the key or ckey like you've always done. new_mob.key = key @@ -31,8 +31,8 @@ /datum/mind var/key - var/name //replaces mob/var/original_name - var/ghostname //replaces name for observers name if set + var/name //replaces mob/var/original_name + var/ghostname //replaces name for observers name if set var/mob/living/current var/active = FALSE @@ -102,43 +102,43 @@ /datum/mind/proc/transfer_to(mob/new_character, force_key_move = 0) original_character = null - if(current) // remove ourself from our old body's mind variable + if(current) // remove ourself from our old body's mind variable current.mind = null UnregisterSignal(current, COMSIG_LIVING_DEATH) SStgui.on_transfer(current, new_character) if(key) - if(new_character.key != key) //if we're transferring into a body with a key associated which is not ours - new_character.ghostize(1) //we'll need to ghostize so that key isn't mobless. + if(new_character.key != key) //if we're transferring into a body with a key associated which is not ours + new_character.ghostize(1) //we'll need to ghostize so that key isn't mobless. else key = new_character.key - if(new_character.mind) //disassociate any mind currently in our new body's mind variable + if(new_character.mind) //disassociate any mind currently in our new body's mind variable new_character.mind.current = null var/datum/atom_hud/antag/hud_to_transfer = antag_hud//we need this because leave_hud() will clear this list var/mob/living/old_current = current if(current) - current.transfer_observers_to(new_character) //transfer anyone observing the old character to the new one + current.transfer_observers_to(new_character) //transfer anyone observing the old character to the new one //SKYRAT CHANGE ADDITION BEGIN - AMBITIONS if(my_ambitions) remove_verb(current, /mob/proc/view_ambitions) add_verb(new_character, /mob/proc/view_ambitions) //SKYRAT CHANGE ADDITION END - current = new_character //associate ourself with our new body - new_character.mind = src //and associate our new body with ourself - for(var/a in antag_datums) //Makes sure all antag datums effects are applied in the new body + current = new_character //associate ourself with our new body + new_character.mind = src //and associate our new body with ourself + for(var/a in antag_datums) //Makes sure all antag datums effects are applied in the new body var/datum/antagonist/A = a A.on_body_transfer(old_current, current) if(iscarbon(new_character)) var/mob/living/carbon/C = new_character C.last_mind = src - transfer_antag_huds(hud_to_transfer) //inherit the antag HUD + transfer_antag_huds(hud_to_transfer) //inherit the antag HUD transfer_actions(new_character) transfer_martial_arts(new_character) RegisterSignal(new_character, COMSIG_LIVING_DEATH, .proc/set_death_time) if(active || force_key_move) - new_character.key = key //now transfer the key to link the client to our new body + new_character.key = key //now transfer the key to link the client to our new body if(new_character.client) LAZYCLEARLIST(new_character.client.recent_examines) new_character.client.init_verbs() // re-initialize character specific verbs @@ -818,8 +818,8 @@ return TRUE /mob/proc/sync_mind() - mind_initialize() //updates the mind (or creates and initializes one if one doesn't exist) - mind.active = TRUE //indicates that the mind is currently synced with a client + mind_initialize() //updates the mind (or creates and initializes one if one doesn't exist) + mind.active = TRUE //indicates that the mind is currently synced with a client /datum/mind/proc/has_martialart(string) if(martial_art && martial_art.id == string) diff --git a/code/datums/outfit.dm b/code/datums/outfit.dm index 7ac750668fc..35d1584d502 100755 --- a/code/datums/outfit.dm +++ b/code/datums/outfit.dm @@ -269,7 +269,7 @@ if(!istype(H)) return if(H.back) - H.back.add_fingerprint(H,1) //The 1 sets a flag to ignore gloves + H.back.add_fingerprint(H,1) //The 1 sets a flag to ignore gloves for(var/obj/item/I in H.back.contents) I.add_fingerprint(H,1) if(H.wear_id) diff --git a/code/datums/position_point_vector.dm b/code/datums/position_point_vector.dm index 07fe0ed7652..66073656a01 100644 --- a/code/datums/position_point_vector.dm +++ b/code/datums/position_point_vector.dm @@ -9,7 +9,7 @@ #define RETURN_POINT_VECTOR(ATOM, ANGLE, SPEED) (new /datum/point/vector(ATOM, null, null, null, null, ANGLE, SPEED)) #define RETURN_POINT_VECTOR_INCREMENT(ATOM, ANGLE, SPEED, AMT) (new /datum/point/vector(ATOM, null, null, null, null, ANGLE, SPEED, AMT)) -/proc/point_midpoint_points(datum/point/a, datum/point/b) //Obviously will not support multiZ calculations! Same for the two below. +/proc/point_midpoint_points(datum/point/a, datum/point/b) //Obviously will not support multiZ calculations! Same for the two below. var/datum/point/P = new P.x = a.x + (b.x - a.x) / 2 P.y = a.y + (b.y - a.y) / 2 @@ -22,7 +22,7 @@ /proc/angle_between_points(datum/point/a, datum/point/b) return ATAN2((b.y - a.y), (b.x - a.x)) -/datum/position //For positions with map x/y/z and pixel x/y so you don't have to return lists. Could use addition/subtraction in the future I guess. +/datum/position //For positions with map x/y/z and pixel x/y so you don't have to return lists. Could use addition/subtraction in the future I guess. var/x = 0 var/y = 0 var/z = 0 @@ -32,7 +32,7 @@ /datum/position/proc/valid() return x && y && z && !isnull(pixel_x) && !isnull(pixel_y) -/datum/position/New(_x = 0, _y = 0, _z = 0, _pixel_x = 0, _pixel_y = 0) //first argument can also be a /datum/point. +/datum/position/New(_x = 0, _y = 0, _z = 0, _pixel_x = 0, _pixel_y = 0) //first argument can also be a /datum/point. if(istype(_x, /datum/point)) var/datum/point/P = _x var/turf/T = P.return_turf() @@ -66,7 +66,7 @@ /datum/position/proc/return_point() return new /datum/point(src) -/datum/point //A precise point on the map in absolute pixel locations based on world.icon_size. Pixels are FROM THE EDGE OF THE MAP! +/datum/point //A precise point on the map in absolute pixel locations based on world.icon_size. Pixels are FROM THE EDGE OF THE MAP! var/x = 0 var/y = 0 var/z = 0 @@ -80,7 +80,7 @@ p.z = z return p -/datum/point/New(_x, _y, _z, _pixel_x = 0, _pixel_y = 0) //first argument can also be a /datum/position or /atom. +/datum/point/New(_x, _y, _z, _pixel_x = 0, _pixel_y = 0) //first argument can also be a /datum/position or /atom. if(istype(_x, /datum/position)) var/datum/position/P = _x _x = P.x @@ -117,7 +117,7 @@ /datum/point/proc/return_turf() return locate(CEILING(x / world.icon_size, 1), CEILING(y / world.icon_size, 1), z) -/datum/point/proc/return_coordinates() //[turf_x, turf_y, z] +/datum/point/proc/return_coordinates() //[turf_x, turf_y, z] return list(CEILING(x / world.icon_size, 1), CEILING(y / world.icon_size, 1), z) /datum/point/proc/return_position() @@ -130,12 +130,12 @@ return MODULUS(y, world.icon_size) - 16 - 1 /datum/point/vector - var/speed = 32 //pixels per iteration + var/speed = 32 //pixels per iteration var/iteration = 0 var/angle = 0 - var/mpx = 0 //calculated x/y movement amounts to prevent having to do trig every step. + var/mpx = 0 //calculated x/y movement amounts to prevent having to do trig every step. var/mpy = 0 - var/starting_x = 0 //just like before, pixels from EDGE of map! This is set in initialize_location(). + var/starting_x = 0 //just like before, pixels from EDGE of map! This is set in initialize_location(). var/starting_y = 0 var/starting_z = 0 @@ -168,7 +168,7 @@ speed = pixel_speed set_angle(new_angle) -/datum/point/vector/proc/set_angle(new_angle) //calculations use "byond angle" where north is 0 instead of 90, and south is 180 instead of 270. +/datum/point/vector/proc/set_angle(new_angle) //calculations use "byond angle" where north is 0 instead of 90, and south is 180 instead of 270. if(isnull(angle)) return angle = new_angle @@ -201,7 +201,7 @@ /datum/point/vector/proc/on_z_change() return -/datum/point/vector/processed //pixel_speed is per decisecond. +/datum/point/vector/processed //pixel_speed is per decisecond. var/last_process = 0 var/last_move = 0 var/paused = FALSE diff --git a/code/datums/ruins.dm b/code/datums/ruins.dm index 2b33a9b843b..fd1061b9383 100644 --- a/code/datums/ruins.dm +++ b/code/datums/ruins.dm @@ -6,7 +6,7 @@ How is there a wooden container filled with 18th century coinage in the middle of a lavawracked hellscape? \ It is clearly a mystery." - var/unpickable = FALSE //If TRUE these won't be placed automatically (can still be forced or loaded with another ruin) + var/unpickable = FALSE //If TRUE these won't be placed automatically (can still be forced or loaded with another ruin) var/always_place = FALSE //Will skip the whole weighting process and just plop this down, ideally you want the ruins of this kind to have no cost. var/placement_weight = 1 //How often should this ruin appear var/cost = 0 //Cost in ruin budget placement system diff --git a/code/datums/shuttles.dm b/code/datums/shuttles.dm index c80007e3bd0..78be3851ae2 100644 --- a/code/datums/shuttles.dm +++ b/code/datums/shuttles.dm @@ -61,7 +61,7 @@ . = ..() if(!.) return - var/list/turfs = block( locate(.[MAP_MINX], .[MAP_MINY], .[MAP_MINZ]), + var/list/turfs = block( locate(.[MAP_MINX], .[MAP_MINY], .[MAP_MINZ]), locate(.[MAP_MAXX], .[MAP_MAXY], .[MAP_MAXZ])) for(var/i in 1 to turfs.len) var/turf/place = turfs[i] diff --git a/code/datums/status_effects/debuffs.dm b/code/datums/status_effects/debuffs.dm index 2037462bfef..fc73b6102fd 100644 --- a/code/datums/status_effects/debuffs.dm +++ b/code/datums/status_effects/debuffs.dm @@ -760,7 +760,7 @@ /datum/status_effect/convulsing id = "convulsing" - duration = 150 + duration = 150 status_type = STATUS_EFFECT_REFRESH alert_type = /atom/movable/screen/alert/status_effect/convulsing diff --git a/code/datums/view.dm b/code/datums/view.dm index 102385727f9..65eb0953e5c 100644 --- a/code/datums/view.dm +++ b/code/datums/view.dm @@ -52,8 +52,8 @@ /datum/view_data/proc/setTo(toAdd) var/list/shitcode = getviewsize(toAdd) //Backward compatability to account - width = shitcode[1] //for a change in how sizes get calculated. we used to include world.view in - height = shitcode[2] //this, but it was jank, so I had to move it + width = shitcode[1] //for a change in how sizes get calculated. we used to include world.view in + height = shitcode[2] //this, but it was jank, so I had to move it apply() /datum/view_data/proc/setBoth(wid, hei) diff --git a/code/datums/weakrefs.dm b/code/datums/weakrefs.dm index ea6da232ebb..ee119b33c67 100644 --- a/code/datums/weakrefs.dm +++ b/code/datums/weakrefs.dm @@ -7,7 +7,7 @@ input.weak_reference = new /datum/weakref(input) return input.weak_reference -/datum/proc/create_weakref() //Forced creation for admin proccalls +/datum/proc/create_weakref() //Forced creation for admin proccalls return WEAKREF(src) /datum/weakref @@ -21,7 +21,7 @@ qdel(target) if(!force) - return QDEL_HINT_LETMELIVE //Let BYOND autoGC thiswhen nothing is using it anymore. + return QDEL_HINT_LETMELIVE //Let BYOND autoGC thiswhen nothing is using it anymore. target?.weak_reference = null return ..() diff --git a/code/datums/weather/weather_types/radiation_storm.dm b/code/datums/weather/weather_types/radiation_storm.dm index 3ad1b770e9c..5a084aa23b5 100644 --- a/code/datums/weather/weather_types/radiation_storm.dm +++ b/code/datums/weather/weather_types/radiation_storm.dm @@ -50,7 +50,7 @@ priority_announce("The radiation threat has passed. Please return to your workplaces.", "Anomaly Alert") status_alarm(FALSE) -/datum/weather/rad_storm/proc/status_alarm(active) //Makes the status displays show the radiation warning for those who missed the announcement. +/datum/weather/rad_storm/proc/status_alarm(active) //Makes the status displays show the radiation warning for those who missed the announcement. var/datum/radio_frequency/frequency = SSradio.return_frequency(FREQ_STATUS_DISPLAYS) if(!frequency) return diff --git a/code/datums/wires/tesla_coil.dm b/code/datums/wires/tesla_coil.dm index a924548f0b9..c2517aebf84 100644 --- a/code/datums/wires/tesla_coil.dm +++ b/code/datums/wires/tesla_coil.dm @@ -1,6 +1,6 @@ /datum/wires/tesla_coil proper_name = "Tesla Coil" - randomize = TRUE //Only one wire don't need blueprints + randomize = TRUE //Only one wire don't need blueprints holder_type = /obj/machinery/power/tesla_coil /datum/wires/tesla_coil/New(atom/holder) diff --git a/code/datums/world_topic.dm b/code/datums/world_topic.dm index baae7c6bba1..b24810b4f21 100644 --- a/code/datums/world_topic.dm +++ b/code/datums/world_topic.dm @@ -63,7 +63,7 @@ /datum/world_topic/pr_announce keyword = "announce" require_comms_key = TRUE - var/static/list/PRcounts = list() //PR id -> number of times announced this round + var/static/list/PRcounts = list() //PR id -> number of times announced this round /datum/world_topic/pr_announce/Run(list/input) var/list/payload = json_decode(input["payload"]) diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index 3c3be6f3557..6755438ed2e 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -183,7 +183,7 @@ GLOBAL_LIST_EMPTY(teleportlocs) * Sets machine power levels in the area */ /area/LateInitialize() - power_change() // all machines set to current power level, also updates icon + power_change() // all machines set to current power level, also updates icon update_beauty() /area/proc/RunGeneration() @@ -243,7 +243,7 @@ GLOBAL_LIST_EMPTY(teleportlocs) return if (state != poweralm) poweralm = state - if(istype(source)) //Only report power alarms on the z-level where the source is located. + if(istype(source)) //Only report power alarms on the z-level where the source is located. for (var/item in GLOB.silicon_mobs) var/mob/living/silicon/aiPlayer = item if (!state) @@ -322,7 +322,7 @@ GLOBAL_LIST_EMPTY(teleportlocs) for(var/FD in firedoors) var/obj/machinery/door/firedoor/D = FD var/cont = !D.welded - if(cont && opening) //don't open if adjacent area is on fire + if(cont && opening) //don't open if adjacent area is on fire for(var/I in D.affecting_areas) var/area/A = I if(A.fire) @@ -399,7 +399,7 @@ GLOBAL_LIST_EMPTY(teleportlocs) /area/process() if(!triggered_firealarms) firereset() //If there are no breaches or fires, and this alert was caused by a breach or fire, die - if(firedoors_last_closed_on + 100 < world.time) //every 10 seconds + if(firedoors_last_closed_on + 100 < world.time) //every 10 seconds ModifyFiredoors(FALSE) /** @@ -496,7 +496,7 @@ GLOBAL_LIST_EMPTY(teleportlocs) * evalutes a mixture of variables mappers can set, requires_power, always_unpowered and then * per channel power_equip, power_light, power_environ */ -/area/proc/powered(chan) // return true if the area has power to given channel +/area/proc/powered(chan) // return true if the area has power to given channel if(!requires_power) return TRUE @@ -524,8 +524,8 @@ GLOBAL_LIST_EMPTY(teleportlocs) * Updates the area icon, calls power change on all machinees in the area, and sends the `COMSIG_AREA_POWER_CHANGE` signal. */ /area/proc/power_change() - for(var/obj/machinery/M in src) // for each machine in the area - M.power_change() // reverify power status (to update icons etc.) + for(var/obj/machinery/M in src) // for each machine in the area + M.power_change() // reverify power status (to update icons etc.) SEND_SIGNAL(src, COMSIG_AREA_POWER_CHANGE) update_icon() diff --git a/code/game/area/space_station_13_areas.dm b/code/game/area/space_station_13_areas.dm index 85bf35d996b..d9afef345c0 100644 --- a/code/game/area/space_station_13_areas.dm +++ b/code/game/area/space_station_13_areas.dm @@ -3,12 +3,12 @@ ### This file contains a list of all the areas in your station. Format is as follows: /area/CATEGORY/OR/DESCRIPTOR/NAME (you can make as many subdivisions as you want) - name = "NICE NAME" (not required but makes things really nice) - icon = 'ICON FILENAME' (defaults to 'icons/turf/areas.dmi') - icon_state = "NAME OF ICON" (defaults to "unknown" (blank)) - requires_power = FALSE (defaults to true) + name = "NICE NAME" (not required but makes things really nice) + icon = 'ICON FILENAME' (defaults to 'icons/turf/areas.dmi') + icon_state = "NAME OF ICON" (defaults to "unknown" (blank)) + requires_power = FALSE (defaults to true) ambience_index = AMBIENCE_GENERIC (picks the ambience from an assoc list in ambience.dm) - ambientsounds = list() (defaults to ambience_index's assoc on Initialize(). override it as "ambientsounds = list('sound/ambience/signal.ogg')" or by changing ambience_index) + ambientsounds = list() (defaults to ambience_index's assoc on Initialize(). override it as "ambientsounds = list('sound/ambience/signal.ogg')" or by changing ambience_index) NOTE: there are two lists of areas in the end of this file: centcom and station itself. Please maintain these lists valid. --rastaf0 @@ -17,7 +17,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station /*-----------------------------------------------------------------------------*/ -/area/ai_monitored //stub defined ai_monitored.dm +/area/ai_monitored //stub defined ai_monitored.dm /area/ai_monitored/turret_protected @@ -1323,7 +1323,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station ambientsounds = list('sound/ambience/ambisin2.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/ambigen10.ogg', 'sound/ambience/ambitech.ogg',\ 'sound/ambience/ambitech2.ogg', 'sound/ambience/ambitech3.ogg', 'sound/ambience/ambimystery.ogg') airlock_wires = /datum/wires/airlock/engineering - network_root_id = STATION_NETWORK_ROOT // They should of unpluged the router before they left + network_root_id = STATION_NETWORK_ROOT // They should of unpluged the router before they left /area/tcommsat/computer name = "Telecomms Control Room" diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index fe10ef7aa3c..6aeec41d020 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -15,7 +15,7 @@ var/tk_throw_range = 1 var/mob/pulledby = null var/initial_language_holder = /datum/language_holder - var/datum/language_holder/language_holder // Mindless mobs and objects need language too, some times. Mind holder takes prescedence. + var/datum/language_holder/language_holder // Mindless mobs and objects need language too, some times. Mind holder takes prescedence. var/verb_say = "says" var/verb_ask = "asks" var/verb_exclaim = "exclaims" @@ -33,10 +33,10 @@ /// If false makes [CanPass][/atom/proc/CanPass] call [CanPassThrough][/atom/movable/proc/CanPassThrough] on this type instead of using default behaviour var/generic_canpass = TRUE var/moving_diagonally = 0 //0: not doing a diagonal move. 1 and 2: doing the first/second step of the diagonal move - var/atom/movable/moving_from_pull //attempt to resume grab after moving instead of before. + var/atom/movable/moving_from_pull //attempt to resume grab after moving instead of before. var/list/client_mobs_in_contents // This contains all the client mobs within this container - var/list/acted_explosions //for explosion dodging - var/datum/forced_movement/force_moving = null //handled soley by forced_movement.dm + var/list/acted_explosions //for explosion dodging + var/datum/forced_movement/force_moving = null //handled soley by forced_movement.dm /** * In case you have multiple types, you automatically use the most useful one. @@ -185,7 +185,7 @@ var/static/list/banned_edits = list("step_x" = TRUE, "step_y" = TRUE, "step_size" = TRUE, "bounds" = TRUE) var/static/list/careful_edits = list("bound_x" = TRUE, "bound_y" = TRUE, "bound_width" = TRUE, "bound_height" = TRUE) if(banned_edits[var_name]) - return FALSE //PLEASE no. + return FALSE //PLEASE no. if((careful_edits[var_name]) && (var_value % world.icon_size) != 0) return FALSE @@ -323,7 +323,7 @@ if(pulling.anchored || pulling.move_resist > move_force) stop_pulling() return - if(pulledby && moving_diagonally != FIRST_DIAG_STEP && get_dist(src, pulledby) > 1) //separated from our puller and not in the middle of a diagonal move. + if(pulledby && moving_diagonally != FIRST_DIAG_STEP && get_dist(src, pulledby) > 1) //separated from our puller and not in the middle of a diagonal move. pulledby.stop_pulling() @@ -910,8 +910,8 @@ acted_explosions += ex_id return TRUE -/* Language procs -* Unless you are doing something very specific, these are the ones you want to use. +/* Language procs +* Unless you are doing something very specific, these are the ones you want to use. */ /// Gets or creates the relevant language holder. For mindless atoms, gets the local one. For atom with mind, gets the mind one. diff --git a/code/game/communications.dm b/code/game/communications.dm index f932929d3ec..e87fda9198d 100644 --- a/code/game/communications.dm +++ b/code/game/communications.dm @@ -60,7 +60,7 @@ * If receiving object don't know right key, it must ignore encrypted signal in its receive_signal. * */ -/* the radio controller is a confusing piece of shit and didnt work +/* the radio controller is a confusing piece of shit and didnt work so i made radios not use the radio controller. */ GLOBAL_LIST_EMPTY(all_radios) diff --git a/code/game/data_huds.dm b/code/game/data_huds.dm index 63c72bf6a1e..4686410fca5 100644 --- a/code/game/data_huds.dm +++ b/code/game/data_huds.dm @@ -363,7 +363,7 @@ Diagnostic HUDs! holder.icon_state = null else if(deployed) //AI shell in use by an AI holder.icon_state = "hudtrackingai" - else //Empty AI shell + else //Empty AI shell holder.icon_state = "hudtracking" //AI side tracking of AI shell control diff --git a/code/game/gamemodes/brother/traitor_bro.dm b/code/game/gamemodes/brother/traitor_bro.dm index 4b9499be778..38330088531 100644 --- a/code/game/gamemodes/brother/traitor_bro.dm +++ b/code/game/gamemodes/brother/traitor_bro.dm @@ -46,7 +46,7 @@ log_game("[key_name(bro)] has been selected as a Brother") pre_brother_teams += team . = ..() - if(.) //To ensure the game mode is going ahead + if(.) //To ensure the game mode is going ahead for(var/teams in pre_brother_teams) for(var/antag in teams) GLOB.pre_setup_antags += antag diff --git a/code/game/gamemodes/changeling/traitor_chan.dm b/code/game/gamemodes/changeling/traitor_chan.dm index 80cdc0105cc..6aba25fe640 100644 --- a/code/game/gamemodes/changeling/traitor_chan.dm +++ b/code/game/gamemodes/changeling/traitor_chan.dm @@ -6,7 +6,7 @@ traitors_possible = 3 //hard limit on traitors if scaling is turned off restricted_jobs = list("Prisoner","AI", "Cyborg") required_players = 25 - required_enemies = 1 // how many of each type are required + required_enemies = 1 // how many of each type are required recommended_enemies = 3 reroll_friendly = 1 announce_span = "Traitors and Changelings" @@ -53,7 +53,7 @@ changelings += changeling changeling.restricted_roles = restricted_jobs . = ..() - if(.) //To ensure the game mode is going ahead + if(.) //To ensure the game mode is going ahead for(var/antag in changelings) GLOB.pre_setup_antags += antag return diff --git a/code/game/gamemodes/dynamic/dynamic.dm b/code/game/gamemodes/dynamic/dynamic.dm index b9f65735ea9..0a776922deb 100644 --- a/code/game/gamemodes/dynamic/dynamic.dm +++ b/code/game/gamemodes/dynamic/dynamic.dm @@ -420,7 +420,7 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1) message_admins("Drafting players for forced ruleset [rule.name].") log_game("DYNAMIC: Drafting players for forced ruleset [rule.name].") rule.mode = src - rule.acceptable(roundstart_pop_ready, threat_level) // Assigns some vars in the modes, running it here for consistency + rule.acceptable(roundstart_pop_ready, threat_level) // Assigns some vars in the modes, running it here for consistency rule.candidates = candidates.Copy() rule.trim_candidates() if (rule.ready(roundstart_pop_ready, TRUE)) @@ -440,7 +440,7 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1) for (var/datum/dynamic_ruleset/roundstart/rule in roundstart_rules) if (!rule.weight) continue - if (rule.acceptable(roundstart_pop_ready, threat_level) && round_start_budget >= rule.cost) // If we got the population and threat required + if (rule.acceptable(roundstart_pop_ready, threat_level) && round_start_budget >= rule.cost) // If we got the population and threat required rule.candidates = candidates.Copy() rule.trim_candidates() if (rule.ready(roundstart_pop_ready) && rule.candidates.len > 0) @@ -514,7 +514,7 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1) current_rules += rule new_snapshot(rule) return TRUE - rule.clean_up() // Refund threat, delete teams and so on. + rule.clean_up() // Refund threat, delete teams and so on. executed_rules -= rule stack_trace("The starting rule \"[rule.name]\" failed to execute.") return FALSE diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm index c425c722043..397db97388e 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm @@ -78,7 +78,7 @@ required_enemies = list(2,2,1,1,1,1,1,0,0,0) required_candidates = 1 weight = 2 - delay = 1 MINUTES // Prevents rule start while head is offstation. + delay = 1 MINUTES // Prevents rule start while head is offstation. cost = 20 requirements = list(101,101,70,40,30,20,20,20,20,20) flags = HIGH_IMPACT_RULESET @@ -101,8 +101,8 @@ return (head_check >= required_heads_of_staff) /datum/dynamic_ruleset/latejoin/provocateur/execute() - var/mob/M = pick(candidates) // This should contain a single player, but in case. - if(check_eligible(M.mind)) // Didnt die/run off z-level/get implanted since leaving shuttle. + var/mob/M = pick(candidates) // This should contain a single player, but in case. + if(check_eligible(M.mind)) // Didnt die/run off z-level/get implanted since leaving shuttle. assigned += M.mind M.mind.special_role = antag_flag revolution = new() @@ -140,7 +140,7 @@ ////////////////////////////////////////////// // // -// HERETIC SMUGGLER // +// HERETIC SMUGGLER // // // ////////////////////////////////////////////// diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm index 20483ca4ef8..e2215097414 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm @@ -284,7 +284,7 @@ ////////////////////////////////////////////// // // // Malfunctioning AI // -// // +// // ////////////////////////////////////////////// /datum/dynamic_ruleset/midround/malf diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm index 82947528529..c535625d6fa 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm @@ -15,7 +15,7 @@ restricted_roles = list("Cyborg") required_candidates = 1 weight = 5 - cost = 8 // Avoid raising traitor threat above 10, as it is the default low cost ruleset. + cost = 8 // Avoid raising traitor threat above 10, as it is the default low cost ruleset. scaling_cost = 9 requirements = list(10,10,10,10,10,10,10,10,10,10) antag_cap = list("denominator" = 24) @@ -57,7 +57,7 @@ cost = 15 scaling_cost = 15 requirements = list(40,30,30,20,20,15,15,15,10,10) - antag_cap = 2 // Can pick 3 per team, but rare enough it doesn't matter. + antag_cap = 2 // Can pick 3 per team, but rare enough it doesn't matter. var/list/datum/team/brother_team/pre_brother_teams = list() var/const/min_team_size = 2 @@ -358,7 +358,7 @@ ////////////////////////////////////////////// // // -// REVS // +// REVS // // // ////////////////////////////////////////////// diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index 69a10fc9ff4..c098380dd9d 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -22,10 +22,10 @@ var/station_was_nuked = 0 //see nuclearbomb.dm and malfunction.dm var/nuke_off_station = 0 //Used for tracking where the nuke hit var/round_ends_with_antag_death = 0 //flags the "one verse the station" antags as such - var/list/datum/mind/antag_candidates = list() // List of possible starting antags goes here - var/list/restricted_jobs = list() // Jobs it doesn't make sense to be. I.E chaplain or AI cultist - var/list/protected_jobs = list() // Jobs that can't be traitors because - var/list/required_jobs = list() // alternative required job groups eg list(list(cap=1),list(hos=1,sec=2)) translates to one captain OR one hos and two secmans + var/list/datum/mind/antag_candidates = list() // List of possible starting antags goes here + var/list/restricted_jobs = list() // Jobs it doesn't make sense to be. I.E chaplain or AI cultist + var/list/protected_jobs = list() // Jobs that can't be traitors because + var/list/required_jobs = list() // alternative required job groups eg list(list(cap=1),list(hos=1,sec=2)) translates to one captain OR one hos and two secmans var/required_players = 0 var/maximum_players = -1 // -1 is no maximum, positive numbers limit the selection of a mode on overstaffed stations var/required_enemies = 0 @@ -34,8 +34,8 @@ var/mob/living/living_antag_player = null var/datum/game_mode/replacementmode = null var/round_converted = 0 //0: round not converted, 1: round going to convert, 2: round converted - var/reroll_friendly //During mode conversion only these are in the running - var/continuous_sanity_checked //Catches some cases where config options could be used to suggest that modes without antagonists should end when all antagonists die + var/reroll_friendly //During mode conversion only these are in the running + var/continuous_sanity_checked //Catches some cases where config options could be used to suggest that modes without antagonists should end when all antagonists die var/enemy_minimum_age = 7 //How many days must players have been playing before they can play this antagonist var/announce_span = "warning" //The gamemode's name will be in this span during announcement. @@ -49,7 +49,7 @@ var/allow_persistence_save = TRUE var/gamemode_ready = FALSE //Is the gamemode all set up and ready to start checking for ending conditions. - var/setup_error //What stopepd setting up the mode. + var/setup_error //What stopepd setting up the mode. /// Associative list of current players, in order: living players, living antagonists, dead players and observers. var/list/list/current_players = list(CURRENT_LIVING_PLAYERS = list(), CURRENT_LIVING_ANTAGS = list(), CURRENT_DEAD_PLAYERS = list(), CURRENT_OBSERVERS = list()) @@ -361,7 +361,7 @@ if(antag_select >= previous && antag_select <= (current-1)) SSpersistence.antag_rep_change[p_ckey] = -(spend - DEFAULT_ANTAG_TICKETS) -// WARNING("AR_DEBUG: Player [mind.key] won spending [spend] tickets from starting value [SSpersistence.antag_rep[p_ckey]]") +// WARNING("AR_DEBUG: Player [mind.key] won spending [spend] tickets from starting value [SSpersistence.antag_rep[p_ckey]]") return mind @@ -389,11 +389,11 @@ if(role in player.client.prefs.be_special) if(!is_banned_from(player.ckey, list(role, ROLE_SYNDICATE)) && !QDELETED(player)) if(age_check(player.client)) //Must be older than the minimum age - candidates += player.mind // Get a list of all the people who want to be the antagonist for this round + candidates += player.mind // Get a list of all the people who want to be the antagonist for this round if(restricted_jobs) for(var/datum/mind/player in candidates) - for(var/job in restricted_jobs) // Remove people who want to be antagonist but have a job already that precludes it + for(var/job in restricted_jobs) // Remove people who want to be antagonist but have a job already that precludes it if(player.assigned_role == job) candidates -= player @@ -405,26 +405,26 @@ drafted += player.mind if(restricted_jobs) - for(var/datum/mind/player in drafted) // Remove people who can't be an antagonist + for(var/datum/mind/player in drafted) // Remove people who can't be an antagonist for(var/job in restricted_jobs) if(player.assigned_role == job) drafted -= player drafted = shuffle(drafted) // Will hopefully increase randomness, Donkie - while(candidates.len < recommended_enemies) // Pick randomlly just the number of people we need and add them to our list of candidates + while(candidates.len < recommended_enemies) // Pick randomlly just the number of people we need and add them to our list of candidates if(drafted.len > 0) applicant = pick(drafted) if(applicant) candidates += applicant drafted.Remove(applicant) - else // Not enough scrubs, ABORT ABORT ABORT + else // Not enough scrubs, ABORT ABORT ABORT break - return candidates // Returns: The number of people who had the antagonist role set to yes, regardless of recomended_enemies, if that number is greater than recommended_enemies - // recommended_enemies if the number of people with that role set to yes is less than recomended_enemies, - // Less if there are not enough valid players in the game entirely to make recommended_enemies. + return candidates // Returns: The number of people who had the antagonist role set to yes, regardless of recomended_enemies, if that number is greater than recommended_enemies + // recommended_enemies if the number of people with that role set to yes is less than recomended_enemies, + // Less if there are not enough valid players in the game entirely to make recommended_enemies. @@ -499,11 +499,11 @@ if(L.ckey && L.client) var/failed = FALSE - if(L.client.inactivity >= (ROUNDSTART_LOGOUT_REPORT_TIME / 2)) //Connected, but inactive (alt+tabbed or something) + if(L.client.inactivity >= (ROUNDSTART_LOGOUT_REPORT_TIME / 2)) //Connected, but inactive (alt+tabbed or something) msg += "[L.name] ([L.key]), the [L.job] (Connected, Inactive)\n" failed = TRUE //AFK client if(!failed && L.stat) - if(L.suiciding) //Suicider + if(L.suiciding) //Suicider msg += "[L.name] ([L.key]), the [L.job] (Suicide)\n" failed = TRUE //Disconnected client if(!failed && (L.stat == UNCONSCIOUS || L.stat == HARD_CRIT)) @@ -514,19 +514,19 @@ failed = TRUE //Dead var/p_ckey = L.client.ckey -// WARNING("AR_DEBUG: [p_ckey]: failed - [failed], antag_rep_change: [SSpersistence.antag_rep_change[p_ckey]]") +// WARNING("AR_DEBUG: [p_ckey]: failed - [failed], antag_rep_change: [SSpersistence.antag_rep_change[p_ckey]]") // people who died or left should not gain any reputation // people who rolled antagonist still lose it if(failed && SSpersistence.antag_rep_change[p_ckey] > 0) -// WARNING("AR_DEBUG: Zeroed [p_ckey]'s antag_rep_change") +// WARNING("AR_DEBUG: Zeroed [p_ckey]'s antag_rep_change") SSpersistence.antag_rep_change[p_ckey] = 0 continue //Happy connected client for(var/mob/dead/observer/D in GLOB.dead_mob_list) if(D.mind && D.mind.current == L) if(L.stat == DEAD) - if(L.suiciding) //Suicider + if(L.suiciding) //Suicider msg += "[L.name] ([ckey(D.mind.key)]), the [L.job] (Suicide)\n" continue //Disconnected client else @@ -546,7 +546,7 @@ //If the configuration option is set to require players to be logged as old enough to play certain jobs, then this proc checks that they are, otherwise it just returns 1 /datum/game_mode/proc/age_check(client/C) if(get_remaining_days(C) == 0) - return 1 //Available in 0 days = available right now = player is old enough to play. + return 1 //Available in 0 days = available right now = player is old enough to play. return 0 diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index 7f34ec68c96..0a52636cf1e 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -1,15 +1,15 @@ GLOBAL_LIST(admin_objective_list) //Prefilled admin assignable objective list /datum/objective - var/datum/mind/owner //The primary owner of the objective. !!SOMEWHAT DEPRECATED!! Prefer using 'team' for new code. - var/datum/team/team //An alternative to 'owner': a team. Use this when writing new code. - var/name = "generic objective" //Name for admin prompts - var/explanation_text = "Nothing" //What that person is supposed to do. - var/team_explanation_text //For when there are multiple owners. - var/datum/mind/target = null //If they are focused on a particular person. - var/target_amount = 0 //If they are focused on a particular number. Steal objectives have their own counter. - var/completed = FALSE //currently only used for custom objectives. - var/martyr_compatible = FALSE //If the objective is compatible with martyr objective, i.e. if you can still do it while dead. + var/datum/mind/owner //The primary owner of the objective. !!SOMEWHAT DEPRECATED!! Prefer using 'team' for new code. + var/datum/team/team //An alternative to 'owner': a team. Use this when writing new code. + var/name = "generic objective" //Name for admin prompts + var/explanation_text = "Nothing" //What that person is supposed to do. + var/team_explanation_text //For when there are multiple owners. + var/datum/mind/target = null //If they are focused on a particular person. + var/target_amount = 0 //If they are focused on a particular number. Steal objectives have their own counter. + var/completed = FALSE //currently only used for custom objectives. + var/martyr_compatible = FALSE //If the objective is compatible with martyr objective, i.e. if you can still do it while dead. /datum/objective/New(text) if(text) @@ -194,7 +194,7 @@ GLOBAL_LIST(admin_objective_list) //Prefilled admin assignable objective list admin_simple_target_pick(admin) /datum/objective/assassinate/internal - var/stolen = FALSE //Have we already eliminated this target? + var/stolen = FALSE //Have we already eliminated this target? /datum/objective/assassinate/internal/update_explanation_text() ..() @@ -611,7 +611,7 @@ GLOBAL_LIST_EMPTY(possible_items) if(!isliving(M.current)) continue - var/list/all_items = M.current.GetAllContents() //this should get things in cheesewheels, books, etc. + var/list/all_items = M.current.GetAllContents() //this should get things in cheesewheels, books, etc. for(var/obj/I in all_items) //Check for items if(istype(I, steal_target)) @@ -655,7 +655,7 @@ GLOBAL_LIST_EMPTY(possible_items_special) var/list/datum/mind/owners = get_owners() for(var/datum/mind/owner in owners) if(ismob(owner.current)) - var/mob/M = owner.current //Yeah if you get morphed and you eat a quantum tech disk with the RD's latest backup good on you soldier. + var/mob/M = owner.current //Yeah if you get morphed and you eat a quantum tech disk with the RD's latest backup good on you soldier. if(ishuman(M)) var/mob/living/carbon/human/H = M if(H && (H.stat != DEAD) && istype(H.wear_suit, /obj/item/clothing/suit/space/space_ninja)) @@ -859,7 +859,7 @@ GLOBAL_LIST_EMPTY(possible_items_special) update_explanation_text() /datum/objective/destroy/internal - var/stolen = FALSE //Have we already eliminated this target? + var/stolen = FALSE //Have we already eliminated this target? /datum/objective/steal_five_of_type name = "steal five of" @@ -876,7 +876,7 @@ GLOBAL_LIST_EMPTY(possible_items_special) for(var/datum/mind/M in owners) if(!isliving(M.current)) continue - var/list/all_items = M.current.GetAllContents() //this should get things in cheesewheels, books, etc. + var/list/all_items = M.current.GetAllContents() //this should get things in cheesewheels, books, etc. for(var/obj/I in all_items) //Check for wanted items if(is_type_in_typecache(I, wanted_items)) stolen_count++ @@ -902,7 +902,7 @@ GLOBAL_LIST_EMPTY(possible_items_special) for(var/datum/mind/M in owners) if(!isliving(M.current)) continue - var/list/all_items = M.current.GetAllContents() //this should get things in cheesewheels, books, etc. + var/list/all_items = M.current.GetAllContents() //this should get things in cheesewheels, books, etc. for(var/obj/I in all_items) //Check for wanted items if(istype(I, /obj/item/book/granter/spell)) var/obj/item/book/granter/spell/spellbook = I diff --git a/code/game/gamemodes/objective_items.dm b/code/game/gamemodes/objective_items.dm index d14f822d3bc..bf26c35f307 100644 --- a/code/game/gamemodes/objective_items.dm +++ b/code/game/gamemodes/objective_items.dm @@ -2,10 +2,10 @@ /datum/objective_item var/name = "A silly bike horn! Honk!" - var/targetitem = /obj/item/bikehorn //typepath of the objective item - var/difficulty = 9001 //vaguely how hard it is to do this objective - var/list/excludefromjob = list() //If you don't want a job to get a certain objective (no captain stealing his own medal, etcetc) - var/list/altitems = list() //Items which can serve as an alternative to the objective (darn you blueprints) + var/targetitem = /obj/item/bikehorn //typepath of the objective item + var/difficulty = 9001 //vaguely how hard it is to do this objective + var/list/excludefromjob = list() //If you don't want a job to get a certain objective (no captain stealing his own medal, etcetc) + var/list/altitems = list() //Items which can serve as an alternative to the objective (darn you blueprints) var/list/special_equipment = list() /datum/objective_item/proc/check_special_completion() //for objectives with special checks (is that slime extract unused? does that intellicard have an ai in it? etcetc) @@ -151,7 +151,7 @@ return TRUE if(istype(I, /obj/item/photo)) var/obj/item/photo/P = I - if(P.picture.has_blueprints) //if the blueprints are in frame + if(P.picture.has_blueprints) //if the blueprints are in frame return TRUE return FALSE diff --git a/code/game/gamemodes/revolution/revolution.dm b/code/game/gamemodes/revolution/revolution.dm index a3b3539f232..a0bbf99a94a 100644 --- a/code/game/gamemodes/revolution/revolution.dm +++ b/code/game/gamemodes/revolution/revolution.dm @@ -63,7 +63,7 @@ var/list/sec = SSjob.get_living_sec() var/weighted_score = min(max(round(heads.len - ((8 - sec.len) / 3)),1),max_headrevs) - for(var/datum/mind/rev_mind in headrev_candidates) //People with return to lobby may still be in the lobby. Let's pick someone else in that case. + for(var/datum/mind/rev_mind in headrev_candidates) //People with return to lobby may still be in the lobby. Let's pick someone else in that case. if(isnewplayer(rev_mind.current)) headrev_candidates -= rev_mind var/list/newcandidates = shuffle(antag_candidates) @@ -77,8 +77,8 @@ continue else var/mob/Nm = lenin.current - if(Nm.job in restricted_jobs) //Don't make the HOS a replacement revhead - antag_candidates += lenin //Let's let them keep antag chance for other antags + if(Nm.job in restricted_jobs) //Don't make the HOS a replacement revhead + antag_candidates += lenin //Let's let them keep antag chance for other antags continue headrev_candidates += lenin diff --git a/code/game/gamemodes/sandbox/h_sandbox.dm b/code/game/gamemodes/sandbox/h_sandbox.dm index c40cbde96db..777dc057af7 100644 --- a/code/game/gamemodes/sandbox/h_sandbox.dm +++ b/code/game/gamemodes/sandbox/h_sandbox.dm @@ -31,46 +31,46 @@ GLOBAL_VAR_INIT(hsboxspawn, TRUE) /datum/h_sandbox/proc/update() var/static/list/hrefs = list( "Space Gear", - "Suit Up (Space Travel Gear)" = "hsbsuit", - "Spawn Gas Mask" = "hsbspawn&path=[/obj/item/clothing/mask/gas]", - "Spawn Emergency Air Tank" = "hsbspawn&path=[/obj/item/tank/internals/emergency_oxygen/double]", + "Suit Up (Space Travel Gear)" = "hsbsuit", + "Spawn Gas Mask" = "hsbspawn&path=[/obj/item/clothing/mask/gas]", + "Spawn Emergency Air Tank" = "hsbspawn&path=[/obj/item/tank/internals/emergency_oxygen/double]", "Standard Tools", - "Spawn Flashlight" = "hsbspawn&path=[/obj/item/flashlight]", - "Spawn Toolbox" = "hsbspawn&path=[/obj/item/storage/toolbox/mechanical]", - "Spawn Experimental Welding tool" = "hsbspawn&path=[/obj/item/weldingtool/experimental]", - "Spawn Light Replacer" = "hsbspawn&path=[/obj/item/lightreplacer]", - "Spawn Medical Kit" = "hsbspawn&path=[/obj/item/storage/firstaid/regular]", - "Spawn All-Access ID" = "hsbaaid", + "Spawn Flashlight" = "hsbspawn&path=[/obj/item/flashlight]", + "Spawn Toolbox" = "hsbspawn&path=[/obj/item/storage/toolbox/mechanical]", + "Spawn Experimental Welding tool" = "hsbspawn&path=[/obj/item/weldingtool/experimental]", + "Spawn Light Replacer" = "hsbspawn&path=[/obj/item/lightreplacer]", + "Spawn Medical Kit" = "hsbspawn&path=[/obj/item/storage/firstaid/regular]", + "Spawn All-Access ID" = "hsbaaid", "Building Supplies", "Spawn 50 Wood" = "hsbwood", - "Spawn 50 Metal" = "hsbmetal", - "Spawn 50 Plasteel" = "hsbplasteel", + "Spawn 50 Metal" = "hsbmetal", + "Spawn 50 Plasteel" = "hsbplasteel", "Spawn 50 Reinforced Glass" = "hsbrglass", - "Spawn 50 Glass" = "hsbglass", - "Spawn Box of Materials" = "hsbspawn&path=[/obj/item/storage/box/material]", - "Spawn Full Cable Coil" = "hsbspawn&path=[/obj/item/stack/cable_coil]", - "Spawn Hyper Capacity Power Cell" = "hsbspawn&path=[/obj/item/stock_parts/cell/hyper]", - "Spawn Inf. Capacity Power Cell" = "hsbspawn&path=[/obj/item/stock_parts/cell/infinite]", - "Spawn Rapid Construction Device" = "hsbrcd", - "Spawn RCD Ammo" = "hsb_safespawn&path=[/obj/item/rcd_ammo]", - "Spawn Airlock" = "hsbairlock", + "Spawn 50 Glass" = "hsbglass", + "Spawn Box of Materials" = "hsbspawn&path=[/obj/item/storage/box/material]", + "Spawn Full Cable Coil" = "hsbspawn&path=[/obj/item/stack/cable_coil]", + "Spawn Hyper Capacity Power Cell" = "hsbspawn&path=[/obj/item/stock_parts/cell/hyper]", + "Spawn Inf. Capacity Power Cell" = "hsbspawn&path=[/obj/item/stock_parts/cell/infinite]", + "Spawn Rapid Construction Device" = "hsbrcd", + "Spawn RCD Ammo" = "hsb_safespawn&path=[/obj/item/rcd_ammo]", + "Spawn Airlock" = "hsbairlock", "Miscellaneous", - "Spawn Air Scrubber" = "hsbscrubber", - "Spawn CentCom Technology Disk" = "hsbspawn&path=[/obj/item/disk/tech_disk/debug]", - "Spawn Adminordrazine" = "hsbspawn&path=[/obj/item/reagent_containers/pill/adminordrazine]", - "Spawn Water Tank" = "hsbspawn&path=[/obj/structure/reagent_dispensers/watertank]", + "Spawn Air Scrubber" = "hsbscrubber", + "Spawn CentCom Technology Disk" = "hsbspawn&path=[/obj/item/disk/tech_disk/debug]", + "Spawn Adminordrazine" = "hsbspawn&path=[/obj/item/reagent_containers/pill/adminordrazine]", + "Spawn Water Tank" = "hsbspawn&path=[/obj/structure/reagent_dispensers/watertank]", "Bots", - "Spawn Cleanbot" = "hsbspawn&path=[/mob/living/simple_animal/bot/cleanbot]", - "Spawn Floorbot" = "hsbspawn&path=[/mob/living/simple_animal/bot/floorbot]", - "Spawn Medbot" = "hsbspawn&path=[/mob/living/simple_animal/bot/medbot]", + "Spawn Cleanbot" = "hsbspawn&path=[/mob/living/simple_animal/bot/cleanbot]", + "Spawn Floorbot" = "hsbspawn&path=[/mob/living/simple_animal/bot/floorbot]", + "Spawn Medbot" = "hsbspawn&path=[/mob/living/simple_animal/bot/medbot]", "Canisters", - "Spawn O2 Canister" = "hsbspawn&path=[/obj/machinery/portable_atmospherics/canister/oxygen]", - "Spawn Air Canister" = "hsbspawn&path=[/obj/machinery/portable_atmospherics/canister/air]") + "Spawn O2 Canister" = "hsbspawn&path=[/obj/machinery/portable_atmospherics/canister/oxygen]", + "Spawn Air Canister" = "hsbspawn&path=[/obj/machinery/portable_atmospherics/canister/air]") if(!hsbinfo) diff --git a/code/game/machinery/PDApainter.dm b/code/game/machinery/PDApainter.dm index 2f8eaf5c00f..fcd783981a3 100644 --- a/code/game/machinery/PDApainter.dm +++ b/code/game/machinery/PDApainter.dm @@ -109,7 +109,7 @@ return if(storedpda) - if(machine_stat & BROKEN) //otherwise the PDA is stuck until repaired + if(machine_stat & BROKEN) //otherwise the PDA is stuck until repaired ejectpda() to_chat(user, "You manage to eject the loaded PDA.") else diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index cca2561c4f7..fab8f6a4020 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -23,7 +23,7 @@ list(/datum/reagent/medicine/c2/multiver, /datum/reagent/medicine/mutadone, /datum/reagent/medicine/mannitol, /datum/reagent/medicine/salbutamol, /datum/reagent/medicine/pen_acid), list(/datum/reagent/medicine/omnizine) ) - var/list/chem_buttons //Used when emagged to scramble which chem is used, eg: mutadone -> morphine + var/list/chem_buttons //Used when emagged to scramble which chem is used, eg: mutadone -> morphine var/scrambled_chems = FALSE //Are chem buttons scrambled? used as a warning var/enter_message = "You feel cool air surround you. You go numb as your senses turn inward." payment_department = ACCOUNT_MED diff --git a/code/game/machinery/_machinery.dm b/code/game/machinery/_machinery.dm index 79dbb6818da..15c5d5f36b5 100644 --- a/code/game/machinery/_machinery.dm +++ b/code/game/machinery/_machinery.dm @@ -78,7 +78,7 @@ * * process_atmos() * Called by the 'air subsystem' once per atmos tick for each machine that is listed in its 'atmos_machines' list. - * Compiled by Aygar + * Compiled by Aygar */ /obj/machinery name = "machinery" @@ -721,8 +721,8 @@ LAZYREMOVE(component_parts, AM) circuit = null -/obj/machinery/proc/adjust_item_drop_location(atom/movable/AM) // Adjust item drop location to a 3x3 grid inside the tile, returns slot id from 0 to 8 - var/md5 = md5(AM.name) // Oh, and it's deterministic too. A specific item will always drop from the same slot. +/obj/machinery/proc/adjust_item_drop_location(atom/movable/AM) // Adjust item drop location to a 3x3 grid inside the tile, returns slot id from 0 to 8 + var/md5 = md5(AM.name) // Oh, and it's deterministic too. A specific item will always drop from the same slot. for (var/i in 1 to 32) . += hex2num(md5[i]) . = . % 9 diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index 0535eac673d..d22dca8bd8d 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -1,6 +1,6 @@ -#define AUTOLATHE_MAIN_MENU 1 -#define AUTOLATHE_CATEGORY_MENU 2 -#define AUTOLATHE_SEARCH_MENU 3 +#define AUTOLATHE_MAIN_MENU 1 +#define AUTOLATHE_CATEGORY_MENU 2 +#define AUTOLATHE_SEARCH_MENU 3 /obj/machinery/autolathe name = "autolathe" @@ -408,7 +408,7 @@ disabled = FALSE /obj/machinery/autolathe/proc/shock(mob/user, prb) - if(machine_stat & (BROKEN|NOPOWER)) // unpowered, no shock + if(machine_stat & (BROKEN|NOPOWER)) // unpowered, no shock return FALSE if(!prob(prb)) return FALSE diff --git a/code/game/machinery/camera/camera_assembly.dm b/code/game/machinery/camera/camera_assembly.dm index b866bbeccca..0eeb6596ee6 100644 --- a/code/game/machinery/camera/camera_assembly.dm +++ b/code/game/machinery/camera/camera_assembly.dm @@ -17,7 +17,7 @@ icon = 'icons/obj/machines/camera.dmi' icon_state = "camera_assembly" max_integrity = 150 - // Motion, EMP-Proof, X-ray + // Motion, EMP-Proof, X-ray var/obj/item/analyzer/xray_module var/malf_xray_firmware_active //used to keep from revealing malf AI upgrades for user facing isXRay() checks when they use Upgrade Camera Network ability //will be false if the camera is upgraded with the proper parts. @@ -149,7 +149,7 @@ set_anchored(TRUE) return - if(STATE_WIRED) // Upgrades! + if(STATE_WIRED) // Upgrades! if(istype(W, /obj/item/stack/sheet/mineral/plasma)) //emp upgrade if(emp_module) to_chat(user, "[src] already contains a [emp_module]!") diff --git a/code/game/machinery/camera/presets.dm b/code/game/machinery/camera/presets.dm index a830950b026..aa7ac1c7378 100644 --- a/code/game/machinery/camera/presets.dm +++ b/code/game/machinery/camera/presets.dm @@ -76,7 +76,7 @@ /obj/machinery/camera/proc/upgradeEmpProof(malf_upgrade, ignore_malf_upgrades) if(isEmpProof(ignore_malf_upgrades)) //pass a malf upgrade to ignore_malf_upgrades so we can replace the malf module with the normal one - return //that way if someone tries to upgrade an already malf-upgraded camera, it'll just upgrade it to a normal version. + return //that way if someone tries to upgrade an already malf-upgraded camera, it'll just upgrade it to a normal version. AddElement(/datum/element/empprotection, EMP_PROTECT_SELF | EMP_PROTECT_WIRES | EMP_PROTECT_CONTENTS) if(malf_upgrade) assembly.malf_emp_firmware_active = TRUE //don't add parts to drop, update icon, ect. reconstructing it will also retain the upgrade. @@ -102,7 +102,7 @@ /obj/machinery/camera/proc/upgradeXRay(malf_upgrade, ignore_malf_upgrades) if(isXRay(ignore_malf_upgrades)) //pass a malf upgrade to ignore_malf_upgrades so we can replace the malf upgrade with the normal one - return //that way if someone tries to upgrade an already malf-upgraded camera, it'll just upgrade it to a normal version. + return //that way if someone tries to upgrade an already malf-upgraded camera, it'll just upgrade it to a normal version. if(malf_upgrade) assembly.malf_xray_firmware_active = TRUE //don't add parts to drop, update icon, ect. reconstructing it will also retain the upgrade. assembly.malf_xray_firmware_present = TRUE //so the upgrade is retained after incompatible parts are removed. diff --git a/code/game/machinery/cell_charger.dm b/code/game/machinery/cell_charger.dm index 2b82ad34a03..7ffc7041c80 100644 --- a/code/game/machinery/cell_charger.dm +++ b/code/game/machinery/cell_charger.dm @@ -21,7 +21,7 @@ . += image(charging.icon, charging.icon_state) . += "ccharger-on" if(!(machine_stat & (BROKEN|NOPOWER))) - var/newlevel = round(charging.percent() * 4 / 100) + var/newlevel = round(charging.percent() * 4 / 100) . += "ccharger-o[newlevel]" /obj/machinery/cell_charger/examine(mob/user) diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index cedd1dc830b..617fdfad63f 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -627,26 +627,26 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list( // *** THE ORION TRAIL ** // -#define ORION_TRAIL_WINTURN 9 +#define ORION_TRAIL_WINTURN 9 //Orion Trail Events -#define ORION_TRAIL_RAIDERS "Raiders" -#define ORION_TRAIL_FLUX "Interstellar Flux" -#define ORION_TRAIL_ILLNESS "Illness" -#define ORION_TRAIL_BREAKDOWN "Breakdown" -#define ORION_TRAIL_LING "Changelings?" +#define ORION_TRAIL_RAIDERS "Raiders" +#define ORION_TRAIL_FLUX "Interstellar Flux" +#define ORION_TRAIL_ILLNESS "Illness" +#define ORION_TRAIL_BREAKDOWN "Breakdown" +#define ORION_TRAIL_LING "Changelings?" #define ORION_TRAIL_LING_ATTACK "Changeling Ambush" -#define ORION_TRAIL_MALFUNCTION "Malfunction" -#define ORION_TRAIL_COLLISION "Collision" -#define ORION_TRAIL_SPACEPORT "Spaceport" -#define ORION_TRAIL_BLACKHOLE "BlackHole" -#define ORION_TRAIL_OLDSHIP "Old Ship" -#define ORION_TRAIL_SEARCH "Old Ship Search" +#define ORION_TRAIL_MALFUNCTION "Malfunction" +#define ORION_TRAIL_COLLISION "Collision" +#define ORION_TRAIL_SPACEPORT "Spaceport" +#define ORION_TRAIL_BLACKHOLE "BlackHole" +#define ORION_TRAIL_OLDSHIP "Old Ship" +#define ORION_TRAIL_SEARCH "Old Ship Search" -#define ORION_STATUS_START 1 -#define ORION_STATUS_NORMAL 2 -#define ORION_STATUS_GAMEOVER 3 -#define ORION_STATUS_MARKET 4 +#define ORION_STATUS_START 1 +#define ORION_STATUS_NORMAL 2 +#define ORION_STATUS_GAMEOVER 3 +#define ORION_STATUS_MARKET 4 /obj/machinery/computer/arcade/orion_trail name = "The Orion Trail" @@ -664,15 +664,15 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list( var/eventdat = null var/event = null var/list/settlers = list("Harry","Larry","Bob") - var/list/events = list(ORION_TRAIL_RAIDERS = 3, - ORION_TRAIL_FLUX = 1, - ORION_TRAIL_ILLNESS = 3, - ORION_TRAIL_BREAKDOWN = 2, - ORION_TRAIL_LING = 3, - ORION_TRAIL_MALFUNCTION = 2, - ORION_TRAIL_COLLISION = 1, - ORION_TRAIL_SPACEPORT = 2, - ORION_TRAIL_OLDSHIP = 2 + var/list/events = list(ORION_TRAIL_RAIDERS = 3, + ORION_TRAIL_FLUX = 1, + ORION_TRAIL_ILLNESS = 3, + ORION_TRAIL_BREAKDOWN = 2, + ORION_TRAIL_LING = 3, + ORION_TRAIL_MALFUNCTION = 2, + ORION_TRAIL_COLLISION = 1, + ORION_TRAIL_SPACEPORT = 2, + ORION_TRAIL_OLDSHIP = 2 ) var/list/stops = list() var/list/stopblurbs = list() diff --git a/code/game/machinery/computer/atmos_control.dm b/code/game/machinery/computer/atmos_control.dm index e0f1137c4ff..cf358d60b58 100644 --- a/code/game/machinery/computer/atmos_control.dm +++ b/code/game/machinery/computer/atmos_control.dm @@ -204,11 +204,11 @@ GLOBAL_LIST_EMPTY(atmos_air_controllers) if(!info) continue data["sensors"] += list(list( - "id_tag" = id_tag, - "long_name" = sanitize(long_name), - "pressure" = info["pressure"], - "temperature" = info["temperature"], - "gases" = info["gases"] + "id_tag" = id_tag, + "long_name" = sanitize(long_name), + "pressure" = info["pressure"], + "temperature" = info["temperature"], + "gases" = info["gases"] )) return data diff --git a/code/game/machinery/computer/crew.dm b/code/game/machinery/computer/crew.dm index dc16767e240..69b3e560dfc 100644 --- a/code/game/machinery/computer/crew.dm +++ b/code/game/machinery/computer/crew.dm @@ -1,7 +1,7 @@ /// 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 +#define UNKNOWN_JOB_ID 81 /obj/machinery/computer/crew name = "crew monitoring console" diff --git a/code/game/machinery/computer/dna_console.dm b/code/game/machinery/computer/dna_console.dm index 9addd86561b..99eb0215a0c 100644 --- a/code/game/machinery/computer/dna_console.dm +++ b/code/game/machinery/computer/dna_console.dm @@ -284,7 +284,7 @@ data["radStrength"] = radstrength data["radDuration"] = radduration data["stdDevStr"] = radstrength * RADIATION_STRENGTH_MULTIPLIER - switch(RADIATION_ACCURACY_MULTIPLIER / (radduration + (connected_scanner.precision_coeff ** 2))) //hardcoded values from a z-table for a normal distribution + switch(RADIATION_ACCURACY_MULTIPLIER / (radduration + (connected_scanner.precision_coeff ** 2))) //hardcoded values from a z-table for a normal distribution if(0 to 0.25) data["stdDevAcc"] = ">95 %" if(0.25 to 0.5) @@ -573,7 +573,7 @@ // ---------------------------------------------------------------------- // // params["mutref"] - ATOM Ref of specific mutation to swap out // params["source"] - The source the request came from. - // Expected results: + // Expected results: // "occupant" - From genetic sequencer // "console" - From DNA Console storage // "disk" - From inserted diskette @@ -710,7 +710,7 @@ // referred to as a "Research" type. Expects a string with 0 or 1, which // then gets converted to a number. // params["source"] - The source the request came from. - // Expected results: + // Expected results: // "occupant" - From genetic sequencer // "console" - From DNA Console storage // "disk" - From inserted diskette @@ -784,7 +784,7 @@ // ---------------------------------------------------------------------- // // params["mutref"] - ATOM Ref of specific mutation to store // params["source"] - The source the request came from. - // Expected results: + // Expected results: // "occupant" - From genetic sequencer // "disk" - From inserted diskette if("save_console") @@ -818,7 +818,7 @@ // ---------------------------------------------------------------------- // // params["mutref"] - ATOM Ref of specific mutation to store // params["source"] - The source the request came from - // Expected results: + // Expected results: // "occupant" - From genetic sequencer // "console" - From DNA Console storage if("save_disk") @@ -1195,8 +1195,8 @@ // params["type"] - Type of injector to create // Expected results: // "ue" - Unique Enzyme, changes name and blood type - // "ui" - Unique Identity, changes looks - // "mixed" - Combination of both ue and ui + // "ui" - Unique Identity, changes looks + // "mixed" - Combination of both ue and ui if("makeup_injector") // Convert the index to a number and clamp within the array range, then // copy the data from the disk to that buffer @@ -1274,8 +1274,8 @@ // params["type"] - Type of genetic makeup copy to implement // Expected results: // "ue" - Unique Enzyme, changes name and blood type - // "ui" - Unique Identity, changes looks - // "mixed" - Combination of both ue and ui + // "ui" - Unique Identity, changes looks + // "mixed" - Combination of both ue and ui if("makeup_apply") // GUARD CHECK - Can we genetically modify the occupant? Includes scanner // operational guard checks. @@ -1311,8 +1311,8 @@ // params["type"] - Type of genetic makeup copy to implement // Expected results: // "ue" - Unique Enzyme, changes name and blood type - // "ui" - Unique Identity, changes looks - // "mixed" - Combination of both ue and ui + // "ui" - Unique Identity, changes looks + // "mixed" - Combination of both ue and ui if("makeup_delay") // Convert the index to a number and clamp within the array range, then // copy the data from the disk to that buffer @@ -1391,7 +1391,7 @@ // GUARD CHECK - If the name is null or blank, reject. // GUARD CHECK - If the name isn't in the list of advanced injectors, we // want to reject this as it shouldn't be possible ever do this. - // Unexpected result + // Unexpected result if(!inj_name || !(inj_name in injector_selection)) return @@ -1415,7 +1415,7 @@ // GUARD CHECK - If the name is null or blank, reject. // GUARD CHECK - If the name isn't in the list of advanced injectors, we // want to reject this as it shouldn't be possible ever do this. - // Unexpected result + // Unexpected result if(!inj_name || !(inj_name in injector_selection)) return @@ -1449,7 +1449,7 @@ if("add_advinj_mut") // GUARD CHECK - Can we genetically modify the occupant? Includes scanner // operational guard checks. - // This is needed because this operation can only be completed from the + // This is needed because this operation can only be completed from the // genetic sequencer. if(!can_modify_occupant()) return @@ -1635,7 +1635,7 @@ // Check validity of occupent for DNA Modification // DNA Modification: // requires DNA - // this DNA can not be bad + // this DNA can not be bad // is done via radiation bursts, so radiation immune carbons are not viable // And the DNA Scanner itself must have a valid scan level if(scanner_occupant.has_dna() && !HAS_TRAIT(scanner_occupant, TRAIT_GENELESS) && !HAS_TRAIT(scanner_occupant, TRAIT_BADDNA) || (connected_scanner.scan_level == 3)) @@ -2018,7 +2018,7 @@ var/mutation // Assume the occupant is valid and the check has been carried out before - // calling this proc with the relevant flags. + // calling this proc with the relevant flags. if(target_flags & SEARCH_OCCUPANT) mutation = (locate(ref) in scanner_occupant.dna.mutations) if(mutation) @@ -2069,11 +2069,11 @@ var/length = length(input) var/ran = gaussian(0, rs*RADIATION_STRENGTH_MULTIPLIER) if(ran == 0) - ran = pick(-1,1) //hacky, statistically should almost never happen. 0-chance makes people mad though + ran = pick(-1,1) //hacky, statistically should almost never happen. 0-chance makes people mad though else if(ran < 0) - ran = round(ran) //negative, so floor it + ran = round(ran) //negative, so floor it else - ran = -round(-ran) //positive, so ceiling it + ran = -round(-ran) //positive, so ceiling it return num2hex(WRAP(hex2num(input)+ran, 0, 16**length), length) /** @@ -2092,7 +2092,7 @@ return var/len = length_char(scanner_occupant.dna.uni_identity) - var/num = randomize_radiation_accuracy(rad_pulse_index, radduration + (connected_scanner.precision_coeff ** 2), len) //Each manipulator level above 1 makes randomization as accurate as selected time + manipulator lvl^2 //Value is this high for the same reason as with laser - not worth the hassle of upgrading if the bonus is low + var/num = randomize_radiation_accuracy(rad_pulse_index, radduration + (connected_scanner.precision_coeff ** 2), len) //Each manipulator level above 1 makes randomization as accurate as selected time + manipulator lvl^2 //Value is this high for the same reason as with laser - not worth the hassle of upgrading if the bonus is low var/hex = copytext_char(scanner_occupant.dna.uni_identity, num, num+1) hex = scramble(hex, radstrength, radduration) diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm index 4835378b964..c08162f58fa 100644 --- a/code/game/machinery/computer/medical.dm +++ b/code/game/machinery/computer/medical.dm @@ -160,9 +160,9 @@ var/bdat = null for(var/mob/living/simple_animal/bot/medbot/M in GLOB.alive_mob_list) if(M.z != z) - continue //only find medibots on the same z-level as the computer + continue //only find medibots on the same z-level as the computer var/turf/bl = get_turf(M) - if(bl) //if it can't find a turf for the medibot, then it probably shouldn't be showing up + if(bl) //if it can't find a turf for the medibot, then it probably shouldn't be showing up bdat += "[M.name] - \[[bl.x],[bl.y]\] - [M.on ? "Online" : "Offline"]
" if(!bdat) dat += "
None detected
" @@ -547,7 +547,7 @@ else R.fields["name"] = random_unique_name(R.fields["gender"],1) if(2) - R.fields["gender"] = pick("Male", "Female", "Other") + R.fields["gender"] = pick("Male", "Female", "Other") if(3) R.fields["age"] = rand(AGE_MIN, AGE_MAX) if(4) diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index 0e9e67f7423..e0fdb2a086d 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -540,19 +540,19 @@ What a mess.*/ //Medical Record var/datum/data/record/M = new /datum/data/record() - M.fields["id"] = active1.fields["id"] - M.fields["name"] = active1.fields["name"] - M.fields["blood_type"] = "?" - M.fields["b_dna"] = "?????" - M.fields["mi_dis"] = "None" - M.fields["mi_dis_d"] = "No minor disabilities have been declared." - M.fields["ma_dis"] = "None" - M.fields["ma_dis_d"] = "No major disabilities have been diagnosed." - M.fields["alg"] = "None" - M.fields["alg_d"] = "No allergies have been detected in this patient." - M.fields["cdi"] = "None" - M.fields["cdi_d"] = "No diseases have been diagnosed at the moment." - M.fields["notes"] = "No notes." + M.fields["id"] = active1.fields["id"] + M.fields["name"] = active1.fields["name"] + M.fields["blood_type"] = "?" + M.fields["b_dna"] = "?????" + M.fields["mi_dis"] = "None" + M.fields["mi_dis_d"] = "No minor disabilities have been declared." + M.fields["ma_dis"] = "None" + M.fields["ma_dis_d"] = "No major disabilities have been diagnosed." + M.fields["alg"] = "None" + M.fields["alg_d"] = "No allergies have been detected in this patient." + M.fields["cdi"] = "None" + M.fields["cdi_d"] = "No diseases have been diagnosed at the moment." + M.fields["notes"] = "No notes." GLOB.data_core.medical += M diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 29920e3ed0d..151dbe7b5a4 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -31,25 +31,25 @@ // Wires for the airlock are located in the datum folder, inside the wires datum folder. -#define AIRLOCK_CLOSED 1 -#define AIRLOCK_CLOSING 2 -#define AIRLOCK_OPEN 3 -#define AIRLOCK_OPENING 4 -#define AIRLOCK_DENY 5 -#define AIRLOCK_EMAG 6 +#define AIRLOCK_CLOSED 1 +#define AIRLOCK_CLOSING 2 +#define AIRLOCK_OPEN 3 +#define AIRLOCK_OPENING 4 +#define AIRLOCK_DENY 5 +#define AIRLOCK_EMAG 6 -#define AIRLOCK_SECURITY_NONE 0 //Normal airlock //Wires are not secured -#define AIRLOCK_SECURITY_IRON 1 //Medium security airlock //There is a simple iron plate over wires (use welder) -#define AIRLOCK_SECURITY_PLASTEEL_I_S 2 //Sliced inner plating (use crowbar), jumps to 0 -#define AIRLOCK_SECURITY_PLASTEEL_I 3 //Removed outer plating, second layer here (use welder) -#define AIRLOCK_SECURITY_PLASTEEL_O_S 4 //Sliced outer plating (use crowbar) -#define AIRLOCK_SECURITY_PLASTEEL_O 5 //There is first layer of plasteel (use welder) -#define AIRLOCK_SECURITY_PLASTEEL 6 //Max security airlock //Fully secured wires (use wirecutters to remove grille, that is electrified) +#define AIRLOCK_SECURITY_NONE 0 //Normal airlock //Wires are not secured +#define AIRLOCK_SECURITY_IRON 1 //Medium security airlock //There is a simple iron plate over wires (use welder) +#define AIRLOCK_SECURITY_PLASTEEL_I_S 2 //Sliced inner plating (use crowbar), jumps to 0 +#define AIRLOCK_SECURITY_PLASTEEL_I 3 //Removed outer plating, second layer here (use welder) +#define AIRLOCK_SECURITY_PLASTEEL_O_S 4 //Sliced outer plating (use crowbar) +#define AIRLOCK_SECURITY_PLASTEEL_O 5 //There is first layer of plasteel (use welder) +#define AIRLOCK_SECURITY_PLASTEEL 6 //Max security airlock //Fully secured wires (use wirecutters to remove grille, that is electrified) -#define AIRLOCK_INTEGRITY_N 300 // Normal airlock integrity +#define AIRLOCK_INTEGRITY_N 300 // Normal airlock integrity #define AIRLOCK_INTEGRITY_MULTIPLIER 1.5 // How much reinforced doors health increases /// How much extra health airlocks get when braced with a seal -#define AIRLOCK_SEAL_MULTIPLIER 2 +#define AIRLOCK_SEAL_MULTIPLIER 2 #define AIRLOCK_DAMAGE_DEFLECTION_N 21 // Normal airlock damage deflection #define AIRLOCK_DAMAGE_DEFLECTION_R 30 // Reinforced airlock damage deflection @@ -109,7 +109,7 @@ var/obj/machinery/door/airlock/cyclelinkedairlock var/shuttledocked = 0 var/delayed_close_requested = FALSE // TRUE means the door will automatically close the next time it's opened. - var/air_tight = FALSE //TRUE means density will be set as soon as the door begins to close + var/air_tight = FALSE //TRUE means density will be set as soon as the door begins to close var/prying_so_hard = FALSE flags_1 = RAD_PROTECT_CONTENTS_1 | RAD_NO_CONTAMINATE_1 @@ -419,10 +419,10 @@ // returns TRUE if shocked, FALSE otherwise // The preceding comment was borrowed from the grille's shock script /obj/machinery/door/airlock/proc/shock(mob/living/user, prb) - if(!istype(user) || !hasPower()) // unpowered, no shock + if(!istype(user) || !hasPower()) // unpowered, no shock return FALSE if(!COOLDOWN_FINISHED(src, shockCooldown)) - return FALSE //Already shocked someone recently? + return FALSE //Already shocked someone recently? if(!prob(prb)) return FALSE //you lucked out, no shock for you do_sparks(5, TRUE, src) @@ -1615,7 +1615,7 @@ open() /** - * Generates the airlock's wire layout based on the current area the airlock resides in. + * Generates the airlock's wire layout based on the current area the airlock resides in. * * Returns a new /datum/wires/ with the appropriate wire layout based on the airlock_wires * of the area the airlock is in. diff --git a/code/game/machinery/doors/brigdoors.dm b/code/game/machinery/doors/brigdoors.dm index a9384c7dcd5..7d3a0b94008 100644 --- a/code/game/machinery/doors/brigdoors.dm +++ b/code/game/machinery/doors/brigdoors.dm @@ -34,7 +34,7 @@ var/activation_time = 0 var/timer_duration = 0 - var/timing = FALSE // boolean, true/1 timer is on, false/0 means it's not timing + var/timing = FALSE // boolean, true/1 timer is on, false/0 means it's not timing var/list/obj/machinery/targets = list() var/obj/item/radio/Radio //needed to send messages to sec radio diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index 55f8599855f..54f19849873 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -34,7 +34,7 @@ var/locked = FALSE //whether the door is bolted or not. var/assemblytype //the type of door frame to drop during deconstruction var/datum/effect_system/spark_spread/spark_system - var/real_explosion_block //ignore this, just use explosion_block + var/real_explosion_block //ignore this, just use explosion_block var/red_alert_access = FALSE //if TRUE, this door will always open on red alert var/poddoor = FALSE var/unres_sides = 0 //Unrestricted sides. A bitflag for which direction (if any) can open the door with no access @@ -121,7 +121,7 @@ if(isliving(AM)) var/mob/living/M = AM if(world.time - M.last_bumped <= 10) - return //Can bump-open one airlock per second. This is to prevent shock spam. + return //Can bump-open one airlock per second. This is to prevent shock spam. M.last_bumped = world.time if(HAS_TRAIT(M, TRAIT_HANDS_BLOCKED) && !check_access(null)) return diff --git a/code/game/machinery/doors/poddoor.dm b/code/game/machinery/doors/poddoor.dm index f1ee63638de..00aea3c3509 100644 --- a/code/game/machinery/doors/poddoor.dm +++ b/code/game/machinery/doors/poddoor.dm @@ -37,7 +37,7 @@ var/change_id = input("Set the shutters/blast door/blast door controllers ID. It must be a number between 1 and 100.", "ID", id) as num|null if(change_id) id = clamp(round(change_id, 1), 1, 100) - to_chat(user, "You change the ID to [id].") + to_chat(user, "You change the ID to [id].") if(W.tool_behaviour == TOOL_CROWBAR && deconstruction == INTACT) to_chat(user, "You start to remove the airlock electronics.") @@ -80,7 +80,7 @@ //special poddoors that open when emergency shuttle docks at centcom /obj/machinery/door/poddoor/shuttledock ertblast = TRUE - var/checkdir = 4 //door won't open if turf in this dir is `turftype` + var/checkdir = 4 //door won't open if turf in this dir is `turftype` var/turftype = /turf/open/space /obj/machinery/door/poddoor/shuttledock/proc/check() diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index 82e8bad72ce..84ff78643b9 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -287,7 +287,7 @@ return return ..() -/obj/machinery/door/window/interact(mob/user) //for sillycones +/obj/machinery/door/window/interact(mob/user) //for sillycones try_to_activate_door(user) /obj/machinery/door/window/try_to_activate_door(mob/user) diff --git a/code/game/machinery/electrolyzer.dm b/code/game/machinery/electrolyzer.dm index d42d5bc17b8..cc4cb771b7c 100644 --- a/code/game/machinery/electrolyzer.dm +++ b/code/game/machinery/electrolyzer.dm @@ -1,5 +1,5 @@ -#define ELECTROLYZER_MODE_STANDBY "standby" -#define ELECTROLYZER_MODE_WORKING "working" +#define ELECTROLYZER_MODE_STANDBY "standby" +#define ELECTROLYZER_MODE_WORKING "working" /obj/machinery/electrolyzer anchored = FALSE diff --git a/code/game/machinery/embedded_controller/access_controller.dm b/code/game/machinery/embedded_controller/access_controller.dm index 889252b9194..244a9392ca6 100644 --- a/code/game/machinery/embedded_controller/access_controller.dm +++ b/code/game/machinery/embedded_controller/access_controller.dm @@ -1,8 +1,8 @@ -#define CLOSING 1 -#define OPENING 2 -#define CYCLE 3 -#define CYCLE_EXTERIOR 4 -#define CYCLE_INTERIOR 5 +#define CLOSING 1 +#define OPENING 2 +#define CYCLE 3 +#define CYCLE_EXTERIOR 4 +#define CYCLE_INTERIOR 5 /obj/machinery/door_buttons power_channel = AREA_USAGE_ENVIRON diff --git a/code/game/machinery/embedded_controller/airlock_controller.dm b/code/game/machinery/embedded_controller/airlock_controller.dm index a6e331f3f68..f200f5df73e 100644 --- a/code/game/machinery/embedded_controller/airlock_controller.dm +++ b/code/game/machinery/embedded_controller/airlock_controller.dm @@ -1,9 +1,9 @@ //States for airlock_control -#define AIRLOCK_STATE_INOPEN -2 -#define AIRLOCK_STATE_PRESSURIZE -1 -#define AIRLOCK_STATE_CLOSED 0 -#define AIRLOCK_STATE_DEPRESSURIZE 1 -#define AIRLOCK_STATE_OUTOPEN 2 +#define AIRLOCK_STATE_INOPEN -2 +#define AIRLOCK_STATE_PRESSURIZE -1 +#define AIRLOCK_STATE_CLOSED 0 +#define AIRLOCK_STATE_DEPRESSURIZE 1 +#define AIRLOCK_STATE_OUTOPEN 2 /datum/computer/file/embedded_program/airlock_controller var/id_tag diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index d209ace9946..61ea80e6b84 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -1,8 +1,8 @@ /* Holograms! * Contains: - * Holopad - * Hologram - * Other stuff + * Holopad + * Hologram + * Other stuff */ /* @@ -377,7 +377,7 @@ Possible to do for anyone motivated enough: if(outgoing_call) HC.Disconnect(src)//can't answer calls while calling else - playsound(src, 'sound/machines/twobeep.ogg', 100) //bring, bring! + playsound(src, 'sound/machines/twobeep.ogg', 100) //bring, bring! ringing = TRUE update_icon() @@ -395,7 +395,7 @@ Possible to do for anyone motivated enough: var/obj/effect/overlay/holo_pad_hologram/Hologram = new(loc)//Spawn a blank effect at the location. if(AI) Hologram.icon = AI.holo_icon - else //make it like real life + else //make it like real life Hologram.icon = user.icon Hologram.icon_state = user.icon_state Hologram.copy_overlays(user, TRUE) @@ -408,7 +408,7 @@ Possible to do for anyone motivated enough: Hologram.layer = FLY_LAYER//Above all the other objects/mobs. Or the vast majority of them. Hologram.set_anchored(TRUE)//So space wind cannot drag it. Hologram.name = "[user.name] (Hologram)"//If someone decides to right click. - Hologram.set_light(2) //hologram lighting + Hologram.set_light(2) //hologram lighting move_hologram() set_holo(user, Hologram) @@ -566,7 +566,7 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/ Hologram.layer = FLY_LAYER//Above all the other objects/mobs. Or the vast majority of them. Hologram.set_anchored(TRUE)//So space wind cannot drag it. Hologram.name = "[record.caller_name] (Hologram)"//If someone decides to right click. - Hologram.set_light(2) //hologram lighting + Hologram.set_light(2) //hologram lighting visible_message("A holographic image of [record.caller_name] flickers to life before your eyes!") return Hologram diff --git a/code/game/machinery/igniter.dm b/code/game/machinery/igniter.dm index cbfaad9b3ac..712eb943d71 100644 --- a/code/game/machinery/igniter.dm +++ b/code/game/machinery/igniter.dm @@ -36,7 +36,7 @@ on = !( on ) update_icon() -/obj/machinery/igniter/process() //ugh why is this even in process()? +/obj/machinery/igniter/process() //ugh why is this even in process()? if (on && !(machine_stat & NOPOWER) ) var/turf/location = loc if (isturf(location)) diff --git a/code/game/machinery/limbgrower.dm b/code/game/machinery/limbgrower.dm index fe6804ea903..aac7160cc9a 100644 --- a/code/game/machinery/limbgrower.dm +++ b/code/game/machinery/limbgrower.dm @@ -115,10 +115,10 @@ return /obj/machinery/limbgrower/proc/build_item() - if(reagents.has_reagent(/datum/reagent/medicine/c2/synthflesh, being_built.reagents_list[/datum/reagent/medicine/c2/synthflesh]*prod_coeff)) //sanity check, if this happens we are in big trouble + if(reagents.has_reagent(/datum/reagent/medicine/c2/synthflesh, being_built.reagents_list[/datum/reagent/medicine/c2/synthflesh]*prod_coeff)) //sanity check, if this happens we are in big trouble reagents.remove_reagent(/datum/reagent/medicine/c2/synthflesh,being_built.reagents_list[/datum/reagent/medicine/c2/synthflesh]*prod_coeff) var/buildpath = being_built.build_path - if(ispath(buildpath, /obj/item/bodypart)) //This feels like spatgheti code, but i need to initilise a limb somehow + if(ispath(buildpath, /obj/item/bodypart)) //This feels like spatgheti code, but i need to initilise a limb somehow build_limb(buildpath) else //Just build whatever it is @@ -135,7 +135,7 @@ var/obj/item/bodypart/limb limb = new buildpath(loc) if(selected_category=="human" || selected_category=="lizard" || selected_category=="ethereal") //Species with greyscale parts should be included here - if(selected_category=="human") //humans don't use the full colour spectrum, they use random_skin_tone + if(selected_category=="human") //humans don't use the full colour spectrum, they use random_skin_tone limb.skin_tone = random_skin_tone() else limb.species_color = random_short_color() @@ -150,7 +150,7 @@ limb.desc = "A synthetically produced [selected_category] limb, grown in a tube. This one is for the [parse_zone(limb.body_zone)]." limb.species_id = selected_category limb.update_icon_dropped() - limb.original_owner = "limb grower" //prevents updating the icon, so a lizard arm on a human stays a lizard arm etc. + limb.original_owner = "limb grower" //prevents updating the icon, so a lizard arm on a human stays a lizard arm etc. /obj/machinery/limbgrower/RefreshParts() reagents.maximum_volume = 0 diff --git a/code/game/machinery/mass_driver.dm b/code/game/machinery/mass_driver.dm index 5c0ce82b24c..b71a4ce1036 100644 --- a/code/game/machinery/mass_driver.dm +++ b/code/game/machinery/mass_driver.dm @@ -9,7 +9,7 @@ var/power = 1 var/code = 1 var/id = 1 - var/drive_range = 50 //this is mostly irrelevant since current mass drivers throw into space, but you could make a lower-range mass driver for interstation transport or something I guess. + var/drive_range = 50 //this is mostly irrelevant since current mass drivers throw into space, but you could make a lower-range mass driver for interstation transport or something I guess. /obj/machinery/mass_driver/chapelgun name = "holy driver" @@ -40,7 +40,7 @@ var/O_limit var/atom/target = get_edge_target_turf(src, dir) for(var/atom/movable/O in loc) - if(!O.anchored || ismecha(O)) //Mechs need their launch platforms. + if(!O.anchored || ismecha(O)) //Mechs need their launch platforms. if(ismob(O) && !isliving(O)) continue O_limit++ diff --git a/code/game/machinery/medical_kiosk.dm b/code/game/machinery/medical_kiosk.dm index 3cd0b413d7c..04c6a07374f 100644 --- a/code/game/machinery/medical_kiosk.dm +++ b/code/game/machinery/medical_kiosk.dm @@ -14,13 +14,13 @@ var/obj/item/scanner_wand var/default_price = 15 //I'm defaulting to a low price on this, but in the future I wouldn't have an issue making it more or less expensive. var/active_price = 15 //Change by using a multitool on the board. - var/pandemonium = FALSE //AKA: Emag mode. + var/pandemonium = FALSE //AKA: Emag mode. var/scan_active_1 = FALSE //Shows if the machine is being used for a general scan. - var/scan_active_2 = FALSE //as above, symptom scan - var/scan_active_3 = FALSE //as above, radiological scan - var/scan_active_4 = FALSE //as above, chemical/hallucinations. - var/paying_customer = FALSE //Ticked yes if passing inuse() + var/scan_active_2 = FALSE //as above, symptom scan + var/scan_active_3 = FALSE //as above, radiological scan + var/scan_active_4 = FALSE //as above, chemical/hallucinations. + var/paying_customer = FALSE //Ticked yes if passing inuse() var/datum/bank_account/account //payer's account. var/mob/living/carbon/human/H //The person using the console in each instance. Used for paying for the kiosk. @@ -232,7 +232,7 @@ var/addict_list = list() var/hallucination_status = "Patient is not hallucinating." - if(altPatient.reagents.reagent_list.len) //Chemical Analysis details. + if(altPatient.reagents.reagent_list.len) //Chemical Analysis details. for(var/r in altPatient.reagents.reagent_list) var/datum/reagent/reagent = r if(reagent.chemical_flags & REAGENT_INVISIBLE) //Don't show hidden chems @@ -301,10 +301,10 @@ data["kiosk_cost"] = active_price + (chaos_modifier * (rand(1,25))) data["patient_name"] = patient_name data["patient_health"] = round(((total_health - (chaos_modifier * (rand(1,50)))) / max_health) * 100, 0.001) - data["brute_health"] = round(brute_loss+(chaos_modifier * (rand(1,30))),0.001) //To break this down for easy reading, all health values are rounded to the .001 place - data["burn_health"] = round(fire_loss+(chaos_modifier * (rand(1,30))),0.001) //then a random number is added, which is multiplied by chaos modifier. - data["toxin_health"] = round(tox_loss+(chaos_modifier * (rand(1,30))),0.001) //That allows for a weaker version of the affect to be applied while hallucinating as opposed to emagged. - data["suffocation_health"] = round(oxy_loss+(chaos_modifier * (rand(1,30))),0.001) //It's not the cleanest but it does make for a colorful window. + data["brute_health"] = round(brute_loss+(chaos_modifier * (rand(1,30))),0.001) //To break this down for easy reading, all health values are rounded to the .001 place + data["burn_health"] = round(fire_loss+(chaos_modifier * (rand(1,30))),0.001) //then a random number is added, which is multiplied by chaos modifier. + data["toxin_health"] = round(tox_loss+(chaos_modifier * (rand(1,30))),0.001) //That allows for a weaker version of the affect to be applied while hallucinating as opposed to emagged. + data["suffocation_health"] = round(oxy_loss+(chaos_modifier * (rand(1,30))),0.001) //It's not the cleanest but it does make for a colorful window. data["clone_health"] = round(clone_loss+(chaos_modifier * (rand(1,30))),0.001) data["brain_health"] = brain_status data["brain_damage"] = brain_loss+(chaos_modifier * (rand(1,30))) @@ -325,9 +325,9 @@ data["hallucinating_status"] = hallucination_status data["active_status_1"] = scan_active_1 // General Scan Check - data["active_status_2"] = scan_active_2 // Symptom Scan Check - data["active_status_3"] = scan_active_3 // Radio-Neuro Scan Check - data["active_status_4"] = scan_active_4 // Radio-Neuro Scan Check + data["active_status_2"] = scan_active_2 // Symptom Scan Check + data["active_status_3"] = scan_active_3 // Radio-Neuro Scan Check + data["active_status_4"] = scan_active_4 // Radio-Neuro Scan Check return data /obj/machinery/medical_kiosk/ui_act(action,active) diff --git a/code/game/machinery/navbeacon.dm b/code/game/machinery/navbeacon.dm index dbbfd9c821b..0def272f6f0 100644 --- a/code/game/machinery/navbeacon.dm +++ b/code/game/machinery/navbeacon.dm @@ -11,12 +11,12 @@ max_integrity = 500 armor = list(MELEE = 70, BULLET = 70, LASER = 70, ENERGY = 70, BOMB = 0, BIO = 0, RAD = 0, FIRE = 80, ACID = 80) - var/open = FALSE // true if cover is open - var/locked = TRUE // true if controls are locked + var/open = FALSE // true if cover is open + var/locked = TRUE // true if controls are locked var/freq = FREQ_NAV_BEACON - var/location = "" // location response text - var/list/codes // assoc. list of transponder codes - var/codes_txt = "" // codes as set on map: "tag1;tag2" or "tag1=value;tag2=value" + var/location = "" // location response text + var/list/codes // assoc. list of transponder codes + var/codes_txt = "" // codes as set on map: "tag1;tag2" or "tag1=value;tag2=value" var/wayfinding = FALSE req_one_access = list(ACCESS_ENGINE, ACCESS_ROBOTICS) @@ -57,10 +57,10 @@ codes = new() - var/list/entries = splittext(codes_txt, ";") // entries are separated by semicolons + var/list/entries = splittext(codes_txt, ";") // entries are separated by semicolons for(var/e in entries) - var/index = findtext(e, "=") // format is "key=value" + var/index = findtext(e, "=") // format is "key=value" if(index) var/key = copytext(e, 1, index) var/val = copytext(e, index + length(e[index])) @@ -95,7 +95,7 @@ /obj/machinery/navbeacon/attackby(obj/item/I, mob/user, params) var/turf/T = loc if(T.intact) - return // prevent intraction when T-scanner revealed + return // prevent intraction when T-scanner revealed if(I.tool_behaviour == TOOL_SCREWDRIVER) open = !open @@ -128,9 +128,9 @@ var/ai = isAI(user) var/turf/T = loc if(T.intact) - return // prevent intraction when T-scanner revealed + return // prevent intraction when T-scanner revealed - if(!open && !ai) // can't alter controls if not open, unless you're an AI + if(!open && !ai) // can't alter controls if not open, unless you're an AI to_chat(user, "The beacon's control cover is closed!") return @@ -158,9 +158,9 @@ Transponder Codes:
    "} for(var/key in codes) t += "
  • [key] ... [codes[key]]" - t += " Edit" - t += " Delete
    " - t += " Add New
    " + t += " Edit" + t += " Delete
    " + t += " Add New
    " t+= "
      " var/datum/browser/popup = new(user, "navbeacon", "Navigation Beacon", 300, 400) diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm index e222e8b4b2e..22a285431c6 100644 --- a/code/game/machinery/pipe/construction.dm +++ b/code/game/machinery/pipe/construction.dm @@ -138,12 +138,12 @@ Buildable meters var/obj/machinery/atmospherics/fakeA = pipe_type var/flags = initial(fakeA.pipe_flags) for(var/obj/machinery/atmospherics/M in loc) - if((M.pipe_flags & flags & PIPING_ONE_PER_TURF)) //Only one dense/requires density object per tile, eg connectors/cryo/heater/coolers. + if((M.pipe_flags & flags & PIPING_ONE_PER_TURF)) //Only one dense/requires density object per tile, eg connectors/cryo/heater/coolers. to_chat(user, "Something is hogging the tile!") return TRUE if((M.piping_layer != piping_layer) && !((M.pipe_flags | flags) & PIPING_ALL_LAYER)) //don't continue if either pipe goes across all layers continue - if(M.GetInitDirections() & SSair.get_init_dirs(pipe_type, fixed_dir())) // matches at least one direction on either type of pipe + if(M.GetInitDirections() & SSair.get_init_dirs(pipe_type, fixed_dir())) // matches at least one direction on either type of pipe to_chat(user, "There is already a pipe at that location!") return TRUE // no conflicts found diff --git a/code/game/machinery/porta_turret/portable_turret.dm b/code/game/machinery/porta_turret/portable_turret.dm index f165696ddcc..bba2454b32e 100644 --- a/code/game/machinery/porta_turret/portable_turret.dm +++ b/code/game/machinery/porta_turret/portable_turret.dm @@ -4,14 +4,14 @@ #define POPUP_ANIM_TIME 5 #define POPDOWN_ANIM_TIME 5 //Be sure to change the icon animation at the same time or it'll look bad -#define TURRET_FLAG_SHOOT_ALL_REACT (1<<0) // The turret gets pissed off and shoots at people nearby (unless they have sec access!) -#define TURRET_FLAG_AUTH_WEAPONS (1<<1) // Checks if it can shoot people that have a weapon they aren't authorized to have -#define TURRET_FLAG_SHOOT_CRIMINALS (1<<2) // Checks if it can shoot people that are wanted -#define TURRET_FLAG_SHOOT_ALL (1<<3) // The turret gets pissed off and shoots at people nearby (unless they have sec access!) -#define TURRET_FLAG_SHOOT_ANOMALOUS (1<<4) // Checks if it can shoot at unidentified lifeforms (ie xenos) -#define TURRET_FLAG_SHOOT_UNSHIELDED (1<<5) // Checks if it can shoot people that aren't mindshielded and who arent heads -#define TURRET_FLAG_SHOOT_BORGS (1<<6) // checks if it can shoot cyborgs -#define TURRET_FLAG_SHOOT_HEADS (1<<7) // checks if it can shoot at heads of staff +#define TURRET_FLAG_SHOOT_ALL_REACT (1<<0) // The turret gets pissed off and shoots at people nearby (unless they have sec access!) +#define TURRET_FLAG_AUTH_WEAPONS (1<<1) // Checks if it can shoot people that have a weapon they aren't authorized to have +#define TURRET_FLAG_SHOOT_CRIMINALS (1<<2) // Checks if it can shoot people that are wanted +#define TURRET_FLAG_SHOOT_ALL (1<<3) // The turret gets pissed off and shoots at people nearby (unless they have sec access!) +#define TURRET_FLAG_SHOOT_ANOMALOUS (1<<4) // Checks if it can shoot at unidentified lifeforms (ie xenos) +#define TURRET_FLAG_SHOOT_UNSHIELDED (1<<5) // Checks if it can shoot people that aren't mindshielded and who arent heads +#define TURRET_FLAG_SHOOT_BORGS (1<<6) // checks if it can shoot cyborgs +#define TURRET_FLAG_SHOOT_HEADS (1<<7) // checks if it can shoot at heads of staff DEFINE_BITFIELD(turret_flags, list( "TURRET_FLAG_SHOOT_ALL_REACT" = TURRET_FLAG_SHOOT_ALL_REACT, @@ -29,15 +29,15 @@ DEFINE_BITFIELD(turret_flags, list( icon = 'icons/obj/turrets.dmi' icon_state = "turretCover" layer = OBJ_LAYER - invisibility = INVISIBILITY_OBSERVER //the turret is invisible if it's inside its cover + invisibility = INVISIBILITY_OBSERVER //the turret is invisible if it's inside its cover density = TRUE desc = "A covered turret that shoots at its enemies." - use_power = IDLE_POWER_USE //this turret uses and requires power - idle_power_usage = 50 //when inactive, this turret takes up constant 50 Equipment power - active_power_usage = 300 //when active, this turret takes up constant 300 Equipment power + use_power = IDLE_POWER_USE //this turret uses and requires power + idle_power_usage = 50 //when inactive, this turret takes up constant 50 Equipment power + active_power_usage = 300 //when active, this turret takes up constant 300 Equipment power req_access = list(ACCESS_SECURITY) /// Only people with Security access - power_channel = AREA_USAGE_EQUIP //drains power from the EQUIPMENT channel - max_integrity = 160 //the turret's health + power_channel = AREA_USAGE_EQUIP //drains power from the EQUIPMENT channel + max_integrity = 160 //the turret's health integrity_failure = 0.5 armor = list(MELEE = 50, BULLET = 30, LASER = 30, ENERGY = 30, BOMB = 30, BIO = 0, RAD = 0, FIRE = 90, ACID = 90) base_icon_state = "standard" @@ -401,18 +401,18 @@ DEFINE_BITFIELD(turret_flags, list( if(.) power_change() invisibility = 0 - spark_system.start() //creates some sparks because they look cool - qdel(cover) //deletes the cover - no need on keeping it there! + spark_system.start() //creates some sparks because they look cool + qdel(cover) //deletes the cover - no need on keeping it there! /obj/machinery/porta_turret/process() //the main machinery process - if(cover == null && anchored) //if it has no cover and is anchored - if(machine_stat & BROKEN) //if the turret is borked - qdel(cover) //delete its cover, assuming it has one. Workaround for a pesky little bug + if(cover == null && anchored) //if it has no cover and is anchored + if(machine_stat & BROKEN) //if the turret is borked + qdel(cover) //delete its cover, assuming it has one. Workaround for a pesky little bug else if(has_cover) - cover = new /obj/machinery/porta_turret_cover(loc) //if the turret has no cover and is anchored, give it a cover - cover.parent_turret = src //assign the cover its parent_turret, which would be this (src) + cover = new /obj/machinery/porta_turret_cover(loc) //if the turret has no cover and is anchored, give it a cover + cover.parent_turret = src //assign the cover its parent_turret, which would be this (src) if(!on || (machine_stat & (NOPOWER|BROKEN))) return PROCESS_KILL @@ -498,7 +498,7 @@ DEFINE_BITFIELD(turret_flags, list( if(target(M)) return 1 -/obj/machinery/porta_turret/proc/popUp() //pops the turret up +/obj/machinery/porta_turret/proc/popUp() //pops the turret up if(!anchored) return if(raising || raised) @@ -516,7 +516,7 @@ DEFINE_BITFIELD(turret_flags, list( raised = 1 layer = MOB_LAYER -/obj/machinery/porta_turret/proc/popDown() //pops the turret down +/obj/machinery/porta_turret/proc/popDown() //pops the turret down if(raising || !raised) return if(machine_stat & BROKEN) @@ -534,17 +534,17 @@ DEFINE_BITFIELD(turret_flags, list( update_icon() /obj/machinery/porta_turret/proc/assess_perp(mob/living/carbon/human/perp) - var/threatcount = 0 //the integer returned + var/threatcount = 0 //the integer returned if(obj_flags & EMAGGED) - return 10 //if emagged, always return 10. + return 10 //if emagged, always return 10. if((turret_flags & (TURRET_FLAG_SHOOT_ALL | TURRET_FLAG_SHOOT_ALL_REACT)) && !allowed(perp)) //if the turret has been attacked or is angry, target all non-sec people if(!allowed(perp)) return 10 - if(turret_flags & TURRET_FLAG_AUTH_WEAPONS) //check for weapon authorization + if(turret_flags & TURRET_FLAG_AUTH_WEAPONS) //check for weapon authorization if(isnull(perp.wear_id) || istype(perp.wear_id.GetID(), /obj/item/card/id/syndicate)) if(allowed(perp)) //if the perp has security access, return 0 @@ -555,7 +555,7 @@ DEFINE_BITFIELD(turret_flags, list( if(istype(perp.belt, /obj/item/gun) || istype(perp.belt, /obj/item/melee/baton)) threatcount += 2 - if(turret_flags & TURRET_FLAG_SHOOT_CRIMINALS) //if the turret can check the records, check if they are set to *Arrest* on records + if(turret_flags & TURRET_FLAG_SHOOT_CRIMINALS) //if the turret can check the records, check if they are set to *Arrest* on records var/perpname = perp.get_face_name(perp.get_id_name()) var/datum/data/record/R = find_record("name", perpname, GLOB.data_core.security) if(!R || (R.fields["criminal"] == "*Arrest*")) @@ -578,7 +578,7 @@ DEFINE_BITFIELD(turret_flags, list( /obj/machinery/porta_turret/proc/target(atom/movable/target) if(target) - popUp() //pop the turret up if it's not already up. + popUp() //pop the turret up if it's not already up. setDir(get_dir(base, target))//even if you can't shoot, follow the target shootAt(target) return 1 @@ -588,7 +588,7 @@ DEFINE_BITFIELD(turret_flags, list( if(!raised) //the turret has to be raised in order to fire - makes sense, right? return - if(!(obj_flags & EMAGGED)) //if it hasn't been emagged, cooldown before shooting again + if(!(obj_flags & EMAGGED)) //if it hasn't been emagged, cooldown before shooting again if(last_fired + shot_delay > world.time) return last_fired = world.time @@ -927,7 +927,7 @@ DEFINE_BITFIELD(turret_flags, list( if (issilicon(user)) return attack_hand(user) - if ( get_dist(src, user) == 0 ) // trying to unlock the interface + if ( get_dist(src, user) == 0 ) // trying to unlock the interface if (allowed(usr)) if(obj_flags & EMAGGED) to_chat(user, "The turret control is unresponsive!") @@ -1093,8 +1093,8 @@ DEFINE_BITFIELD(turret_flags, list( /obj/machinery/porta_turret/lasertag/assess_perp(mob/living/carbon/human/perp) . = 0 - if(team_color == "blue") //Lasertag turrets target the opposing team, how great is that? -Sieve - . = 0 //But does not target anyone else + if(team_color == "blue") //Lasertag turrets target the opposing team, how great is that? -Sieve + . = 0 //But does not target anyone else if(istype(perp.wear_suit, /obj/item/clothing/suit/redtag)) . += 4 if(perp.is_holding_item_of_type(/obj/item/gun/energy/laser/redtag)) diff --git a/code/game/machinery/porta_turret/portable_turret_construct.dm b/code/game/machinery/porta_turret/portable_turret_construct.dm index 8120260fd7b..0808dd0e88f 100644 --- a/code/game/machinery/porta_turret/portable_turret_construct.dm +++ b/code/game/machinery/porta_turret/portable_turret_construct.dm @@ -16,13 +16,13 @@ anchored = FALSE density = TRUE var/build_step = PTURRET_UNSECURED //the current step in the building process - var/finish_name = "turret" //the name applied to the product turret + var/finish_name = "turret" //the name applied to the product turret var/obj/item/gun/installed_gun = null /obj/machinery/porta_turret_construct/attackby(obj/item/I, mob/user, params) //this is a bit unwieldy but self-explanatory switch(build_step) - if(PTURRET_UNSECURED) //first step + if(PTURRET_UNSECURED) //first step if(I.tool_behaviour == TOOL_WRENCH && !anchored) I.play_tool_sound(src, 100) to_chat(user, "You secure the external bolts.") @@ -157,7 +157,7 @@ build_step = PTURRET_CLOSED return - if(istype(I, /obj/item/pen)) //you can rename turrets like bots! + if(istype(I, /obj/item/pen)) //you can rename turrets like bots! var/t = stripped_input(user, "Enter new turret name", name, finish_name) if(!t) return diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm index 64132452cc8..e5e64e0fe47 100644 --- a/code/game/machinery/requests_console.dm +++ b/code/game/machinery/requests_console.dm @@ -8,17 +8,17 @@ GLOBAL_LIST_EMPTY(allConsoles) GLOBAL_LIST_EMPTY(req_console_ckey_departments) -#define REQ_SCREEN_MAIN 0 -#define REQ_SCREEN_REQ_ASSISTANCE 1 -#define REQ_SCREEN_REQ_SUPPLIES 2 -#define REQ_SCREEN_RELAY 3 -#define REQ_SCREEN_WRITE 4 -#define REQ_SCREEN_CHOOSE 5 -#define REQ_SCREEN_SENT 6 -#define REQ_SCREEN_ERR 7 -#define REQ_SCREEN_VIEW_MSGS 8 -#define REQ_SCREEN_AUTHENTICATE 9 -#define REQ_SCREEN_ANNOUNCE 10 +#define REQ_SCREEN_MAIN 0 +#define REQ_SCREEN_REQ_ASSISTANCE 1 +#define REQ_SCREEN_REQ_SUPPLIES 2 +#define REQ_SCREEN_RELAY 3 +#define REQ_SCREEN_WRITE 4 +#define REQ_SCREEN_CHOOSE 5 +#define REQ_SCREEN_SENT 6 +#define REQ_SCREEN_ERR 7 +#define REQ_SCREEN_VIEW_MSGS 8 +#define REQ_SCREEN_AUTHENTICATE 9 +#define REQ_SCREEN_ANNOUNCE 10 #define REQ_EMERGENCY_SECURITY 1 #define REQ_EMERGENCY_ENGINEERING 2 @@ -33,12 +33,12 @@ GLOBAL_LIST_EMPTY(req_console_ckey_departments) var/list/messages = list() //List of all messages var/departmentType = 0 //bitflag // 0 = none (not listed, can only replied to) - // assistance = 1 - // supplies = 2 - // info = 4 - // assistance + supplies = 3 - // assistance + info = 5 - // supplies + info = 6 + // assistance = 1 + // supplies = 2 + // info = 4 + // assistance + supplies = 3 + // assistance + info = 5 + // supplies + info = 6 // assistance + supplies + info = 7 var/newmessagepriority = REQ_NO_NEW_MESSAGE var/screen = REQ_SCREEN_MAIN diff --git a/code/game/machinery/roulette_machine.dm b/code/game/machinery/roulette_machine.dm index 379a1e55d39..624dbbf1ba0 100644 --- a/code/game/machinery/roulette_machine.dm +++ b/code/game/machinery/roulette_machine.dm @@ -146,7 +146,7 @@ var/potential_payout = chosen_bet_amount * potential_payout_mult if(!check_bartender_funds(potential_payout)) - return FALSE //bartender is too poor + return FALSE //bartender is too poor if(last_anti_spam > world.time) //do not cheat me return FALSE @@ -379,7 +379,7 @@ icon_state = "open" /obj/machinery/roulette/proc/shock(mob/user, prb) - if(!on) // unpowered, no shock + if(!on) // unpowered, no shock return FALSE if(!prob(prb)) return FALSE //you lucked out, no shock for you diff --git a/code/game/machinery/scan_gate.dm b/code/game/machinery/scan_gate.dm index 7ec04995dad..6371d83a334 100644 --- a/code/game/machinery/scan_gate.dm +++ b/code/game/machinery/scan_gate.dm @@ -1,22 +1,22 @@ -#define SCANGATE_NONE "Off" -#define SCANGATE_MINDSHIELD "Mindshield" -#define SCANGATE_NANITES "Nanites" -#define SCANGATE_DISEASE "Disease" -#define SCANGATE_GUNS "Guns" -#define SCANGATE_WANTED "Wanted" -#define SCANGATE_SPECIES "Species" -#define SCANGATE_NUTRITION "Nutrition" +#define SCANGATE_NONE "Off" +#define SCANGATE_MINDSHIELD "Mindshield" +#define SCANGATE_NANITES "Nanites" +#define SCANGATE_DISEASE "Disease" +#define SCANGATE_GUNS "Guns" +#define SCANGATE_WANTED "Wanted" +#define SCANGATE_SPECIES "Species" +#define SCANGATE_NUTRITION "Nutrition" -#define SCANGATE_HUMAN "human" -#define SCANGATE_LIZARD "lizard" -#define SCANGATE_FELINID "felinid" -#define SCANGATE_FLY "fly" -#define SCANGATE_PLASMAMAN "plasma" -#define SCANGATE_MOTH "moth" -#define SCANGATE_JELLY "jelly" -#define SCANGATE_POD "pod" -#define SCANGATE_GOLEM "golem" -#define SCANGATE_ZOMBIE "zombie" +#define SCANGATE_HUMAN "human" +#define SCANGATE_LIZARD "lizard" +#define SCANGATE_FELINID "felinid" +#define SCANGATE_FLY "fly" +#define SCANGATE_PLASMAMAN "plasma" +#define SCANGATE_MOTH "moth" +#define SCANGATE_JELLY "jelly" +#define SCANGATE_POD "pod" +#define SCANGATE_GOLEM "golem" +#define SCANGATE_ZOMBIE "zombie" /obj/machinery/scanner_gate name = "scanner gate" diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm index 975e5c258d8..4bcaec6762d 100644 --- a/code/game/machinery/shieldgen.dm +++ b/code/game/machinery/shieldgen.dm @@ -270,7 +270,7 @@ var/shield_range = 8 var/obj/structure/cable/attached // the attached cable -/obj/machinery/power/shieldwallgen/xenobiologyaccess //use in xenobiology containment +/obj/machinery/power/shieldwallgen/xenobiologyaccess //use in xenobiology containment name = "xenobiology shield wall generator" desc = "A shield generator meant for use in xenobiology." req_access = list(ACCESS_XENOBIOLOGY) diff --git a/code/game/machinery/slotmachine.dm b/code/game/machinery/slotmachine.dm index 963b411115e..882781d4d2e 100644 --- a/code/game/machinery/slotmachine.dm +++ b/code/game/machinery/slotmachine.dm @@ -1,7 +1,7 @@ /*******************************\ -| Slot Machines | -| Original code by Glloyd | -| Tgstation port by Miauw | +| Slot Machines | +| Original code by Glloyd | +| Tgstation port by Miauw | \*******************************/ #define SPIN_PRICE 5 diff --git a/code/game/machinery/spaceheater.dm b/code/game/machinery/spaceheater.dm index aea97f0a898..05684f98e71 100644 --- a/code/game/machinery/spaceheater.dm +++ b/code/game/machinery/spaceheater.dm @@ -1,6 +1,6 @@ -#define HEATER_MODE_STANDBY "standby" -#define HEATER_MODE_HEAT "heat" -#define HEATER_MODE_COOL "cool" +#define HEATER_MODE_STANDBY "standby" +#define HEATER_MODE_HEAT "heat" +#define HEATER_MODE_COOL "cool" /obj/machinery/space_heater anchored = FALSE diff --git a/code/game/machinery/status_display.dm b/code/game/machinery/status_display.dm index cf1108df9af..86fa0a1191a 100644 --- a/code/game/machinery/status_display.dm +++ b/code/game/machinery/status_display.dm @@ -26,9 +26,9 @@ maptext_width = 32 maptext_y = -1 - var/message1 = "" // message line 1 - var/message2 = "" // message line 2 - var/index1 // display index for scrolling messages or 0 if non-scrolling + var/message1 = "" // message line 1 + var/message2 = "" // message line 2 + var/index1 // display index for scrolling messages or 0 if non-scrolling var/index2 /// Immediately blank the display. diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index f43854ea95a..85b8b323e2b 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -518,7 +518,7 @@ return ..() -/* ref tg-git issue #45036 +/* ref tg-git issue #45036 screwdriving it open while it's running a decontamination sequence without closing the panel prior to finish causes the SSU to break due to state_open being set to TRUE at the end, and the panel becoming inaccessible. */ diff --git a/code/game/machinery/syndicatebomb.dm b/code/game/machinery/syndicatebomb.dm index c500d35c897..1d6cc870abf 100644 --- a/code/game/machinery/syndicatebomb.dm +++ b/code/game/machinery/syndicatebomb.dm @@ -1,5 +1,5 @@ #define BUTTON_COOLDOWN 60 // cant delay the bomb forever -#define BUTTON_DELAY 50 //five seconds +#define BUTTON_DELAY 50 //five seconds /obj/machinery/syndicatebomb icon = 'icons/obj/assemblies.dmi' @@ -22,12 +22,12 @@ var/can_unanchor = TRUE - var/open_panel = FALSE //are the wires exposed? - var/active = FALSE //is the bomb counting down? + var/open_panel = FALSE //are the wires exposed? + var/active = FALSE //is the bomb counting down? var/obj/item/bombcore/payload = /obj/item/bombcore var/beepsound = 'sound/items/timer.ogg' - var/delayedbig = FALSE //delay wire pulsed? - var/delayedlittle = FALSE //activation wire pulsed? + var/delayedbig = FALSE //delay wire pulsed? + var/delayedlittle = FALSE //activation wire pulsed? var/obj/effect/countdown/syndicatebomb/countdown var/next_beep @@ -298,7 +298,7 @@ qdel(src) /obj/item/bombcore/proc/defuse() -//Note: the machine's defusal is mostly done from the wires code, this is here if you want the core itself to do anything. +//Note: the machine's defusal is mostly done from the wires code, this is here if you want the core itself to do anything. ///Bomb Core Subtypes/// @@ -336,7 +336,7 @@ attempts++ defusals++ holder.loc.visible_message("[icon2html(holder, viewers(holder))] Alert: Bomb has been defused. Your score is now [defusals] for [attempts]! Resetting wires in 5 seconds...") - sleep(50) //Just in case someone is trying to remove the bomb core this gives them a little window to crowbar it out + sleep(50) //Just in case someone is trying to remove the bomb core this gives them a little window to crowbar it out if(istype(holder)) reset() @@ -361,7 +361,7 @@ /obj/item/bombcore/badmin/summon/clown summon_path = /mob/living/simple_animal/hostile/retaliate/clown - amt_summon = 50 + amt_summon = 50 /obj/item/bombcore/badmin/summon/clown/defuse() playsound(src, 'sound/misc/sadtrombone.ogg', 50) @@ -467,7 +467,7 @@ // Using different grenade casings, causes the payload to have different properties. var/obj/item/stock_parts/matter_bin/MB = locate(/obj/item/stock_parts/matter_bin) in src if(MB) - max_beakers += MB.rating // max beakers = 2-5. + max_beakers += MB.rating // max beakers = 2-5. qdel(MB) for(var/obj/item/grenade/chem_grenade/G in src) @@ -529,8 +529,8 @@ righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' w_class = WEIGHT_CLASS_TINY var/timer = 0 - var/detonated = 0 - var/existent = 0 + var/detonated = 0 + var/existent = 0 /obj/item/syndicatedetonator/attack_self(mob/user) if(timer < world.time) @@ -544,8 +544,8 @@ if(detonated) detonated-- log_bomber(user, "remotely detonated [detonated ? "syndicate bombs" : "a syndicate bomb"] using a", src) - detonated = 0 - existent = 0 + detonated = 0 + existent = 0 timer = world.time + BUTTON_COOLDOWN diff --git a/code/game/machinery/telecomms/computers/logbrowser.dm b/code/game/machinery/telecomms/computers/logbrowser.dm index 4d1f6693ced..650aa270b6c 100644 --- a/code/game/machinery/telecomms/computers/logbrowser.dm +++ b/code/game/machinery/telecomms/computers/logbrowser.dm @@ -5,12 +5,12 @@ icon_screen = "comm_logs" desc = "Has full access to all details and record of the telecommunications network it's monitoring." - var/screen = 0 // the screen number: - var/list/servers = list() // the servers located by the computer + var/screen = 0 // the screen number: + var/list/servers = list() // the servers located by the computer var/obj/machinery/telecomms/server/SelectedServer - var/network = "NULL" // the network to probe - var/temp = "" // temporary feedback messages + var/network = "NULL" // the network to probe + var/temp = "" // temporary feedback messages var/universal_translate = 0 // set to 1 if it can translate nonhuman speech @@ -67,7 +67,7 @@ // -- Determine race of orator -- var/mobtype = C.parameters["mobtype"] - var/race // The actual race of the mob + var/race // The actual race of the mob if(ispath(mobtype, /mob/living/carbon/human) || ispath(mobtype, /mob/living/brain)) race = "Humanoid" diff --git a/code/game/machinery/telecomms/computers/message.dm b/code/game/machinery/telecomms/computers/message.dm index 3bbb3964087..f3adae7bc7d 100644 --- a/code/game/machinery/telecomms/computers/message.dm +++ b/code/game/machinery/telecomms/computers/message.dm @@ -5,10 +5,10 @@ #define LINKED_SERVER_NONRESPONSIVE (!linkedServer || (linkedServer.machine_stat & (NOPOWER|BROKEN))) -#define MSG_MON_SCREEN_MAIN 0 -#define MSG_MON_SCREEN_LOGS 1 -#define MSG_MON_SCREEN_HACKED 2 -#define MSG_MON_SCREEN_CUSTOM_MSG 3 +#define MSG_MON_SCREEN_MAIN 0 +#define MSG_MON_SCREEN_LOGS 1 +#define MSG_MON_SCREEN_HACKED 2 +#define MSG_MON_SCREEN_CUSTOM_MSG 3 #define MSG_MON_SCREEN_REQUEST_LOGS 4 // The monitor itself. @@ -28,16 +28,16 @@ var/defaultmsg = "Welcome. Please select an option." var/rebootmsg = "%$&(£: Critical %$$@ Error // !RestArting! - ?pLeaSe wAit!" //Computer properties - var/screen = MSG_MON_SCREEN_MAIN // 0 = Main menu, 1 = Message Logs, 2 = Hacked screen, 3 = Custom Message - var/hacking = FALSE // Is it being hacked into by the AI/Cyborg - var/message = "System bootup complete. Please select an option." // The message that shows on the main menu. + var/screen = MSG_MON_SCREEN_MAIN // 0 = Main menu, 1 = Message Logs, 2 = Hacked screen, 3 = Custom Message + var/hacking = FALSE // Is it being hacked into by the AI/Cyborg + var/message = "System bootup complete. Please select an option." // The message that shows on the main menu. var/auth = FALSE // Are they authenticated? var/optioncount = 7 // Custom Message Properties var/customsender = "System Administrator" var/obj/item/pda/customrecepient = null - var/customjob = "Admin" - var/custommessage = "This is a test, please ignore." + var/customjob = "Admin" + var/custommessage = "This is a test, please ignore." /obj/machinery/computer/message_monitor/attackby(obj/item/O, mob/living/user, params) @@ -202,7 +202,7 @@ Recipient Message"} //Sender - Sender's Job - Recepient - Message - //Al Green- Your Dad - Your Mom - WHAT UP!? + //Al Green- Your Dad - Your Mom - WHAT UP!? dat += {"[customsender] [customjob] @@ -214,14 +214,14 @@ if(MSG_MON_SCREEN_REQUEST_LOGS) var/index = 0 - /* data_rc_msg - X - 5% + /* data_rc_msg + X - 5% var/rec_dpt = "Unspecified" //name of the person - 15% var/send_dpt = "Unspecified" //name of the sender- 15% - var/message = "Blank" //transferred message - 300px - var/stamp = "Unstamped" - 15% - var/id_auth = "Unauthenticated" - 15% - var/priority = "Normal" - 10% + var/message = "Blank" //transferred message - 300px + var/stamp = "Unstamped" - 15% + var/id_auth = "Unauthenticated" - 15% + var/priority = "Normal" - 10% */ dat += "
      Back - Refresh
      " dat += {" @@ -254,10 +254,10 @@ obj_flags &= ~EMAGGED /obj/machinery/computer/message_monitor/proc/ResetMessage() - customsender = "System Administrator" + customsender = "System Administrator" customrecepient = null - custommessage = "This is a test, please ignore." - customjob = "Admin" + custommessage = "This is a test, please ignore." + customjob = "Admin" /obj/machinery/computer/message_monitor/Topic(href, href_list) if(..()) diff --git a/code/game/machinery/telecomms/computers/telemonitor.dm b/code/game/machinery/telecomms/computers/telemonitor.dm index 3fa9ac129a8..1ac63752b12 100644 --- a/code/game/machinery/telecomms/computers/telemonitor.dm +++ b/code/game/machinery/telecomms/computers/telemonitor.dm @@ -10,13 +10,13 @@ icon_screen = "comm_monitor" desc = "Monitors the details of the telecommunications network it's synced with." - var/screen = 0 // the screen number: - var/list/machinelist = list() // the machines located by the computer + var/screen = 0 // the screen number: + var/list/machinelist = list() // the machines located by the computer var/obj/machinery/telecomms/SelectedMachine - var/network = "NULL" // the network to probe + var/network = "NULL" // the network to probe - var/temp = "" // temporary feedback messages + var/temp = "" // temporary feedback messages circuit = /obj/item/circuitboard/computer/comm_monitor /obj/machinery/computer/telecomms/monitor/ui_interact(mob/user) diff --git a/code/game/machinery/telecomms/telecomunications.dm b/code/game/machinery/telecomms/telecomunications.dm index c296dbe9984..39b846fa3c7 100644 --- a/code/game/machinery/telecomms/telecomunications.dm +++ b/code/game/machinery/telecomms/telecomunications.dm @@ -27,7 +27,7 @@ GLOBAL_LIST_EMPTY(telecomms_list) var/list/freq_listening = list() // list of frequencies to tune into: if none, will listen to all var/on = TRUE - var/toggled = TRUE // Is it toggled on + var/toggled = TRUE // Is it toggled on var/long_range_link = FALSE // Can you link it across Z levels or on the otherside of the map? (Relay & Hub) var/hide = FALSE // Is it a hidden machine? diff --git a/code/game/objects/buckling.dm b/code/game/objects/buckling.dm index 3dc8ec8f94f..b2bea71a08b 100644 --- a/code/game/objects/buckling.dm +++ b/code/game/objects/buckling.dm @@ -92,9 +92,9 @@ return FALSE // This signal will check if the mob is mounting this atom to ride it. There are 3 possibilities for how this goes - // 1. This movable doesn't have a ridable element and can't be ridden, so nothing gets returned, so continue on - // 2. There's a ridable element but we failed to mount it for whatever reason (maybe it has no seats left, for example), so we cancel the buckling - // 3. There's a ridable element and we were successfully able to mount, so keep it going and continue on with buckling + // 1. This movable doesn't have a ridable element and can't be ridden, so nothing gets returned, so continue on + // 2. There's a ridable element but we failed to mount it for whatever reason (maybe it has no seats left, for example), so we cancel the buckling + // 3. There's a ridable element and we were successfully able to mount, so keep it going and continue on with buckling if(SEND_SIGNAL(src, COMSIG_MOVABLE_PREBUCKLE, M, force, buckle_mob_flags) & COMPONENT_BLOCK_BUCKLE) return FALSE diff --git a/code/game/objects/effects/blessing.dm b/code/game/objects/effects/blessing.dm index 9db8d46b9ed..f7cb9c6723e 100644 --- a/code/game/objects/effects/blessing.dm +++ b/code/game/objects/effects/blessing.dm @@ -18,7 +18,7 @@ add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/blessed_aware, "blessing", I) RegisterSignal(loc, COMSIG_ATOM_INTERCEPT_TELEPORT, .proc/block_cult_teleport) -/obj/effect/blessing/Destroy() +/obj/effect/blessing/Destroy() UnregisterSignal(loc, COMSIG_ATOM_INTERCEPT_TELEPORT) return ..() diff --git a/code/game/objects/effects/bump_teleporter.dm b/code/game/objects/effects/bump_teleporter.dm index eddcb876668..0d2905c397c 100644 --- a/code/game/objects/effects/bump_teleporter.dm +++ b/code/game/objects/effects/bump_teleporter.dm @@ -2,9 +2,9 @@ name = "bump-teleporter" icon = 'icons/hud/screen_gen.dmi' icon_state = "x2" - var/id = null //id of this bump_teleporter. - var/id_target = null //id of bump_teleporter which this moves you to. - invisibility = INVISIBILITY_ABSTRACT //nope, can't see this + var/id = null //id of this bump_teleporter. + var/id_target = null //id of bump_teleporter which this moves you to. + invisibility = INVISIBILITY_ABSTRACT //nope, can't see this anchored = TRUE density = TRUE opacity = FALSE diff --git a/code/game/objects/effects/contraband.dm b/code/game/objects/effects/contraband.dm index 72ac3d28b4b..a6b4a2087c4 100644 --- a/code/game/objects/effects/contraband.dm +++ b/code/game/objects/effects/contraband.dm @@ -145,21 +145,21 @@ to_chat(user, "The wall is far too cluttered to place a poster!") return - to_chat(user, "You start placing the poster on the wall..." ) + to_chat(user, "You start placing the poster on the wall..." ) var/obj/structure/sign/poster/D = P.poster_structure var/temp_loc = get_turf(user) flick("poster_being_set",D) D.forceMove(src) - qdel(P) //delete it now to cut down on sanity checks afterwards. Agouri's code supports rerolling it anyway + qdel(P) //delete it now to cut down on sanity checks afterwards. Agouri's code supports rerolling it anyway playsound(D.loc, 'sound/items/poster_being_created.ogg', 100, TRUE) if(do_after(user, PLACE_SPEED, target=src)) if(!D || QDELETED(D)) return - if(iswallturf(src) && user && user.loc == temp_loc) //Let's check if everything is still there + if(iswallturf(src) && user && user.loc == temp_loc) //Let's check if everything is still there to_chat(user, "You place the poster!") return diff --git a/code/game/objects/effects/effect_system/effects_foam.dm b/code/game/objects/effects/effect_system/effects_foam.dm index 513fc71153a..7a91bff4166 100644 --- a/code/game/objects/effects/effect_system/effects_foam.dm +++ b/code/game/objects/effects/effect_system/effects_foam.dm @@ -204,7 +204,7 @@ /////////////////////////////////////////////// //FOAM EFFECT DATUM /datum/effect_system/foam_spread - var/amount = 10 // the size of the foam spread. + var/amount = 10 // the size of the foam spread. var/obj/chemholder effect_type = /obj/effect/particle_effect/foam var/metal = 0 @@ -259,7 +259,7 @@ icon = 'icons/effects/effects.dmi' icon_state = "metalfoam" density = TRUE - opacity = TRUE // changed in New() + opacity = TRUE // changed in New() anchored = TRUE layer = EDGED_TURF_LAYER resistance_flags = FIRE_PROOF | ACID_PROOF diff --git a/code/game/objects/effects/effect_system/effects_other.dm b/code/game/objects/effects/effect_system/effects_other.dm index 520e251a2a8..49b3869f140 100644 --- a/code/game/objects/effects/effect_system/effects_other.dm +++ b/code/game/objects/effects/effect_system/effects_other.dm @@ -84,10 +84,10 @@ //Reagent-based explosion effect /datum/effect_system/reagents_explosion - var/amount // TNT equivalent - var/flashing = FALSE // does explosion creates flash effect? - var/flashing_factor = 0 // factor of how powerful the flash effect relatively to the explosion - var/explosion_message = 1 //whether we show a message to mobs. + var/amount // TNT equivalent + var/flashing = FALSE // does explosion creates flash effect? + var/flashing_factor = 0 // factor of how powerful the flash effect relatively to the explosion + var/explosion_message = 1 //whether we show a message to mobs. /datum/effect_system/reagents_explosion/set_up(amt, loca, flash = FALSE, flash_fact = 0, message = TRUE) amount = amt diff --git a/code/game/objects/effects/glowshroom.dm b/code/game/objects/effects/glowshroom.dm index beb6ee94fed..7eb778128f3 100644 --- a/code/game/objects/effects/glowshroom.dm +++ b/code/game/objects/effects/glowshroom.dm @@ -49,7 +49,7 @@ . += "This is a [generation]\th generation [name]!" /** - * Creates a new glowshroom structure. + * Creates a new glowshroom structure. * * Arguments: * * newseed - Seed of the shroom @@ -169,7 +169,7 @@ continue Decay(TRUE, 2) // Decay before spawning new mushrooms to reduce their endurance - if(QDELETED(src)) //Decay can end us + if(QDELETED(src)) //Decay can end us return var/obj/structure/glowshroom/child = new type(newLoc, myseed, TRUE, TRUE) child.generation = generation + 1 diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm index 5c3bb97e9c1..76bbf00ae81 100644 --- a/code/game/objects/effects/landmarks.dm +++ b/code/game/objects/effects/landmarks.dm @@ -380,7 +380,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player) /obj/effect/landmark/thunderdome/one/Initialize(mapload) ..() - GLOB.tdome1 += loc + GLOB.tdome1 += loc return INITIALIZE_HINT_QDEL /obj/effect/landmark/thunderdome/two diff --git a/code/game/objects/effects/portals.dm b/code/game/objects/effects/portals.dm index 2f7c175738d..2d20dc4b402 100644 --- a/code/game/objects/effects/portals.dm +++ b/code/game/objects/effects/portals.dm @@ -19,12 +19,12 @@ anchored = TRUE var/mech_sized = FALSE var/obj/effect/portal/linked - var/hardlinked = TRUE //Requires a linked portal at all times. Destroy if there's no linked portal, if there is destroy it when this one is deleted. + var/hardlinked = TRUE //Requires a linked portal at all times. Destroy if there's no linked portal, if there is destroy it when this one is deleted. var/teleport_channel = TELEPORT_CHANNEL_BLUESPACE - var/turf/hard_target //For when a portal needs a hard target and isn't to be linked. - var/atmos_link = FALSE //Link source/destination atmos. - var/turf/open/atmos_source //Atmos link source - var/turf/open/atmos_destination //Atmos link destination + var/turf/hard_target //For when a portal needs a hard target and isn't to be linked. + var/atmos_link = FALSE //Link source/destination atmos. + var/turf/open/atmos_source //Atmos link source + var/turf/open/atmos_destination //Atmos link destination var/allow_anchored = FALSE var/innate_accuracy_penalty = 0 var/last_effect = 0 @@ -117,7 +117,7 @@ return FALSE LAZYINITLIST(atmos_source.atmos_adjacent_turfs) LAZYINITLIST(atmos_destination.atmos_adjacent_turfs) - if(atmos_source.atmos_adjacent_turfs[atmos_destination] || atmos_destination.atmos_adjacent_turfs[atmos_source]) //Already linked! + if(atmos_source.atmos_adjacent_turfs[atmos_destination] || atmos_destination.atmos_adjacent_turfs[atmos_source]) //Already linked! return FALSE atmos_source.atmos_adjacent_turfs[atmos_destination] = TRUE atmos_destination.atmos_adjacent_turfs[atmos_source] = TRUE diff --git a/code/game/objects/effects/proximity.dm b/code/game/objects/effects/proximity.dm index 5c477501f45..d75521c38d3 100644 --- a/code/game/objects/effects/proximity.dm +++ b/code/game/objects/effects/proximity.dm @@ -1,10 +1,10 @@ /datum/proximity_monitor - var/atom/host //the atom we are tracking + var/atom/host //the atom we are tracking var/atom/hasprox_receiver //the atom that will receive HasProximity calls. var/atom/last_host_loc var/list/checkers //list of /obj/effect/abstract/proximity_checkers var/current_range - var/ignore_if_not_on_turf //don't check turfs in range if the host's loc isn't a turf + var/ignore_if_not_on_turf //don't check turfs in range if the host's loc isn't a turf var/wire = FALSE /datum/proximity_monitor/New(atom/_host, range, _ignore_if_not_on_turf = TRUE) @@ -41,12 +41,12 @@ var/atom/_host = host var/atom/new_host_loc = _host.loc if(last_host_loc != new_host_loc) - last_host_loc = new_host_loc //hopefully this won't cause GC issues with containers + last_host_loc = new_host_loc //hopefully this won't cause GC issues with containers var/curr_range = current_range SetRange(curr_range, TRUE) if(curr_range) testing("HasProx: [host] -> [host]") - hasprox_receiver.HasProximity(host) //if we are processing, we're guaranteed to be a movable + hasprox_receiver.HasProximity(host) //if we are processing, we're guaranteed to be a movable /datum/proximity_monitor/proc/SetRange(range, force_rebuild = FALSE) if(!force_rebuild && range == current_range) @@ -63,7 +63,7 @@ var/atom/loc_to_use = ignore_if_not_on_turf ? _host.loc : get_turf(_host) if(wire && !isturf(loc_to_use)) //it makes assemblies attached on wires work loc_to_use = get_turf(loc_to_use) - if(!isturf(loc_to_use)) //only check the host's loc + if(!isturf(loc_to_use)) //only check the host's loc if(range) var/obj/effect/abstract/proximity_checker/pc if(old_checkers_len) @@ -73,7 +73,7 @@ else pc = new(loc_to_use, src) - checkers_local += pc //only check the host's loc + checkers_local += pc //only check the host's loc return var/list/turfs = RANGE_TURFS(range, loc_to_use) @@ -86,7 +86,7 @@ var/obj/effect/abstract/proximity_checker/pc = checkers_local[I] pc.forceMove(turfs[I]) else - qdel(checkers_local[I]) //delete the leftovers + qdel(checkers_local[I]) //delete the leftovers if(old_checkers_len < turfs_len) //create what we lack diff --git a/code/game/objects/effects/spawners/bombspawner.dm b/code/game/objects/effects/spawners/bombspawner.dm index daede72e3ae..804240a322e 100644 --- a/code/game/objects/effects/spawners/bombspawner.dm +++ b/code/game/objects/effects/spawners/bombspawner.dm @@ -1,16 +1,16 @@ -#define CELSIUS_TO_KELVIN(T_K) ((T_K) + T0C) +#define CELSIUS_TO_KELVIN(T_K) ((T_K) + T0C) -#define OPTIMAL_TEMP_K_PLA_BURN_SCALE(PRESSURE_P,PRESSURE_O,TEMP_O) (((PRESSURE_P) * GLOB.meta_gas_info[/datum/gas/plasma][META_GAS_SPECIFIC_HEAT]) / (((PRESSURE_P) * GLOB.meta_gas_info[/datum/gas/plasma][META_GAS_SPECIFIC_HEAT] + (PRESSURE_O) * GLOB.meta_gas_info[/datum/gas/oxygen][META_GAS_SPECIFIC_HEAT]) / PLASMA_UPPER_TEMPERATURE - (PRESSURE_O) * GLOB.meta_gas_info[/datum/gas/oxygen][META_GAS_SPECIFIC_HEAT] / CELSIUS_TO_KELVIN(TEMP_O))) -#define OPTIMAL_TEMP_K_PLA_BURN_RATIO(PRESSURE_P,PRESSURE_O,TEMP_O) (CELSIUS_TO_KELVIN(TEMP_O) * PLASMA_OXYGEN_FULLBURN * (PRESSURE_P) / (PRESSURE_O)) +#define OPTIMAL_TEMP_K_PLA_BURN_SCALE(PRESSURE_P,PRESSURE_O,TEMP_O) (((PRESSURE_P) * GLOB.meta_gas_info[/datum/gas/plasma][META_GAS_SPECIFIC_HEAT]) / (((PRESSURE_P) * GLOB.meta_gas_info[/datum/gas/plasma][META_GAS_SPECIFIC_HEAT] + (PRESSURE_O) * GLOB.meta_gas_info[/datum/gas/oxygen][META_GAS_SPECIFIC_HEAT]) / PLASMA_UPPER_TEMPERATURE - (PRESSURE_O) * GLOB.meta_gas_info[/datum/gas/oxygen][META_GAS_SPECIFIC_HEAT] / CELSIUS_TO_KELVIN(TEMP_O))) +#define OPTIMAL_TEMP_K_PLA_BURN_RATIO(PRESSURE_P,PRESSURE_O,TEMP_O) (CELSIUS_TO_KELVIN(TEMP_O) * PLASMA_OXYGEN_FULLBURN * (PRESSURE_P) / (PRESSURE_O)) /obj/effect/spawner/newbomb name = "bomb" icon = 'icons/hud/screen_gen.dmi' icon_state = "x" var/temp_p = 1500 - var/temp_o = 1000 // tank temperatures + var/temp_o = 1000 // tank temperatures var/pressure_p = 10 * ONE_ATMOSPHERE - var/pressure_o = 10 * ONE_ATMOSPHERE //tank pressures + var/pressure_o = 10 * ONE_ATMOSPHERE //tank pressures var/assembly_type /obj/effect/spawner/newbomb/Initialize() diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm index f354b2ee66a..c288eff7d39 100644 --- a/code/game/objects/effects/spawners/lootdrop.dm +++ b/code/game/objects/effects/spawners/lootdrop.dm @@ -2,9 +2,9 @@ icon = 'icons/effects/landmarks_static.dmi' icon_state = "random_loot" layer = OBJ_LAYER - var/lootcount = 1 //how many items will be spawned - var/lootdoubles = TRUE //if the same item can be spawned twice - var/list/loot //a list of possible items to spawn e.g. list(/obj/item, /obj/structure, /obj/effect) + var/lootcount = 1 //how many items will be spawned + var/lootdoubles = TRUE //if the same item can be spawned twice + var/list/loot //a list of possible items to spawn e.g. list(/obj/item, /obj/structure, /obj/effect) var/fan_out_items = FALSE //Whether the items should be distributed to offsets 0,1,-1,2,-2,3,-3.. This overrides pixel_x/y on the spawner itself /obj/effect/spawner/lootdrop/Initialize(mapload) diff --git a/code/game/objects/effects/step_triggers.dm b/code/game/objects/effects/step_triggers.dm index 322b13285fe..d1296af5236 100644 --- a/code/game/objects/effects/step_triggers.dm +++ b/code/game/objects/effects/step_triggers.dm @@ -30,7 +30,7 @@ /* Sends a message to mob when triggered*/ /obj/effect/step_trigger/message - var/message //the message to give to the mob + var/message //the message to give to the mob var/once = 1 mobs_only = TRUE @@ -44,9 +44,9 @@ /obj/effect/step_trigger/thrower var/direction = SOUTH // the direction of throw - var/tiles = 3 // if 0: forever until atom hits a stopper + var/tiles = 3 // if 0: forever until atom hits a stopper var/immobilize = 1 // if nonzero: prevents mobs from moving while they're being flung - var/speed = 1 // delay of movement + var/speed = 1 // delay of movement var/facedir = 0 // if 1: atom faces the direction of movement var/nostop = 0 // if 1: will only be stopped by teleporters var/list/affecting = list() @@ -106,7 +106,7 @@ /* Instant teleporter */ /obj/effect/step_trigger/teleporter - var/teleport_x = 0 // teleportation coordinates (if one is null, then no teleport!) + var/teleport_x = 0 // teleportation coordinates (if one is null, then no teleport!) var/teleport_y = 0 var/teleport_z = 0 @@ -136,7 +136,7 @@ /obj/effect/step_trigger/teleport_fancy var/locationx var/locationy - var/uses = 1 //0 for infinite uses + var/uses = 1 //0 for infinite uses var/entersparks = 0 var/exitsparks = 0 var/entersmoke = 0 diff --git a/code/game/objects/effects/temporary_visuals/projectiles/projectile_effects.dm b/code/game/objects/effects/temporary_visuals/projectiles/projectile_effects.dm index 49cdc3667cf..47fc591829a 100644 --- a/code/game/objects/effects/temporary_visuals/projectiles/projectile_effects.dm +++ b/code/game/objects/effects/temporary_visuals/projectiles/projectile_effects.dm @@ -45,7 +45,7 @@ appearance = look scale_to(1,scaling, FALSE) turn_to(angle_override, FALSE) - if(!isnull(new_loc)) //If you want to null it just delete it... + if(!isnull(new_loc)) //If you want to null it just delete it... forceMove(new_loc) for(var/i in 1 to increment) pixel_x += round((sin(angle_override)+16*sin(angle_override)*2), 1) diff --git a/code/game/objects/effects/temporary_visuals/projectiles/tracer.dm b/code/game/objects/effects/temporary_visuals/projectiles/tracer.dm index 0fbe2079c5a..ed96360fffb 100644 --- a/code/game/objects/effects/temporary_visuals/projectiles/tracer.dm +++ b/code/game/objects/effects/temporary_visuals/projectiles/tracer.dm @@ -1,4 +1,4 @@ -/proc/generate_tracer_between_points(datum/point/starting, datum/point/ending, beam_type, color, qdel_in = 5, light_range = 2, light_color_override, light_intensity = 1, instance_key) //Do not pass z-crossing points as that will not be properly (and likely will never be properly until it's absolutely needed) supported! +/proc/generate_tracer_between_points(datum/point/starting, datum/point/ending, beam_type, color, qdel_in = 5, light_range = 2, light_color_override, light_intensity = 1, instance_key) //Do not pass z-crossing points as that will not be properly (and likely will never be properly until it's absolutely needed) supported! if(!istype(starting) || !istype(ending) || !ispath(beam_type)) return var/datum/point/midpoint = point_midpoint_points(starting, ending) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 97a4e05526f..0fbebef7de3 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -13,14 +13,14 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb icon = 'icons/obj/items_and_weapons.dmi' blocks_emissive = EMISSIVE_BLOCK_GENERIC - /* !!!!!!!!!!!!!!! IMPORTANT !!!!!!!!!!!!!! + /* !!!!!!!!!!!!!!! IMPORTANT !!!!!!!!!!!!!! IF YOU ADD MORE ICON CRAP TO THIS ENSURE YOU ALSO ADD THE NEW VARS TO CHAMELEON ITEM_ACTION'S update_item() PROC (/datum/action/item_action/chameleon/change/proc/update_item()) WASHING MASHINE'S dye_item() PROC (/obj/item/proc/dye_item()) AND ALSO TO THE CHANGELING PROFILE DISGUISE SYSTEMS (/datum/changelingprofile / /datum/antagonist/changeling/proc/create_profile() / /proc/changeling_transform()) - !!!!!!!!!!!!!!! IMPORTANT !!!!!!!!!!!!!! */ + !!!!!!!!!!!!!!! IMPORTANT !!!!!!!!!!!!!! */ ///icon state for inhand overlays, if null the normal icon_state will be used. var/inhand_icon_state = null @@ -36,14 +36,14 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb ///Forced mob worn layer instead of the standard preferred ssize. var/alternate_worn_layer - /* !!!!!!!!!!!!!!! IMPORTANT !!!!!!!!!!!!!! + /* !!!!!!!!!!!!!!! IMPORTANT !!!!!!!!!!!!!! IF YOU ADD MORE ICON CRAP TO THIS ENSURE YOU ALSO ADD THE NEW VARS TO CHAMELEON ITEM_ACTION'S update_item() PROC (/datum/action/item_action/chameleon/change/proc/update_item()) WASHING MASHINE'S dye_item() PROC (/obj/item/proc/dye_item()) AND ALSO TO THE CHANGELING PROFILE DISGUISE SYSTEMS (/datum/changelingprofile / /datum/antagonist/changeling/proc/create_profile() / /proc/changeling_transform()) - !!!!!!!!!!!!!!! IMPORTANT !!!!!!!!!!!!!! */ + !!!!!!!!!!!!!!! IMPORTANT !!!!!!!!!!!!!! */ ///Dimensions of the icon file used when this item is worn, eg: hats.dmi (32x32 sprite, 64x64 sprite, etc.). Allows inhands/worn sprites to be of any size, but still centered on a mob properly var/worn_x_dimension = 32 @@ -216,7 +216,7 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb hitsound = "swing_hit" /obj/item/Destroy() - item_flags &= ~DROPDEL //prevent reqdels + item_flags &= ~DROPDEL //prevent reqdels if(ismob(loc)) var/mob/m = loc m.temporarilyRemoveItemFromInventory(src, TRUE) @@ -369,11 +369,11 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb else to_chat(user, "You burn your hand on [src]!") var/obj/item/bodypart/affecting = C.get_bodypart("[(user.active_hand_index % 2 == 0) ? "r" : "l" ]_arm") - if(affecting?.receive_damage( 0, 5 )) // 5 burn damage + if(affecting?.receive_damage( 0, 5 )) // 5 burn damage C.update_damage_overlays() return - if(!(interaction_flags_item & INTERACT_ITEM_ATTACK_HAND_PICKUP)) //See if we're supposed to auto pickup. + if(!(interaction_flags_item & INTERACT_ITEM_ATTACK_HAND_PICKUP)) //See if we're supposed to auto pickup. return //Heavy gravity makes picking up things very slow. diff --git a/code/game/objects/items/AI_modules.dm b/code/game/objects/items/AI_modules.dm index 5a523bb4308..50ea296f126 100644 --- a/code/game/objects/items/AI_modules.dm +++ b/code/game/objects/items/AI_modules.dm @@ -479,7 +479,7 @@ AI MODULES ..() /obj/item/ai_module/syndicate/transmitInstructions(datum/ai_laws/law_datum, mob/sender, overflow) -// ..() //We don't want this module reporting to the AI who dun it. --NEO +// ..() //We don't want this module reporting to the AI who dun it. --NEO if(law_datum.owner) to_chat(law_datum.owner, "BZZZZT") if(!overflow) diff --git a/code/game/objects/items/RCD.dm b/code/game/objects/items/RCD.dm index c0f6ddbecdb..f1873c11637 100644 --- a/code/game/objects/items/RCD.dm +++ b/code/game/objects/items/RCD.dm @@ -30,8 +30,8 @@ RLD var/matter = 0 var/max_matter = 100 var/no_ammo_message = "The \'Low Ammo\' light on the device blinks yellow." - var/has_ammobar = FALSE //controls whether or not does update_icon apply ammo indicator overlays - var/ammo_sections = 10 //amount of divisions in the ammo indicator overlay/number of ammo indicator states + var/has_ammobar = FALSE //controls whether or not does update_icon apply ammo indicator overlays + var/ammo_sections = 10 //amount of divisions in the ammo indicator overlay/number of ammo indicator states /// Bitflags for upgrades var/upgrade = NONE /// Bitflags for banned upgrades @@ -111,7 +111,7 @@ RLD loaded = loadwithsheets(O, user) if(loaded) to_chat(user, "[src] now holds [matter]/[max_matter] matter-units.") - update_icon() //ensures that ammo counters (if present) get updated + update_icon() //ensures that ammo counters (if present) get updated return loaded /obj/item/construction/proc/loadwithsheets(obj/item/stack/S, mob/user) @@ -178,7 +178,7 @@ RLD if(!. && user) to_chat(user, no_ammo_message) if(has_ammobar) - flick("[icon_state]_empty", src) //somewhat hacky thing to make RCDs with ammo counters actually have a blinking yellow light + flick("[icon_state]_empty", src) //somewhat hacky thing to make RCDs with ammo counters actually have a blinking yellow light return . /obj/item/construction/proc/range_check(atom/A, mob/user) diff --git a/code/game/objects/items/RPD.dm b/code/game/objects/items/RPD.dm index 67ae28aa8ef..ce7ef8e03a1 100644 --- a/code/game/objects/items/RPD.dm +++ b/code/game/objects/items/RPD.dm @@ -15,65 +15,65 @@ RPD GLOBAL_LIST_INIT(atmos_pipe_recipes, list( "Pipes" = list( - new /datum/pipe_info/pipe("Pipe", /obj/machinery/atmospherics/pipe/simple, TRUE), - new /datum/pipe_info/pipe("Manifold", /obj/machinery/atmospherics/pipe/manifold, TRUE), - new /datum/pipe_info/pipe("4-Way Manifold", /obj/machinery/atmospherics/pipe/manifold4w, TRUE), - new /datum/pipe_info/pipe("Layer Adapter", /obj/machinery/atmospherics/pipe/layer_manifold, TRUE), - new /datum/pipe_info/pipe("Multi-Deck Adapter", /obj/machinery/atmospherics/pipe/multiz, TRUE), + new /datum/pipe_info/pipe("Pipe", /obj/machinery/atmospherics/pipe/simple, TRUE), + new /datum/pipe_info/pipe("Manifold", /obj/machinery/atmospherics/pipe/manifold, TRUE), + new /datum/pipe_info/pipe("4-Way Manifold", /obj/machinery/atmospherics/pipe/manifold4w, TRUE), + new /datum/pipe_info/pipe("Layer Adapter", /obj/machinery/atmospherics/pipe/layer_manifold, TRUE), + new /datum/pipe_info/pipe("Multi-Deck Adapter", /obj/machinery/atmospherics/pipe/multiz, TRUE), ), "Devices" = list( - new /datum/pipe_info/pipe("Connector", /obj/machinery/atmospherics/components/unary/portables_connector, TRUE), - new /datum/pipe_info/pipe("Gas Pump", /obj/machinery/atmospherics/components/binary/pump, TRUE), - new /datum/pipe_info/pipe("Volume Pump", /obj/machinery/atmospherics/components/binary/volume_pump, TRUE), - new /datum/pipe_info/pipe("Gas Filter", /obj/machinery/atmospherics/components/trinary/filter, TRUE), - new /datum/pipe_info/pipe("Gas Mixer", /obj/machinery/atmospherics/components/trinary/mixer, TRUE), - new /datum/pipe_info/pipe("Passive Gate", /obj/machinery/atmospherics/components/binary/passive_gate, TRUE), - new /datum/pipe_info/pipe("Injector", /obj/machinery/atmospherics/components/unary/outlet_injector, TRUE), - new /datum/pipe_info/pipe("Scrubber", /obj/machinery/atmospherics/components/unary/vent_scrubber, TRUE), - new /datum/pipe_info/pipe("Unary Vent", /obj/machinery/atmospherics/components/unary/vent_pump, TRUE), - new /datum/pipe_info/pipe("Passive Vent", /obj/machinery/atmospherics/components/unary/passive_vent, TRUE), - new /datum/pipe_info/pipe("Manual Valve", /obj/machinery/atmospherics/components/binary/valve, TRUE), - new /datum/pipe_info/pipe("Digital Valve", /obj/machinery/atmospherics/components/binary/valve/digital, TRUE), - new /datum/pipe_info/pipe("Pressure Valve", /obj/machinery/atmospherics/components/binary/pressure_valve, TRUE), - new /datum/pipe_info/pipe("Temperature Gate", /obj/machinery/atmospherics/components/binary/temperature_gate, TRUE), - new /datum/pipe_info/pipe("Temperature Pump", /obj/machinery/atmospherics/components/binary/temperature_pump, TRUE), + new /datum/pipe_info/pipe("Connector", /obj/machinery/atmospherics/components/unary/portables_connector, TRUE), + new /datum/pipe_info/pipe("Gas Pump", /obj/machinery/atmospherics/components/binary/pump, TRUE), + new /datum/pipe_info/pipe("Volume Pump", /obj/machinery/atmospherics/components/binary/volume_pump, TRUE), + new /datum/pipe_info/pipe("Gas Filter", /obj/machinery/atmospherics/components/trinary/filter, TRUE), + new /datum/pipe_info/pipe("Gas Mixer", /obj/machinery/atmospherics/components/trinary/mixer, TRUE), + new /datum/pipe_info/pipe("Passive Gate", /obj/machinery/atmospherics/components/binary/passive_gate, TRUE), + new /datum/pipe_info/pipe("Injector", /obj/machinery/atmospherics/components/unary/outlet_injector, TRUE), + new /datum/pipe_info/pipe("Scrubber", /obj/machinery/atmospherics/components/unary/vent_scrubber, TRUE), + new /datum/pipe_info/pipe("Unary Vent", /obj/machinery/atmospherics/components/unary/vent_pump, TRUE), + new /datum/pipe_info/pipe("Passive Vent", /obj/machinery/atmospherics/components/unary/passive_vent, TRUE), + new /datum/pipe_info/pipe("Manual Valve", /obj/machinery/atmospherics/components/binary/valve, TRUE), + new /datum/pipe_info/pipe("Digital Valve", /obj/machinery/atmospherics/components/binary/valve/digital, TRUE), + new /datum/pipe_info/pipe("Pressure Valve", /obj/machinery/atmospherics/components/binary/pressure_valve, TRUE), + new /datum/pipe_info/pipe("Temperature Gate", /obj/machinery/atmospherics/components/binary/temperature_gate, TRUE), + new /datum/pipe_info/pipe("Temperature Pump", /obj/machinery/atmospherics/components/binary/temperature_pump, TRUE), new /datum/pipe_info/meter("Meter"), ), "Heat Exchange" = list( - new /datum/pipe_info/pipe("Pipe", /obj/machinery/atmospherics/pipe/heat_exchanging/simple, FALSE), - new /datum/pipe_info/pipe("Manifold", /obj/machinery/atmospherics/pipe/heat_exchanging/manifold, FALSE), - new /datum/pipe_info/pipe("4-Way Manifold", /obj/machinery/atmospherics/pipe/heat_exchanging/manifold4w, FALSE), - new /datum/pipe_info/pipe("Junction", /obj/machinery/atmospherics/pipe/heat_exchanging/junction, FALSE), - new /datum/pipe_info/pipe("Heat Exchanger", /obj/machinery/atmospherics/components/unary/heat_exchanger, FALSE), + new /datum/pipe_info/pipe("Pipe", /obj/machinery/atmospherics/pipe/heat_exchanging/simple, FALSE), + new /datum/pipe_info/pipe("Manifold", /obj/machinery/atmospherics/pipe/heat_exchanging/manifold, FALSE), + new /datum/pipe_info/pipe("4-Way Manifold", /obj/machinery/atmospherics/pipe/heat_exchanging/manifold4w, FALSE), + new /datum/pipe_info/pipe("Junction", /obj/machinery/atmospherics/pipe/heat_exchanging/junction, FALSE), + new /datum/pipe_info/pipe("Heat Exchanger", /obj/machinery/atmospherics/components/unary/heat_exchanger, FALSE), ) )) GLOBAL_LIST_INIT(disposal_pipe_recipes, list( "Disposal Pipes" = list( - new /datum/pipe_info/disposal("Pipe", /obj/structure/disposalpipe/segment, PIPE_BENDABLE), - new /datum/pipe_info/disposal("Junction", /obj/structure/disposalpipe/junction, PIPE_TRIN_M), - new /datum/pipe_info/disposal("Y-Junction", /obj/structure/disposalpipe/junction/yjunction), - new /datum/pipe_info/disposal("Sort Junction", /obj/structure/disposalpipe/sorting/mail, PIPE_TRIN_M), - new /datum/pipe_info/disposal("Trunk", /obj/structure/disposalpipe/trunk), - new /datum/pipe_info/disposal("Bin", /obj/machinery/disposal/bin, PIPE_ONEDIR), - new /datum/pipe_info/disposal("Outlet", /obj/structure/disposaloutlet), - new /datum/pipe_info/disposal("Chute", /obj/machinery/disposal/delivery_chute), + new /datum/pipe_info/disposal("Pipe", /obj/structure/disposalpipe/segment, PIPE_BENDABLE), + new /datum/pipe_info/disposal("Junction", /obj/structure/disposalpipe/junction, PIPE_TRIN_M), + new /datum/pipe_info/disposal("Y-Junction", /obj/structure/disposalpipe/junction/yjunction), + new /datum/pipe_info/disposal("Sort Junction", /obj/structure/disposalpipe/sorting/mail, PIPE_TRIN_M), + new /datum/pipe_info/disposal("Trunk", /obj/structure/disposalpipe/trunk), + new /datum/pipe_info/disposal("Bin", /obj/machinery/disposal/bin, PIPE_ONEDIR), + new /datum/pipe_info/disposal("Outlet", /obj/structure/disposaloutlet), + new /datum/pipe_info/disposal("Chute", /obj/machinery/disposal/delivery_chute), ) )) GLOBAL_LIST_INIT(transit_tube_recipes, list( "Transit Tubes" = list( - new /datum/pipe_info/transit("Straight Tube", /obj/structure/c_transit_tube, PIPE_STRAIGHT), - new /datum/pipe_info/transit("Straight Tube with Crossing", /obj/structure/c_transit_tube/crossing, PIPE_STRAIGHT), - new /datum/pipe_info/transit("Curved Tube", /obj/structure/c_transit_tube/curved, PIPE_UNARY_FLIPPABLE), - new /datum/pipe_info/transit("Diagonal Tube", /obj/structure/c_transit_tube/diagonal, PIPE_STRAIGHT), - new /datum/pipe_info/transit("Diagonal Tube with Crossing", /obj/structure/c_transit_tube/diagonal/crossing, PIPE_STRAIGHT), - new /datum/pipe_info/transit("Junction", /obj/structure/c_transit_tube/junction, PIPE_UNARY_FLIPPABLE), + new /datum/pipe_info/transit("Straight Tube", /obj/structure/c_transit_tube, PIPE_STRAIGHT), + new /datum/pipe_info/transit("Straight Tube with Crossing", /obj/structure/c_transit_tube/crossing, PIPE_STRAIGHT), + new /datum/pipe_info/transit("Curved Tube", /obj/structure/c_transit_tube/curved, PIPE_UNARY_FLIPPABLE), + new /datum/pipe_info/transit("Diagonal Tube", /obj/structure/c_transit_tube/diagonal, PIPE_STRAIGHT), + new /datum/pipe_info/transit("Diagonal Tube with Crossing", /obj/structure/c_transit_tube/diagonal/crossing, PIPE_STRAIGHT), + new /datum/pipe_info/transit("Junction", /obj/structure/c_transit_tube/junction, PIPE_UNARY_FLIPPABLE), ), "Station Equipment" = list( - new /datum/pipe_info/transit("Through Tube Station", /obj/structure/c_transit_tube/station, PIPE_STRAIGHT), - new /datum/pipe_info/transit("Terminus Tube Station", /obj/structure/c_transit_tube/station/reverse, PIPE_UNARY), - new /datum/pipe_info/transit("Transit Tube Pod", /obj/structure/c_transit_tube_pod, PIPE_ONEDIR), + new /datum/pipe_info/transit("Through Tube Station", /obj/structure/c_transit_tube/station, PIPE_STRAIGHT), + new /datum/pipe_info/transit("Terminus Tube Station", /obj/structure/c_transit_tube/station/reverse, PIPE_UNARY), + new /datum/pipe_info/transit("Transit Tube Pod", /obj/structure/c_transit_tube_pod, PIPE_ONEDIR), ) )) diff --git a/code/game/objects/items/blueprints.dm b/code/game/objects/items/blueprints.dm index a6bb5ade5f2..b0282187caf 100644 --- a/code/game/objects/items/blueprints.dm +++ b/code/game/objects/items/blueprints.dm @@ -53,7 +53,7 @@ resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF var/list/image/showing = list() var/client/viewing - var/legend = FALSE //Viewing the wire legend + var/legend = FALSE //Viewing the wire legend /obj/item/areaeditor/blueprints/Destroy() @@ -174,11 +174,11 @@ /obj/item/areaeditor/blueprints/proc/view_wire_set(mob/user, wireset) //for some reason you can't use wireset directly as a derefencer so this is the next best :/ for(var/device in GLOB.wire_color_directory) - if("[device]" == wireset) //I know... don't change it... + if("[device]" == wireset) //I know... don't change it... var/message = "

      [GLOB.wire_name_directory[device]]:" for(var/Col in GLOB.wire_color_directory[device]) var/wire_name = GLOB.wire_color_directory[device][Col] - if(!findtext(wire_name, WIRE_DUD_PREFIX)) //don't show duds + if(!findtext(wire_name, WIRE_DUD_PREFIX)) //don't show duds message += "

      [Col]: [wire_name]

      " message += "

      " return message diff --git a/code/game/objects/items/candle.dm b/code/game/objects/items/candle.dm index bd73390dd0d..7d4fad649ba 100644 --- a/code/game/objects/items/candle.dm +++ b/code/game/objects/items/candle.dm @@ -1,4 +1,4 @@ -#define CANDLE_LUMINOSITY 2 +#define CANDLE_LUMINOSITY 2 /obj/item/candle name = "red candle" desc = "In Greek myth, Prometheus stole fire from the Gods and gave it to \ diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm index 3bf967dca0d..ae2f4da71bf 100644 --- a/code/game/objects/items/cards_ids.dm +++ b/code/game/objects/items/cards_ids.dm @@ -1,9 +1,9 @@ /* Cards * Contains: - * DATA CARD - * ID CARD - * FINGERPRINT CARD HOLDER - * FINGERPRINT CARD + * DATA CARD + * ID CARD + * FINGERPRINT CARD HOLDER + * FINGERPRINT CARD */ diff --git a/code/game/objects/items/cigs_lighters.dm b/code/game/objects/items/cigs_lighters.dm index 07bcf1419a9..7c13a5ef4ab 100644 --- a/code/game/objects/items/cigs_lighters.dm +++ b/code/game/objects/items/cigs_lighters.dm @@ -169,10 +169,10 @@ CIGARETTE PACKETS ARE IN FANCY.DM . = ..() if(!proximity || lit) //can't dip if cigarette is lit (it will heat the reagents in the glass instead) return - if(istype(glass)) //you can dip cigarettes into beakers - if(glass.reagents.trans_to(src, chem_volume, transfered_by = user)) //if reagents were transfered, show the message + if(istype(glass)) //you can dip cigarettes into beakers + if(glass.reagents.trans_to(src, chem_volume, transfered_by = user)) //if reagents were transfered, show the message to_chat(user, "You dip \the [src] into \the [glass].") - else //if not, either the beaker was empty, or the cigarette was full + else //if not, either the beaker was empty, or the cigarette was full if(!glass.reagents.total_volume) to_chat(user, "[glass] is empty!") else @@ -549,7 +549,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM STOP_PROCESSING(SSobj, src) return open_flame() - if(reagents?.total_volume) // check if it has any reagents at all + if(reagents?.total_volume) // check if it has any reagents at all handle_reagents() diff --git a/code/game/objects/items/circuitboards/computer_circuitboards.dm b/code/game/objects/items/circuitboards/computer_circuitboards.dm index 1eb38559b66..64512bbc21a 100644 --- a/code/game/objects/items/circuitboards/computer_circuitboards.dm +++ b/code/game/objects/items/circuitboards/computer_circuitboards.dm @@ -42,9 +42,9 @@ //obj/item/circuitboard/computer/shield -// name = "Shield Control (Computer Board)" -// icon_state = "command" -// build_path = /obj/machinery/computer/stationshield +// name = "Shield Control (Computer Board)" +// icon_state = "command" +// build_path = /obj/machinery/computer/stationshield //Engineering diff --git a/code/game/objects/items/clown_items.dm b/code/game/objects/items/clown_items.dm index 7640952bbab..8a95cd9a364 100644 --- a/code/game/objects/items/clown_items.dm +++ b/code/game/objects/items/clown_items.dm @@ -1,9 +1,9 @@ /* Clown Items * Contains: - * Soap - * Bike Horns - * Air Horns - * Canned Laughter + * Soap + * Bike Horns + * Air Horns + * Canned Laughter */ /* @@ -136,7 +136,7 @@ else if(ishuman(target) && user.zone_selected == BODY_ZONE_PRECISE_MOUTH) var/mob/living/carbon/human/human_user = user - user.visible_message("\the [user] washes \the [target]'s mouth out with [src.name]!", "You wash \the [target]'s mouth out with [src.name]!") //washes mouth out with soap sounds better than 'the soap' here if(user.zone_selected == "mouth") + user.visible_message("\the [user] washes \the [target]'s mouth out with [src.name]!", "You wash \the [target]'s mouth out with [src.name]!") //washes mouth out with soap sounds better than 'the soap' here if(user.zone_selected == "mouth") if(human_user.lip_style) user.mind?.adjust_experience(/datum/skill/cleaning, CLEAN_SKILL_GENERIC_WASH_XP) human_user.update_lips(null) diff --git a/code/game/objects/items/control_wand.dm b/code/game/objects/items/control_wand.dm index b2d1b28796f..88e7f40ef78 100644 --- a/code/game/objects/items/control_wand.dm +++ b/code/game/objects/items/control_wand.dm @@ -61,7 +61,7 @@ var/datum/netdata/data = new(list("data" = mode,"data_secondary" = "toggle")) data.receiver_id = target_interface.hardware_id data.passkey = access_list - data.user = user // for responce message + data.user = user // for responce message ntnet_send(data) diff --git a/code/game/objects/items/cosmetics.dm b/code/game/objects/items/cosmetics.dm index 2a3bbf4536c..869c3d0ace9 100644 --- a/code/game/objects/items/cosmetics.dm +++ b/code/game/objects/items/cosmetics.dm @@ -62,7 +62,7 @@ if(target.is_mouth_covered()) to_chat(user, "Remove [ target == user ? "your" : "[target.p_their()]" ] mask!") return - if(target.lip_style) //if they already have lipstick on + if(target.lip_style) //if they already have lipstick on to_chat(user, "You need to wipe off the old lipstick first!") return diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm index 8753f5476af..17916a94d5f 100644 --- a/code/game/objects/items/crayons.dm +++ b/code/game/objects/items/crayons.dm @@ -10,9 +10,9 @@ #define RANDOM_RUNE "Random Rune" #define RANDOM_ANY "Random Anything" -#define PAINT_NORMAL 1 -#define PAINT_LARGE_HORIZONTAL 2 -#define PAINT_LARGE_HORIZONTAL_ICON 'icons/effects/96x32.dmi' +#define PAINT_NORMAL 1 +#define PAINT_LARGE_HORIZONTAL 2 +#define PAINT_LARGE_HORIZONTAL_ICON 'icons/effects/96x32.dmi' /* * Crayons @@ -361,7 +361,7 @@ clicky = clamp(text2num(LAZYACCESS(modifiers, ICON_Y)) - 16, -(world.icon_size/2), world.icon_size/2) if(!instant) - to_chat(user, "You start drawing a [temp] on the [target.name]...") + to_chat(user, "You start drawing a [temp] on the [target.name]...") if(pre_noise) audible_message("You hear spraying.") diff --git a/code/game/objects/items/defib.dm b/code/game/objects/items/defib.dm index 06a15e9a50f..1a4982eb6f3 100644 --- a/code/game/objects/items/defib.dm +++ b/code/game/objects/items/defib.dm @@ -458,7 +458,7 @@ do_help(H, user) /obj/item/shockpaddles/proc/shock_touching(dmg, mob/H) - if(isliving(H.pulledby)) //CLEAR! + if(isliving(H.pulledby)) //CLEAR! var/mob/living/M = H.pulledby if(M.electrocute_act(30, H)) M.visible_message("[M] is electrocuted by [M.p_their()] contact with [H]!") diff --git a/code/game/objects/items/dehy_carp.dm b/code/game/objects/items/dehy_carp.dm index 1283b94af5f..17aed4d32ed 100644 --- a/code/game/objects/items/dehy_carp.dm +++ b/code/game/objects/items/dehy_carp.dm @@ -1,17 +1,17 @@ /* - * Dehydrated Carp - * Instant carp, just add water + * Dehydrated Carp + * Instant carp, just add water */ //Child of carpplushie because this should do everything the toy does and more /obj/item/toy/plush/carpplushie/dehy_carp - var/mob/owner = null //Carp doesn't attack owner, set when using in hand - var/owned = 0 //Boolean, no owner to begin with + var/mob/owner = null //Carp doesn't attack owner, set when using in hand + var/owned = 0 //Boolean, no owner to begin with var/mobtype = /mob/living/simple_animal/hostile/carp //So admins can change what mob spawns via var fuckery //Attack self /obj/item/toy/plush/carpplushie/dehy_carp/attack_self(mob/user) - src.add_fingerprint(user) //Anyone can add their fingerprints to it with this + src.add_fingerprint(user) //Anyone can add their fingerprints to it with this if(!owned) to_chat(user, "You pet [src]. You swear it looks up at you.") owner = user diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index bfeb93e8d4c..f8c4ff353ab 100644 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -3,13 +3,13 @@ GLOBAL_LIST_EMPTY(PDAs) -#define PDA_SCANNER_NONE 0 -#define PDA_SCANNER_MEDICAL 1 -#define PDA_SCANNER_FORENSICS 2 //unused -#define PDA_SCANNER_REAGENT 3 -#define PDA_SCANNER_HALOGEN 4 -#define PDA_SCANNER_GAS 5 -#define PDA_SPAM_DELAY 2 MINUTES +#define PDA_SCANNER_NONE 0 +#define PDA_SCANNER_MEDICAL 1 +#define PDA_SCANNER_FORENSICS 2 //unused +#define PDA_SCANNER_REAGENT 3 +#define PDA_SCANNER_HALOGEN 4 +#define PDA_SCANNER_GAS 5 +#define PDA_SPAM_DELAY 2 MINUTES /obj/item/pda//SKYRAT EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE name = "\improper PDA" @@ -74,13 +74,13 @@ GLOBAL_LIST_EMPTY(PDAs) var/obj/item/card/id/id = null //Making it possible to slot an ID card into the PDA so it can function as both. var/ownjob = null //related to above - var/obj/item/paicard/pai = null // A slot for a personal AI device + var/obj/item/paicard/pai = null // A slot for a personal AI device var/datum/picture/picture //Scanned photo var/list/contained_item = list(/obj/item/pen, /obj/item/toy/crayon, /obj/item/lipstick, /obj/item/flashlight/pen, /obj/item/clothing/mask/cigarette) var/obj/item/inserted_item //Used for pen, crayon, and lipstick insertion or removal. Same as above. - var/overlays_x_offset = 0 //x offset to use for certain overlays + var/overlays_x_offset = 0 //x offset to use for certain overlays var/underline_flag = TRUE //flag for underline @@ -115,7 +115,7 @@ GLOBAL_LIST_EMPTY(PDAs) if(inserted_item) inserted_item = new inserted_item(src) else - inserted_item = new /obj/item/pen(src) + inserted_item = new /obj/item/pen(src) update_icon() /obj/item/pda/equipped(mob/user, slot) @@ -640,9 +640,9 @@ GLOBAL_LIST_EMPTY(PDAs) if("pai") switch(href_list["option"]) - if("1") // Configure pAI device + if("1") // Configure pAI device pai.attack_self(U) - if("2") // Eject pAI device + if("2") // Eject pAI device usr.put_in_hands(pai) to_chat(usr, "You remove the pAI from the [name].") @@ -1007,7 +1007,7 @@ GLOBAL_LIST_EMPTY(PDAs) to_chat(user, "You put the ID into \the [src]'s slot.") updateSelfDialog()//Update self dialog on success. - return //Return in case of failed check or when successful. + return //Return in case of failed check or when successful. updateSelfDialog()//For the non-input related code. else if(istype(C, /obj/item/paicard) && !pai) if(!user.transferItemToLoc(C, src)) diff --git a/code/game/objects/items/devices/PDA/cart.dm b/code/game/objects/items/devices/PDA/cart.dm index 1f3f4944ba7..55fb7eabbdf 100644 --- a/code/game/objects/items/devices/PDA/cart.dm +++ b/code/game/objects/items/devices/PDA/cart.dm @@ -1,19 +1,19 @@ -#define CART_SECURITY (1<<0) -#define CART_ENGINE (1<<1) -#define CART_ATMOS (1<<2) -#define CART_MEDICAL (1<<3) -#define CART_MANIFEST (1<<4) -#define CART_CLOWN (1<<5) -#define CART_MIME (1<<6) -#define CART_JANITOR (1<<7) -#define CART_REAGENT_SCANNER (1<<8) -#define CART_NEWSCASTER (1<<9) -#define CART_REMOTE_DOOR (1<<10) -#define CART_STATUS_DISPLAY (1<<11) -#define CART_QUARTERMASTER (1<<12) -#define CART_HYDROPONICS (1<<13) -#define CART_DRONEPHONE (1<<14) +#define CART_SECURITY (1<<0) +#define CART_ENGINE (1<<1) +#define CART_ATMOS (1<<2) +#define CART_MEDICAL (1<<3) +#define CART_MANIFEST (1<<4) +#define CART_CLOWN (1<<5) +#define CART_MIME (1<<6) +#define CART_JANITOR (1<<7) +#define CART_REAGENT_SCANNER (1<<8) +#define CART_NEWSCASTER (1<<9) +#define CART_REMOTE_DOOR (1<<10) +#define CART_STATUS_DISPLAY (1<<11) +#define CART_QUARTERMASTER (1<<12) +#define CART_HYDROPONICS (1<<13) +#define CART_DRONEPHONE (1<<14) /obj/item/cartridge//SKYRAT EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE @@ -42,7 +42,7 @@ var/datum/data/record/active3 = null //Security var/obj/machinery/computer/monitor/powmonitor = null // Power Monitor var/list/powermonitors = list() - var/message1 // used for status_displays + var/message1 // used for status_displays var/message2 var/list/stored_data = list() var/current_channel @@ -707,9 +707,9 @@ Code: menu += "\[Return Home\]
      " else - menu += "
      \[Stop Patrol\] " //patrolon - menu += "\[Start Patrol\] " //patroloff - menu += "\[Summon Bot\]
      " //summon + menu += "
      \[Stop Patrol\] " //patrolon + menu += "\[Start Patrol\] " //patroloff + menu += "\[Summon Bot\]
      " //summon menu += "Keep an ID inserted to upload access codes upon summoning." menu += "
      [PDAIMG(back)]Return to bot list" diff --git a/code/game/objects/items/devices/PDA/virus_cart.dm b/code/game/objects/items/devices/PDA/virus_cart.dm index 4adf6031410..2e13051dd89 100644 --- a/code/game/objects/items/devices/PDA/virus_cart.dm +++ b/code/game/objects/items/devices/PDA/virus_cart.dm @@ -55,7 +55,7 @@ name = "\improper Detomatix cartridge" icon_state = "cart" access = CART_REMOTE_DOOR - remote_door_id = "smindicate" //Make sure this matches the syndicate shuttle's shield/door id!! //don't ask about the name, testing. + remote_door_id = "smindicate" //Make sure this matches the syndicate shuttle's shield/door id!! //don't ask about the name, testing. charges = 4 /obj/item/cartridge/virus/syndicate/send_virus(obj/item/pda/target, mob/living/U) diff --git a/code/game/objects/items/devices/camera_bug.dm b/code/game/objects/items/devices/camera_bug.dm index 5cc15fde3b5..40402faf123 100644 --- a/code/game/objects/items/devices/camera_bug.dm +++ b/code/game/objects/items/devices/camera_bug.dm @@ -1,7 +1,7 @@ -#define BUGMODE_LIST 0 -#define BUGMODE_MONITOR 1 -#define BUGMODE_TRACK 2 +#define BUGMODE_LIST 0 +#define BUGMODE_MONITOR 1 +#define BUGMODE_TRACK 2 @@ -9,11 +9,11 @@ name = "camera bug" desc = "For illicit snooping through the camera network." icon = 'icons/obj/device.dmi' - icon_state = "camera_bug" - w_class = WEIGHT_CLASS_TINY - inhand_icon_state = "camera_bug" - throw_speed = 4 - throw_range = 20 + icon_state = "camera_bug" + w_class = WEIGHT_CLASS_TINY + inhand_icon_state = "camera_bug" + throw_speed = 4 + throw_range = 20 item_flags = NOBLUDGEON var/obj/machinery/camera/current = null diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index 4b942c5e148..50dc0474c2e 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -56,8 +56,8 @@ add_fingerprint(user) if(istype(M) && on && (user.zone_selected in list(BODY_ZONE_PRECISE_EYES, BODY_ZONE_PRECISE_MOUTH))) - if((HAS_TRAIT(user, TRAIT_CLUMSY) || HAS_TRAIT(user, TRAIT_DUMB)) && prob(50)) //too dumb to use flashlight properly - return ..() //just hit them in the head + if((HAS_TRAIT(user, TRAIT_CLUMSY) || HAS_TRAIT(user, TRAIT_DUMB)) && prob(50)) //too dumb to use flashlight properly + return ..() //just hit them in the head if(!ISADVANCEDTOOLUSER(user)) to_chat(user, "You don't have the dexterity to do this!") @@ -82,7 +82,7 @@ to_chat(user, "[M] doesn't have any eyes!") return - if(M == user) //they're using it on themselves + if(M == user) //they're using it on themselves if(M.flash_act(visual = 1)) M.visible_message("[M] directs [src] to [M.p_their()] eyes.", "You wave the light in front of your eyes! Trippy!") else @@ -92,7 +92,7 @@ "You direct [src] to [M]'s eyes.") if(M.stat == DEAD || (M.is_blind()) || !M.flash_act(visual = 1)) //mob is dead or fully blind to_chat(user, "[M]'s pupils don't react to the light!") - else if(M.dna && M.dna.check_mutation(XRAY)) //mob has X-ray vision + else if(M.dna && M.dna.check_mutation(XRAY)) //mob has X-ray vision to_chat(user, "[M]'s pupils give an eerie glow!") else //they're okay! to_chat(user, "[M]'s pupils narrow.") @@ -357,7 +357,7 @@ lefthand_file = 'icons/mob/inhands/equipment/mining_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/mining_righthand.dmi' desc = "A mining lantern." - light_range = 6 // luminosity when on + light_range = 6 // luminosity when on light_system = MOVABLE_LIGHT /obj/item/flashlight/lantern/heirloom_moth diff --git a/code/game/objects/items/devices/multitool.dm b/code/game/objects/items/devices/multitool.dm index f035432a59f..dec3b006efa 100644 --- a/code/game/objects/items/devices/multitool.dm +++ b/code/game/objects/items/devices/multitool.dm @@ -48,7 +48,7 @@ var/track_cooldown = 0 var/track_delay = 10 //How often it checks for proximity var/detect_state = PROXIMITY_NONE - var/rangealert = 8 //Glows red when inside + var/rangealert = 8 //Glows red when inside var/rangewarning = 20 //Glows yellow when inside var/hud_type = DATA_HUD_AI_DETECT var/hud_on = FALSE diff --git a/code/game/objects/items/devices/paicard.dm b/code/game/objects/items/devices/paicard.dm index 1d6a9252c6a..36df5a5158f 100644 --- a/code/game/objects/items/devices/paicard.dm +++ b/code/game/objects/items/devices/paicard.dm @@ -146,9 +146,9 @@ attack_self(usr) -// WIRE_SIGNAL = 1 -// WIRE_RECEIVE = 2 -// WIRE_TRANSMIT = 4 +// WIRE_SIGNAL = 1 +// WIRE_RECEIVE = 2 +// WIRE_TRANSMIT = 4 /obj/item/paicard/proc/setPersonality(mob/living/silicon/pai/personality) pai = personality diff --git a/code/game/objects/items/devices/portable_chem_mixer.dm b/code/game/objects/items/devices/portable_chem_mixer.dm index 712bc201e3d..bc37625f861 100644 --- a/code/game/objects/items/devices/portable_chem_mixer.dm +++ b/code/game/objects/items/devices/portable_chem_mixer.dm @@ -10,10 +10,10 @@ custom_price = PAYCHECK_MEDIUM * 10 custom_premium_price = PAYCHECK_MEDIUM * 14 - var/obj/item/reagent_containers/beaker = null ///Creating an empty slot for a beaker that can be added to dispense into - var/amount = 30 ///The amount of reagent that is to be dispensed currently + var/obj/item/reagent_containers/beaker = null ///Creating an empty slot for a beaker that can be added to dispense into + var/amount = 30 ///The amount of reagent that is to be dispensed currently - var/list/dispensable_reagents = list() ///List in which all currently dispensable reagents go + var/list/dispensable_reagents = list() ///List in which all currently dispensable reagents go /obj/item/storage/portable_chem_mixer/ComponentInitialize() . = ..() @@ -97,9 +97,9 @@ * Replaces the beaker of the portable chemical mixer with another beaker, or simply adds the new beaker if none is in currently * * Checks if a valid user and a valid new beaker exist and attempts to replace the current beaker in the portable chemical mixer with the one in hand. Simply places the new beaker in if no beaker is currently loaded - * Arguments: - * * mob/living/user - The user who is trying to exchange beakers - * * obj/item/reagent_containers/new_beaker - The new beaker that the user wants to put into the device + * Arguments: + * * mob/living/user - The user who is trying to exchange beakers + * * obj/item/reagent_containers/new_beaker - The new beaker that the user wants to put into the device */ /obj/item/storage/portable_chem_mixer/proc/replace_beaker(mob/living/user, obj/item/reagent_containers/new_beaker) if(!user) diff --git a/code/game/objects/items/devices/powersink.dm b/code/game/objects/items/devices/powersink.dm index aab94e012b7..6d87b994fca 100644 --- a/code/game/objects/items/devices/powersink.dm +++ b/code/game/objects/items/devices/powersink.dm @@ -18,13 +18,13 @@ throw_speed = 1 throw_range = 2 custom_materials = list(/datum/material/iron=750) - var/drain_rate = 2000000 // amount of power to drain per tick - var/power_drained = 0 // has drained this much power - var/max_power = 6e8 // maximum power that can be drained before exploding - var/mode = 0 // 0 = off, 1=clamped (off), 2=operating + var/drain_rate = 2000000 // amount of power to drain per tick + var/power_drained = 0 // has drained this much power + var/max_power = 6e8 // maximum power that can be drained before exploding + var/mode = 0 // 0 = off, 1=clamped (off), 2=operating var/admins_warned = FALSE // stop spam, only warn the admins once that we are about to boom - var/obj/structure/cable/attached // the attached cable + var/obj/structure/cable/attached // the attached cable /obj/item/powersink/update_icon_state() icon_state = "powersink[mode == OPERATING]" diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index a678583d260..fdbebe1dbb9 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -360,7 +360,7 @@ return emped++ //There's been an EMP; better count it var/curremp = emped //Remember which EMP this was - if (listening && ismob(loc)) // if the radio is turned on and on someone's person they notice + if (listening && ismob(loc)) // if the radio is turned on and on someone's person they notice to_chat(loc, "\The [src] overloads.") broadcasting = FALSE listening = FALSE @@ -437,6 +437,6 @@ recalculateChannels() -/obj/item/radio/off // Station bounced radios, their only difference is spawning with the speakers off, this was made to help the lag. - listening = 0 // And it's nice to have a subtype too for future features. +/obj/item/radio/off // Station bounced radios, their only difference is spawning with the speakers off, this was made to help the lag. + listening = 0 // And it's nice to have a subtype too for future features. dog_fashion = /datum/dog_fashion/back diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index 36da0dad728..f3ff12f122c 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -112,7 +112,7 @@ GENE SCANNER to_chat(user, "You switch the health analyzer to report extra info on wounds.") /obj/item/healthanalyzer/attack(mob/living/M, mob/living/carbon/human/user) - flick("[icon_state]-scan", src) //makes it so that it plays the scan animation upon scanning, including clumsy scanning + flick("[icon_state]-scan", src) //makes it so that it plays the scan animation upon scanning, including clumsy scanning // Clumsiness/brain damage check if ((HAS_TRAIT(user, TRAIT_CLUMSY) || HAS_TRAIT(user, TRAIT_DUMB)) && prob(50)) @@ -922,7 +922,7 @@ GENE SCANNER var/selected_target = null /obj/item/scanner_wand/attack(mob/living/M, mob/living/carbon/human/user) - flick("[icon_state]_active", src) //nice little visual flash when scanning someone else. + flick("[icon_state]_active", src) //nice little visual flash when scanning someone else. if((HAS_TRAIT(user, TRAIT_CLUMSY) || HAS_TRAIT(user, TRAIT_DUMB)) && prob(25)) user.visible_message("[user] targets himself for scanning.", \ diff --git a/code/game/objects/items/devices/taperecorder.dm b/code/game/objects/items/devices/taperecorder.dm index 98857edaca1..d034d0933e1 100644 --- a/code/game/objects/items/devices/taperecorder.dm +++ b/code/game/objects/items/devices/taperecorder.dm @@ -167,7 +167,7 @@ say("Recording started.") update_sound() update_icon() - var/used = mytape.used_capacity //to stop runtimes when you eject the tape + var/used = mytape.used_capacity //to stop runtimes when you eject the tape var/max = mytape.max_capacity while(recording && used < max) mytape.used_capacity += 1 SECONDS @@ -221,7 +221,7 @@ update_sound() say("Playback started.") playsound(src, 'sound/items/taperecorder/taperecorder_play.ogg', 50, FALSE) - var/used = mytape.used_capacity //to stop runtimes when you eject the tape + var/used = mytape.used_capacity //to stop runtimes when you eject the tape var/max = mytape.max_capacity for(var/i = 1, used <= max, sleep(playsleepseconds)) if(!mytape) diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm index bd35ada8e98..03b1334115c 100644 --- a/code/game/objects/items/devices/traitordevices.dm +++ b/code/game/objects/items/devices/traitordevices.dm @@ -34,7 +34,7 @@ effective or pretty fucking useless. /obj/item/batterer/attack_self(mob/living/carbon/user, flag = 0, emp = 0) - if(!user) return + if(!user) return if(times_used >= max_uses) to_chat(user, "The mind batterer has been burnt out!") return diff --git a/code/game/objects/items/devices/transfer_valve.dm b/code/game/objects/items/devices/transfer_valve.dm index f3846c2e4b5..2bd922def89 100644 --- a/code/game/objects/items/devices/transfer_valve.dm +++ b/code/game/objects/items/devices/transfer_valve.dm @@ -50,7 +50,7 @@ attached_device = A to_chat(user, "You attach the [item] to the valve controls and secure it.") A.holder = src - A.toggle_secure() //this calls update_icon(), which calls update_icon() on the holder (i.e. the bomb). + A.toggle_secure() //this calls update_icon(), which calls update_icon() on the holder (i.e. the bomb). log_bomber(user, "attached a [item.name] to a ttv -", src, null, FALSE) attacher = user return @@ -87,7 +87,7 @@ if(toggle) toggle = FALSE toggle_valve() - addtimer(CALLBACK(src, .proc/toggle_off), 5) //To stop a signal being spammed from a proxy sensor constantly going off or whatever + addtimer(CALLBACK(src, .proc/toggle_off), 5) //To stop a signal being spammed from a proxy sensor constantly going off or whatever /obj/item/transfer_valve/proc/toggle_off() toggle = TRUE diff --git a/code/game/objects/items/dna_injector.dm b/code/game/objects/items/dna_injector.dm index 37d3cbf527d..bea310c8372 100644 --- a/code/game/objects/items/dna_injector.dm +++ b/code/game/objects/items/dna_injector.dm @@ -40,7 +40,7 @@ M.dna.unique_enzymes = fields["UE"] M.name = M.real_name M.dna.blood_type = fields["blood_type"] - if(fields["UI"]) //UI+UE + if(fields["UI"]) //UI+UE M.dna.uni_identity = merge_text(M.dna.uni_identity, fields["UI"]) M.updateappearance(mutations_overlay_update=1) log_attack("[log_msg] [loc_name(user)]") @@ -73,7 +73,7 @@ log_combat(user, target, "injected", src) - if(!inject(target, user)) //Now we actually do the heavy lifting. + if(!inject(target, user)) //Now we actually do the heavy lifting. to_chat(user, "It appears that [target] does not have compatible DNA.") used = 1 @@ -437,7 +437,7 @@ var/duration = 600 /obj/item/dnainjector/timed/inject(mob/living/carbon/M, mob/user) - if(M.stat == DEAD) //prevents dead people from having their DNA changed + if(M.stat == DEAD) //prevents dead people from having their DNA changed to_chat(user, "You can't modify [M]'s DNA while [M.p_theyre()] dead.") return FALSE @@ -474,7 +474,7 @@ M.name = M.real_name M.dna.blood_type = fields["blood_type"] M.dna.temporary_mutations[UE_CHANGED] = endtime - if(fields["UI"]) //UI+UE + if(fields["UI"]) //UI+UE if(!M.dna.previous["UI"]) M.dna.previous["UI"] = M.dna.uni_identity M.dna.uni_identity = merge_text(M.dna.uni_identity, fields["UI"]) diff --git a/code/game/objects/items/dualsaber.dm b/code/game/objects/items/dualsaber.dm index 827592ba5ae..a4c0f4f4ea6 100644 --- a/code/game/objects/items/dualsaber.dm +++ b/code/game/objects/items/dualsaber.dm @@ -84,7 +84,7 @@ var/obj/item/bodypart/head/myhead = user.get_bodypart(BODY_ZONE_HEAD)//stole from chainsaw code var/obj/item/organ/brain/B = user.getorganslot(ORGAN_SLOT_BRAIN) - B.organ_flags &= ~ORGAN_VITAL //this cant possibly be a good idea + B.organ_flags &= ~ORGAN_VITAL //this cant possibly be a good idea var/randdir for(var/i in 1 to 24)//like a headless chicken! if(user.is_holding(src)) diff --git a/code/game/objects/items/emags.dm b/code/game/objects/items/emags.dm index 2501e35311f..039525deab3 100644 --- a/code/game/objects/items/emags.dm +++ b/code/game/objects/items/emags.dm @@ -1,6 +1,6 @@ /* Emags * Contains: - * EMAGS AND DOORMAGS + * EMAGS AND DOORMAGS */ diff --git a/code/game/objects/items/extinguisher.dm b/code/game/objects/items/extinguisher.dm index 9b39cf19847..1976e02828f 100644 --- a/code/game/objects/items/extinguisher.dm +++ b/code/game/objects/items/extinguisher.dm @@ -34,7 +34,7 @@ desc = "A light and compact fibreglass-framed model fire extinguisher." icon_state = "miniFE0" inhand_icon_state = "miniFE" - hitsound = null //it is much lighter, after all. + hitsound = null //it is much lighter, after all. flags_1 = null //doesn't CONDUCT_1 throwforce = 2 w_class = WEIGHT_CLASS_SMALL diff --git a/code/game/objects/items/flamethrower.dm b/code/game/objects/items/flamethrower.dm index 1d50421d7bd..765cece8745 100644 --- a/code/game/objects/items/flamethrower.dm +++ b/code/game/objects/items/flamethrower.dm @@ -18,7 +18,7 @@ light_system = MOVABLE_LIGHT light_on = FALSE var/status = FALSE - var/lit = FALSE //on or off + var/lit = FALSE //on or off var/operating = FALSE//cooldown var/obj/item/weldingtool/weldtool = null var/obj/item/assembly/igniter/igniter = null @@ -195,7 +195,7 @@ var/turf/previousturf = get_turf(src) for(var/turf/T in turflist) if(T == previousturf) - continue //so we don't burn the tile we be standin on + continue //so we don't burn the tile we be standin on var/list/turfs_sharing_with_prev = previousturf.GetAtmosAdjacentTurfs(alldir=1) if(!(T in turfs_sharing_with_prev)) break diff --git a/code/game/objects/items/food/egg.dm b/code/game/objects/items/food/egg.dm index 396fd25a755..f3534674ca5 100644 --- a/code/game/objects/items/food/egg.dm +++ b/code/game/objects/items/food/egg.dm @@ -103,7 +103,7 @@ foodtypes = MEAT | BREAKFAST w_class = WEIGHT_CLASS_SMALL -/obj/item/food/omelette //FUCK THIS +/obj/item/food/omelette //FUCK THIS name = "omelette du fromage" desc = "That's all you can say!" icon_state = "omelette" diff --git a/code/game/objects/items/food/misc.dm b/code/game/objects/items/food/misc.dm index c71de67a59a..5ebd68d9d84 100644 --- a/code/game/objects/items/food/misc.dm +++ b/code/game/objects/items/food/misc.dm @@ -23,7 +23,7 @@ icon_state = "royalcheese" food_reagents = list(/datum/reagent/consumable/nutriment = 15, /datum/reagent/consumable/nutriment/vitamin = 5, /datum/reagent/gold = 20, /datum/reagent/toxin/mutagen = 5) w_class = WEIGHT_CLASS_BULKY - tastes = list("cheese" = 4, "royalty" = 1) + tastes = list("cheese" = 4, "royalty" = 1) rat_heal = 70 /obj/item/food/cheese @@ -481,7 +481,7 @@ icon = 'icons/obj/lollipop.dmi' icon_state = "lollipop_stick" inhand_icon_state = "lollipop_stick" - food_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1, /datum/reagent/iron = 10, /datum/reagent/consumable/sugar = 5, /datum/reagent/medicine/omnizine = 2) //Honk + food_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1, /datum/reagent/iron = 10, /datum/reagent/consumable/sugar = 5, /datum/reagent/medicine/omnizine = 2) //Honk var/mutable_appearance/head var/headcolor = rgb(0, 0, 0) tastes = list("candy" = 1) @@ -590,7 +590,7 @@ icon = 'icons/obj/lollipop.dmi' icon_state = "gumball" worn_icon_state = "bubblegum" - food_reagents = list(/datum/reagent/consumable/sugar = 5, /datum/reagent/medicine/sal_acid = 2, /datum/reagent/medicine/oxandrolone = 2) //Kek + food_reagents = list(/datum/reagent/consumable/sugar = 5, /datum/reagent/medicine/sal_acid = 2, /datum/reagent/medicine/oxandrolone = 2) //Kek tastes = list("candy") foodtypes = JUNKFOOD w_class = WEIGHT_CLASS_TINY @@ -805,5 +805,5 @@ junkiness = junkiness,\ check_liked = CALLBACK(src, .proc/check_liked)) -/obj/item/food/rationpack/proc/check_liked(fraction, mob/M) //Nobody likes rationpacks. Nobody. +/obj/item/food/rationpack/proc/check_liked(fraction, mob/M) //Nobody likes rationpacks. Nobody. return FOOD_DISLIKED diff --git a/code/game/objects/items/gift.dm b/code/game/objects/items/gift.dm index 0ff9c7d48a8..a3dfb4f2762 100644 --- a/code/game/objects/items/gift.dm +++ b/code/game/objects/items/gift.dm @@ -1,7 +1,7 @@ /* Gifts and wrapping paper * Contains: - * Gifts - * Wrapping Paper + * Gifts + * Wrapping Paper */ /* diff --git a/code/game/objects/items/grenades/chem_grenade.dm b/code/game/objects/items/grenades/chem_grenade.dm index 3030421b774..182a7a34bfd 100644 --- a/code/game/objects/items/grenades/chem_grenade.dm +++ b/code/game/objects/items/grenades/chem_grenade.dm @@ -27,7 +27,7 @@ wires = new /datum/wires/explosive/chem_grenade(src) /obj/item/grenade/chem_grenade/examine(mob/user) - display_timer = (stage == GRENADE_READY) //show/hide the timer based on assembly state + display_timer = (stage == GRENADE_READY) //show/hide the timer based on assembly state . = ..() if(user.can_see_reagents()) if(beakers.len) @@ -66,7 +66,7 @@ else if(stage == GRENADE_READY) det_time = det_time == 50 ? 30 : 50 //toggle between 30 and 50 if(landminemode) - landminemode.time = det_time * 0.1 //overwrites the proxy sensor activation timer + landminemode.time = det_time * 0.1 //overwrites the proxy sensor activation timer to_chat(user, "You modify the time delay. It's set for [DisplayTimeText(det_time)].") else @@ -194,7 +194,7 @@ stage_change(GRENADE_EMPTY) active = FALSE return -// logs from custom assemblies priming are handled by the wire component +// logs from custom assemblies priming are handled by the wire component log_game("A grenade detonated at [AREACOORD(detonation_turf)]") update_mob() @@ -211,7 +211,7 @@ banned_containers = list() affected_area = 5 ignition_temp = 25 // Large grenades are slightly more effective at setting off heat-sensitive mixtures than smaller grenades. - threatscale = 1.1 // 10% more effective. + threatscale = 1.1 // 10% more effective. /obj/item/grenade/chem_grenade/large/detonate(mob/living/lanced_by) if(stage != GRENADE_READY) diff --git a/code/game/objects/items/grenades/flashbang.dm b/code/game/objects/items/grenades/flashbang.dm index 43bcce45a4f..72fa6954999 100644 --- a/code/game/objects/items/grenades/flashbang.dm +++ b/code/game/objects/items/grenades/flashbang.dm @@ -20,7 +20,7 @@ qdel(src) /obj/item/grenade/flashbang/proc/bang(turf/T , mob/living/M) - if(M.stat == DEAD) //They're dead! + if(M.stat == DEAD) //They're dead! return M.show_message("BANG", MSG_AUDIBLE) var/distance = max(0,get_dist(get_turf(src),T)) @@ -32,7 +32,7 @@ M.add_confusion(max(30/max(1,distance), 10)) //Bang - if(!distance || loc == M || loc == M.loc) //Stop allahu akbarring rooms with this. + if(!distance || loc == M || loc == M.loc) //Stop allahu akbarring rooms with this. //M.Paralyze(20) - SKYRAT EDIT REMOVAL - COMBAT //M.Knockdown(200) - SKYRAT EDIT REMOVAL - COMBAT M.StaminaKnockdown(40, TRUE, TRUE, knockdown_amt = 5 SECONDS) @@ -91,7 +91,7 @@ qdel(src) /obj/item/grenade/stingbang/proc/pop(turf/T , mob/living/M) - if(M.stat == DEAD) //They're dead! + if(M.stat == DEAD) //They're dead! return M.show_message("POP", MSG_AUDIBLE) var/distance = max(0,get_dist(get_turf(src),T)) diff --git a/code/game/objects/items/grenades/ghettobomb.dm b/code/game/objects/items/grenades/ghettobomb.dm index fe3a5756014..c9fe83ae22f 100644 --- a/code/game/objects/items/grenades/ghettobomb.dm +++ b/code/game/objects/items/grenades/ghettobomb.dm @@ -66,7 +66,7 @@ /obj/item/grenade/iedcasing/detonate(mob/living/lanced_by) //Blowing that can up . = ..() update_mob() - explosion(src.loc,-1,-1,2, flame_range = 4) // small explosion, plus a very large fireball. + explosion(src.loc,-1,-1,2, flame_range = 4) // small explosion, plus a very large fireball. qdel(src) /obj/item/grenade/iedcasing/change_det_time() diff --git a/code/game/objects/items/grenades/hypno.dm b/code/game/objects/items/grenades/hypno.dm index a4c59bc30c1..237c3dc7ae1 100644 --- a/code/game/objects/items/grenades/hypno.dm +++ b/code/game/objects/items/grenades/hypno.dm @@ -21,7 +21,7 @@ qdel(src) /obj/item/grenade/hypnotic/proc/bang(turf/T, mob/living/M) - if(M.stat == DEAD) //They're dead! + if(M.stat == DEAD) //They're dead! return var/distance = max(0,get_dist(get_turf(src),T)) diff --git a/code/game/objects/items/grenades/plastic.dm b/code/game/objects/items/grenades/plastic.dm index 623c00fff9b..b48ba4d4ecb 100644 --- a/code/game/objects/items/grenades/plastic.dm +++ b/code/game/objects/items/grenades/plastic.dm @@ -97,7 +97,7 @@ notify_ghosts("[user] has planted \a [src] on [target] with a [det_time] second fuse!", source = target, action = NOTIFY_ORBIT, flashwindow = FALSE, header = "Explosive Planted") - moveToNullspace() //Yep + moveToNullspace() //Yep if(istype(AM, /obj/item)) //your crappy throwing star can't fly so good with a giant brick of c4 on it. var/obj/item/I = AM diff --git a/code/game/objects/items/grenades/spawnergrenade.dm b/code/game/objects/items/grenades/spawnergrenade.dm index 02528ee8158..e8241f872ab 100644 --- a/code/game/objects/items/grenades/spawnergrenade.dm +++ b/code/game/objects/items/grenades/spawnergrenade.dm @@ -7,7 +7,7 @@ var/spawner_type = null // must be an object path var/deliveryamt = 1 // amount of type to deliver -/obj/item/grenade/spawnergrenade/detonate(mob/living/lanced_by) // Prime now just handles the two loops that query for people in lockers and people who can see it. +/obj/item/grenade/spawnergrenade/detonate(mob/living/lanced_by) // Prime now just handles the two loops that query for people in lockers and people who can see it. . = ..() update_mob() if(spawner_type && deliveryamt) diff --git a/code/game/objects/items/hand_items.dm b/code/game/objects/items/hand_items.dm index 57dc1d43ebf..313be3d7b4d 100644 --- a/code/game/objects/items/hand_items.dm +++ b/code/game/objects/items/hand_items.dm @@ -24,7 +24,7 @@ return ..() /obj/item/circlegame/dropped(mob/user) - UnregisterSignal(user, COMSIG_PARENT_EXAMINE) //loc will have changed by the time this is called, so Destroy() can't catch it + UnregisterSignal(user, COMSIG_PARENT_EXAMINE) //loc will have changed by the time this is called, so Destroy() can't catch it // this is a dropdel item. return ..() diff --git a/code/game/objects/items/holy_weapons.dm b/code/game/objects/items/holy_weapons.dm index 92e4605072c..4d362e8c2ce 100644 --- a/code/game/objects/items/holy_weapons.dm +++ b/code/game/objects/items/holy_weapons.dm @@ -531,9 +531,9 @@ S.ckey = C.ckey S.fully_replace_character_name(null, "The spirit of [name]") S.status_flags |= GODMODE - S.copy_languages(user, LANGUAGE_MASTER) //Make sure the sword can understand and communicate with the user. + S.copy_languages(user, LANGUAGE_MASTER) //Make sure the sword can understand and communicate with the user. S.update_atom_languages() - grant_all_languages(FALSE, FALSE, TRUE) //Grants omnitongue + grant_all_languages(FALSE, FALSE, TRUE) //Grants omnitongue var/input = sanitize_name(stripped_input(S,"What are you named?", ,"", MAX_NAME_LEN)) if(src && input) diff --git a/code/game/objects/items/hot_potato.dm b/code/game/objects/items/hot_potato.dm index 09e938a4f60..b9b9c0b85fc 100644 --- a/code/game/objects/items/hot_potato.dm +++ b/code/game/objects/items/hot_potato.dm @@ -10,9 +10,9 @@ var/icon_on = "potato_active" var/detonation_timerid var/activation_time = 0 - var/timer = 600 //deciseconds + var/timer = 600 //deciseconds var/show_timer = FALSE - var/reusable = FALSE //absolute madman + var/reusable = FALSE //absolute madman var/sticky = TRUE var/forceful_attachment = TRUE var/stimulant = TRUE @@ -80,7 +80,7 @@ L.SetImmobilized(0) L.SetParalyzed(0) L.SetUnconscious(0) - L.reagents.add_reagent(/datum/reagent/medicine/muscle_stimulant, clamp(5 - L.reagents.get_reagent_amount(/datum/reagent/medicine/muscle_stimulant), 0, 5)) //If you don't have legs or get bola'd, tough luck! + L.reagents.add_reagent(/datum/reagent/medicine/muscle_stimulant, clamp(5 - L.reagents.get_reagent_amount(/datum/reagent/medicine/muscle_stimulant), 0, 5)) //If you don't have legs or get bola'd, tough luck! /obj/item/hot_potato/examine(mob/user) diff --git a/code/game/objects/items/hourglass.dm b/code/game/objects/items/hourglass.dm index f4997089c68..300ff6fb3d6 100644 --- a/code/game/objects/items/hourglass.dm +++ b/code/game/objects/items/hourglass.dm @@ -6,7 +6,7 @@ var/obj/effect/countdown/hourglass/countdown var/time = 1 MINUTES var/finish_time //So countdown doesn't need to fiddle with timers - var/timing_id //if present we're timing + var/timing_id //if present we're timing var/hand_activated = TRUE icon = 'icons/obj/hourglass.dmi' icon_state = "hourglass_idle" diff --git a/code/game/objects/items/kitchen.dm b/code/game/objects/items/kitchen.dm index 5d540999ca1..5727fb7a16f 100644 --- a/code/game/objects/items/kitchen.dm +++ b/code/game/objects/items/kitchen.dm @@ -1,13 +1,13 @@ /* Kitchen tools * Contains: - * Fork - * Kitchen knives - * Ritual Knife - * Bloodletter - * Butcher's cleaver - * Combat Knife - * Rolling Pins - * Plastic Utensils + * Fork + * Kitchen knives + * Ritual Knife + * Bloodletter + * Butcher's cleaver + * Combat Knife + * Rolling Pins + * Plastic Utensils */ /obj/item/kitchen @@ -92,7 +92,7 @@ sharpness = SHARP_EDGED armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 50, ACID = 50) item_flags = EYE_STAB - var/bayonet = FALSE //Can this be attached to a gun? + var/bayonet = FALSE //Can this be attached to a gun? wound_bonus = -5 bare_wound_bonus = 10 tool_behaviour = TOOL_KNIFE diff --git a/code/game/objects/items/manuals.dm b/code/game/objects/items/manuals.dm index d1045a001e9..067fdfbf224 100644 --- a/code/game/objects/items/manuals.dm +++ b/code/game/objects/items/manuals.dm @@ -215,7 +215,7 @@
    • Insert the nuclear authorisation disk into slot.
    • Type numeric authorisation code into the keypad. This should have been provided. Note: If you make a mistake press R to reset the device.
    • Press the E button to log onto the device.
      • - You now have activated the device. To deactivate the buttons at anytime for example when you've already prepped the bomb for detonation remove the auth disk OR press the R on the keypad.
      + You now have activated the device. To deactivate the buttons at anytime for example when you've already prepped the bomb for detonation remove the auth disk OR press the R on the keypad.
      Now the bomb CAN ONLY be detonated using the timer. Manual detonation is not an option.
      Note: Nanotrasen is a pain in the neck.
      Toggle off the SAFETY.
      diff --git a/code/game/objects/items/miscellaneous.dm b/code/game/objects/items/miscellaneous.dm index bf3b940c129..f9a72916c4f 100644 --- a/code/game/objects/items/miscellaneous.dm +++ b/code/game/objects/items/miscellaneous.dm @@ -345,7 +345,7 @@ ///List of mobs that have already been mobbed. var/static/list/mob_mobs = list() -#define NICKNAME_CAP (MAX_NAME_LEN/2) +#define NICKNAME_CAP (MAX_NAME_LEN/2) /obj/item/virgin_mary/attackby(obj/item/W, mob/user, params) . = ..() if(resistance_flags & ON_FIRE) diff --git a/code/game/objects/items/mop.dm b/code/game/objects/items/mop.dm index f2ea96d0c36..b0c4b752afc 100644 --- a/code/game/objects/items/mop.dm +++ b/code/game/objects/items/mop.dm @@ -35,11 +35,11 @@ cleaner.mind.adjust_experience(/datum/skill/cleaning, total_experience_gain) A.wash(CLEAN_SCRUB) - reagents.expose(A, TOUCH, 10) //Needed for proper floor wetting. + reagents.expose(A, TOUCH, 10) //Needed for proper floor wetting. var/val2remove = 1 if(cleaner?.mind) val2remove = round(cleaner.mind.get_skill_modifier(/datum/skill/cleaning, SKILL_SPEED_MODIFIER),0.1) - reagents.remove_any(val2remove) //reaction() doesn't use up the reagents + reagents.remove_any(val2remove) //reaction() doesn't use up the reagents /obj/item/mop/afterattack(atom/A, mob/user, proximity) diff --git a/code/game/objects/items/paint.dm b/code/game/objects/items/paint.dm index d3141c1d301..6a569e79387 100644 --- a/code/game/objects/items/paint.dm +++ b/code/game/objects/items/paint.dm @@ -1,4 +1,4 @@ -//NEVER USE THIS IT SUX -PETETHEGOAT +//NEVER USE THIS IT SUX -PETETHEGOAT //IT SUCKS A BIT LESS -GIACOM /obj/item/paint diff --git a/code/game/objects/items/pet_carrier.dm b/code/game/objects/items/pet_carrier.dm index 71d9f806ce5..52b199b1824 100644 --- a/code/game/objects/items/pet_carrier.dm +++ b/code/game/objects/items/pet_carrier.dm @@ -135,7 +135,7 @@ to_chat(user, "You start pushing out of [src]... (This will take about 20 seconds.)") if(!do_after(user, 200, target = user) || open || !locked || !(user in occupants)) return - loc.visible_message("[user] shoves out of [src]!", null, null, null, user) + loc.visible_message("[user] shoves out of [src]!", null, null, null, user) to_chat(user, "You shove open [src]'s door against the lock's resistance and fall out!") locked = FALSE open = TRUE diff --git a/code/game/objects/items/plushes.dm b/code/game/objects/items/plushes.dm index 20109c001a6..20369cc6732 100644 --- a/code/game/objects/items/plushes.dm +++ b/code/game/objects/items/plushes.dm @@ -15,11 +15,11 @@ var/obj/item/toy/plush/lover var/obj/item/toy/plush/partner var/obj/item/toy/plush/plush_child - var/obj/item/toy/plush/paternal_parent //who initiated creation - var/obj/item/toy/plush/maternal_parent //who owns, see love() + var/obj/item/toy/plush/paternal_parent //who initiated creation + var/obj/item/toy/plush/maternal_parent //who owns, see love() var/static/list/breeding_blacklist = typecacheof(/obj/item/toy/plush/carpplushie/dehy_carp) // you cannot have sexual relations with this plush - var/list/scorned = list() //who the plush hates - var/list/scorned_by = list() //who hates the plush, to remove external references on Destroy() + var/list/scorned = list() //who the plush hates + var/list/scorned_by = list() //who hates the plush, to remove external references on Destroy() var/heartbroken = FALSE var/vowbroken = FALSE var/young = FALSE @@ -46,11 +46,11 @@ else gender = MALE - love_message = list("\n[src] is so happy, \he could rip a seam!") - partner_message = list("\n[src] has a ring on \his finger! It says bound to my dear [partner].") - heartbroken_message = list("\n[src] looks so sad.") - vowbroken_message = list("\n[src] lost \his ring...") - parent_message = list("\n[src] can't remember what sleep is.") + love_message = list("\n[src] is so happy, \he could rip a seam!") + partner_message = list("\n[src] has a ring on \his finger! It says bound to my dear [partner].") + heartbroken_message = list("\n[src] looks so sad.") + vowbroken_message = list("\n[src] lost \his ring...") + parent_message = list("\n[src] can't remember what sleep is.") normal_desc = desc @@ -165,11 +165,11 @@ return return ..() -/obj/item/toy/plush/proc/love(obj/item/toy/plush/Kisser, mob/living/user) //~<3 - var/chance = 100 //to steal a kiss, surely there's a 100% chance no-one would reject a plush such as I? - var/concern = 20 //perhaps something might cloud true love with doubt - var/loyalty = 30 //why should another get between us? - var/duty = 50 //conquering another's is what I live for +/obj/item/toy/plush/proc/love(obj/item/toy/plush/Kisser, mob/living/user) //~<3 + var/chance = 100 //to steal a kiss, surely there's a 100% chance no-one would reject a plush such as I? + var/concern = 20 //perhaps something might cloud true love with doubt + var/loyalty = 30 //why should another get between us? + var/duty = 50 //conquering another's is what I live for //we are not catholic if(young == TRUE || Kisser.young == TRUE) @@ -188,19 +188,19 @@ "That didn't feel like it worked.", NONE) //first comes love - else if(Kisser.lover != src && Kisser.partner != src) //cannot be lovers or married - if(Kisser.lover) //if the initiator has a lover - Kisser.lover.heartbreak(Kisser) //the old lover can get over the kiss-and-run whilst the kisser has some fun - chance -= concern //one heart already broken, what does another mean? - if(lover) //if the recipient has a lover - chance -= loyalty //mustn't... but those lips - if(partner) //if the recipient has a partner - chance -= duty //do we mate for life? + else if(Kisser.lover != src && Kisser.partner != src) //cannot be lovers or married + if(Kisser.lover) //if the initiator has a lover + Kisser.lover.heartbreak(Kisser) //the old lover can get over the kiss-and-run whilst the kisser has some fun + chance -= concern //one heart already broken, what does another mean? + if(lover) //if the recipient has a lover + chance -= loyalty //mustn't... but those lips + if(partner) //if the recipient has a partner + chance -= duty //do we mate for life? - if(prob(chance)) //did we bag a date? + if(prob(chance)) //did we bag a date? user.visible_message("[user] makes [Kisser] kiss [src]!", "You make [Kisser] kiss [src]!") - if(lover) //who cares for the past, we live in the present + if(lover) //who cares for the past, we live in the present lover.heartbreak(src) new_lover(Kisser) Kisser.new_lover(src) @@ -209,14 +209,14 @@ "That didn't feel like it worked, this time.", NONE) //then comes marriage - else if(Kisser.lover == src && Kisser.partner != src) //need to be lovers (assumes loving is a two way street) but not married (also assumes similar) + else if(Kisser.lover == src && Kisser.partner != src) //need to be lovers (assumes loving is a two way street) but not married (also assumes similar) user.visible_message("[user] pronounces [Kisser] and [src] married! D'aw.", "You pronounce [Kisser] and [src] married!") new_partner(Kisser) Kisser.new_partner(src) //then comes a baby in a baby's carriage, or an adoption in an adoption's orphanage - else if(Kisser.partner == src && !plush_child) //the one advancing does not take ownership of the child and we have a one child policy in the toyshop + else if(Kisser.partner == src && !plush_child) //the one advancing does not take ownership of the child and we have a one child policy in the toyshop user.visible_message("[user] is going to break [Kisser] and [src] by bashing them like that.", "[Kisser] passionately embraces [src] in your hands. Look away you perv!") user.client.give_award(/datum/award/achievement/misc/rule8, user) @@ -236,20 +236,20 @@ /obj/item/toy/plush/proc/heartbreak(obj/item/toy/plush/Brutus) if(lover != Brutus) to_chat(world, "lover != Brutus") - return //why are we considering someone we don't love? + return //why are we considering someone we don't love? scorned.Add(Brutus) Brutus.scorned_by(src) lover = null - Brutus.lover = null //feeling's mutual + Brutus.lover = null //feeling's mutual heartbroken = TRUE mood_message = pick(heartbroken_message) - if(partner == Brutus) //oh dear... + if(partner == Brutus) //oh dear... partner = null - Brutus.partner = null //it'd be weird otherwise + Brutus.partner = null //it'd be weird otherwise vowbroken = TRUE mood_message = pick(vowbroken_message) @@ -260,7 +260,7 @@ /obj/item/toy/plush/proc/new_lover(obj/item/toy/plush/Juliet) if(lover == Juliet) - return //nice try + return //nice try lover = Juliet cheer_up() @@ -269,14 +269,14 @@ mood_message = pick(love_message) update_desc() - if(partner) //who? - partner = null //more like who cares + if(partner) //who? + partner = null //more like who cares /obj/item/toy/plush/proc/new_partner(obj/item/toy/plush/Apple_of_my_eye) if(partner == Apple_of_my_eye) - return //double marriage is just insecurity + return //double marriage is just insecurity if(lover != Apple_of_my_eye) - return //union not born out of love will falter + return //union not born out of love will falter partner = Apple_of_my_eye @@ -288,27 +288,27 @@ /obj/item/toy/plush/proc/plop(obj/item/toy/plush/Daddy) if(partner != Daddy) - return FALSE //we do not have bastards in our toyshop + return FALSE //we do not have bastards in our toyshop if(is_type_in_typecache(Daddy, breeding_blacklist)) return FALSE // some love is forbidden - if(prob(50)) //it has my eyes + if(prob(50)) //it has my eyes plush_child = new type(get_turf(loc)) - else //it has your eyes + else //it has your eyes plush_child = new Daddy.type(get_turf(loc)) plush_child.make_young(src, Daddy) /obj/item/toy/plush/proc/make_young(obj/item/toy/plush/Mama, obj/item/toy/plush/Dada) if(Mama == Dada) - return //cloning is reserved for plants and spacemen + return //cloning is reserved for plants and spacemen maternal_parent = Mama paternal_parent = Dada young = TRUE - name = "[Mama] Jr" //Icelandic naming convention pending - normal_desc = "[src] is a little baby of [maternal_parent] and [paternal_parent]!" //original desc won't be used so the child can have moods + name = "[Mama] Jr" //Icelandic naming convention pending + normal_desc = "[src] is a little baby of [maternal_parent] and [paternal_parent]!" //original desc won't be used so the child can have moods update_desc() Mama.mood_message = pick(Mama.parent_message) @@ -316,13 +316,13 @@ Dada.mood_message = pick(Dada.parent_message) Dada.update_desc() -/obj/item/toy/plush/proc/bad_news(obj/item/toy/plush/Deceased) //cotton to cotton, sawdust to sawdust +/obj/item/toy/plush/proc/bad_news(obj/item/toy/plush/Deceased) //cotton to cotton, sawdust to sawdust var/is_that_letter_for_me = FALSE - if(partner == Deceased) //covers marriage + if(partner == Deceased) //covers marriage is_that_letter_for_me = TRUE partner = null lover = null - else if(lover == Deceased) //covers lovers + else if(lover == Deceased) //covers lovers is_that_letter_for_me = TRUE lover = null @@ -343,7 +343,7 @@ //covers bad memories if(Deceased in scorned) scorned.Remove(Deceased) - cheer_up() //what cold button eyes you have + cheer_up() //what cold button eyes you have if(Deceased in scorned_by) scorned_by.Remove(Deceased) @@ -355,11 +355,11 @@ mood_message = pick(heartbroken_message) update_desc() -/obj/item/toy/plush/proc/cheer_up() //it'll be all right +/obj/item/toy/plush/proc/cheer_up() //it'll be all right if(!heartbroken) - return //you cannot make smile what is already + return //you cannot make smile what is already if(vowbroken) - return //it's a pretty big deal + return //it's a pretty big deal heartbroken = !heartbroken @@ -367,7 +367,7 @@ mood_message = null update_desc() -/obj/item/toy/plush/proc/heal_memories() //time fixes all wounds +/obj/item/toy/plush/proc/heal_memories() //time fixes all wounds if(!vowbroken) vowbroken = !vowbroken if(mood_message in vowbroken_message) @@ -402,7 +402,7 @@ icon_state = "plushvar" divine = TRUE var/obj/item/toy/plush/narplush/clash_target - gender = MALE //he's a boy, right? + gender = MALE //he's a boy, right? /obj/item/toy/plush/ratplush/Moved() . = ..() @@ -489,7 +489,7 @@ icon_state = "narplush" divine = TRUE var/clashing - gender = FEMALE //it's canon if the toy is + gender = FEMALE //it's canon if the toy is /obj/item/toy/plush/narplush/Moved() . = ..() @@ -547,7 +547,7 @@ attack_verb_continuous = list("blorbles", "slimes", "absorbs") attack_verb_simple = list("blorble", "slime", "absorb") squeak_override = list('sound/effects/blobattack.ogg' = 1) - gender = FEMALE //given all the jokes and drawings, I'm not sure the xenobiologists would make a slimeboy + gender = FEMALE //given all the jokes and drawings, I'm not sure the xenobiologists would make a slimeboy /obj/item/toy/plush/awakenedplushie name = "awakened plushie" diff --git a/code/game/objects/items/pneumaticCannon.dm b/code/game/objects/items/pneumaticCannon.dm index 77afe486d27..1ee7b437bfb 100644 --- a/code/game/objects/items/pneumaticCannon.dm +++ b/code/game/objects/items/pneumaticCannon.dm @@ -23,11 +23,11 @@ var/pressureSetting = 1 //How powerful the cannon is - higher pressure = more gas but more powerful throws var/checktank = TRUE var/range_multiplier = 1 - var/throw_amount = 1 //How many items to throw per fire + var/throw_amount = 1 //How many items to throw per fire var/fire_mode = PCANNON_FIFO var/automatic = FALSE var/clumsyCheck = TRUE - var/list/allowed_typecache //Leave as null to allow all. + var/list/allowed_typecache //Leave as null to allow all. var/charge_amount = 1 var/charge_ticks = 1 var/charge_tick = 0 @@ -43,7 +43,7 @@ if(selfcharge) init_charge() -/obj/item/pneumatic_cannon/proc/init_charge() //wrapper so it can be vv'd easier +/obj/item/pneumatic_cannon/proc/init_charge() //wrapper so it can be vv'd easier START_PROCESSING(SSobj, src) /obj/item/pneumatic_cannon/process() @@ -101,13 +101,13 @@ load_item(IW, user) /obj/item/pneumatic_cannon/proc/can_load_item(obj/item/I, mob/user) - if(!istype(I)) //Players can't load non items, this allows for admin varedit inserts. + if(!istype(I)) //Players can't load non items, this allows for admin varedit inserts. return TRUE if(allowed_typecache && !is_type_in_typecache(I, allowed_typecache)) if(user) to_chat(user, "[I] won't fit into [src]!") return - if((loadedWeightClass + I.w_class) > maxWeightClass) //Only make messages if there's a user + if((loadedWeightClass + I.w_class) > maxWeightClass) //Only make messages if there's a user if(user) to_chat(user, "\The [I] won't fit into \the [src]!") return FALSE @@ -120,7 +120,7 @@ /obj/item/pneumatic_cannon/proc/load_item(obj/item/I, mob/user) if(!can_load_item(I, user)) return FALSE - if(user) //Only use transfer proc if there's a user, otherwise just set loc. + if(user) //Only use transfer proc if there's a user, otherwise just set loc. if(!user.transferItemToLoc(I, src)) return FALSE to_chat(user, "You load \the [I] into \the [src].") @@ -286,7 +286,7 @@ range_multiplier = 3 fire_mode = PCANNON_FIFO throw_amount = 1 - maxWeightClass = 150 //50 pies. :^) + maxWeightClass = 150 //50 pies. :^) clumsyCheck = FALSE var/static/list/pie_typecache = typecacheof(/obj/item/food/pie) @@ -298,11 +298,11 @@ automatic = TRUE selfcharge = TRUE charge_type = /obj/item/food/pie/cream - maxWeightClass = 60 //20 pies. + maxWeightClass = 60 //20 pies. /obj/item/pneumatic_cannon/pie/selfcharge/cyborg name = "low velocity pie cannon" automatic = FALSE charge_type = /obj/item/food/pie/cream/nostun - maxWeightClass = 6 //2 pies - charge_ticks = 2 //4 second/pie + maxWeightClass = 6 //2 pies + charge_ticks = 2 //4 second/pie diff --git a/code/game/objects/items/puzzle_pieces.dm b/code/game/objects/items/puzzle_pieces.dm index f98ef4877ce..be5813c4e97 100644 --- a/code/game/objects/items/puzzle_pieces.dm +++ b/code/game/objects/items/puzzle_pieces.dm @@ -1,6 +1,6 @@ //************** //*****Keys******************* -//************** ** ** +//************** ** ** /obj/item/keycard name = "security keycard" desc = "This feels like it belongs to a door." diff --git a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm index f4327d02b05..bf212d5285d 100644 --- a/code/game/objects/items/robot/robot_items.dm +++ b/code/game/objects/items/robot/robot_items.dm @@ -363,7 +363,7 @@ . = ..() check_amount() -/obj/item/borg/lollipop/proc/check_amount() //Doesn't even use processing ticks. +/obj/item/borg/lollipop/proc/check_amount() //Doesn't even use processing ticks. if(charging) return if(candy < candymax) @@ -431,7 +431,7 @@ user.visible_message("[user] blasts a flying lollipop at [target]!") check_amount() -/obj/item/borg/lollipop/proc/shootG(atom/target, mob/living/user, params) //Most certainly a good idea. +/obj/item/borg/lollipop/proc/shootG(atom/target, mob/living/user, params) //Most certainly a good idea. if(candy <= 0) to_chat(user, "Not enough gumballs left!") return FALSE @@ -518,7 +518,7 @@ S.color = color dropped = TRUE -/obj/item/ammo_casing/caseless/lollipop //NEEDS RANDOMIZED COLOR LOGIC. +/obj/item/ammo_casing/caseless/lollipop //NEEDS RANDOMIZED COLOR LOGIC. name = "Lollipop" desc = "Why are you seeing this?!" projectile_type = /obj/projectile/bullet/reusable/lollipop @@ -590,7 +590,7 @@ var/projectile_damage_coefficient = 0.5 /// Energy cost per tracked projectile damage amount per second var/projectile_damage_tick_ecost_coefficient = 10 - var/projectile_speed_coefficient = 1.5 //Higher the coefficient slower the projectile. + var/projectile_speed_coefficient = 1.5 //Higher the coefficient slower the projectile. /// Energy cost per tracked projectile per second var/projectile_tick_speed_ecost = 75 var/list/obj/projectile/tracked @@ -693,7 +693,7 @@ var/usage = 0 for(var/I in tracked) var/obj/projectile/P = I - if(!P.stun && P.nodamage) //No damage + if(!P.stun && P.nodamage) //No damage continue usage += projectile_tick_speed_ecost * delta_time usage += tracked[I] * projectile_damage_tick_ecost_coefficient * delta_time diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm index 6425aa318c2..5b9b301a1e1 100644 --- a/code/game/objects/items/robot/robot_upgrades.dm +++ b/code/game/objects/items/robot/robot_upgrades.dm @@ -11,7 +11,7 @@ var/installed = FALSE var/require_model = FALSE var/list/model_type = null - /// Bitflags listing model compatibility. Used in the exosuit fabricator for creating sub-categories. + /// Bitflags listing model compatibility. Used in the exosuit fabricator for creating sub-categories. var/list/model_flags = NONE // if true, is not stored in the robot to be ejected // if model is reset diff --git a/code/game/objects/items/shields.dm b/code/game/objects/items/shields.dm index b3ff2433c26..88714449cbe 100644 --- a/code/game/objects/items/shields.dm +++ b/code/game/objects/items/shields.dm @@ -3,7 +3,7 @@ icon = 'icons/obj/shields.dmi' block_chance = 50 armor = list(MELEE = 50, BULLET = 50, LASER = 50, ENERGY = 0, BOMB = 30, BIO = 0, RAD = 0, FIRE = 80, ACID = 70) - var/transparent = FALSE // makes beam projectiles pass through the shield + var/transparent = FALSE // makes beam projectiles pass through the shield /obj/item/shield/proc/on_shield_block(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", damage = 0, attack_type = MELEE_ATTACK) return TRUE diff --git a/code/game/objects/items/signs.dm b/code/game/objects/items/signs.dm index 236b0d34e0d..9c2b3f5537f 100644 --- a/code/game/objects/items/signs.dm +++ b/code/game/objects/items/signs.dm @@ -26,7 +26,7 @@ if(txt && user.canUseTopic(src, BE_CLOSE)) label = txt name = "[label] sign" - desc = "It reads: [label]" + desc = "It reads: [label]" /obj/item/picket_sign/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/pen) || istype(W, /obj/item/toy/crayon)) diff --git a/code/game/objects/items/spear.dm b/code/game/objects/items/spear.dm index 0fde80b2aec..3b1af0f9051 100644 --- a/code/game/objects/items/spear.dm +++ b/code/game/objects/items/spear.dm @@ -165,13 +165,13 @@ /* * Bone Spear */ -/obj/item/spear/bonespear //Blatant imitation of spear, but made out of bone. Not valid for explosive modification. +/obj/item/spear/bonespear //Blatant imitation of spear, but made out of bone. Not valid for explosive modification. icon_state = "bone_spear0" name = "bone spear" desc = "A haphazardly-constructed yet still deadly weapon. The pinnacle of modern technology." force = 12 throwforce = 22 - armour_penetration = 15 //Enhanced armor piercing + armour_penetration = 15 //Enhanced armor piercing /obj/item/spear/bonespear/ComponentInitialize() . = ..() diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index b6b4f120600..9b828af8071 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -290,7 +290,7 @@ /obj/item/stack/medical/mesh/Initialize(mapload, new_amount, merge = TRUE, list/mat_override=null, mat_amt=1) . = ..() - if(amount == max_amount) //only seal full mesh packs + if(amount == max_amount) //only seal full mesh packs is_open = FALSE update_icon() diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm index 6b0956ed7ba..ba43e578a73 100644 --- a/code/game/objects/items/stacks/sheets/glass.dm +++ b/code/game/objects/items/stacks/sheets/glass.dm @@ -1,8 +1,8 @@ /* Glass stack types * Contains: - * Glass sheets - * Reinforced glass sheets - * Glass shards - TODO: Move this into code/game/object/item/weapons + * Glass sheets + * Reinforced glass sheets + * Glass shards - TODO: Move this into code/game/object/item/weapons */ /* diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index e902f73b7c6..addc932cfb9 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -411,67 +411,67 @@ GLOBAL_LIST_INIT(durathread_recipes, list ( \ /* * Cardboard */ -GLOBAL_LIST_INIT(cardboard_recipes, list ( \ - new/datum/stack_recipe("box", /obj/item/storage/box), \ - new/datum/stack_recipe("cardborg suit", /obj/item/clothing/suit/cardborg, 3), \ - new/datum/stack_recipe("cardborg helmet", /obj/item/clothing/head/cardborg), \ +GLOBAL_LIST_INIT(cardboard_recipes, list ( \ + new/datum/stack_recipe("box", /obj/item/storage/box), \ + new/datum/stack_recipe("cardborg suit", /obj/item/clothing/suit/cardborg, 3), \ + new/datum/stack_recipe("cardborg helmet", /obj/item/clothing/head/cardborg), \ new/datum/stack_recipe("large box", /obj/structure/closet/cardboard, 4, one_per_turf = TRUE, on_floor = TRUE), \ - new/datum/stack_recipe("cardboard cutout", /obj/item/cardboard_cutout, 5), \ - null, \ + new/datum/stack_recipe("cardboard cutout", /obj/item/cardboard_cutout, 5), \ + null, \ - new/datum/stack_recipe("pizza box", /obj/item/pizzabox), \ - new/datum/stack_recipe("folder", /obj/item/folder), \ - null, \ + new/datum/stack_recipe("pizza box", /obj/item/pizzabox), \ + new/datum/stack_recipe("folder", /obj/item/folder), \ + null, \ //TO-DO: Find a proper way to just change the illustration on the box. Code isn't the issue, input is. new/datum/stack_recipe_list("fancy boxes", list( - new /datum/stack_recipe("donut box", /obj/item/storage/fancy/donut_box), \ - new /datum/stack_recipe("egg box", /obj/item/storage/fancy/egg_box), \ - new /datum/stack_recipe("donk-pockets box", /obj/item/storage/box/donkpockets), \ - new /datum/stack_recipe("donk-pockets spicy box", /obj/item/storage/box/donkpockets/donkpocketspicy), \ - new /datum/stack_recipe("donk-pockets teriyaki box", /obj/item/storage/box/donkpockets/donkpocketteriyaki), \ - new /datum/stack_recipe("donk-pockets pizza box", /obj/item/storage/box/donkpockets/donkpocketpizza), \ - new /datum/stack_recipe("donk-pockets berry box", /obj/item/storage/box/donkpockets/donkpocketberry), \ - new /datum/stack_recipe("donk-pockets honk box", /obj/item/storage/box/donkpockets/donkpockethonk), \ + new /datum/stack_recipe("donut box", /obj/item/storage/fancy/donut_box), \ + new /datum/stack_recipe("egg box", /obj/item/storage/fancy/egg_box), \ + new /datum/stack_recipe("donk-pockets box", /obj/item/storage/box/donkpockets), \ + new /datum/stack_recipe("donk-pockets spicy box", /obj/item/storage/box/donkpockets/donkpocketspicy), \ + new /datum/stack_recipe("donk-pockets teriyaki box", /obj/item/storage/box/donkpockets/donkpocketteriyaki), \ + new /datum/stack_recipe("donk-pockets pizza box", /obj/item/storage/box/donkpockets/donkpocketpizza), \ + new /datum/stack_recipe("donk-pockets berry box", /obj/item/storage/box/donkpockets/donkpocketberry), \ + new /datum/stack_recipe("donk-pockets honk box", /obj/item/storage/box/donkpockets/donkpockethonk), \ new /datum/stack_recipe("monkey cube box", /obj/item/storage/box/monkeycubes), - new /datum/stack_recipe("nugget box", /obj/item/storage/fancy/nugget_box), \ - null, \ + new /datum/stack_recipe("nugget box", /obj/item/storage/fancy/nugget_box), \ + null, \ - new /datum/stack_recipe("lethal ammo box", /obj/item/storage/box/lethalshot), \ - new /datum/stack_recipe("rubber shot ammo box", /obj/item/storage/box/rubbershot), \ - new /datum/stack_recipe("bean bag ammo box", /obj/item/storage/box/beanbag), \ - new /datum/stack_recipe("flashbang box", /obj/item/storage/box/flashbangs), \ - new /datum/stack_recipe("flashes box", /obj/item/storage/box/flashes), \ - new /datum/stack_recipe("handcuffs box", /obj/item/storage/box/handcuffs), \ - new /datum/stack_recipe("ID card box", /obj/item/storage/box/ids), \ - new /datum/stack_recipe("PDA box", /obj/item/storage/box/pdas), \ - null, \ + new /datum/stack_recipe("lethal ammo box", /obj/item/storage/box/lethalshot), \ + new /datum/stack_recipe("rubber shot ammo box", /obj/item/storage/box/rubbershot), \ + new /datum/stack_recipe("bean bag ammo box", /obj/item/storage/box/beanbag), \ + new /datum/stack_recipe("flashbang box", /obj/item/storage/box/flashbangs), \ + new /datum/stack_recipe("flashes box", /obj/item/storage/box/flashes), \ + new /datum/stack_recipe("handcuffs box", /obj/item/storage/box/handcuffs), \ + new /datum/stack_recipe("ID card box", /obj/item/storage/box/ids), \ + new /datum/stack_recipe("PDA box", /obj/item/storage/box/pdas), \ + null, \ - new /datum/stack_recipe("pillbottle box", /obj/item/storage/box/pillbottles), \ - new /datum/stack_recipe("beaker box", /obj/item/storage/box/beakers), \ - new /datum/stack_recipe("syringe box", /obj/item/storage/box/syringes), \ - new /datum/stack_recipe("latex gloves box", /obj/item/storage/box/gloves), \ - new /datum/stack_recipe("sterile masks box", /obj/item/storage/box/masks), \ - new /datum/stack_recipe("body bag box", /obj/item/storage/box/bodybags), \ - new /datum/stack_recipe("perscription glasses box", /obj/item/storage/box/rxglasses), \ - new /datum/stack_recipe("medipen box", /obj/item/storage/box/medipens), \ - new /datum/stack_recipe("oxygen tank box", /obj/item/storage/box/emergencytank), \ - new /datum/stack_recipe("extended oxygen tank box", /obj/item/storage/box/engitank), \ - null, \ + new /datum/stack_recipe("pillbottle box", /obj/item/storage/box/pillbottles), \ + new /datum/stack_recipe("beaker box", /obj/item/storage/box/beakers), \ + new /datum/stack_recipe("syringe box", /obj/item/storage/box/syringes), \ + new /datum/stack_recipe("latex gloves box", /obj/item/storage/box/gloves), \ + new /datum/stack_recipe("sterile masks box", /obj/item/storage/box/masks), \ + new /datum/stack_recipe("body bag box", /obj/item/storage/box/bodybags), \ + new /datum/stack_recipe("perscription glasses box", /obj/item/storage/box/rxglasses), \ + new /datum/stack_recipe("medipen box", /obj/item/storage/box/medipens), \ + new /datum/stack_recipe("oxygen tank box", /obj/item/storage/box/emergencytank), \ + new /datum/stack_recipe("extended oxygen tank box", /obj/item/storage/box/engitank), \ + null, \ - new /datum/stack_recipe("survival box", /obj/item/storage/box/survival), \ - new /datum/stack_recipe("extended tank survival box", /obj/item/storage/box/survival/engineer), \ - new /datum/stack_recipe("disk box", /obj/item/storage/box/disks), \ - new /datum/stack_recipe("light tubes box", /obj/item/storage/box/lights/tubes), \ - new /datum/stack_recipe("light bulbs box", /obj/item/storage/box/lights/bulbs), \ - new /datum/stack_recipe("mixed lights box", /obj/item/storage/box/lights/mixed), \ - new /datum/stack_recipe("mouse traps box", /obj/item/storage/box/mousetraps), \ + new /datum/stack_recipe("survival box", /obj/item/storage/box/survival), \ + new /datum/stack_recipe("extended tank survival box", /obj/item/storage/box/survival/engineer), \ + new /datum/stack_recipe("disk box", /obj/item/storage/box/disks), \ + new /datum/stack_recipe("light tubes box", /obj/item/storage/box/lights/tubes), \ + new /datum/stack_recipe("light bulbs box", /obj/item/storage/box/lights/bulbs), \ + new /datum/stack_recipe("mixed lights box", /obj/item/storage/box/lights/mixed), \ + new /datum/stack_recipe("mouse traps box", /obj/item/storage/box/mousetraps), \ new /datum/stack_recipe("candle box", /obj/item/storage/fancy/candle_box) )), - null, \ + null, \ )) -/obj/item/stack/sheet/cardboard //BubbleWrap //it's cardboard you fuck +/obj/item/stack/sheet/cardboard //BubbleWrap //it's cardboard you fuck name = "cardboard" desc = "Large sheets of card, like boxes folded flat." singular_name = "cardboard sheet" diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm index 80f340a0ace..f69459ab1aa 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -1,8 +1,8 @@ /* Stack type objects! * Contains: - * Stacks - * Recipe datum - * Recipe list datum + * Stacks + * Recipe datum + * Recipe list datum */ /* @@ -415,7 +415,7 @@ return FALSE if(mats_per_unit != check.mats_per_unit) return FALSE - if(is_cyborg) // No merging cyborg stacks into other stacks + if(is_cyborg) // No merging cyborg stacks into other stacks return FALSE return TRUE diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm index a9cfd2c9981..0a3c70fc443 100644 --- a/code/game/objects/items/storage/backpack.dm +++ b/code/game/objects/items/storage/backpack.dm @@ -1,8 +1,8 @@ /* Backpacks * Contains: - * Backpack - * Backpack Types - * Satchel Types + * Backpack + * Backpack Types + * Satchel Types */ /* @@ -17,7 +17,7 @@ lefthand_file = 'icons/mob/inhands/equipment/backpack_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/backpack_righthand.dmi' w_class = WEIGHT_CLASS_BULKY - slot_flags = ITEM_SLOT_BACK //ERROOOOO + slot_flags = ITEM_SLOT_BACK //ERROOOOO resistance_flags = NONE max_integrity = 300 diff --git a/code/game/objects/items/storage/bags.dm b/code/game/objects/items/storage/bags.dm index 38f386ee010..7df266728a3 100644 --- a/code/game/objects/items/storage/bags.dm +++ b/code/game/objects/items/storage/bags.dm @@ -1,18 +1,18 @@ /* - * These absorb the functionality of the plant bag, ore satchel, etc. - * They use the use_to_pickup, quick_gather, and quick_empty functions - * that were already defined in weapon/storage, but which had been - * re-implemented in other classes. + * These absorb the functionality of the plant bag, ore satchel, etc. + * They use the use_to_pickup, quick_gather, and quick_empty functions + * that were already defined in weapon/storage, but which had been + * re-implemented in other classes. * - * Contains: - * Trash Bag - * Mining Satchel - * Plant Bag - * Sheet Snatcher - * Book Bag + * Contains: + * Trash Bag + * Mining Satchel + * Plant Bag + * Sheet Snatcher + * Book Bag * Biowaste Bag * - * -Sayu + * -Sayu */ // Generic non-item @@ -386,7 +386,7 @@ desc = "A cheap metal tray to pile today's meal onto." /* - * Chemistry bag + * Chemistry bag */ /obj/item/storage/bag/chemistry diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm index 9b5dc6e2b70..4b141d7b81c 100644 --- a/code/game/objects/items/storage/boxes.dm +++ b/code/game/objects/items/storage/boxes.dm @@ -1,24 +1,24 @@ /* - * Everything derived from the common cardboard box. - * Basically everything except the original is a kit (starts full). + * Everything derived from the common cardboard box. + * Basically everything except the original is a kit (starts full). * - * Contains: - * Empty box, starter boxes (survival/engineer), - * Latex glove and sterile mask boxes, - * Syringe, beaker, dna injector boxes, - * Blanks, flashbangs, and EMP grenade boxes, - * Tracking and chemical implant boxes, - * Prescription glasses and drinking glass boxes, - * Condiment bottle and silly cup boxes, - * Donkpocket and monkeycube boxes, - * ID and security PDA cart boxes, - * Handcuff, mousetrap, and pillbottle boxes, - * Snap-pops and matchboxes, - * Replacement light boxes. - * Action Figure Boxes - * Various paper bags. + * Contains: + * Empty box, starter boxes (survival/engineer), + * Latex glove and sterile mask boxes, + * Syringe, beaker, dna injector boxes, + * Blanks, flashbangs, and EMP grenade boxes, + * Tracking and chemical implant boxes, + * Prescription glasses and drinking glass boxes, + * Condiment bottle and silly cup boxes, + * Donkpocket and monkeycube boxes, + * ID and security PDA cart boxes, + * Handcuff, mousetrap, and pillbottle boxes, + * Snap-pops and matchboxes, + * Replacement light boxes. + * Action Figure Boxes + * Various paper bags. * - * For syndicate call-ins see uplink_kits.dm + * For syndicate call-ins see uplink_kits.dm */ /obj/item/storage/box @@ -556,7 +556,7 @@ new /obj/item/pda(src) new /obj/item/cartridge/head(src) - var/newcart = pick( /obj/item/cartridge/engineering, + var/newcart = pick( /obj/item/cartridge/engineering, /obj/item/cartridge/security, /obj/item/cartridge/medical, /obj/item/cartridge/signal/toxins, @@ -656,7 +656,7 @@ /obj/item/storage/box/alienhandcuffs/PopulateContents() for(var/i in 1 to 7) - new /obj/item/restraints/handcuffs/alien(src) + new /obj/item/restraints/handcuffs/alien(src) /obj/item/storage/box/fakesyndiesuit name = "boxed space suit and helmet" @@ -1083,7 +1083,7 @@ name = "box of materials" illustration = "implant" -/obj/item/storage/box/material/PopulateContents() //less uranium because radioactive +/obj/item/storage/box/material/PopulateContents() //less uranium because radioactive var/static/items_inside = list( /obj/item/stack/sheet/iron/fifty=1,\ /obj/item/stack/sheet/glass/fifty=1,\ diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm index 29a532b7261..ed46f4f2361 100644 --- a/code/game/objects/items/storage/fancy.dm +++ b/code/game/objects/items/storage/fancy.dm @@ -3,15 +3,15 @@ * .. Sorry for the shitty path name, I couldnt think of a better one. * * WARNING: var/icon_type is used for both examine text and sprite name. Please look at the procs below and adjust your sprite names accordingly - * TODO: Cigarette boxes should be ported to this standard + * TODO: Cigarette boxes should be ported to this standard * * Contains: - * Donut Box - * Egg Box - * Candle Box - * Cigarette Box - * Cigar Case - * Heart Shaped Box w/ Chocolates + * Donut Box + * Egg Box + * Candle Box + * Cigarette Box + * Cigar Case + * Heart Shaped Box w/ Chocolates */ /obj/item/storage/fancy diff --git a/code/game/objects/items/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm index 3c5440f9a72..a59cc9e6369 100644 --- a/code/game/objects/items/storage/firstaid.dm +++ b/code/game/objects/items/storage/firstaid.dm @@ -1,8 +1,8 @@ /* First aid storage * Contains: - * First Aid Kits - * Pill Bottles - * Dice Pack (in a pill bottle) + * First Aid Kits + * Pill Bottles + * Dice Pack (in a pill bottle) */ /* diff --git a/code/game/objects/items/storage/holsters.dm b/code/game/objects/items/storage/holsters.dm index 7640a072b29..5a347dada27 100644 --- a/code/game/objects/items/storage/holsters.dm +++ b/code/game/objects/items/storage/holsters.dm @@ -51,7 +51,7 @@ /obj/item/ammo_box/a762, /obj/item/gun/ballistic/automatic/toy/pistol, /obj/item/ammo_box/magazine/toy/pistol, - /obj/item/gun/energy/e_gun/mini, + /obj/item/gun/energy/e_gun/mini, /obj/item/gun/energy/disabler, /obj/item/gun/energy/dueling )) diff --git a/code/game/objects/items/storage/secure.dm b/code/game/objects/items/storage/secure.dm index 9dfa343ccab..ed459a866f9 100644 --- a/code/game/objects/items/storage/secure.dm +++ b/code/game/objects/items/storage/secure.dm @@ -1,10 +1,10 @@ /* - * Absorbs /obj/item/secstorage. - * Reimplements it only slightly to use existing storage functionality. + * Absorbs /obj/item/secstorage. + * Reimplements it only slightly to use existing storage functionality. * - * Contains: - * Secure Briefcase - * Wall Safe + * Contains: + * Secure Briefcase + * Wall Safe */ // ----------------------------- @@ -173,7 +173,7 @@ . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.set_holdable(null, list(/obj/item/storage/secure/briefcase)) - STR.max_w_class = 8 //?? + STR.max_w_class = 8 //?? /obj/item/storage/secure/safe/PopulateContents() new /obj/item/paper(src) diff --git a/code/game/objects/items/storage/toolbox.dm b/code/game/objects/items/storage/toolbox.dm index 174dd02af3d..4afd9457676 100644 --- a/code/game/objects/items/storage/toolbox.dm +++ b/code/game/objects/items/storage/toolbox.dm @@ -280,7 +280,7 @@ //floorbot assembly /obj/item/storage/toolbox/attackby(obj/item/stack/tile/iron/T, mob/user, params) - var/list/allowed_toolbox = list(/obj/item/storage/toolbox/emergency, //which toolboxes can be made into floorbots + var/list/allowed_toolbox = list(/obj/item/storage/toolbox/emergency, //which toolboxes can be made into floorbots /obj/item/storage/toolbox/electrical, /obj/item/storage/toolbox/mechanical, /obj/item/storage/toolbox/artistic, diff --git a/code/game/objects/items/storage/uplink_kits.dm b/code/game/objects/items/storage/uplink_kits.dm index 03f44f69d58..131a7fc2d03 100644 --- a/code/game/objects/items/storage/uplink_kits.dm +++ b/code/game/objects/items/storage/uplink_kits.dm @@ -7,7 +7,7 @@ if("recon") new /obj/item/clothing/glasses/thermal/xray(src) // ~8 tc? new /obj/item/storage/briefcase/launchpad(src) //6 tc - new /obj/item/binoculars(src) // 2 tc? + new /obj/item/binoculars(src) // 2 tc? new /obj/item/encryptionkey/syndicate(src) // 2 tc new /obj/item/storage/box/syndie_kit/space(src) //4 tc new /obj/item/grenade/frag(src) // ~2 tc each? diff --git a/code/game/objects/items/tanks/tank_types.dm b/code/game/objects/items/tanks/tank_types.dm index 4ef2152ce2e..3a865bae6a5 100644 --- a/code/game/objects/items/tanks/tank_types.dm +++ b/code/game/objects/items/tanks/tank_types.dm @@ -1,11 +1,11 @@ /* Types of tanks! * Contains: - * Oxygen - * Anesthetic - * Air - * Plasma - * Emergency Oxygen - * Generic + * Oxygen + * Anesthetic + * Air + * Plasma + * Emergency Oxygen + * Generic */ /* @@ -67,7 +67,7 @@ worn_icon_state = "plasmatank" tank_holder_icon_state = null flags_1 = CONDUCT_1 - slot_flags = null //they have no straps! + slot_flags = null //they have no straps! force = 8 @@ -125,7 +125,7 @@ worn_icon = null slot_flags = ITEM_SLOT_BELT force = 5 - volume = 24 //enough so they need to refill but not that often to be a chore + volume = 24 //enough so they need to refill but not that often to be a chore w_class = WEIGHT_CLASS_SMALL //thanks i forgot this /obj/item/tank/internals/plasmaman/belt/full/populate_gas() diff --git a/code/game/objects/items/tanks/watertank.dm b/code/game/objects/items/tanks/watertank.dm index 65ece0d44d4..b52751a5d8c 100644 --- a/code/game/objects/items/tanks/watertank.dm +++ b/code/game/objects/items/tanks/watertank.dm @@ -126,7 +126,7 @@ tank = loc if(!istype(tank)) return INITIALIZE_HINT_QDEL - reagents = tank.reagents //This mister is really just a proxy for the tank's reagents + reagents = tank.reagents //This mister is really just a proxy for the tank's reagents /obj/item/reagent_containers/spray/mister/attack_self() return diff --git a/code/game/objects/items/teleportation.dm b/code/game/objects/items/teleportation.dm index 5c7a54be855..871a9b10d56 100644 --- a/code/game/objects/items/teleportation.dm +++ b/code/game/objects/items/teleportation.dm @@ -3,8 +3,8 @@ /* Teleportation devices. * Contains: - * Locator - * Hand-tele + * Locator + * Hand-tele */ /* @@ -213,7 +213,7 @@ var/list/dangerous_turfs = list() for(var/turf/dangerous_turf in urange(10, orange=1)) if(dangerous_turf.x > world.maxx - PORTAL_DANGEROUS_EDGE_LIMIT || dangerous_turf.x < PORTAL_DANGEROUS_EDGE_LIMIT) - continue //putting them at the edge is dumb + continue //putting them at the edge is dumb if(dangerous_turf.y > world.maxy - PORTAL_DANGEROUS_EDGE_LIMIT || dangerous_turf.y < PORTAL_DANGEROUS_EDGE_LIMIT) continue var/area/dangerous_area = dangerous_turf.loc @@ -277,7 +277,7 @@ /obj/item/hand_tele/proc/on_portal_destroy(obj/effect/portal/P) SIGNAL_HANDLER - active_portal_pairs -= P //If this portal pair is made by us it'll be erased along with the other portal by the portal. + active_portal_pairs -= P //If this portal pair is made by us it'll be erased along with the other portal by the portal. /obj/item/hand_tele/proc/is_parent_of_portal(obj/effect/portal/P) if(!istype(P)) diff --git a/code/game/objects/items/tools/weldingtool.dm b/code/game/objects/items/tools/weldingtool.dm index 970297b66bb..9f9fa47338a 100644 --- a/code/game/objects/items/tools/weldingtool.dm +++ b/code/game/objects/items/tools/weldingtool.dm @@ -35,11 +35,11 @@ custom_materials = list(/datum/material/iron=70, /datum/material/glass=30) ///Whether the welding tool is on or off. var/welding = FALSE - var/status = TRUE //Whether the welder is secured or unsecured (able to attach rods to it to make a flamethrower) - var/max_fuel = 20 //The max amount of fuel the welder can hold + var/status = TRUE //Whether the welder is secured or unsecured (able to attach rods to it to make a flamethrower) + var/max_fuel = 20 //The max amount of fuel the welder can hold var/change_icons = 1 var/can_off_process = 0 - var/burned_fuel_for = 0 //when fuel was last removed + var/burned_fuel_for = 0 //when fuel was last removed var/acti_sound = 'sound/items/welderactivate.ogg' var/deac_sound = 'sound/items/welderdeactivate.ogg' diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 8d8f400284f..77089032718 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -1,28 +1,28 @@ /* Toys! * Contains - * Balloons - * Fake singularity - * Toy gun - * Toy crossbow - * Toy swords - * Crayons - * Snap pops - * AI core prizes - * Toy codex gigas - * Skeleton toys - * Cards - * Toy nuke - * Fake meteor - * Foam armblade - * Toy big red button - * Beach ball - * Toy xeno + * Balloons + * Fake singularity + * Toy gun + * Toy crossbow + * Toy swords + * Crayons + * Snap pops + * AI core prizes + * Toy codex gigas + * Skeleton toys + * Cards + * Toy nuke + * Fake meteor + * Foam armblade + * Toy big red button + * Beach ball + * Toy xeno * Kitty toys! - * Snowballs - * Clockwork Watches - * Toy Daggers - * Squeaky Brain - * Broken Radio + * Snowballs + * Clockwork Watches + * Toy Daggers + * Squeaky Brain + * Broken Radio */ /obj/item/toy diff --git a/code/game/objects/obj_defense.dm b/code/game/objects/obj_defense.dm index 1dc1a752733..72810ed1ce2 100644 --- a/code/game/objects/obj_defense.dm +++ b/code/game/objects/obj_defense.dm @@ -35,7 +35,7 @@ var/armor_protection = 0 if(damage_flag) armor_protection = armor.getRating(damage_flag) - if(armor_protection) //Only apply weak-against-armor/hollowpoint effects if there actually IS armor. + if(armor_protection) //Only apply weak-against-armor/hollowpoint effects if there actually IS armor. armor_protection = clamp(armor_protection - armour_penetration, min(armor_protection, 0), 100) return round(damage_amount * (100 - armor_protection)*0.01, DAMAGE_PRECISION) @@ -241,7 +241,7 @@ GLOBAL_DATUM_INIT(acid_overlay, /mutable_appearance, mutable_appearance('icons/e if(current_integrity != 0 && current_max != 0) var/percentage = current_integrity / current_max - current_integrity = max(1, round(percentage * new_max)) //don't destroy it as a result + current_integrity = max(1, round(percentage * new_max)) //don't destroy it as a result obj_integrity = current_integrity max_integrity = new_max diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index 6051f942b12..38247b0f2e2 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -14,7 +14,7 @@ var/bare_wound_bonus = 0 var/datum/armor/armor - var/obj_integrity //defaults to max_integrity + var/obj_integrity //defaults to max_integrity var/max_integrity = 500 var/integrity_failure = 0 //0 if we have no special broken behavior, otherwise is a percentage of at what point the obj breaks. 0.5 being 50% ///Damage under this value will be completely ignored @@ -125,8 +125,8 @@ /obj/proc/handle_internal_lifeform(mob/lifeform_inside_me, breath_request) //Return: (NONSTANDARD) - // null if object handles breathing logic for lifeform - // datum/air_group to tell lifeform to process using that breath return + // null if object handles breathing logic for lifeform + // datum/air_group to tell lifeform to process using that breath return //DEFAULT: Take air from turf to give to have mob process if(breath_request>0) diff --git a/code/game/objects/structures/ai_core.dm b/code/game/objects/structures/ai_core.dm index eda4d23e946..a150a998754 100644 --- a/code/game/objects/structures/ai_core.dm +++ b/code/game/objects/structures/ai_core.dm @@ -69,7 +69,7 @@ . += "Its transmitter seems to be [active? "on" : "off"]." . += "You could [active? "deactivate" : "activate"] it with a multitool." -/obj/structure/ai_core/latejoin_inactive/proc/is_available() //If people still manage to use this feature to spawn-kill AI latejoins ahelp them. +/obj/structure/ai_core/latejoin_inactive/proc/is_available() //If people still manage to use this feature to spawn-kill AI latejoins ahelp them. if(!available) return FALSE if(!safety_checks) diff --git a/code/game/objects/structures/aliens.dm b/code/game/objects/structures/aliens.dm index e7204e76662..f5cc2f08318 100644 --- a/code/game/objects/structures/aliens.dm +++ b/code/game/objects/structures/aliens.dm @@ -1,9 +1,9 @@ /* Alien shit! * Contains: - * structure/alien - * Resin - * Weeds - * Egg + * structure/alien + * Resin + * Weeds + * Egg */ @@ -259,7 +259,7 @@ #define BURST "burst" #define GROWING "growing" #define GROWN "grown" -#define MIN_GROWTH_TIME 900 //time it takes to grow a hugger +#define MIN_GROWTH_TIME 900 //time it takes to grow a hugger #define MAX_GROWTH_TIME 1500 /obj/structure/alien/egg @@ -271,7 +271,7 @@ anchored = TRUE max_integrity = 100 integrity_failure = 0.05 - var/status = GROWING //can be GROWING, GROWN or BURST; all mutually exclusive + var/status = GROWING //can be GROWING, GROWN or BURST; all mutually exclusive layer = MOB_LAYER var/obj/item/clothing/mask/facehugger/child diff --git a/code/game/objects/structures/beds_chairs/bed.dm b/code/game/objects/structures/beds_chairs/bed.dm index 1ec1cec8e3c..ad571ae34f0 100644 --- a/code/game/objects/structures/beds_chairs/bed.dm +++ b/code/game/objects/structures/beds_chairs/bed.dm @@ -1,7 +1,7 @@ /* Beds... get your mind out of the gutter, they're for sleeping! * Contains: - * Beds - * Roller beds + * Beds + * Roller beds */ /* diff --git a/code/game/objects/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm index 8d2cc3a2a5f..1d3fbe9947b 100644 --- a/code/game/objects/structures/beds_chairs/chair.dm +++ b/code/game/objects/structures/beds_chairs/chair.dm @@ -24,7 +24,7 @@ /obj/structure/chair/Initialize() . = ..() - if(!anchored) //why would you put these on the shuttle? + if(!anchored) //why would you put these on the shuttle? addtimer(CALLBACK(src, .proc/RemoveFromLatejoin), 0) if(prob(0.2)) name = "tactical [name]" @@ -53,7 +53,7 @@ return ..() /obj/structure/chair/proc/RemoveFromLatejoin() - SSjob.latejoin_trackers -= src //These may be here due to the arrivals shuttle + SSjob.latejoin_trackers -= src //These may be here due to the arrivals shuttle /obj/structure/chair/deconstruct() // If we have materials, and don't have the NOCONSTRUCT flag diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm index d5ea41adc9f..6403a3c4373 100644 --- a/code/game/objects/structures/bedsheet_bin.dm +++ b/code/game/objects/structures/bedsheet_bin.dm @@ -30,7 +30,7 @@ LINEN BINS AddElement(/datum/element/bed_tuckable, 0, 0, 0) /obj/item/bedsheet/attack_self(mob/user) - if(!user.CanReach(src)) //No telekenetic grabbing. + if(!user.CanReach(src)) //No telekenetic grabbing. return if(!user.dropItemToGround(src)) return @@ -355,7 +355,7 @@ LINEN BINS new /obj/item/stack/rods(loc, 2) qdel(src) - else if(amount && !hidden && I.w_class < WEIGHT_CLASS_BULKY) //make sure there's sheets to hide it among, make sure nothing else is hidden in there. + else if(amount && !hidden && I.w_class < WEIGHT_CLASS_BULKY) //make sure there's sheets to hide it among, make sure nothing else is hidden in there. if(!user.transferItemToLoc(I, src)) to_chat(user, "\The [I] is stuck to your hand, you cannot hide it among the sheets!") return diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index 3db0ebd7311..cc50bc1e2bc 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/closet.dmi' icon_state = "generic" density = TRUE - drag_slowdown = 1.5 // Same as a prone mob + drag_slowdown = 1.5 // Same as a prone mob max_integrity = 200 integrity_failure = 0.25 armor = list(MELEE = 20, BULLET = 10, LASER = 10, ENERGY = 0, BOMB = 10, BIO = 0, RAD = 0, FIRE = 70, ACID = 60) @@ -42,7 +42,7 @@ /obj/structure/closet/Initialize(mapload) - if(mapload && !opened) // if closed, any item at the crate's loc is put in the contents + if(mapload && !opened) // if closed, any item at the crate's loc is put in the contents addtimer(CALLBACK(src, .proc/take_contents), 0) . = ..() update_icon() diff --git a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm index e5eb23a0938..eb316a830c5 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm @@ -11,13 +11,13 @@ recursive_organ_check(src) /obj/structure/closet/secure_closet/freezer/open(mob/living/user, force = FALSE) - if(opened || !can_open(user, force)) //dupe check just so we don't let the organs decay when someone fails to open the locker + if(opened || !can_open(user, force)) //dupe check just so we don't let the organs decay when someone fails to open the locker return FALSE recursive_organ_check(src) return ..() /obj/structure/closet/secure_closet/freezer/close(mob/living/user) - if(..()) //if we actually closed the locker + if(..()) //if we actually closed the locker recursive_organ_check(src) /obj/structure/closet/secure_closet/freezer/ex_act() diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm index 6821fb58715..2894c30e242 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -80,7 +80,7 @@ new /obj/item/clothing/suit/toggle/labcoat/cmo(src) new /obj/item/clothing/under/rank/medical/chief_medical_officer(src) new /obj/item/clothing/under/rank/medical/chief_medical_officer/skirt(src) - new /obj/item/clothing/shoes/sneakers/brown (src) + new /obj/item/clothing/shoes/sneakers/brown (src) new /obj/item/cartridge/cmo(src) new /obj/item/radio/headset/heads/cmo(src) new /obj/item/megaphone/command(src) diff --git a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm index 3d054c223b2..f1898e19956 100644 --- a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm @@ -1,12 +1,12 @@ /* Utility Closets * Contains: - * Emergency Closet - * Fire Closet - * Tool Closet - * Radiation Closet - * Bombsuit Closet - * Hydrant - * First Aid + * Emergency Closet + * Fire Closet + * Tool Closet + * Radiation Closet + * Bombsuit Closet + * Hydrant + * First Aid */ /* diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index cc9525d4a36..a55e8b3a728 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -113,7 +113,7 @@ for(var/i in 1 to rand(7,15)) new /obj/effect/spawner/lootdrop/garbage_spawner(src) if(prob(12)) - new /obj/item/storage/bag/trash/filled(src) + new /obj/item/storage/bag/trash/filled(src) new /obj/effect/spawner/scatter/grime(loc) /obj/structure/closet/crate/internals diff --git a/code/game/objects/structures/crates_lockers/crates/large.dm b/code/game/objects/structures/crates_lockers/crates/large.dm index 8ec3ef4c94d..907b4680068 100644 --- a/code/game/objects/structures/crates_lockers/crates/large.dm +++ b/code/game/objects/structures/crates_lockers/crates/large.dm @@ -41,8 +41,8 @@ qdel(src) else - if(user.combat_mode) //Only return ..() if intent is harm, otherwise return 0 or just end it. - return ..() //Stops it from opening and turning invisible when items are used on it. + if(user.combat_mode) //Only return ..() if intent is harm, otherwise return 0 or just end it. + return ..() //Stops it from opening and turning invisible when items are used on it. else to_chat(user, "You need a crowbar to pry this open!") diff --git a/code/game/objects/structures/crates_lockers/crates/wooden.dm b/code/game/objects/structures/crates_lockers/crates/wooden.dm index dcffd08bb54..d1d5cfddb5e 100644 --- a/code/game/objects/structures/crates_lockers/crates/wooden.dm +++ b/code/game/objects/structures/crates_lockers/crates/wooden.dm @@ -15,8 +15,8 @@ /obj/structure/closet/crate/wooden/toy/PopulateContents() . = ..() - new /obj/item/megaphone/clown(src) - new /obj/item/reagent_containers/food/drinks/soda_cans/canned_laughter(src) + new /obj/item/megaphone/clown(src) + new /obj/item/reagent_containers/food/drinks/soda_cans/canned_laughter(src) new /obj/item/pneumatic_cannon/pie(src) new /obj/item/food/pie/cream(src) new /obj/item/storage/crayons(src) diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm index 7c472e99b46..34b54c92f0a 100644 --- a/code/game/objects/structures/flora.dm +++ b/code/game/objects/structures/flora.dm @@ -145,7 +145,7 @@ name = "grass" desc = "A patch of overgrown grass." icon = 'icons/obj/flora/snowflora.dmi' - gender = PLURAL //"this is grass" not "this is a grass" + gender = PLURAL //"this is grass" not "this is a grass" /obj/structure/flora/grass/brown icon_state = "snowgrass1bb" diff --git a/code/game/objects/structures/ghost_role_spawners.dm b/code/game/objects/structures/ghost_role_spawners.dm index ab269cd665d..6b3eba9949c 100644 --- a/code/game/objects/structures/ghost_role_spawners.dm +++ b/code/game/objects/structures/ghost_role_spawners.dm @@ -435,7 +435,7 @@ icon = 'icons/obj/machines/sleeper.dmi' icon_state = "sleeper_s" outfit = /datum/outfit/syndicate_empty - assignedrole = "Space Syndicate" //I know this is really dumb, but Syndicate operative is nuke ops + assignedrole = "Space Syndicate" //I know this is really dumb, but Syndicate operative is nuke ops /datum/outfit/syndicate_empty name = "Syndicate Operative Empty" @@ -897,7 +897,7 @@ /obj/effect/mob_spawn/mouse name = "sleeper" - mob_type = /mob/living/simple_animal/mouse + mob_type = /mob/living/simple_animal/mouse death = FALSE roundstart = FALSE icon = 'icons/obj/machines/sleeper.dmi' @@ -905,7 +905,7 @@ /obj/effect/mob_spawn/cow name = "sleeper" - mob_type = /mob/living/simple_animal/cow + mob_type = /mob/living/simple_animal/cow death = FALSE roundstart = FALSE mob_gender = FEMALE diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm index 59957c1c5fb..826b318b8d3 100644 --- a/code/game/objects/structures/girders.dm +++ b/code/game/objects/structures/girders.dm @@ -212,7 +212,7 @@ else if(istype(W, /obj/item/pipe)) var/obj/item/pipe/P = W - if (P.pipe_type in list(0, 1, 5)) //simple pipes, simple bends, and simple manifolds. + if (P.pipe_type in list(0, 1, 5)) //simple pipes, simple bends, and simple manifolds. if(!user.transferItemToLoc(P, drop_location())) return to_chat(user, "You fit the pipe into \the [src].") diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index dbe7ba65685..b757951c5bc 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -236,7 +236,7 @@ // returns 1 if shocked, 0 otherwise /obj/structure/grille/proc/shock(mob/user, prb) - if(!anchored || broken) // anchored/broken grilles are never connected + if(!anchored || broken) // anchored/broken grilles are never connected return FALSE if(!prob(prb)) return FALSE diff --git a/code/game/objects/structures/holosign.dm b/code/game/objects/structures/holosign.dm index e5f264057e9..0220978b9ed 100644 --- a/code/game/objects/structures/holosign.dm +++ b/code/game/objects/structures/holosign.dm @@ -59,7 +59,7 @@ return if(iscarbon(mover)) var/mob/living/carbon/C = mover - if(C.stat) // Lets not prevent dragging unconscious/dead people. + if(C.stat) // Lets not prevent dragging unconscious/dead people. return TRUE if(allow_walk && C.m_intent == MOVE_INTENT_WALK) return TRUE @@ -74,7 +74,7 @@ . = ..() if(iscarbon(mover)) var/mob/living/carbon/C = mover - if(C.stat) // Lets not prevent dragging unconscious/dead people. + if(C.stat) // Lets not prevent dragging unconscious/dead people. return TRUE if(allow_walk && C.m_intent != MOVE_INTENT_WALK) return FALSE @@ -114,11 +114,11 @@ allow_walk = FALSE /obj/structure/holosign/barrier/cyborg/bullet_act(obj/projectile/P) - take_damage((P.damage / 5) , BRUTE, MELEE, 1) //Doesn't really matter what damage flag it is. + take_damage((P.damage / 5) , BRUTE, MELEE, 1) //Doesn't really matter what damage flag it is. if(istype(P, /obj/projectile/energy/electrode)) - take_damage(10, BRUTE, MELEE, 1) //Tasers aren't harmful. + take_damage(10, BRUTE, MELEE, 1) //Tasers aren't harmful. if(istype(P, /obj/projectile/beam/disabler)) - take_damage(5, BRUTE, MELEE, 1) //Disablers aren't harmful. + take_damage(5, BRUTE, MELEE, 1) //Disablers aren't harmful. return BULLET_ACT_HIT /obj/structure/holosign/barrier/medical @@ -175,7 +175,7 @@ var/shockcd = 0 /obj/structure/holosign/barrier/cyborg/hacked/bullet_act(obj/projectile/P) - take_damage(P.damage, BRUTE, MELEE, 1) //Yeah no this doesn't get projectile resistance. + take_damage(P.damage, BRUTE, MELEE, 1) //Yeah no this doesn't get projectile resistance. return BULLET_ACT_HIT /obj/structure/holosign/barrier/cyborg/hacked/proc/cooldown() diff --git a/code/game/objects/structures/ladders.dm b/code/game/objects/structures/ladders.dm index 61f772d7dd7..c9fadc95766 100644 --- a/code/game/objects/structures/ladders.dm +++ b/code/game/objects/structures/ladders.dm @@ -66,7 +66,7 @@ icon_state = "ladder10" else if(down) icon_state = "ladder01" - else //wtf make your ladders properly assholes + else //wtf make your ladders properly assholes icon_state = "ladder00" /obj/structure/ladder/singularity_pull() diff --git a/code/game/objects/structures/manned_turret.dm b/code/game/objects/structures/manned_turret.dm index 8736360aa9a..303b6ca9ee2 100644 --- a/code/game/objects/structures/manned_turret.dm +++ b/code/game/objects/structures/manned_turret.dm @@ -56,7 +56,7 @@ if(M.dropItemToGround(I)) var/obj/item/gun_control/TC = new(src) M.put_in_hands(TC) - else //Entries in the list should only ever be items or null, so if it's not an item, we can assume it's an empty hand + else //Entries in the list should only ever be items or null, so if it's not an item, we can assume it's an empty hand var/obj/item/gun_control/TC = new(src) M.put_in_hands(TC) M.pixel_y = 14 @@ -82,7 +82,7 @@ if(C) var/atom/A = C.mouseObject var/turf/T = get_turf(A) - if(istype(T)) //They're hovering over something in the map. + if(istype(T)) //They're hovering over something in the map. direction_track(controller, T) calculated_projectile_vars = calculate_projectile_angle_and_pixel_offsets(controller, C.mouseParams) @@ -147,7 +147,7 @@ /obj/machinery/manned_turret/proc/fire_helper(mob/user) if(user.incapacitated() || !(user in buckled_mobs)) return - update_positioning() //REFRESH MOUSE TRACKING!! + update_positioning() //REFRESH MOUSE TRACKING!! var/turf/targets_from = get_turf(src) if(QDELETED(target)) target = target_turf diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm index efb88a8664e..5b175ad5f28 100644 --- a/code/game/objects/structures/mirror.dm +++ b/code/game/objects/structures/mirror.dm @@ -31,7 +31,7 @@ if(H.gender != FEMALE) var/new_style = input(user, "Select a facial hairstyle", "Grooming") as null|anything in GLOB.facial_hairstyles_list if(!user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK)) - return //no tele-grooming + return //no tele-grooming if(new_style) H.facial_hairstyle = new_style else @@ -40,7 +40,7 @@ //handle normal hair var/new_style = input(user, "Select a hairstyle", "Grooming") as null|anything in GLOB.hairstyles_list if(!user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK)) - return //no tele-grooming + return //no tele-grooming if(HAS_TRAIT(H, TRAIT_BALD)) to_chat(H, "If only growing back hair were that easy for you...") if(new_style) diff --git a/code/game/objects/structures/mop_bucket.dm b/code/game/objects/structures/mop_bucket.dm index f6fb6e62b3a..92bc098e855 100644 --- a/code/game/objects/structures/mop_bucket.dm +++ b/code/game/objects/structures/mop_bucket.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/janitor.dmi' icon_state = "mopbucket" density = TRUE - var/amount_per_transfer_from_this = 5 //shit I dunno, adding this so syringes stop runtime erroring. --NeoFite + var/amount_per_transfer_from_this = 5 //shit I dunno, adding this so syringes stop runtime erroring. --NeoFite /obj/structure/mopbucket/Initialize() diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm index c01136bada2..cef958ca65c 100644 --- a/code/game/objects/structures/morgue.dm +++ b/code/game/objects/structures/morgue.dm @@ -1,11 +1,11 @@ /* Morgue stuff * Contains: - * Morgue - * Morgue tray - * Crematorium - * Creamatorium - * Crematorium tray - * Crematorium button + * Morgue + * Morgue tray + * Crematorium + * Creamatorium + * Crematorium tray + * Crematorium button */ /* diff --git a/code/game/objects/structures/noticeboard.dm b/code/game/objects/structures/noticeboard.dm index c39162fad83..a40b462b991 100644 --- a/code/game/objects/structures/noticeboard.dm +++ b/code/game/objects/structures/noticeboard.dm @@ -58,7 +58,7 @@ ..() usr.set_machine(src) if(href_list["remove"]) - if(usr.stat != CONSCIOUS || HAS_TRAIT(usr, TRAIT_HANDS_BLOCKED)) //For when a player is handcuffed while they have the notice window open + if(usr.stat != CONSCIOUS || HAS_TRAIT(usr, TRAIT_HANDS_BLOCKED)) //For when a player is handcuffed while they have the notice window open return var/obj/item/I = locate(href_list["remove"]) in contents if(istype(I) && I.loc == src) diff --git a/code/game/objects/structures/plasticflaps.dm b/code/game/objects/structures/plasticflaps.dm index 57f171410d3..72bd452dfef 100644 --- a/code/game/objects/structures/plasticflaps.dm +++ b/code/game/objects/structures/plasticflaps.dm @@ -95,7 +95,7 @@ return TRUE var/ventcrawler = HAS_TRAIT(M, TRAIT_VENTCRAWLER_ALWAYS) || HAS_TRAIT(M, TRAIT_VENTCRAWLER_NUDE) - if(M.body_position == STANDING_UP && !ventcrawler && M.mob_size != MOB_SIZE_TINY) //If your not laying down, or a ventcrawler or a small creature, no pass. + if(M.body_position == STANDING_UP && !ventcrawler && M.mob_size != MOB_SIZE_TINY) //If your not laying down, or a ventcrawler or a small creature, no pass. return FALSE /obj/structure/plasticflaps/deconstruct(disassembled = TRUE) diff --git a/code/game/objects/structures/shower.dm b/code/game/objects/structures/shower.dm index e17322ff778..b12411bd3c4 100644 --- a/code/game/objects/structures/shower.dm +++ b/code/game/objects/structures/shower.dm @@ -7,7 +7,7 @@ /// The volume of it's internal reagents the shower applies to everything it sprays. #define SHOWER_SPRAY_VOLUME 5 /// How much the volume of the shower's spay reagents are amplified by when it sprays something. -#define SHOWER_EXPOSURE_MULTIPLIER 2 // Showers effectively double exposed reagents +#define SHOWER_EXPOSURE_MULTIPLIER 2 // Showers effectively double exposed reagents /obj/machinery/shower @@ -151,7 +151,7 @@ for(var/am in loc) var/atom/movable/movable_content = am if(!ismopable(movable_content)) // Mopables will be cleaned anyways by the turf wash above - wash_atom(movable_content) // Reagent exposure is handled in wash_atom + wash_atom(movable_content) // Reagent exposure is handled in wash_atom reagents.remove_any(SHOWER_SPRAY_VOLUME) return diff --git a/code/game/objects/structures/stairs.dm b/code/game/objects/structures/stairs.dm index e737cdfc4b7..e7b228d6fda 100644 --- a/code/game/objects/structures/stairs.dm +++ b/code/game/objects/structures/stairs.dm @@ -39,7 +39,7 @@ listeningTo = null return ..() -/obj/structure/stairs/Move() //Look this should never happen but... +/obj/structure/stairs/Move() //Look this should never happen but... . = ..() if(force_open_above) build_signal_listener() @@ -79,7 +79,7 @@ if(!checking.zPassIn(AM, UP, get_turf(src))) return var/turf/target = get_step_multiz(get_turf(src), (dir|UP)) - if(istype(target) && !target.can_zFall(AM, null, get_step_multiz(target, DOWN))) //Don't throw them into a tile that will just dump them back down. + if(istype(target) && !target.can_zFall(AM, null, get_step_multiz(target, DOWN))) //Don't throw them into a tile that will just dump them back down. if(isliving(AM)) var/mob/living/L = AM var/pulling = L.pulling @@ -129,7 +129,7 @@ if(isTerminator()) . |= FALL_INTERCEPTED | FALL_NO_MESSAGE -/obj/structure/stairs/proc/isTerminator() //If this is the last stair in a chain and should move mobs up +/obj/structure/stairs/proc/isTerminator() //If this is the last stair in a chain and should move mobs up if(terminator_mode != STAIR_TERMINATOR_AUTOMATIC) return (terminator_mode == STAIR_TERMINATOR_YES) var/turf/T = get_turf(src) diff --git a/code/game/objects/structures/table_frames.dm b/code/game/objects/structures/table_frames.dm index 28954150e97..1d8aa462284 100644 --- a/code/game/objects/structures/table_frames.dm +++ b/code/game/objects/structures/table_frames.dm @@ -1,7 +1,7 @@ /* Table Frames * Contains: - * Frames - * Wooden Frames + * Frames + * Wooden Frames */ diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm index a13f661b269..89f38104d94 100644 --- a/code/game/objects/structures/tables_racks.dm +++ b/code/game/objects/structures/tables_racks.dm @@ -1,11 +1,11 @@ /* Tables and Racks * Contains: - * Tables - * Glass Tables - * Wooden Tables - * Reinforced Tables - * Racks - * Rack Parts + * Tables + * Glass Tables + * Wooden Tables + * Reinforced Tables + * Racks + * Rack Parts */ /* diff --git a/code/game/objects/structures/transit_tubes/transit_tube_pod.dm b/code/game/objects/structures/transit_tubes/transit_tube_pod.dm index 6987dd5c1f2..b026051d49a 100644 --- a/code/game/objects/structures/transit_tubes/transit_tube_pod.dm +++ b/code/game/objects/structures/transit_tubes/transit_tube_pod.dm @@ -154,7 +154,7 @@ moving = FALSE var/obj/structure/transit_tube/TT = locate(/obj/structure/transit_tube) in loc - if(!TT || (!(dir in TT.tube_dirs) && !(turn(dir,180) in TT.tube_dirs))) //landed on a turf without transit tube or not in our direction + if(!TT || (!(dir in TT.tube_dirs) && !(turn(dir,180) in TT.tube_dirs))) //landed on a turf without transit tube or not in our direction outside_tube() /obj/structure/transit_tube_pod/proc/outside_tube() diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index 76b819883d5..3bcb3513119 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -5,10 +5,10 @@ icon_state = "toilet00" density = FALSE anchored = TRUE - var/open = FALSE //if the lid is up - var/cistern = 0 //if the cistern bit is open - var/w_items = 0 //the combined w_class of all the items in the cistern - var/mob/living/swirlie = null //the mob being given a swirlie + var/open = FALSE //if the lid is up + var/cistern = 0 //if the cistern bit is open + var/w_items = 0 //the combined w_class of all the items in the cistern + var/mob/living/swirlie = null //the mob being given a swirlie var/buildstacktype = /obj/item/stack/sheet/iron //they're iron now, shut up var/buildstackamount = 1 @@ -238,7 +238,7 @@ /obj/item/bikehorn/rubberducky name = "rubber ducky" - desc = "Rubber ducky you're so fine, you make bathtime lots of fuuun. Rubber ducky I'm awfully fooooond of yooooouuuu~" //thanks doohl + desc = "Rubber ducky you're so fine, you make bathtime lots of fuuun. Rubber ducky I'm awfully fooooond of yooooouuuu~" //thanks doohl icon = 'icons/obj/watercloset.dmi' icon_state = "rubberducky" inhand_icon_state = "rubberducky" @@ -477,7 +477,7 @@ icon_state = "sink" desc = "A sink used for washing one's hands and face. This one seems to be infinite!" anchored = TRUE - var/busy = FALSE //Something's being washed at the moment + var/busy = FALSE //Something's being washed at the moment var/dispensedreagent = /datum/reagent/water // for whenever plumbing happens /obj/structure/water_source/attack_hand(mob/living/user) @@ -592,7 +592,7 @@ return ..() -/obj/structure/water_source/puddle //splishy splashy ^_^ +/obj/structure/water_source/puddle //splishy splashy ^_^ name = "puddle" desc = "A puddle used for washing one's hands and face." icon_state = "puddle" diff --git a/code/game/objects/structures/windoor_assembly.dm b/code/game/objects/structures/windoor_assembly.dm index 35552638275..846a1385ac9 100644 --- a/code/game/objects/structures/windoor_assembly.dm +++ b/code/game/objects/structures/windoor_assembly.dm @@ -24,9 +24,9 @@ var/created_name = null //Vars to help with the icon's name - var/facing = "l" //Does the windoor open to the left or right? - var/secure = FALSE //Whether or not this creates a secure windoor - var/state = "01" //How far the door assembly has progressed + var/facing = "l" //Does the windoor open to the left or right? + var/secure = FALSE //Whether or not this creates a secure windoor + var/state = "01" //How far the door assembly has progressed CanAtmosPass = ATMOS_PASS_PROC /obj/structure/windoor_assembly/New(loc, set_dir) diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index afa21ac9a8c..d0a7c28eec7 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -24,7 +24,7 @@ var/glass_type = /obj/item/stack/sheet/glass var/glass_amount = 1 var/mutable_appearance/crack_overlay - var/real_explosion_block //ignore this, just use explosion_block + var/real_explosion_block //ignore this, just use explosion_block var/breaksound = "shatter" var/knocksound = 'sound/effects/Glassknock.ogg' var/bashsound = 'sound/effects/Glassbash.ogg' @@ -158,7 +158,7 @@ /obj/structure/window/attack_paw(mob/user) return attack_hand(user) -/obj/structure/window/attack_generic(mob/user, damage_amount = 0, damage_type = BRUTE, damage_flag = 0, sound_effect = 1) //used by attack_alien, attack_animal, and attack_slime +/obj/structure/window/attack_generic(mob/user, damage_amount = 0, damage_type = BRUTE, damage_flag = 0, sound_effect = 1) //used by attack_alien, attack_animal, and attack_slime if(!can_be_reached(user)) return ..() diff --git a/code/game/say.dm b/code/game/say.dm index b1f3402831a..e3b2ff7c51f 100644 --- a/code/game/say.dm +++ b/code/game/say.dm @@ -174,7 +174,7 @@ GLOBAL_LIST_INIT(freqtospan, list( return "0" /atom/movable/proc/GetVoice() - return "[src]" //Returns the atom's name, prepended with 'The' if it's not a proper noun + return "[src]" //Returns the atom's name, prepended with 'The' if it's not a proper noun /atom/movable/proc/IsVocal() return 1 diff --git a/code/game/sound.dm b/code/game/sound.dm index 2e87c14db54..e92381280e3 100644 --- a/code/game/sound.dm +++ b/code/game/sound.dm @@ -239,7 +239,7 @@ distance_multiplier - Can be used to multiply the distance at which the sound is if ("pageturn") soundin = pick('sound/effects/pageturn1.ogg', 'sound/effects/pageturn2.ogg','sound/effects/pageturn3.ogg') if ("ricochet") - soundin = pick( 'sound/weapons/effects/ric1.ogg', 'sound/weapons/effects/ric2.ogg','sound/weapons/effects/ric3.ogg','sound/weapons/effects/ric4.ogg','sound/weapons/effects/ric5.ogg') + soundin = pick( 'sound/weapons/effects/ric1.ogg', 'sound/weapons/effects/ric2.ogg','sound/weapons/effects/ric3.ogg','sound/weapons/effects/ric4.ogg','sound/weapons/effects/ric5.ogg') if ("terminal_type") soundin = pick('sound/machines/terminal_button01.ogg', 'sound/machines/terminal_button02.ogg', 'sound/machines/terminal_button03.ogg', \ 'sound/machines/terminal_button04.ogg', 'sound/machines/terminal_button05.ogg', 'sound/machines/terminal_button06.ogg', \ diff --git a/code/game/turfs/change_turf.dm b/code/game/turfs/change_turf.dm index 0251eb36173..72f33d4c5ed 100644 --- a/code/game/turfs/change_turf.dm +++ b/code/game/turfs/change_turf.dm @@ -21,7 +21,7 @@ GLOBAL_LIST_INIT(blacklisted_automated_baseturfs, typecacheof(list( /turf/proc/copyTurf(turf/T) if(T.type != type) var/obj/O - if(underlays.len) //we have underlays, which implies some sort of transparency, so we want to a snapshot of the previous turf as an underlay + if(underlays.len) //we have underlays, which implies some sort of transparency, so we want to a snapshot of the previous turf as an underlay O = new() O.underlays.Add(T) T.ChangeTurf(type) @@ -97,7 +97,7 @@ GLOBAL_LIST_INIT(blacklisted_automated_baseturfs, typecacheof(list( comp.RemoveComponent() changing_turf = TRUE - qdel(src) //Just get the side effects and call Destroy + qdel(src) //Just get the side effects and call Destroy var/turf/W = new path(src) for(var/i in transferring_comps) diff --git a/code/game/turfs/closed/walls.dm b/code/game/turfs/closed/walls.dm index b4f74c11e25..703cc710785 100644 --- a/code/game/turfs/closed/walls.dm +++ b/code/game/turfs/closed/walls.dm @@ -184,11 +184,11 @@ //get the user's location if(!isturf(user.loc)) - return //can't do this stuff whilst inside objects and such + return //can't do this stuff whilst inside objects and such add_fingerprint(user) - var/turf/T = user.loc //get user's location for delay checks + var/turf/T = user.loc //get user's location for delay checks //the istype cascade has been spread among various procs for easy overriding if(try_clean(W, user, T) || try_wallmount(W, user, T) || try_decon(W, user, T)) diff --git a/code/game/turfs/open/_open.dm b/code/game/turfs/open/_open.dm index 6a68cc29672..4541d894cfd 100644 --- a/code/game/turfs/open/_open.dm +++ b/code/game/turfs/open/_open.dm @@ -245,7 +245,7 @@ else if(lube&SLIDE_ICE) if(C.force_moving) //If we're already slipping extend it qdel(C.force_moving) - new /datum/forced_movement(C, get_ranged_target_turf(C, olddir, 1), 1, FALSE) //spinning would be bad for ice, fucks up the next dir + new /datum/forced_movement(C, get_ranged_target_turf(C, olddir, 1), 1, FALSE) //spinning would be bad for ice, fucks up the next dir return TRUE /turf/open/proc/MakeSlippery(wet_setting = TURF_WET_WATER, min_wet_time = 0, wet_time_to_add = 0, max_wet_time = MAXIMUM_WET_TIME, permanent) diff --git a/code/game/turfs/open/dirtystation.dm b/code/game/turfs/open/dirtystation.dm index fbcbd3153b4..dc1f36c0c9e 100644 --- a/code/game/turfs/open/dirtystation.dm +++ b/code/game/turfs/open/dirtystation.dm @@ -30,11 +30,11 @@ /area/commons/vacant_room/office, /area/ruin/space)) if(is_type_in_typecache(A, high_dirt_areas)) - new /obj/effect/decal/cleanable/dirt(src) //vanilla, but it works + new /obj/effect/decal/cleanable/dirt(src) //vanilla, but it works return - if(prob(80)) //mid dirt - 1/15 + if(prob(80)) //mid dirt - 1/15 return //Construction zones. Blood, sweat, and oil. Oh, and dirt. @@ -59,7 +59,7 @@ return //Bathrooms. Blood, vomit, and shavings in the sinks. - var/static/list/bathroom_dirt_areas = typecacheof(list( /area/commons/toilet, + var/static/list/bathroom_dirt_areas = typecacheof(list( /area/commons/toilet, /area/awaymission/research/interior/bathroom)) if(is_type_in_typecache(A, bathroom_dirt_areas)) if(prob(40)) @@ -80,7 +80,7 @@ return - if(prob(75)) //low dirt - 1/60 + if(prob(75)) //low dirt - 1/60 return //Areas where gibs will be present. Robusting probably happened some time ago. @@ -127,7 +127,7 @@ /area/command/heads_quarters/rd)) if(is_type_in_typecache(A, science_dirt_areas)) if(prob(20)) - new /obj/effect/decal/cleanable/greenglow/filled(src) //this cleans itself up but it might startle you when you see it. + new /obj/effect/decal/cleanable/greenglow/filled(src) //this cleans itself up but it might startle you when you see it. return return TRUE diff --git a/code/game/turfs/open/lava.dm b/code/game/turfs/open/lava.dm index d7bf9ab13c8..a4c26960d93 100644 --- a/code/game/turfs/open/lava.dm +++ b/code/game/turfs/open/lava.dm @@ -148,7 +148,7 @@ . = 1 var/mob/living/L = thing if(L.movement_type & FLYING) - continue //YOU'RE FLYING OVER IT + continue //YOU'RE FLYING OVER IT var/buckle_check = L.buckled if(isobj(buckle_check)) var/obj/O = buckle_check diff --git a/code/game/turfs/open/openspace.dm b/code/game/turfs/open/openspace.dm index 606c55ba5d0..3d7620a76bc 100644 --- a/code/game/turfs/open/openspace.dm +++ b/code/game/turfs/open/openspace.dm @@ -1,17 +1,17 @@ GLOBAL_DATUM_INIT(openspace_backdrop_one_for_all, /atom/movable/openspace_backdrop, new) /atom/movable/openspace_backdrop - name = "openspace_backdrop" + name = "openspace_backdrop" - anchored = TRUE + anchored = TRUE icon = 'icons/turf/floors.dmi' icon_state = "grey" plane = OPENSPACE_BACKDROP_PLANE - mouse_opacity = MOUSE_OPACITY_TRANSPARENT + mouse_opacity = MOUSE_OPACITY_TRANSPARENT layer = SPLASHSCREEN_LAYER //I don't know why the others are aligned but I shall do the same. - vis_flags = VIS_INHERIT_ID + vis_flags = VIS_INHERIT_ID /turf/open/openspace name = "open space" diff --git a/code/game/turfs/open/space/space.dm b/code/game/turfs/open/space/space.dm index 9418511807e..815fd8b1849 100644 --- a/code/game/turfs/open/space/space.dm +++ b/code/game/turfs/open/space/space.dm @@ -18,9 +18,9 @@ light_power = 0.25 dynamic_lighting = DYNAMIC_LIGHTING_DISABLED bullet_bounce_sound = null - vis_flags = VIS_INHERIT_ID //when this be added to vis_contents of something it be associated with something on clicking, important for visualisation of turf in openspace and interraction with openspace that show you turf. + vis_flags = VIS_INHERIT_ID //when this be added to vis_contents of something it be associated with something on clicking, important for visualisation of turf in openspace and interraction with openspace that show you turf. -/turf/open/space/basic/New() //Do not convert to Initialize +/turf/open/space/basic/New() //Do not convert to Initialize //This is used to optimize the map loader return diff --git a/code/game/turfs/open/space/transit.dm b/code/game/turfs/open/space/transit.dm index be30c63a5b7..1502a7c2438 100644 --- a/code/game/turfs/open/space/transit.dm +++ b/code/game/turfs/open/space/transit.dm @@ -35,8 +35,8 @@ set waitfor = FALSE if(!AM || istype(AM, /obj/docking_port)) return - if(AM.loc != src) // Multi-tile objects are "in" multiple locs but its loc is it's true placement. - return // Don't move multi tile objects if their origin isn't in transit + if(AM.loc != src) // Multi-tile objects are "in" multiple locs but its loc is it's true placement. + return // Don't move multi tile objects if their origin isn't in transit var/max = world.maxx-TRANSITIONEDGE var/min = 1+TRANSITIONEDGE diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index 6986e35980f..1cb5d1c13de 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -24,11 +24,11 @@ GLOBAL_LIST_EMPTY(station_turfs) var/list/image/blueprint_data //for the station blueprints, images of objects eg: pipes - var/explosion_level = 0 //for preventing explosion dodging + var/explosion_level = 0 //for preventing explosion dodging var/explosion_id = 0 var/list/explosion_throw_details - var/requires_activation //add to air processing after initialize? + var/requires_activation //add to air processing after initialize? var/changing_turf = FALSE var/bullet_bounce_sound = 'sound/weapons/gun/general/mag_bullet_remove.ogg' //sound played when a shell casing is ejected ontop of the turf. @@ -292,12 +292,12 @@ GLOBAL_LIST_EMPTY(station_turfs) if(canPassSelf || (mover.movement_type & PHASING)) for(var/i in contents) if(QDELETED(mover)) - return FALSE //We were deleted, do not attempt to proceed with movement. + return FALSE //We were deleted, do not attempt to proceed with movement. if(i == mover || i == mover.loc) // Multi tile objects and moving out of other objects continue var/atom/movable/thing = i if(!thing.Cross(mover)) - if(QDELETED(mover)) //Mover deleted from Cross/CanPass, do not proceed. + if(QDELETED(mover)) //Mover deleted from Cross/CanPass, do not proceed. return FALSE if((mover.movement_type & PHASING)) mover.Bump(thing) @@ -305,9 +305,9 @@ GLOBAL_LIST_EMPTY(station_turfs) else if(!firstbump || ((thing.layer > firstbump.layer || thing.flags_1 & ON_BORDER_1) && !(firstbump.flags_1 & ON_BORDER_1))) firstbump = thing - if(QDELETED(mover)) //Mover deleted from Cross/CanPass/Bump, do not proceed. + if(QDELETED(mover)) //Mover deleted from Cross/CanPass/Bump, do not proceed. return FALSE - if(!canPassSelf) //Even if mover is unstoppable they need to bump us. + if(!canPassSelf) //Even if mover is unstoppable they need to bump us. firstbump = src if(firstbump) mover.Bump(firstbump) @@ -328,7 +328,7 @@ GLOBAL_LIST_EMPTY(station_turfs) if(!(mover.movement_type & PHASING)) return FALSE if(QDELETED(mover)) - return FALSE //We were deleted. + return FALSE //We were deleted. /turf/open/Entered(atom/movable/AM) @@ -515,7 +515,7 @@ GLOBAL_LIST_EMPTY(station_turfs) /turf/proc/add_blueprints_preround(atom/movable/AM) if(!SSticker.HasRoundStarted()) - if(AM.layer == WIRE_LAYER) //wires connect to adjacent positions after its parent init, meaning we need to wait (in this case, until smoothing) to take its image + if(AM.layer == WIRE_LAYER) //wires connect to adjacent positions after its parent init, meaning we need to wait (in this case, until smoothing) to take its image SSicon_smooth.blueprint_queue += AM else add_blueprints(AM) diff --git a/code/game/world.dm b/code/game/world.dm index e1bbc00d6cb..f719a78bd04 100644 --- a/code/game/world.dm +++ b/code/game/world.dm @@ -18,15 +18,15 @@ GLOBAL_VAR(restart_counter) * For clarity, this proc gets triggered later in the initialization pipeline, it is not the first thing to happen, as it might seem. * * Initialization Pipeline: - * Global vars are new()'ed, (including config, glob, and the master controller will also new and preinit all subsystems when it gets new()ed) - * Compiled in maps are loaded (mainly centcom). all areas/turfs/objs/mobs(ATOMs) in these maps will be new()ed - * world/New() (You are here) - * Once world/New() returns, client's can connect. - * 1 second sleep - * Master Controller initialization. - * Subsystem initialization. - * Non-compiled-in maps are maploaded, all atoms are new()ed - * All atoms in both compiled and uncompiled maps are initialized() + * Global vars are new()'ed, (including config, glob, and the master controller will also new and preinit all subsystems when it gets new()ed) + * Compiled in maps are loaded (mainly centcom). all areas/turfs/objs/mobs(ATOMs) in these maps will be new()ed + * world/New() (You are here) + * Once world/New() returns, client's can connect. + * 1 second sleep + * Master Controller initialization. + * Subsystem initialization. + * Non-compiled-in maps are maploaded, all atoms are new()ed + * All atoms in both compiled and uncompiled maps are initialized() */ /world/New() #ifdef USE_EXTOOLS @@ -38,7 +38,7 @@ GLOBAL_VAR(restart_counter) log_world("World loaded at [time_stamp()]!") - make_datum_references_lists() //initialises global lists for referencing frequently used datums (so that we only ever do it once) + make_datum_references_lists() //initialises global lists for referencing frequently used datums (so that we only ever do it once) GLOB.config_error_log = GLOB.world_manifest_log = GLOB.world_pda_log = GLOB.world_job_debug_log = GLOB.sql_error_log = GLOB.world_href_log = GLOB.world_runtime_log = GLOB.world_attack_log = GLOB.world_game_log = GLOB.world_econ_log = GLOB.world_shuttle_log = "data/logs/config_error.[GUID()].log" //temporary file used to record errors with loading config, moved to log directory once logging is set bl @@ -179,7 +179,7 @@ GLOBAL_VAR(restart_counter) log_runtime(GLOB.revdata.get_log_message()) /world/Topic(T, addr, master, key) - TGS_TOPIC //redirect to server tools if necessary + TGS_TOPIC //redirect to server tools if necessary var/static/list/topic_handlers = TopicHandlers() @@ -200,7 +200,7 @@ GLOBAL_VAR(restart_counter) return handler.TryRun(input) /world/proc/AnnouncePR(announcement, list/payload) - var/static/list/PRcounts = list() //PR id -> number of times announced this round + var/static/list/PRcounts = list() //PR id -> number of times announced this round var/id = "[payload["pull_request"]["id"]]" if(!PRcounts[id]) PRcounts[id] = 1 @@ -231,8 +231,8 @@ GLOBAL_VAR(restart_counter) text2file("Success!", "[GLOB.log_directory]/clean_run.lk") else log_world("Test run failed!\n[fail_reasons.Join("\n")]") - sleep(0) //yes, 0, this'll let Reboot finish and prevent byond memes - qdel(src) //shut it down + sleep(0) //yes, 0, this'll let Reboot finish and prevent byond memes + qdel(src) //shut it down /world/Reboot(reason = 0, fast_track = FALSE) if (reason || fast_track) //special reboot, do none of the normal stuff @@ -242,7 +242,7 @@ GLOBAL_VAR(restart_counter) to_chat(world, "Rebooting World immediately due to host request.") else to_chat(world, "Rebooting world...") - Master.Shutdown() //run SS shutdowns + Master.Shutdown() //run SS shutdowns #ifdef UNIT_TESTS FinishTestRun() diff --git a/code/modules/NTNet/netdata.dm b/code/modules/NTNet/netdata.dm index 8df266ac1d5..496df1562e0 100644 --- a/code/modules/NTNet/netdata.dm +++ b/code/modules/NTNet/netdata.dm @@ -107,7 +107,7 @@ /datum/netdata/proc/data_to_json() return json_encode(data) -/datum/netdata/proc/json_list_generation_admin() //for admin logs and such. +/datum/netdata/proc/json_list_generation_admin() //for admin logs and such. . = list() . |= json_list_generation() diff --git a/code/modules/NTNet/network.dm b/code/modules/NTNet/network.dm index 6878ef09313..c66da9b97fc 100644 --- a/code/modules/NTNet/network.dm +++ b/code/modules/NTNet/network.dm @@ -232,10 +232,10 @@ /datum/ntnet/station_root - var/list/services_by_path = list() //type = datum/ntnet_service - var/list/services_by_id = list() //id = datum/ntnet_service + var/list/services_by_path = list() //type = datum/ntnet_service + var/list/services_by_id = list() //id = datum/ntnet_service - var/list/autoinit_service_paths = list() //typepaths + var/list/autoinit_service_paths = list() //typepaths var/list/available_station_software = list() @@ -248,10 +248,10 @@ var/setting_peertopeer = TRUE var/setting_communication = TRUE var/setting_systemcontrol = TRUE - var/setting_disabled = FALSE // Setting to 1 will disable all wireless, independently on relays status. + var/setting_disabled = FALSE // Setting to 1 will disable all wireless, independently on relays status. - var/intrusion_detection_enabled = TRUE // Whether the IDS warning system is enabled - var/intrusion_detection_alarm = FALSE // Set when there is an IDS warning due to malicious (antag) software. + var/intrusion_detection_enabled = TRUE // Whether the IDS warning system is enabled + var/intrusion_detection_alarm = FALSE // Set when there is an IDS warning due to malicious (antag) software. // If new NTNet datum is spawned, it replaces the old one. /datum/ntnet/station_root/New(root_name) @@ -398,7 +398,7 @@ -/datum/ntnet/station_root/proc/register_map_supremecy() //called at map init to make this what station networks use. +/datum/ntnet/station_root/proc/register_map_supremecy() //called at map init to make this what station networks use. for(var/obj/machinery/ntnet_relay/R in GLOB.machines) SSnetworks.relays.Add(R) R.NTNet = src diff --git a/code/modules/NTNet/relays.dm b/code/modules/NTNet/relays.dm index e5bd8d4238a..f66b6966690 100644 --- a/code/modules/NTNet/relays.dm +++ b/code/modules/NTNet/relays.dm @@ -15,14 +15,14 @@ var/relay_enabled = TRUE ///(D)DoS-attack-related failure causing it not to be operational any longer. var/dos_failure = FALSE - var/list/dos_sources = list() // Backwards reference for qdel() stuff + var/list/dos_sources = list() // Backwards reference for qdel() stuff var/uid var/static/gl_uid = 1 // Denial of Service attack variables - var/dos_overload = 0 // Amount of DoS "packets" in this relay's buffer - var/dos_capacity = 500 // Amount of DoS "packets" in buffer required to crash the relay - var/dos_dissipate = 0.5 // Amount of DoS "packets" dissipated over time. + var/dos_overload = 0 // Amount of DoS "packets" in this relay's buffer + var/dos_capacity = 500 // Amount of DoS "packets" in buffer required to crash the relay + var/dos_dissipate = 0.5 // Amount of DoS "packets" dissipated over time. ///Proc called to change the value of the `relay_enabled` variable and append behavior related to its change. diff --git a/code/modules/actionspeed/_actionspeed_modifier.dm b/code/modules/actionspeed/_actionspeed_modifier.dm index a2870be6f46..71bc966acf4 100644 --- a/code/modules/actionspeed/_actionspeed_modifier.dm +++ b/code/modules/actionspeed/_actionspeed_modifier.dm @@ -65,7 +65,7 @@ GLOBAL_LIST_EMPTY(actionspeed_modification_cache) type_or_datum = new type_or_datum var/datum/actionspeed_modifier/existing = LAZYACCESS(actionspeed_modification, type_or_datum.id) if(existing) - if(existing == type_or_datum) //same thing don't need to touch + if(existing == type_or_datum) //same thing don't need to touch return TRUE remove_actionspeed_modifier(existing, FALSE) if(length(actionspeed_modification)) @@ -79,10 +79,10 @@ GLOBAL_LIST_EMPTY(actionspeed_modification_cache) /mob/proc/remove_actionspeed_modifier(datum/actionspeed_modifier/type_id_datum, update = TRUE) var/key if(ispath(type_id_datum)) - key = initial(type_id_datum.id) || "[type_id_datum]" //id if set, path set to string if not. - else if(!istext(type_id_datum)) //if it isn't text it has to be a datum, as it isn't a type. + key = initial(type_id_datum.id) || "[type_id_datum]" //id if set, path set to string if not. + else if(!istext(type_id_datum)) //if it isn't text it has to be a datum, as it isn't a type. key = type_id_datum.id - else //assume it's an id + else //assume it's an id key = type_id_datum if(!LAZYACCESS(actionspeed_modification, key)) return FALSE @@ -171,5 +171,5 @@ GLOBAL_LIST_EMPTY(actionspeed_modification_cache) . -= id /// Checks if a action speed modifier is valid and not missing any data -/proc/actionspeed_data_null_check(datum/actionspeed_modifier/M) //Determines if a data list is not meaningful and should be discarded. +/proc/actionspeed_data_null_check(datum/actionspeed_modifier/M) //Determines if a data list is not meaningful and should be discarded. . = !(M.multiplicative_slowdown) diff --git a/code/modules/admin/IsBanned.dm b/code/modules/admin/IsBanned.dm index b6d8dd219b5..c70d50be86a 100644 --- a/code/modules/admin/IsBanned.dm +++ b/code/modules/admin/IsBanned.dm @@ -99,8 +99,8 @@ return //oh boy, so basically, because of a bug in byond, sometimes stickyban matches don't trigger here, so we can't exempt admins. - // Whitelisting the ckey with the byond whitelist field doesn't work. - // So we instead have to remove every stickyban than later re-add them. + // Whitelisting the ckey with the byond whitelist field doesn't work. + // So we instead have to remove every stickyban than later re-add them. if (!length(GLOB.stickybanadminexemptions)) for (var/banned_ckey in world.GetConfig("ban")) GLOB.stickybanadmintexts[banned_ckey] = world.GetConfig("ban", banned_ckey) @@ -111,7 +111,7 @@ stoplag() // sleep a byond tick GLOB.stickbanadminexemptiontimerid = addtimer(CALLBACK(GLOBAL_PROC, /proc/restore_stickybans), 5 SECONDS, TIMER_STOPPABLE|TIMER_UNIQUE|TIMER_OVERRIDE) return - var/list/ban = ..() //default pager ban stuff + var/list/ban = ..() //default pager ban stuff if (ban) if (!admin) diff --git a/code/modules/admin/admin_ranks.dm b/code/modules/admin/admin_ranks.dm index a666c7afc4d..fd531c64065 100644 --- a/code/modules/admin/admin_ranks.dm +++ b/code/modules/admin/admin_ranks.dm @@ -1,7 +1,7 @@ -GLOBAL_LIST_EMPTY(admin_ranks) //list of all admin_rank datums +GLOBAL_LIST_EMPTY(admin_ranks) //list of all admin_rank datums GLOBAL_PROTECT(admin_ranks) -GLOBAL_LIST_EMPTY(protected_ranks) //admin ranks loaded from txt +GLOBAL_LIST_EMPTY(protected_ranks) //admin ranks loaded from txt GLOBAL_PROTECT(protected_ranks) /datum/admin_rank @@ -101,10 +101,10 @@ GLOBAL_PROTECT(protected_ranks) switch(group_count) if(1) rights |= flag - include_rights |= flag + include_rights |= flag if(2) rights &= ~flag - exclude_rights |= flag + exclude_rights |= flag if(3) can_edit_rights |= flag diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 95586f8ba6b..5c37c313171 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -4,23 +4,23 @@ GLOBAL_LIST_INIT(admin_verbs_default, world.AVerbsDefault()) GLOBAL_PROTECT(admin_verbs_default) /world/proc/AVerbsDefault() return list( - /client/proc/deadmin, /*destroys our own admin datum so we can play as a regular player*/ - /client/proc/cmd_admin_say, /*admin-only ooc chat*/ - /client/proc/cmd_loud_admin_say, /*ditto except its annoying - SKYRAT EDIT ADDITION - ADMIN*/ - /client/proc/hide_verbs, /*hides all our adminverbs*/ - /client/proc/debug_variables, /*allows us to -see- the variables of any instance in the game. +VAREDIT needed to modify*/ - /client/proc/dsay, /*talk in deadchat using our ckey/fakekey*/ - /client/proc/investigate_show, /*various admintools for investigation. Such as a singulo grief-log*/ + /client/proc/deadmin, /*destroys our own admin datum so we can play as a regular player*/ + /client/proc/cmd_admin_say, /*admin-only ooc chat*/ + /client/proc/cmd_loud_admin_say, /*ditto except its annoying - SKYRAT EDIT ADDITION - ADMIN*/ + /client/proc/hide_verbs, /*hides all our adminverbs*/ + /client/proc/debug_variables, /*allows us to -see- the variables of any instance in the game. +VAREDIT needed to modify*/ + /client/proc/dsay, /*talk in deadchat using our ckey/fakekey*/ + /client/proc/investigate_show, /*various admintools for investigation. Such as a singulo grief-log*/ /client/proc/secrets, - /client/proc/toggle_hear_radio, /*allows admins to hide all radio output*/ + /client/proc/toggle_hear_radio, /*allows admins to hide all radio output*/ /client/proc/reload_admins, /client/proc/reestablish_db_connection, /*reattempt a connection to the database*/ - /client/proc/cmd_admin_pm_context, /*right-click adminPM interface*/ - /client/proc/cmd_admin_pm_panel, /*admin-pm list*/ + /client/proc/cmd_admin_pm_context, /*right-click adminPM interface*/ + /client/proc/cmd_admin_pm_panel, /*admin-pm list*/ /client/proc/stop_sounds, /client/proc/mark_datum_mapview, /client/proc/debugstatpanel, - /client/proc/fix_air, /*resets air in designated radius to its default atmos composition*/ + /client/proc/fix_air, /*resets air in designated radius to its default atmos composition*/ /client/proc/revokebunkerbypass, //SKYRAT EDIT ADDITION - PANICBUNKER /client/proc/addbunkerbypass //SKYRAT EDIT ADDITION - PANICBUNKER ) @@ -28,45 +28,45 @@ GLOBAL_LIST_INIT(admin_verbs_admin, world.AVerbsAdmin()) GLOBAL_PROTECT(admin_verbs_admin) /world/proc/AVerbsAdmin() return list( - /client/proc/invisimin, /*allows our mob to go invisible/visible*/ -// /datum/admins/proc/show_traitor_panel, /*interface which shows a mob's mind*/ -Removed due to rare practical use. Moved to debug verbs ~Errorage - /datum/admins/proc/show_player_panel, /*shows an interface for individual players, with various links (links require additional flags*/ + /client/proc/invisimin, /*allows our mob to go invisible/visible*/ +// /datum/admins/proc/show_traitor_panel, /*interface which shows a mob's mind*/ -Removed due to rare practical use. Moved to debug verbs ~Errorage + /datum/admins/proc/show_player_panel, /*shows an interface for individual players, with various links (links require additional flags*/ /datum/verbs/menu/Admin/verb/playerpanel, - /client/proc/game_panel, /*game panel, allows to change game-mode etc*/ - /client/proc/check_ai_laws, /*shows AI and borg laws*/ - /client/proc/ghost_pool_protection, /*opens a menu for toggling ghost roles*/ - /datum/admins/proc/toggleooc, /*toggles ooc on/off for everyone*/ - /datum/admins/proc/toggleoocdead, /*toggles ooc on/off for everyone who is dead*/ - /datum/admins/proc/toggleenter, /*toggles whether people can join the current game*/ - /datum/admins/proc/toggleguests, /*toggles whether guests can join the current game*/ - /datum/admins/proc/announce, /*priority announce something to all clients.*/ + /client/proc/game_panel, /*game panel, allows to change game-mode etc*/ + /client/proc/check_ai_laws, /*shows AI and borg laws*/ + /client/proc/ghost_pool_protection, /*opens a menu for toggling ghost roles*/ + /datum/admins/proc/toggleooc, /*toggles ooc on/off for everyone*/ + /datum/admins/proc/toggleoocdead, /*toggles ooc on/off for everyone who is dead*/ + /datum/admins/proc/toggleenter, /*toggles whether people can join the current game*/ + /datum/admins/proc/toggleguests, /*toggles whether guests can join the current game*/ + /datum/admins/proc/announce, /*priority announce something to all clients.*/ /datum/admins/proc/set_admin_notice, /*announcement all clients see when joining the server.*/ - /client/proc/admin_ghost, /*allows us to ghost/reenter body at will*/ - /client/proc/toggle_view_range, /*changes how far we can see*/ - /client/proc/getserverlogs, /*for accessing server logs*/ - /client/proc/getcurrentlogs, /*for accessing server logs for the current round*/ - /client/proc/cmd_admin_subtle_message, /*send a message to somebody as a 'voice in their head'*/ - /client/proc/cmd_admin_headset_message, /*send a message to somebody through their headset as CentCom*/ - /client/proc/cmd_admin_delete, /*delete an instance/object/mob/etc*/ - /client/proc/cmd_admin_check_contents, /*displays the contents of an instance*/ + /client/proc/admin_ghost, /*allows us to ghost/reenter body at will*/ + /client/proc/toggle_view_range, /*changes how far we can see*/ + /client/proc/getserverlogs, /*for accessing server logs*/ + /client/proc/getcurrentlogs, /*for accessing server logs for the current round*/ + /client/proc/cmd_admin_subtle_message, /*send a message to somebody as a 'voice in their head'*/ + /client/proc/cmd_admin_headset_message, /*send a message to somebody through their headset as CentCom*/ + /client/proc/cmd_admin_delete, /*delete an instance/object/mob/etc*/ + /client/proc/cmd_admin_check_contents, /*displays the contents of an instance*/ /client/proc/centcom_podlauncher,/*Open a window to launch a Supplypod and configure it or it's contents*/ - /client/proc/check_antagonists, /*shows all antags*/ - /datum/admins/proc/access_news_network, /*allows access of newscasters*/ - /client/proc/jumptocoord, /*we ghost and jump to a coordinate*/ - /client/proc/Getmob, /*teleports a mob to our location*/ - /client/proc/Getkey, /*teleports a mob with a certain ckey to our location*/ -// /client/proc/sendmob, /*sends a mob somewhere*/ -Removed due to it needing two sorting procs to work, which were executed every time an admin right-clicked. ~Errorage + /client/proc/check_antagonists, /*shows all antags*/ + /datum/admins/proc/access_news_network, /*allows access of newscasters*/ + /client/proc/jumptocoord, /*we ghost and jump to a coordinate*/ + /client/proc/Getmob, /*teleports a mob to our location*/ + /client/proc/Getkey, /*teleports a mob with a certain ckey to our location*/ +// /client/proc/sendmob, /*sends a mob somewhere*/ -Removed due to it needing two sorting procs to work, which were executed every time an admin right-clicked. ~Errorage /client/proc/jumptoarea, - /client/proc/jumptokey, /*allows us to jump to the location of a mob with a certain ckey*/ - /client/proc/jumptomob, /*allows us to jump to a specific mob*/ - /client/proc/jumptoturf, /*allows us to jump to a specific turf*/ - /client/proc/admin_call_shuttle, /*allows us to call the emergency shuttle*/ - /client/proc/admin_cancel_shuttle, /*allows us to cancel the emergency shuttle, sending it back to centcom*/ + /client/proc/jumptokey, /*allows us to jump to the location of a mob with a certain ckey*/ + /client/proc/jumptomob, /*allows us to jump to a specific mob*/ + /client/proc/jumptoturf, /*allows us to jump to a specific turf*/ + /client/proc/admin_call_shuttle, /*allows us to call the emergency shuttle*/ + /client/proc/admin_cancel_shuttle, /*allows us to cancel the emergency shuttle, sending it back to centcom*/ /client/proc/admin_disable_shuttle, /*allows us to disable the emergency shuttle admin-wise so that it cannot be called*/ /client/proc/admin_enable_shuttle, /*undoes the above*/ - /client/proc/cmd_admin_direct_narrate, /*send text directly to a player with no padding. Useful for narratives and fluff-text*/ - /client/proc/cmd_admin_world_narrate, /*sends text to all players with no padding*/ - /client/proc/cmd_admin_local_narrate, /*sends text to all mobs within view of atom*/ + /client/proc/cmd_admin_direct_narrate, /*send text directly to a player with no padding. Useful for narratives and fluff-text*/ + /client/proc/cmd_admin_world_narrate, /*sends text to all players with no padding*/ + /client/proc/cmd_admin_local_narrate, /*sends text to all mobs within view of atom*/ /client/proc/cmd_admin_create_centcom_report, /client/proc/cmd_change_command_name, /client/proc/cmd_admin_check_player_exp, /* shows players by playtime */ @@ -128,7 +128,7 @@ GLOBAL_PROTECT(admin_verbs_server) /datum/admins/proc/toggleaban, /client/proc/everyone_random, /datum/admins/proc/toggleAI, - /client/proc/cmd_admin_delete, /*delete an instance/object/mob/etc*/ + /client/proc/cmd_admin_delete, /*delete an instance/object/mob/etc*/ /client/proc/cmd_debug_del_all, /client/proc/toggle_random_events, /client/proc/forcerandomrotate, @@ -160,8 +160,8 @@ GLOBAL_PROTECT(admin_verbs_debug) /client/proc/check_bomb_impacts, /proc/machine_upgrade, /client/proc/populate_world, - /client/proc/get_dynex_power, //*debug verbs for dynex explosions. - /client/proc/get_dynex_range, //*debug verbs for dynex explosions. + /client/proc/get_dynex_power, //*debug verbs for dynex explosions. + /client/proc/get_dynex_range, //*debug verbs for dynex explosions. /client/proc/set_dynex_scale, /client/proc/cmd_display_del_log, /client/proc/outfit_manager, @@ -373,7 +373,7 @@ GLOBAL_PROTECT(admin_verbs_hideable) body.ghostize(1) init_verbs() if(body && !body.key) - body.key = "@[key]" //Haaaaaaaack. But the people have spoken. If it breaks; blame adminbus + body.key = "@[key]" //Haaaaaaaack. But the people have spoken. If it breaks; blame adminbus SSblackbox.record_feedback("tally", "admin_verb", 1, "Admin Ghost") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/invisimin() @@ -393,7 +393,7 @@ GLOBAL_PROTECT(admin_verbs_hideable) set category = "Admin.Game" if(holder) holder.check_antagonists() - log_admin("[key_name(usr)] checked antagonists.") //for tsar~ + log_admin("[key_name(usr)] checked antagonists.") //for tsar~ if(!isobserver(usr) && SSticker.HasRoundStarted()) message_admins("[key_name_admin(usr)] checked antagonists.") SSblackbox.record_feedback("tally", "admin_verb", 1, "Check Antagonists") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! diff --git a/code/modules/admin/antag_panel.dm b/code/modules/admin/antag_panel.dm index f8ebc0037ec..131c51e5f00 100644 --- a/code/modules/admin/antag_panel.dm +++ b/code/modules/admin/antag_panel.dm @@ -173,13 +173,13 @@ GLOBAL_VAR(antag_prototypes) antag_header_parts += pref_source.enabled_in_preferences(src) ? "Enabled in Prefs" : "Disabled in Prefs" //Traitor : None | Traitor | IAA - // Command1 | Command2 | Command3 - // Secret Word : Banana - // Objectives: - // 1.Do the thing [a][b] - // [a][b] - // Memory: - // Uplink Code: 777 Alpha + // Command1 | Command2 | Command3 + // Secret Word : Banana + // Objectives: + // 1.Do the thing [a][b] + // [a][b] + // Memory: + // Uplink Code: 777 Alpha var/cat_section = antag_header_parts.Join(" | ") + "
      " if(current_antag) cat_section += current_antag.antag_panel() diff --git a/code/modules/admin/callproc/callproc.dm b/code/modules/admin/callproc/callproc.dm index c7bdc352b1e..b58e1f50b5b 100644 --- a/code/modules/admin/callproc/callproc.dm +++ b/code/modules/admin/callproc/callproc.dm @@ -58,13 +58,13 @@ return var/msg = "[key_name(src)] called [target]'s [procname]() with [lst.len ? "the arguments [list2params(lst)]":"no arguments"]." log_admin(msg) - message_admins(msg) //Proccall announce removed. + message_admins(msg) //Proccall announce removed. admin_ticket_log(target, msg) returnval = WrapAdminProcCall(target, procname, lst) // Pass the lst as an argument list to the proc else //this currently has no hascall protection. wasn't able to get it working. log_admin("[key_name(src)] called [procname]() with [lst.len ? "the arguments [list2params(lst)]":"no arguments"].") - message_admins("[key_name(src)] called [procname]() with [lst.len ? "the arguments [list2params(lst)]":"no arguments"].") //Proccall announce removed. + message_admins("[key_name(src)] called [procname]() with [lst.len ? "the arguments [list2params(lst)]":"no arguments"].") //Proccall announce removed. returnval = WrapAdminProcCall(GLOBAL_PROC, procname, lst) // Pass the lst as an argument list to the proc SSblackbox.record_feedback("tally", "admin_verb", 1, "Advanced ProcCall") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! if(get_retval) @@ -105,7 +105,7 @@ GLOBAL_PROTECT(LastAdminCalledProc) GLOB.LastAdminCalledProc = procname if(target != GLOBAL_PROC) GLOB.LastAdminCalledTargetRef = REF(target) - GLOB.AdminProcCaller = ckey //if this runtimes, too bad for you + GLOB.AdminProcCaller = ckey //if this runtimes, too bad for you ++GLOB.AdminProcCallCount . = world.WrapAdminProcCall(target, procname, arguments) if(--GLOB.AdminProcCallCount == 0) diff --git a/code/modules/admin/chat_commands.dm b/code/modules/admin/chat_commands.dm index 3f0e17c6da4..0c507f80c9f 100644 --- a/code/modules/admin/chat_commands.dm +++ b/code/modules/admin/chat_commands.dm @@ -85,7 +85,7 @@ GLOBAL_LIST(round_end_notifiees) /datum/tgs_chat_command/sdql/Run(datum/tgs_chat_user/sender, params) if(GLOB.AdminProcCaller) return "Unable to run query, another admin proc call is in progress. Try again later." - GLOB.AdminProcCaller = "CHAT_[sender.friendly_name]" //_ won't show up in ckeys so it'll never match with a real admin + GLOB.AdminProcCaller = "CHAT_[sender.friendly_name]" //_ won't show up in ckeys so it'll never match with a real admin var/list/results = world.SDQL2_query(params, GLOB.AdminProcCaller, GLOB.AdminProcCaller) GLOB.AdminProcCaller = null if(!results) diff --git a/code/modules/admin/check_antagonists.dm b/code/modules/admin/check_antagonists.dm index 5eca7208b12..f9fe8fad002 100644 --- a/code/modules/admin/check_antagonists.dm +++ b/code/modules/admin/check_antagonists.dm @@ -160,7 +160,7 @@ dat += "Replacement Game Mode: [SSticker.mode.replacementmode.name]
      " else dat += "Current Game Mode: [SSticker.mode.name]
      " - if(istype(SSticker.mode, /datum/game_mode/dynamic)) // Currently only used by dynamic. If more start using this, find a better way. + if(istype(SSticker.mode, /datum/game_mode/dynamic)) // Currently only used by dynamic. If more start using this, find a better way. dat += "Game Mode Panel
      " dat += "Round Duration: [DisplayTimeText(world.time - SSticker.round_start_time)]
      " dat += "Emergency shuttle
      " diff --git a/code/modules/admin/holder2.dm b/code/modules/admin/holder2.dm index 882a43c9f48..43409363f0a 100644 --- a/code/modules/admin/holder2.dm +++ b/code/modules/admin/holder2.dm @@ -11,14 +11,14 @@ GLOBAL_PROTECT(href_token) var/target var/name = "nobody's admin datum (no rank)" //Makes for better runtimes - var/client/owner = null - var/fakekey = null + var/client/owner = null + var/fakekey = null var/datum/marked_datum var/spamcooldown = 0 - var/admincaster_screen = 0 //TODO: remove all these 5 variables, they are completly unacceptable + var/admincaster_screen = 0 //TODO: remove all these 5 variables, they are completly unacceptable var/datum/newscaster/feed_message/admincaster_feed_message = new /datum/newscaster/feed_message var/datum/newscaster/wanted_message/admincaster_wanted_message = new /datum/newscaster/wanted_message var/datum/newscaster/feed_channel/admincaster_feed_channel = new /datum/newscaster/feed_channel @@ -78,7 +78,7 @@ GLOBAL_PROTECT(href_token) GLOB.admin_datums[target] = src deadmined = FALSE if (GLOB.directory[target]) - associate(GLOB.directory[target]) //find the client for a ckey if they are connected and associate them with us + associate(GLOB.directory[target]) //find the client for a ckey if they are connected and associate them with us /datum/admins/proc/deactivate() @@ -112,7 +112,7 @@ GLOBAL_PROTECT(href_token) activate() owner = C owner.holder = src - owner.add_admin_verbs() //TODO <--- todo what? the proc clearly exists and works since its the backbone to our entire admin system + owner.add_admin_verbs() //TODO <--- todo what? the proc clearly exists and works since its the backbone to our entire admin system remove_verb(owner, /client/proc/readmin) owner.init_verbs() //re-initialize the verb list GLOB.admins |= C diff --git a/code/modules/admin/poll_management.dm b/code/modules/admin/poll_management.dm index abb0431dd28..281e92bf774 100644 --- a/code/modules/admin/poll_management.dm +++ b/code/modules/admin/poll_management.dm @@ -482,7 +482,7 @@ */ /datum/admins/proc/poll_option_panel(datum/poll_question/poll, datum/poll_option/option) var/list/output = list("[HrefTokenFormField()]") - output += {" Option for poll [poll.question] + output += {" Option for poll [poll.question]

      diff --git a/code/modules/admin/stickyban.dm b/code/modules/admin/stickyban.dm index 57487f31446..daeec4cfbcf 100644 --- a/code/modules/admin/stickyban.dm +++ b/code/modules/admin/stickyban.dm @@ -337,7 +337,7 @@ log_admin_private("[key_name(usr)] has reverted [ckey]'s sticky ban to its state at round start.") message_admins("[key_name_admin(usr)] has reverted [ckey]'s sticky ban to its state at round start.") //revert is mostly used when shit goes rouge, so we have to set it to null - // and wait a byond tick before assigning it to ensure byond clears its shit. + // and wait a byond tick before assigning it to ensure byond clears its shit. sleep(world.tick_lag) world.SetConfig("ban",ckey,list2stickyban(cached_ban)) diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 68c58fdeb6d..1671b0108a8 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -1461,7 +1461,7 @@ return return DuplicateObject(marked_datum, perfectcopy=1, newloc=get_turf(usr)) - else if(href_list["object_list"]) //this is the laggiest thing ever + else if(href_list["object_list"]) //this is the laggiest thing ever if(!check_rights(R_SPAWN)) return diff --git a/code/modules/admin/verbs/SDQL2/SDQL_2.dm b/code/modules/admin/verbs/SDQL2/SDQL_2.dm index afb45b5d2d3..acdf6987ced 100644 --- a/code/modules/admin/verbs/SDQL2/SDQL_2.dm +++ b/code/modules/admin/verbs/SDQL2/SDQL_2.dm @@ -180,13 +180,13 @@ #define SDQL2_VALID_OPTION_TYPES list("proccall", "select", "priority", "autogc" , "sequential") #define SDQL2_VALID_OPTION_VALUES list("async", "blocking", "force_nulls", "skip_nulls", "high", "normal", "keep_alive" , "true") -#define SDQL2_OPTION_SELECT_OUTPUT_SKIP_NULLS (1<<0) -#define SDQL2_OPTION_BLOCKING_CALLS (1<<1) -#define SDQL2_OPTION_HIGH_PRIORITY (1<<2) //High priority SDQL query, allow using almost all of the tick. -#define SDQL2_OPTION_DO_NOT_AUTOGC (1<<3) -#define SDQL2_OPTION_SEQUENTIAL (1<<4) +#define SDQL2_OPTION_SELECT_OUTPUT_SKIP_NULLS (1<<0) +#define SDQL2_OPTION_BLOCKING_CALLS (1<<1) +#define SDQL2_OPTION_HIGH_PRIORITY (1<<2) //High priority SDQL query, allow using almost all of the tick. +#define SDQL2_OPTION_DO_NOT_AUTOGC (1<<3) +#define SDQL2_OPTION_SEQUENTIAL (1<<4) -#define SDQL2_OPTIONS_DEFAULT (SDQL2_OPTION_SELECT_OUTPUT_SKIP_NULLS) +#define SDQL2_OPTIONS_DEFAULT (SDQL2_OPTION_SELECT_OUTPUT_SKIP_NULLS) #define SDQL2_IS_RUNNING (state == SDQL2_STATE_EXECUTING || state == SDQL2_STATE_SEARCHING || state == SDQL2_STATE_SWITCHING || state == SDQL2_STATE_PRESEARCH) #define SDQL2_HALT_CHECK if(!SDQL2_IS_RUNNING) {state = SDQL2_STATE_HALTING; return FALSE;}; @@ -315,8 +315,8 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/sdql2_vv_all, new(null var/list/query_tree var/state = SDQL2_STATE_IDLE var/options = SDQL2_OPTIONS_DEFAULT - var/superuser = FALSE //Run things like proccalls without using admin protections - var/allow_admin_interact = TRUE //Allow admins to do things to this excluding varedit these two vars + var/superuser = FALSE //Run things like proccalls without using admin protections + var/allow_admin_interact = TRUE //Allow admins to do things to this excluding varedit these two vars var/static/id_assign = 1 var/id = 0 @@ -431,11 +431,11 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/sdql2_vv_all, new(null if(!action_click) action_click = new(null, "INITIALIZNG", src) var/list/L = list() - L[++L.len] = list("[id] ", "[delete_click.update("DELETE QUERY | STATE : [text_state()] | ALL/ELIG/FIN \ + L[++L.len] = list("[id] ", "[delete_click.update("DELETE QUERY | STATE : [text_state()] | ALL/ELIG/FIN \ [islist(obj_count_all)? length(obj_count_all) : (isnull(obj_count_all)? "0" : obj_count_all)]/\ [islist(obj_count_eligible)? length(obj_count_eligible) : (isnull(obj_count_eligible)? "0" : obj_count_eligible)]/\ [islist(obj_count_finished)? length(obj_count_finished) : (isnull(obj_count_finished)? "0" : obj_count_finished)] - [get_query_text()]")]", REF(delete_click)) - L[++L.len] = list(" ", "[action_click.update("[SDQL2_IS_RUNNING? "HALT" : "RUN"]")]", REF(action_click)) + L[++L.len] = list(" ", "[action_click.update("[SDQL2_IS_RUNNING? "HALT" : "RUN"]")]", REF(action_click)) return L /datum/sdql2_query/proc/delete_click() @@ -735,7 +735,7 @@ GLOBAL_DATUM_INIT(sdql2_vv_statobj, /obj/effect/statclick/sdql2_vv_all, new(null text_list += " at [T] [ADMIN_COORDJMP(T)]" a = T.loc else - var/turf/final = get_turf(T) //Recursive, hopefully? + var/turf/final = get_turf(T) //Recursive, hopefully? if(istype(final)) text_list += " at [final] [ADMIN_COORDJMP(final)]" a = final.loc diff --git a/code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm b/code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm index 0af53d2725e..62cb5f5cf99 100644 --- a/code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm +++ b/code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm @@ -5,44 +5,44 @@ ////////// // -// query : select_query | delete_query | update_query | call_query | explain -// explain : 'EXPLAIN' query -// select_query : 'SELECT' object_selectors -// delete_query : 'DELETE' object_selectors -// update_query : 'UPDATE' object_selectors 'SET' assignments -// call_query : 'CALL' variable 'ON' object_selectors // Note here: 'variable' does function calls. This simplifies parsing. +// query : select_query | delete_query | update_query | call_query | explain +// explain : 'EXPLAIN' query +// select_query : 'SELECT' object_selectors +// delete_query : 'DELETE' object_selectors +// update_query : 'UPDATE' object_selectors 'SET' assignments +// call_query : 'CALL' variable 'ON' object_selectors // Note here: 'variable' does function calls. This simplifies parsing. // -// select_item : '*' | object_type +// select_item : '*' | object_type // // object_selectors : select_item [('FROM' | 'IN') from_item] [modifier_list] // modifier_list : ('WHERE' bool_expression | 'MAP' expression) [modifier_list] // -// from_item : 'world' | expression +// from_item : 'world' | expression // -// call_function : '(' [expression_list] ')' +// call_function : '(' [expression_list] ')' // -// object_type : +// object_type : // -// assignments : assignment [',' assignments] -// assignment : '=' expression -// variable : | variable '.' variable | variable '[' ']' | '{' '}' | '(' expression ')' | call_function +// assignments : assignment [',' assignments] +// assignment : '=' expression +// variable : | variable '.' variable | variable '[' ']' | '{' '}' | '(' expression ')' | call_function // -// bool_expression : expression comparator expression [bool_operator bool_expression] -// expression : ( unary_expression | '(' expression ')' | value ) [binary_operator expression] -// expression_list : expression [',' expression_list] -// unary_expression : unary_operator ( unary_expression | value ) +// bool_expression : expression comparator expression [bool_operator bool_expression] +// expression : ( unary_expression | '(' expression ')' | value ) [binary_operator expression] +// expression_list : expression [',' expression_list] +// unary_expression : unary_operator ( unary_expression | value ) // -// comparator : '=' | '==' | '!=' | '<>' | '<' | '<=' | '>' | '>=' -// value : variable | string | number | 'null' | object_type | array | selectors_array -// unary_operator : '!' | '-' | '~' -// binary_operator : comparator | '+' | '-' | '/' | '*' | '&' | '|' | '^' | '%' -// bool_operator : 'AND' | '&&' | 'OR' | '||' +// comparator : '=' | '==' | '!=' | '<>' | '<' | '<=' | '>' | '>=' +// value : variable | string | number | 'null' | object_type | array | selectors_array +// unary_operator : '!' | '-' | '~' +// binary_operator : comparator | '+' | '-' | '/' | '*' | '&' | '|' | '^' | '%' +// bool_operator : 'AND' | '&&' | 'OR' | '||' // -// array : '[' expression_list ']' -// selectors_array : '@[' object_selectors ']' +// array : '[' expression_list ']' +// selectors_array : '@[' object_selectors ']' // -// string : ''' ''' | '"' '"' -// number : +// string : ''' ''' | '"' '"' +// number : // ////////// @@ -100,7 +100,7 @@ if(length(options)) node["options"] = options -//option_assignment: query_option '=' define +//option_assignment: query_option '=' define /datum/sdql_parser/proc/option_assignment(i, list/node, list/assignment_list = list()) var/type = tokenl(i) if(!(type in SDQL2_VALID_OPTION_TYPES)) @@ -122,7 +122,7 @@ return i -//query: select_query | delete_query | update_query +//query: select_query | delete_query | update_query /datum/sdql_parser/proc/query(i, list/node) query_type = tokenl(i) @@ -145,7 +145,7 @@ query(i + 1, node["explain"]) -// select_query: 'SELECT' object_selectors +// select_query: 'SELECT' object_selectors /datum/sdql_parser/proc/select_query(i, list/node) var/list/select = list() i = object_selectors(i + 1, select) @@ -154,7 +154,7 @@ return i -//delete_query: 'DELETE' object_selectors +//delete_query: 'DELETE' object_selectors /datum/sdql_parser/proc/delete_query(i, list/node) var/list/select = list() i = object_selectors(i + 1, select) @@ -164,7 +164,7 @@ return i -//update_query: 'UPDATE' object_selectors 'SET' assignments +//update_query: 'UPDATE' object_selectors 'SET' assignments /datum/sdql_parser/proc/update_query(i, list/node) var/list/select = list() i = object_selectors(i + 1, select) @@ -182,7 +182,7 @@ return i -//call_query: 'CALL' call_function ['ON' object_selectors] +//call_query: 'CALL' call_function ['ON' object_selectors] /datum/sdql_parser/proc/call_query(i, list/node) var/list/func = list() i = variable(i + 1, func) // Yes technically does anything variable() matches but I don't care, if admins fuck up this badly then they shouldn't be allowed near SDQL. @@ -244,7 +244,7 @@ return i -//assignments: assignment, [',' assignments] +//assignments: assignment, [',' assignments] /datum/sdql_parser/proc/assignments(i, list/node) i = assignment(i, node) @@ -254,7 +254,7 @@ return i -//select_item: '*' | select_function | object_type +//select_item: '*' | select_function | object_type /datum/sdql_parser/proc/select_item(i, list/node) if (token(i) == "*") node += "*" @@ -294,7 +294,7 @@ return i -//from_item: 'world' | expression +//from_item: 'world' | expression /datum/sdql_parser/proc/from_item(i, list/node) if(token(i) == "world") node += "world" @@ -306,7 +306,7 @@ return i -//bool_expression: expression [bool_operator bool_expression] +//bool_expression: expression [bool_operator bool_expression] /datum/sdql_parser/proc/bool_expression(i, list/node) var/list/bool = list() @@ -321,7 +321,7 @@ return i -//assignment: '=' expression +//assignment: '=' expression /datum/sdql_parser/proc/assignment(i, list/node, list/assignment_list = list()) assignment_list += token(i) @@ -340,7 +340,7 @@ return i -//variable: | variable '.' variable | variable '[' ']' | '{' '}' | '(' expression ')' | call_function +//variable: | variable '.' variable | variable '[' ']' | '{' '}' | '(' expression ')' | call_function /datum/sdql_parser/proc/variable(i, list/node) var/list/L = list(token(i)) node[++node.len] = L @@ -388,7 +388,7 @@ return i -//object_type: +//object_type: /datum/sdql_parser/proc/object_type(i, list/node) if(token(i)[1] != "/") @@ -403,7 +403,7 @@ return i + 1 -//comparator: '=' | '==' | '!=' | '<>' | '<' | '<=' | '>' | '>=' +//comparator: '=' | '==' | '!=' | '<>' | '<' | '<=' | '>' | '>=' /datum/sdql_parser/proc/comparator(i, list/node) if(token(i) in list("=", "==", "!=", "<>", "<", "<=", ">", ">=")) @@ -415,7 +415,7 @@ return i + 1 -//bool_operator: 'AND' | '&&' | 'OR' | '||' +//bool_operator: 'AND' | '&&' | 'OR' | '||' /datum/sdql_parser/proc/bool_operator(i, list/node) if(tokenl(i) in list("and", "or", "&&", "||")) @@ -427,7 +427,7 @@ return i + 1 -//string: ''' ''' | '"' '"' +//string: ''' ''' | '"' '"' /datum/sdql_parser/proc/string(i, list/node) if(token(i)[1] in list("'", "\"")) @@ -438,7 +438,7 @@ return i + 1 -//array: '[' expression_list ']' +//array: '[' expression_list ']' /datum/sdql_parser/proc/array(i, list/node) // Arrays get turned into this: list("[", list(exp_1a = exp_1b, ...), ...), "[" is to mark the next node as an array. if(token(i)[1] != "\[") @@ -491,7 +491,7 @@ return i + 1 -//selectors_array: '@[' object_selectors ']' +//selectors_array: '@[' object_selectors ']' /datum/sdql_parser/proc/selectors_array(i, list/node) if(token(i) == "@\[") node += token(i++) @@ -508,7 +508,7 @@ return i + 1 -//call_function: ['(' [arguments] ')'] +//call_function: ['(' [arguments] ')'] /datum/sdql_parser/proc/call_function(i, list/node, list/arguments) if(length(tokenl(i))) var/procname = "" @@ -538,7 +538,7 @@ return i + 1 -//expression: ( unary_expression | value ) [binary_operator expression] +//expression: ( unary_expression | value ) [binary_operator expression] /datum/sdql_parser/proc/expression(i, list/node) if(token(i) in unary_operators) @@ -563,7 +563,7 @@ return i -//unary_expression: unary_operator ( unary_expression | value ) +//unary_expression: unary_operator ( unary_expression | value ) /datum/sdql_parser/proc/unary_expression(i, list/node) if(token(i) in unary_operators) @@ -587,7 +587,7 @@ return i -//binary_operator: comparator | '+' | '-' | '/' | '*' | '&' | '|' | '^' | '%' +//binary_operator: comparator | '+' | '-' | '/' | '*' | '&' | '|' | '^' | '%' /datum/sdql_parser/proc/binary_operator(i, list/node) if(token(i) in (binary_operators + comparators)) @@ -599,7 +599,7 @@ return i + 1 -//value: variable | string | number | 'null' | object_type | array | selectors_array +//value: variable | string | number | 'null' | object_type | array | selectors_array /datum/sdql_parser/proc/value(i, list/node) if(token(i) == "null") node += "null" diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm index 56c85e9440b..b9475769724 100644 --- a/code/modules/admin/verbs/adminhelp.dm +++ b/code/modules/admin/verbs/adminhelp.dm @@ -1,5 +1,5 @@ -/client/var/adminhelptimerid = 0 //a timer id for returning the ahelp verb -/client/var/datum/admin_help/current_ticket //the current ticket the (usually) not-admin client is dealing with +/client/var/adminhelptimerid = 0 //a timer id for returning the ahelp verb +/client/var/datum/admin_help/current_ticket //the current ticket the (usually) not-admin client is dealing with // //TICKET MANAGER @@ -170,12 +170,12 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) var/opened_at var/closed_at - var/client/initiator //semi-misnomer, it's the person who ahelped/was bwoinked + var/client/initiator //semi-misnomer, it's the person who ahelped/was bwoinked var/initiator_ckey var/initiator_key_name var/heard_by_no_admins = FALSE - var/list/_interactions //use AddInteraction() or, preferably, admin_ticket_log() + var/list/_interactions //use AddInteraction() or, preferably, admin_ticket_log() var/obj/effect/statclick/ahelp/statclick @@ -205,7 +205,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) initiator = C initiator_ckey = initiator.ckey initiator_key_name = key_name(initiator, FALSE, TRUE) - if(initiator.current_ticket) //This is a bug + if(initiator.current_ticket) //This is a bug stack_trace("Multiple ahelp current_tickets") initiator.current_ticket.AddInteraction("Ticket erroneously left open by code") initiator.current_ticket.Close() @@ -339,7 +339,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) log_admin_private(msg) SSblackbox.LogAhelp(id, "Reopened", "Reopened by [usr.key]", usr.ckey) SSblackbox.record_feedback("tally", "ahelp_stats", 1, "reopened") - TicketPanel() //can only be done from here, so refresh it + TicketPanel() //can only be done from here, so refresh it //private /datum/admin_help/proc/RemoveActive() @@ -498,7 +498,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) var/msg = "Ticket [TicketHref("#[id]")] titled [name] by [key_name_admin(usr)]" message_admins(msg) log_admin_private(msg) - TicketPanel() //we have to be here to do this + TicketPanel() //we have to be here to do this //Forwarded action from admin/Topic /datum/admin_help/proc/Action(action) @@ -564,7 +564,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) set category = "Admin" set name = "Adminhelp" - if(GLOB.say_disabled) //This is here to try to identify lag problems + if(GLOB.say_disabled) //This is here to try to identify lag problems to_chat(usr, "Speech is currently admin-disabled.", confidential = TRUE) return @@ -610,7 +610,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new) C.current_ticket.AddInteractionPlayer(message) // SKYRAT EDIT ADDITION END return C.current_ticket - if(istext(what)) //ckey + if(istext(what)) //ckey var/datum/admin_help/AH = GLOB.ahelp_tickets.CKey2ActiveTicket(what) if(AH) AH.AddInteraction(message) diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm index ff32ff03c5e..4f7a244cd03 100644 --- a/code/modules/admin/verbs/adminpm.dm +++ b/code/modules/admin/verbs/adminpm.dm @@ -96,7 +96,7 @@ confidential = TRUE) return - if(!holder && !current_ticket) //no ticket? https://www.youtube.com/watch?v=iHSPf6x1Fdo + if(!holder && !current_ticket) //no ticket? https://www.youtube.com/watch?v=iHSPf6x1Fdo to_chat(src, type = MESSAGE_TYPE_ADMINPM, html = "You can no longer reply to this ticket, please open another one by using the Adminhelp verb if need be.", @@ -132,7 +132,7 @@ recipient_ticket = recipient.current_ticket if(external) - if(!externalreplyamount) //to prevent people from spamming irc/discord + if(!externalreplyamount) //to prevent people from spamming irc/discord return if(!msg) msg = input(src,"Message:", "Private message to Administrator") as message|null @@ -226,11 +226,11 @@ var/interaction_message = "PM from-[key_name(src, recipient, 1)] to-[key_name(recipient, src, 1)]: [keywordparsedmsg]" // admin_ticket_log(src, interaction_message) // SKYRAT EDIT ORIGINAL admin_ticket_log(src, interaction_message, FALSE) // SKYRAT EDIT CHANGE -- Player ticket viewing - if(recipient != src) //reeee + if(recipient != src)//reeee // admin_ticket_log(recipient, interaction_message) // SKYRAT EDIT ORIGINAL admin_ticket_log(recipient, interaction_message, FALSE) // SKYRAT EDIT CHANGE -- Player ticket viewing SSblackbox.LogAhelp(current_ticket.id, "Reply", msg, recipient.ckey, src.ckey) - else //recipient is an admin but sender is not + else //recipient is an admin but sender is not var/replymsg = "Reply PM from-[key_name(src, recipient, 1)]: [keywordparsedmsg]" // admin_ticket_log(src, "[replymsg]") // SKYRAT EDIT ORIGINAL admin_ticket_log(src, "[replymsg]", FALSE) // SKYRAT EDIT CHANGE -- Player ticket viewing @@ -249,7 +249,7 @@ SEND_SOUND(recipient, sound('sound/effects/adminhelp.ogg')) else - if(holder) //sender is an admin but recipient is not. Do BIG RED TEXT + if(holder) //sender is an admin but recipient is not. Do BIG RED TEXT var/already_logged = FALSE if(!recipient.current_ticket) //new /datum/admin_help(msg, recipient, TRUE) //ORIGINAL @@ -298,7 +298,7 @@ if(CONFIG_GET(flag/popup_admin_pm)) INVOKE_ASYNC(src, .proc/popup_admin_pm, recipient, msg) - else //neither are admins + else //neither are admins if(!current_ticket) to_chat(src, type = MESSAGE_TYPE_ADMINPM, @@ -323,7 +323,7 @@ log_admin_private("PM: [key_name(src)]->[key_name(recipient)]: [rawmsg]") //we don't use message_admins here because the sender/receiver might get it too for(var/client/X in GLOB.admins) - if(X.key!=key && X.key!=recipient.key) //check client/X is an admin and isn't the sender or recipient + if(X.key!=key && X.key!=recipient.key) //check client/X is an admin and isn't the sender or recipient to_chat(X, type = MESSAGE_TYPE_ADMINPM, html = "PM: [key_name(src, X, 0)]->[key_name(recipient, X, 0)]: [keywordparsedmsg]" , @@ -332,12 +332,12 @@ /client/proc/popup_admin_pm(client/recipient, msg) var/sender = src var/sendername = key - var/reply = input(recipient, msg,"Admin PM from-[sendername]", "") as message|null //show message and await a reply + var/reply = input(recipient, msg,"Admin PM from-[sendername]", "") as message|null //show message and await a reply if(recipient && reply) if(sender) - recipient.cmd_admin_pm(sender,reply) //sender is still about, let's reply to them + recipient.cmd_admin_pm(sender,reply) //sender is still about, let's reply to them else - adminhelp(reply) //sender has left, adminhelp instead + adminhelp(reply) //sender has left, adminhelp instead #define TGS_AHELP_USAGE "Usage: ticket " /proc/TgsPm(target,msg,sender) @@ -451,6 +451,6 @@ i = 0 var/stealth = "@[num2text(num)]" GLOB.stealthminID["IRCKEY"] = stealth - return stealth + return stealth #undef EXTERNALREPLYCOUNT diff --git a/code/modules/admin/verbs/borgpanel.dm b/code/modules/admin/verbs/borgpanel.dm index eab5b2484e1..5bb712bbc1f 100644 --- a/code/modules/admin/verbs/borgpanel.dm +++ b/code/modules/admin/verbs/borgpanel.dm @@ -175,7 +175,7 @@ borg.radio.keyslot.independent = FALSE message_admins("[key_name_admin(user)] removed the [channel] radio channel from [ADMIN_LOOKUPFLW(borg)].") log_admin("[key_name(user)] removed the [channel] radio channel from [key_name(borg)].") - else // We're adding a channel + else // We're adding a channel if (!borg.radio.keyslot) // Assert that an encryption key exists borg.radio.keyslot = new (borg.radio) borg.radio.keyslot.channels[channel] = 1 diff --git a/code/modules/admin/verbs/cinematic.dm b/code/modules/admin/verbs/cinematic.dm index 96a417e7b97..2293f63896a 100644 --- a/code/modules/admin/verbs/cinematic.dm +++ b/code/modules/admin/verbs/cinematic.dm @@ -1,7 +1,7 @@ /client/proc/cinematic() set name = "Cinematic" set category = "Admin.Fun" - set desc = "Shows a cinematic." // Intended for testing but I thought it might be nice for events on the rare occasion Feel free to comment it out if it's not wanted. + set desc = "Shows a cinematic." // Intended for testing but I thought it might be nice for events on the rare occasion Feel free to comment it out if it's not wanted. set hidden = TRUE if(!SSticker) return diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index 3e94c79ebbb..74f9331ce9d 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -748,7 +748,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that message_admins("[key_name_admin(src)] cleared dynamic transit space.") SSblackbox.record_feedback("tally", "admin_verb", 1, "Clear Dynamic Transit") // If... log_admin("[key_name(src)] cleared dynamic transit space.") - SSmapping.wipe_reservations() //this goes after it's logged, incase something horrible happens. + SSmapping.wipe_reservations() //this goes after it's logged, incase something horrible happens. /client/proc/toggle_medal_disable() set category = "Debug" @@ -815,9 +815,9 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that set desc = "Shows tracked profiling info from code lines that support it" var/sortlist = list( - "Avg time" = /proc/cmp_profile_avg_time_dsc, - "Total Time" = /proc/cmp_profile_time_dsc, - "Call Count" = /proc/cmp_profile_count_dsc + "Avg time" = /proc/cmp_profile_avg_time_dsc, + "Total Time" = /proc/cmp_profile_time_dsc, + "Call Count" = /proc/cmp_profile_count_dsc ) var/sort = input(src, "Sort type?", "Sort Type", "Avg time") as null|anything in sortlist if (!sort) diff --git a/code/modules/admin/verbs/mapping.dm b/code/modules/admin/verbs/mapping.dm index 169159b55e2..c3b0a0fa440 100644 --- a/code/modules/admin/verbs/mapping.dm +++ b/code/modules/admin/verbs/mapping.dm @@ -20,18 +20,18 @@ //- Check if the area has too much empty space. If so, make it smaller and replace the rest with maintenance tunnels. GLOBAL_LIST_INIT(admin_verbs_debug_mapping, list( - /client/proc/camera_view, //-errorage - /client/proc/sec_camera_report, //-errorage - /client/proc/intercom_view, //-errorage + /client/proc/camera_view, //-errorage + /client/proc/sec_camera_report, //-errorage + /client/proc/intercom_view, //-errorage /client/proc/air_status, //Air things /client/proc/Cell, //More air things /client/proc/atmosscan, //check plumbing /client/proc/powerdebug, //check power /client/proc/count_objects_on_z_level, /client/proc/count_objects_all, - /client/proc/cmd_assume_direct_control, //-errorage + /client/proc/cmd_assume_direct_control, //-errorage /client/proc/cmd_give_direct_control, - /client/proc/set_server_fps, //allows you to set the ticklag. + /client/proc/set_server_fps, //allows you to set the ticklag. /client/proc/cmd_admin_grantfullaccess, /client/proc/cmd_admin_areatest_all, /client/proc/cmd_admin_areatest_station, diff --git a/code/modules/admin/verbs/one_click_antag.dm b/code/modules/admin/verbs/one_click_antag.dm index 5d4672ac34a..f1fb6009f00 100644 --- a/code/modules/admin/verbs/one_click_antag.dm +++ b/code/modules/admin/verbs/one_click_antag.dm @@ -1,5 +1,5 @@ /// If we spawn an ERT with the "choose experienced leader" option, select the leader from the top X playtimes -#define ERT_EXPERIENCED_LEADER_CHOOSE_TOP 3 +#define ERT_EXPERIENCED_LEADER_CHOOSE_TOP 3 /client/proc/one_click_antag() set name = "Create Antagonist" diff --git a/code/modules/admin/verbs/pray.dm b/code/modules/admin/verbs/pray.dm index 873007a2a55..fa7363f15c3 100644 --- a/code/modules/admin/verbs/pray.dm +++ b/code/modules/admin/verbs/pray.dm @@ -2,7 +2,7 @@ set category = "IC" set name = "Pray" - if(GLOB.say_disabled) //This is here to try to identify lag problems + if(GLOB.say_disabled) //This is here to try to identify lag problems to_chat(usr, "Speech is currently admin-disabled.", confidential = TRUE) return diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 94cbf67d4c7..5532fc0a67e 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -288,13 +288,13 @@ var/list/candidates = list() for(var/mob/M in GLOB.player_list) if(M.stat != DEAD) - continue //we are not dead! + continue //we are not dead! if(!(ROLE_ALIEN in M.client.prefs.be_special)) - continue //we don't want to be an alium + continue //we don't want to be an alium if(M.client.is_afk()) - continue //we are afk + continue //we are afk if(M.mind && M.mind.current && M.mind.current.stat != DEAD) - continue //we have a live body we are tied to + continue //we have a live body we are tied to candidates += M.ckey if(candidates.len) ckey = input("Pick the player you want to respawn as a xeno.", "Suitable Candidates") as null|anything in sortKey(candidates) @@ -356,7 +356,7 @@ Traitors and the like can also be revived with the previous role mostly intact. to_chat(usr, "There is no active key like that in the game or the person is not currently a ghost.", confidential = TRUE) return - if(G_found.mind && !G_found.mind.active) //mind isn't currently in use by someone/something + if(G_found.mind && !G_found.mind.active) //mind isn't currently in use by someone/something //Check if they were an alien if(G_found.mind.assigned_role == ROLE_ALIEN) if(alert("This character appears to have been an alien. Would you like to respawn them as such?",,"Yes","No")=="Yes") @@ -384,34 +384,34 @@ Traitors and the like can also be revived with the previous role mostly intact. SSjob.SendToLateJoin(new_xeno, FALSE) //Now to give them their mind back. - G_found.mind.transfer_to(new_xeno) //be careful when doing stuff like this! I've already checked the mind isn't in use + G_found.mind.transfer_to(new_xeno) //be careful when doing stuff like this! I've already checked the mind isn't in use new_xeno.key = G_found.key to_chat(new_xeno, "You have been fully respawned. Enjoy the game.", confidential = TRUE) var/msg = "[key_name_admin(usr)] has respawned [new_xeno.key] as a filthy xeno." message_admins(msg) admin_ticket_log(new_xeno, msg) - return //all done. The ghost is auto-deleted + return //all done. The ghost is auto-deleted //check if they were a monkey else if(findtext(G_found.real_name,"monkey")) if(alert("This character appears to have been a monkey. Would you like to respawn them as such?",,"Yes","No")=="Yes") var/mob/living/carbon/human/species/monkey/new_monkey = new SSjob.SendToLateJoin(new_monkey) - G_found.mind.transfer_to(new_monkey) //be careful when doing stuff like this! I've already checked the mind isn't in use + G_found.mind.transfer_to(new_monkey) //be careful when doing stuff like this! I've already checked the mind isn't in use new_monkey.key = G_found.key to_chat(new_monkey, "You have been fully respawned. Enjoy the game.", confidential = TRUE) var/msg = "[key_name_admin(usr)] has respawned [new_monkey.key] as a filthy monkey." message_admins(msg) admin_ticket_log(new_monkey, msg) - return //all done. The ghost is auto-deleted + return //all done. The ghost is auto-deleted //Ok, it's not a xeno or a monkey. So, spawn a human. var/mob/living/carbon/human/new_character = new//The mob being spawned. SSjob.SendToLateJoin(new_character) - var/datum/data/record/record_found //Referenced to later to either randomize or not randomize the character. - if(G_found.mind && !G_found.mind.active) //mind isn't currently in use by someone/something + var/datum/data/record/record_found //Referenced to later to either randomize or not randomize the character. + if(G_found.mind && !G_found.mind.active) //mind isn't currently in use by someone/something /*Try and locate a record for the person being respawned through GLOB.data_core. This isn't an exact science but it does the trick more often than not.*/ var/id = md5("[G_found.real_name][G_found.mind.assigned_role]") @@ -432,7 +432,7 @@ Traitors and the like can also be revived with the previous role mostly intact. new_character.name = new_character.real_name if(G_found.mind && !G_found.mind.active) - G_found.mind.transfer_to(new_character) //be careful when doing stuff like this! I've already checked the mind isn't in use + G_found.mind.transfer_to(new_character) //be careful when doing stuff like this! I've already checked the mind isn't in use else new_character.mind_initialize() if(!new_character.mind.assigned_role) @@ -729,7 +729,7 @@ Traitors and the like can also be revived with the previous role mostly intact. view_size.resetToDefault(getScreenSize(prefs.widescreenpref)) log_admin("[key_name(usr)] changed their view range to [view].") - //message_admins("\blue [key_name_admin(usr)] changed their view range to [view].") //why? removed by order of XSI + //message_admins("\blue [key_name_admin(usr)] changed their view range to [view].") //why? removed by order of XSI SSblackbox.record_feedback("nested tally", "admin_toggle", 1, list("Change View Range", "[view]")) //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! @@ -1178,7 +1178,7 @@ Traitors and the like can also be revived with the previous role mostly intact. log_game("[key_name(usr)] triggered a CentCom recall, with the message of: [message]") SSshuttle.centcom_recall(SSshuttle.emergency.timer, message) -/client/proc/cmd_admin_check_player_exp() //Allows admins to determine who the newer players are. +/client/proc/cmd_admin_check_player_exp() //Allows admins to determine who the newer players are. set category = "Admin" set name = "Player Playtime" if(!check_rights(R_ADMIN)) diff --git a/code/modules/admin/view_variables/debug_variables.dm b/code/modules/admin/view_variables/debug_variables.dm index a7c191de58f..938cac122e4 100644 --- a/code/modules/admin/view_variables/debug_variables.dm +++ b/code/modules/admin/view_variables/debug_variables.dm @@ -1,6 +1,6 @@ #define VV_HTML_ENCODE(thing) ( sanitize ? html_encode(thing) : thing ) /// Get displayed variable in VV variable list -/proc/debug_variable(name, value, level, datum/D, sanitize = TRUE) //if D is a list, name will be index, and value will be assoc value. +/proc/debug_variable(name, value, level, datum/D, sanitize = TRUE) //if D is a list, name will be index, and value will be assoc value. var/header if(D) if(islist(D)) @@ -72,7 +72,7 @@ var/val if (IS_NORMAL_LIST(L) && !isnum(key)) val = L[key] - if (isnull(val)) // we still want to display non-null false values, such as 0 or "" + if (isnull(val)) // we still want to display non-null false values, such as 0 or "" val = key key = i diff --git a/code/modules/admin/view_variables/get_variables.dm b/code/modules/admin/view_variables/get_variables.dm index 3f90002edc0..e391c48c798 100644 --- a/code/modules/admin/view_variables/get_variables.dm +++ b/code/modules/admin/view_variables/get_variables.dm @@ -205,7 +205,7 @@ if(VV_PROCCALL_RETVAL) var/list/get_retval = list() callproc_blocking(get_retval) - .["value"] = get_retval[1] //should have been set in proccall! + .["value"] = get_retval[1] //should have been set in proccall! if(.["value"] == null) .["class"] = null return diff --git a/code/modules/admin/view_variables/mass_edit_variables.dm b/code/modules/admin/view_variables/mass_edit_variables.dm index db1536ef00a..b01506a6001 100644 --- a/code/modules/admin/view_variables/mass_edit_variables.dm +++ b/code/modules/admin/view_variables/mass_edit_variables.dm @@ -3,7 +3,7 @@ set name = "Mass Edit Variables" set desc="(target) Edit all instances of a target item's variables" - var/method = 0 //0 means strict type detection while 1 means this type and all subtypes (IE: /obj/item with this set to 1 will set it to ALL items) + var/method = 0 //0 means strict type detection while 1 means this type and all subtypes (IE: /obj/item with this set to 1 will set it to ALL items) if(tgui_alert(src, "Are you sure you'd like to mass-modify every instance of the [var_name] variable? This can break everything if you do not know what you are doing.", "Slow down, chief!", list("Yes", "No")) != "Yes") return diff --git a/code/modules/admin/view_variables/modify_variables.dm b/code/modules/admin/view_variables/modify_variables.dm index b9de3e09bcf..1f400054d9c 100644 --- a/code/modules/admin/view_variables/modify_variables.dm +++ b/code/modules/admin/view_variables/modify_variables.dm @@ -1,10 +1,10 @@ -GLOBAL_LIST_INIT(VVlocked, list("vars", "datum_flags", "client", "mob")) //Requires DEBUG +GLOBAL_LIST_INIT(VVlocked, list("vars", "datum_flags", "client", "mob")) //Requires DEBUG GLOBAL_PROTECT(VVlocked) -GLOBAL_LIST_INIT(VVicon_edit_lock, list("icon", "icon_state", "overlays", "underlays")) //Requires DEBUG or FUN +GLOBAL_LIST_INIT(VVicon_edit_lock, list("icon", "icon_state", "overlays", "underlays")) //Requires DEBUG or FUN GLOBAL_PROTECT(VVicon_edit_lock) -GLOBAL_LIST_INIT(VVckey_edit, list("key", "ckey")) //Requires DEBUG or SPAWN +GLOBAL_LIST_INIT(VVckey_edit, list("key", "ckey")) //Requires DEBUG or SPAWN GLOBAL_PROTECT(VVckey_edit) -GLOBAL_LIST_INIT(VVpixelmovement, list("bound_x", "bound_y", "step_x", "step_y", "step_size", "bound_height", "bound_width", "bounds")) //No editing ever. +GLOBAL_LIST_INIT(VVpixelmovement, list("bound_x", "bound_y", "step_x", "step_y", "step_size", "bound_height", "bound_width", "bounds")) //No editing ever. GLOBAL_PROTECT(VVpixelmovement) /client/proc/vv_parse_text(O, new_var) @@ -50,9 +50,9 @@ GLOBAL_PROTECT(VVpixelmovement) var/datum/D = thing i++ //try one of 3 methods to shorten the type text: - // fancy type, - // fancy type with the base type removed from the begaining, - // the type with the base type removed from the begaining + // fancy type, + // fancy type with the base type removed from the begaining, + // the type with the base type removed from the begaining var/fancytype = types[D.type] if (findtext(fancytype, types[type])) fancytype = copytext(fancytype, length(types[type]) + 1) @@ -186,7 +186,7 @@ GLOBAL_PROTECT(VVpixelmovement) assoc_key = L[index] var/default var/variable - var/old_assoc_value //EXPERIMENTAL - Keep old associated value while modifying key, if any + var/old_assoc_value //EXPERIMENTAL - Keep old associated value while modifying key, if any if(is_normal_list) if (assoc) variable = L[assoc_key] diff --git a/code/modules/admin/view_variables/topic_basic.dm b/code/modules/admin/view_variables/topic_basic.dm index dbc2a58be3b..a6becc966cf 100644 --- a/code/modules/admin/view_variables/topic_basic.dm +++ b/code/modules/admin/view_variables/topic_basic.dm @@ -43,7 +43,7 @@ if(check_rights(R_DEBUG)) if(href_list[VV_HK_DELETE]) usr.client.admin_delete(target) - if (isturf(src)) // show the turf that took its place + if (isturf(src)) // show the turf that took its place usr.client.debug_variables(src) return diff --git a/code/modules/admin/view_variables/topic_list.dm b/code/modules/admin/view_variables/topic_list.dm index 349d9da698a..6bd99253429 100644 --- a/code/modules/admin/view_variables/topic_list.dm +++ b/code/modules/admin/view_variables/topic_list.dm @@ -30,7 +30,7 @@ message_admins("[key_name_admin(src)] modified list's contents: CLEAR NULLS") if(href_list[VV_HK_LIST_SET_LENGTH]) var/value = vv_get_value(VV_NUM) - if (value["class"] != VV_NUM || value["value"] > max(50000, target.len)) //safety - would rather someone not put an extra 0 and erase the server's memory lmao. + if (value["class"] != VV_NUM || value["value"] > max(50000, target.len)) //safety - would rather someone not put an extra 0 and erase the server's memory lmao. return target.len = value["value"] log_world("### ListVarEdit by [src]: /list len: [target.len]") diff --git a/code/modules/admin/view_variables/view_variables.dm b/code/modules/admin/view_variables/view_variables.dm index 487fc2e000d..72eba46b968 100644 --- a/code/modules/admin/view_variables/view_variables.dm +++ b/code/modules/admin/view_variables/view_variables.dm @@ -4,7 +4,7 @@ //set src in world var/static/cookieoffset = rand(1, 9999) //to force cookies to reset after the round. - if(!usr.client || !usr.client.holder) //This is usr because admins can call the proc on other clients, even if they're not admins, to show them VVs. + if(!usr.client || !usr.client.holder) //This is usr because admins can call the proc on other clients, even if they're not admins, to show them VVs. to_chat(usr, "You need to be an administrator to access this.", confidential = TRUE) return diff --git a/code/modules/antagonists/_common/antag_datum.dm b/code/modules/antagonists/_common/antag_datum.dm index e1e2e53bc45..37df21d569e 100644 --- a/code/modules/antagonists/_common/antag_datum.dm +++ b/code/modules/antagonists/_common/antag_datum.dm @@ -2,13 +2,13 @@ GLOBAL_LIST_EMPTY(antagonists) /datum/antagonist var/name = "Antagonist" - var/roundend_category = "other antagonists" //Section of roundend report, datums with same category will be displayed together, also default header for the section - var/show_in_roundend = TRUE //Set to false to hide the antagonists from roundend report - var/prevent_roundtype_conversion = TRUE //If false, the roundtype will still convert with this antag active - var/datum/mind/owner //Mind that owns this datum - var/silent = FALSE //Silent will prevent the gain/lose texts to show - var/can_coexist_with_others = TRUE //Whether or not the person will be able to have more than one datum - var/list/typecache_datum_blacklist = list() //List of datums this type can't coexist with + var/roundend_category = "other antagonists" //Section of roundend report, datums with same category will be displayed together, also default header for the section + var/show_in_roundend = TRUE //Set to false to hide the antagonists from roundend report + var/prevent_roundtype_conversion = TRUE //If false, the roundtype will still convert with this antag active + var/datum/mind/owner //Mind that owns this datum + var/silent = FALSE //Silent will prevent the gain/lose texts to show + var/can_coexist_with_others = TRUE //Whether or not the person will be able to have more than one datum + var/list/typecache_datum_blacklist = list() //List of datums this type can't coexist with var/job_rank var/replace_banned = TRUE //Should replace jobbanned player with ghosts if granted. var/list/objectives = list() @@ -23,8 +23,8 @@ GLOBAL_LIST_EMPTY(antagonists) var/soft_antag = FALSE //Antag panel properties - var/show_in_antagpanel = TRUE //This will hide adding this antag type in antag panel, use only for internal subtypes that shouldn't be added directly but still show if possessed by mind - var/antagpanel_category = "Uncategorized" //Antagpanel will display these together, REQUIRED + var/show_in_antagpanel = TRUE //This will hide adding this antag type in antag panel, use only for internal subtypes that shouldn't be added directly but still show if possessed by mind + var/antagpanel_category = "Uncategorized" //Antagpanel will display these together, REQUIRED var/show_name_in_check_antagonists = FALSE //Will append antagonist name in admin listings - use for categories that share more than one antag type var/show_to_ghosts = FALSE // Should this antagonist be shown as antag to ghosts? Shouldn't be used for stealthy antagonists like traitors @@ -200,7 +200,7 @@ GLOBAL_LIST_EMPTY(antagonists) //Displayed at the start of roundend_category section, default to roundend_category header /datum/antagonist/proc/roundend_report_header() - return "The [roundend_category] were:
      " + return "The [roundend_category] were:
      " //Displayed at the end of roundend_category section /datum/antagonist/proc/roundend_report_footer() diff --git a/code/modules/antagonists/abductor/equipment/abduction_gear.dm b/code/modules/antagonists/abductor/equipment/abduction_gear.dm index 0ecb54078d6..0b3dccbd693 100644 --- a/code/modules/antagonists/abductor/equipment/abduction_gear.dm +++ b/code/modules/antagonists/abductor/equipment/abduction_gear.dm @@ -801,7 +801,7 @@ Congratulations! You are now trained for invasive xenobiology research!"} if(istype(I, /obj/item/stack/sheet/mineral/silver)) var/obj/item/stack/sheet/P = I if(P.get_amount() < 1) - to_chat(user, "You need one sheet of silver to do this!") + to_chat(user, "You need one sheet of silver to do this!") return to_chat(user, "You start adding [P] to [src]...") if(do_after(user, 50, target = src)) diff --git a/code/modules/antagonists/abductor/machinery/console.dm b/code/modules/antagonists/abductor/machinery/console.dm index 422e0274658..df68ef3924c 100644 --- a/code/modules/antagonists/abductor/machinery/console.dm +++ b/code/modules/antagonists/abductor/machinery/console.dm @@ -212,7 +212,7 @@ entry.name = target.name entry.icon = target.icon entry.icon_state = target.icon_state - entry.overlays = target.get_overlays_copy(list(HANDS_LAYER)) //ugh + entry.overlays = target.get_overlays_copy(list(HANDS_LAYER)) //ugh //Update old disguise instead of adding new one if(disguises[entry.name]) disguises[entry.name] = entry diff --git a/code/modules/antagonists/blob/overmind.dm b/code/modules/antagonists/blob/overmind.dm index 33e1b66e85b..b9cc7b26ac6 100644 --- a/code/modules/antagonists/blob/overmind.dm +++ b/code/modules/antagonists/blob/overmind.dm @@ -36,8 +36,8 @@ GLOBAL_LIST_EMPTY(blob_nodes) var/last_reroll_time = 0 //time since we last rerolled, used to give free rerolls var/nodes_required = TRUE //if the blob needs nodes to place resource and factory blobs var/placed = FALSE - var/manualplace_min_time = OVERMIND_STARTING_MIN_PLACE_TIME // Some time to get your bearings - var/autoplace_max_time = OVERMIND_STARTING_AUTO_PLACE_TIME // Automatically place the core in a random spot + var/manualplace_min_time = OVERMIND_STARTING_MIN_PLACE_TIME // Some time to get your bearings + var/autoplace_max_time = OVERMIND_STARTING_AUTO_PLACE_TIME // Automatically place the core in a random spot var/list/blobs_legit = list() var/max_count = 0 //The biggest it got before death var/blobwincount = OVERMIND_WIN_CONDITION_AMOUNT diff --git a/code/modules/antagonists/blob/powers.dm b/code/modules/antagonists/blob/powers.dm index c1eebaf0fc6..ca285953236 100644 --- a/code/modules/antagonists/blob/powers.dm +++ b/code/modules/antagonists/blob/powers.dm @@ -140,7 +140,7 @@ if(!can_buy(BLOBMOB_BLOBBERNAUT_RESOURCE_COST)) return - B.naut = TRUE //temporary placeholder to prevent creation of more than one per factory. + B.naut = TRUE //temporary placeholder to prevent creation of more than one per factory. to_chat(src, "You attempt to produce a blobbernaut.") var/list/mob/dead/observer/candidates = pollGhostCandidates("Do you want to play as a [blobstrain.name] blobbernaut?", ROLE_BLOB, null, ROLE_BLOB, 50) //players must answer rapidly if(LAZYLEN(candidates)) //if we got at least one candidate, they're a blobbernaut now. diff --git a/code/modules/antagonists/blob/structures/_blob.dm b/code/modules/antagonists/blob/structures/_blob.dm index ae3b1965539..467c9727215 100644 --- a/code/modules/antagonists/blob/structures/_blob.dm +++ b/code/modules/antagonists/blob/structures/_blob.dm @@ -339,10 +339,10 @@ desc = "A thick wall of lifeless tendrils." brute_resist = BLOB_BRUTE_RESIST * 0.5 -/obj/structure/blob/special // Generic type for nodes/factories/cores/resource +/obj/structure/blob/special // Generic type for nodes/factories/cores/resource // Core and node vars: claiming, pulsing and expanding /// The radius inside which (previously dead) blob tiles are 'claimed' again by the pulsing overmind. Very rarely used. - var/claim_range = 0 + var/claim_range = 0 /// The radius inside which blobs are pulsed by this overmind. Does stuff like expanding, making blob spores from factories, make resources from nodes etc. var/pulse_range = 0 /// The radius up to which this special structure naturally grows normal blobs. @@ -351,7 +351,7 @@ // Spore production vars: for core, factories, and nodes (with strains) var/mob/living/simple_animal/hostile/blob/blobbernaut/naut = null var/max_spores = 0 - var/list/spores = list() + var/list/spores = list() COOLDOWN_DECLARE(spore_delay) var/spore_cooldown = BLOBMOB_SPORE_SPAWN_COOLDOWN @@ -361,7 +361,7 @@ /// Range this blob free upgrades to reflector blobs at: for the core, and for strains var/reflector_reinforce_range = 0 -/obj/structure/blob/special/proc/reinforce_area(delta_time) // Used by cores and nodes to upgrade their surroundings +/obj/structure/blob/special/proc/reinforce_area(delta_time) // Used by cores and nodes to upgrade their surroundings if(strong_reinforce_range) for(var/obj/structure/blob/normal/B in range(strong_reinforce_range, src)) if(DT_PROB(BLOB_REINFORCE_CHANCE, delta_time)) diff --git a/code/modules/antagonists/blob/structures/core.dm b/code/modules/antagonists/blob/structures/core.dm index e2f8ff17636..af808c2aa8d 100644 --- a/code/modules/antagonists/blob/structures/core.dm +++ b/code/modules/antagonists/blob/structures/core.dm @@ -11,7 +11,7 @@ resistance_flags = LAVA_PROOF strong_reinforce_range = BLOB_CORE_STRONG_REINFORCE_RANGE reflector_reinforce_range = BLOB_CORE_REFLECTOR_REINFORCE_RANGE - claim_range = BLOB_CORE_CLAIM_RANGE + claim_range = BLOB_CORE_CLAIM_RANGE pulse_range = BLOB_CORE_PULSE_RANGE expand_range = BLOB_CORE_EXPAND_RANGE max_spores = BLOB_CORE_MAX_SPORES diff --git a/code/modules/antagonists/blob/structures/node.dm b/code/modules/antagonists/blob/structures/node.dm index 73d2250d6d4..89df63444b0 100644 --- a/code/modules/antagonists/blob/structures/node.dm +++ b/code/modules/antagonists/blob/structures/node.dm @@ -7,7 +7,7 @@ health_regen = BLOB_NODE_HP_REGEN armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 0, RAD = 0, FIRE = 65, ACID = 90) point_return = BLOB_REFUND_NODE_COST - claim_range = BLOB_NODE_CLAIM_RANGE + claim_range = BLOB_NODE_CLAIM_RANGE pulse_range = BLOB_NODE_PULSE_RANGE expand_range = BLOB_NODE_EXPAND_RANGE resistance_flags = LAVA_PROOF diff --git a/code/modules/antagonists/blob/structures/shield.dm b/code/modules/antagonists/blob/structures/shield.dm index 5da6ce75f51..37a1ab12afd 100644 --- a/code/modules/antagonists/blob/structures/shield.dm +++ b/code/modules/antagonists/blob/structures/shield.dm @@ -17,7 +17,7 @@ return "Will prevent the spread of atmospheric changes." return "N/A" -/obj/structure/blob/shield/core // Automatically generated by the core +/obj/structure/blob/shield/core // Automatically generated by the core point_return = 0 /obj/structure/blob/shield/update_icon() @@ -46,5 +46,5 @@ max_integrity = BLOB_REFLECTOR_MAX_HP health_regen = BLOB_REFLECTOR_HP_REGEN -/obj/structure/blob/shield/reflective/core // Automatically generated by the core +/obj/structure/blob/shield/reflective/core // Automatically generated by the core point_return = 0 diff --git a/code/modules/antagonists/changeling/changeling.dm b/code/modules/antagonists/changeling/changeling.dm index cc724fc7974..04e0c4dff7d 100644 --- a/code/modules/antagonists/changeling/changeling.dm +++ b/code/modules/antagonists/changeling/changeling.dm @@ -1,6 +1,6 @@ -#define LING_FAKEDEATH_TIME 400 //40 seconds -#define LING_DEAD_GENETICDAMAGE_HEAL_CAP 50 //The lowest value of geneticdamage handle_changeling() can take it to while dead. -#define LING_ABSORB_RECENT_SPEECH 8 //The amount of recent spoken lines to gain on absorbing a mob +#define LING_FAKEDEATH_TIME 400 //40 seconds +#define LING_DEAD_GENETICDAMAGE_HEAL_CAP 50 //The lowest value of geneticdamage handle_changeling() can take it to while dead. +#define LING_ABSORB_RECENT_SPEECH 8 //The amount of recent spoken lines to gain on absorbing a mob /datum/antagonist/changeling name = "Changeling" @@ -76,7 +76,7 @@ //SKYRAT EDIT REMOVAL END if(give_objectives) forge_objectives() - owner.current.grant_all_languages(FALSE, FALSE, TRUE) //Grants omnitongue. We are able to transform our body after all. + owner.current.grant_all_languages(FALSE, FALSE, TRUE) //Grants omnitongue. We are able to transform our body after all. . = ..() /datum/antagonist/changeling/on_removal() @@ -358,7 +358,7 @@ /datum/antagonist/changeling/proc/create_initial_profile() - var/mob/living/carbon/C = owner.current //only carbons have dna now, so we have to typecaste + var/mob/living/carbon/C = owner.current //only carbons have dna now, so we have to typecaste if(ishuman(C)) add_new_profile(C) diff --git a/code/modules/antagonists/creep/creep.dm b/code/modules/antagonists/creep/creep.dm index 71f85ed8583..8e325e2ffeb 100644 --- a/code/modules/antagonists/creep/creep.dm +++ b/code/modules/antagonists/creep/creep.dm @@ -96,7 +96,7 @@ O.update_explanation_text() /datum/antagonist/obsessed/roundend_report_header() - return "Someone became obsessed!
      " + return "Someone became obsessed!
      " /datum/antagonist/obsessed/roundend_report() var/list/report = list() @@ -255,7 +255,7 @@ for(var/datum/mind/M in owners) if(!isliving(M.current)) continue - var/list/all_items = M.current.GetAllContents() //this should get things in cheesewheels, books, etc. + var/list/all_items = M.current.GetAllContents() //this should get things in cheesewheels, books, etc. for(var/obj/I in all_items) //Check for wanted items if(istype(I, /obj/item/photo)) var/obj/item/photo/P = I diff --git a/code/modules/antagonists/disease/disease_disease.dm b/code/modules/antagonists/disease/disease_disease.dm index 482beaba6be..37ab6ccd153 100644 --- a/code/modules/antagonists/disease/disease_disease.dm +++ b/code/modules/antagonists/disease/disease_disease.dm @@ -51,7 +51,7 @@ if(cures.len) return var/list/not_used = advance_cures.Copy() - not_used.Cut(1, 6) // Removes the first five tiers of cures. + not_used.Cut(1, 6) // Removes the first five tiers of cures. cures = list(pick(pick_n_take(not_used)), pick(pick_n_take(not_used))) // Get the cure name from the cure_id diff --git a/code/modules/antagonists/monkey/monkey.dm b/code/modules/antagonists/monkey/monkey.dm index 7c8ad8659cb..3eac7501505 100644 --- a/code/modules/antagonists/monkey/monkey.dm +++ b/code/modules/antagonists/monkey/monkey.dm @@ -1,7 +1,7 @@ -#define MONKEYS_ESCAPED 1 -#define MONKEYS_LIVED 2 -#define MONKEYS_DIED 3 -#define DISEASE_LIVED 4 +#define MONKEYS_ESCAPED 1 +#define MONKEYS_LIVED 2 +#define MONKEYS_DIED 3 +#define DISEASE_LIVED 4 /datum/antagonist/monkey name = "Monkey" diff --git a/code/modules/antagonists/morph/morph.dm b/code/modules/antagonists/morph/morph.dm index c07166885e9..847fce35808 100644 --- a/code/modules/antagonists/morph/morph.dm +++ b/code/modules/antagonists/morph/morph.dm @@ -100,7 +100,7 @@ "You twist your body and assume the form of [target].") appearance = target.appearance copy_overlays(target) - alpha = max(alpha, 150) //fucking chameleons + alpha = max(alpha, 150) //fucking chameleons transform = initial(transform) pixel_y = base_pixel_y pixel_x = base_pixel_x diff --git a/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm b/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm index 2fbf832ea07..9238f83f67a 100644 --- a/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm +++ b/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm @@ -526,8 +526,8 @@ /obj/machinery/nuclearbomb/beer/attackby(obj/item/W, mob/user, params) if(W.is_refillable()) - W.afterattack(keg, user, TRUE) // redirect refillable containers to the keg, allowing them to be filled - return TRUE // pretend we handled the attack, too. + W.afterattack(keg, user, TRUE) // redirect refillable containers to the keg, allowing them to be filled + return TRUE // pretend we handled the attack, too. if(istype(W, /obj/item/nuke_core_container)) to_chat(user, "[src] has had its plutonium core removed as a part of being decommissioned.") return TRUE diff --git a/code/modules/antagonists/nukeop/nukeop.dm b/code/modules/antagonists/nukeop/nukeop.dm index 966bc177150..70c5124b90d 100644 --- a/code/modules/antagonists/nukeop/nukeop.dm +++ b/code/modules/antagonists/nukeop/nukeop.dm @@ -317,7 +317,7 @@ else if (!disk_rescued && evacuation) return NUKE_RESULT_DISK_STOLEN else - return //Undefined result + return //Undefined result /datum/team/nuclear/roundend_report() var/list/parts = list() diff --git a/code/modules/antagonists/slaughter/slaughter.dm b/code/modules/antagonists/slaughter/slaughter.dm index 0a5a901176a..cd24db4dece 100644 --- a/code/modules/antagonists/slaughter/slaughter.dm +++ b/code/modules/antagonists/slaughter/slaughter.dm @@ -40,7 +40,7 @@ deathmessage = "screams in agony as it sublimates into a sulfurous smoke." deathsound = 'sound/magic/demon_dies.ogg' var/playstyle_string = "You are an imp, a mischievous creature from hell. You are the lowest rank on the hellish totem pole \ - Though you are not obligated to help, perhaps by aiding a higher ranking devil, you might just get a promotion. However, you are incapable \ + Though you are not obligated to help, perhaps by aiding a higher ranking devil, you might just get a promotion. However, you are incapable \ of intentionally harming a fellow devil." /datum/antagonist/imp @@ -271,7 +271,7 @@ if(M.revive(full_heal = TRUE, admin_revive = TRUE)) M.grab_ghost(force = TRUE) playsound(T, feast_sound, 50, TRUE, -1) - to_chat(M, "You leave [src]'s warm embrace, and feel ready to take on the world.") + to_chat(M, "You leave [src]'s warm embrace, and feel ready to take on the world.") /mob/living/simple_animal/hostile/imp/slaughter/laughter/bloodcrawl_swallow(mob/living/victim) // Keep their corpse so rescue is possible diff --git a/code/modules/antagonists/traitor/datum_traitor.dm b/code/modules/antagonists/traitor/datum_traitor.dm index 5f6c5c2866b..6c3d9316cc7 100644 --- a/code/modules/antagonists/traitor/datum_traitor.dm +++ b/code/modules/antagonists/traitor/datum_traitor.dm @@ -1,5 +1,5 @@ #define TRAITOR_HUMAN "human" -#define TRAITOR_AI "AI" +#define TRAITOR_AI "AI" /datum/antagonist/traitor name = "Traitor" @@ -9,7 +9,7 @@ antag_moodlet = /datum/mood_event/focused antag_hud_type = ANTAG_HUD_TRAITOR antag_hud_name = "traitor" - hijack_speed = 0.5 //10 seconds per hijack stage by default + hijack_speed = 0.5 //10 seconds per hijack stage by default var/special_role = ROLE_TRAITOR var/employer = "The Syndicate" var/give_objectives = TRUE @@ -71,7 +71,7 @@ if (GLOB.joined_player_list.len >= 30) // Less murderboning on lowpop thanks is_hijacker = prob(10) var/martyr_chance = prob(20) - var/objective_count = is_hijacker //Hijacking counts towards number of objectives + var/objective_count = is_hijacker //Hijacking counts towards number of objectives var/toa = CONFIG_GET(number/traitor_objectives_amount) for(var/i = objective_count, i < toa, i++) diff --git a/code/modules/antagonists/wizard/equipment/soulstone.dm b/code/modules/antagonists/wizard/equipment/soulstone.dm index 077328c5ca6..6d666f538f8 100644 --- a/code/modules/antagonists/wizard/equipment/soulstone.dm +++ b/code/modules/antagonists/wizard/equipment/soulstone.dm @@ -68,7 +68,7 @@ /obj/item/soulstone/proc/hot_potato(mob/living/user) to_chat(user, "Holy magics residing in \the [src] burn your hand!") var/obj/item/bodypart/affecting = user.get_bodypart("[(user.active_hand_index % 2 == 0) ? "r" : "l" ]_arm") - affecting.receive_damage( 0, 10 ) // 10 burn damage + affecting.receive_damage( 0, 10 ) // 10 burn damage user.emote("scream") user.update_damage_overlays() user.dropItemToGround(src) @@ -199,7 +199,7 @@ /obj/item/soulstone/proc/transfer_soul(choice as text, target, mob/user) switch(choice) if("FORCE") - if(!iscarbon(target)) //TODO: Add sacrifice stoning for non-organics, just because you have no body doesnt mean you dont have a soul + if(!iscarbon(target)) //TODO: Add sacrifice stoning for non-organics, just because you have no body doesnt mean you dont have a soul return FALSE if(contents.len) return FALSE @@ -363,7 +363,7 @@ if(user) S.copy_languages(user, LANGUAGE_MASTER) S.update_atom_languages() - grant_all_languages(FALSE, FALSE, TRUE) //Grants omnitongue + grant_all_languages(FALSE, FALSE, TRUE) //Grants omnitongue if(user) S.faction |= "[REF(user)]" //Add the master as a faction, allowing inter-mob cooperation if(user && iscultist(user)) @@ -390,7 +390,7 @@ chosen_ghost = T.get_ghost(TRUE,TRUE) //Try to grab original owner's ghost first - if(!chosen_ghost || !chosen_ghost.client) //Failing that, we grab a ghosts + if(!chosen_ghost || !chosen_ghost.client) //Failing that, we grab a ghosts var/list/consenting_candidates = pollGhostCandidates("Would you like to play as a Shade?", "Cultist", null, ROLE_CULTIST, 50, POLL_IGNORE_SHADE) if(consenting_candidates.len) chosen_ghost = pick(consenting_candidates) diff --git a/code/modules/assembly/assembly.dm b/code/modules/assembly/assembly.dm index ed7f49c36a6..2158129372d 100644 --- a/code/modules/assembly/assembly.dm +++ b/code/modules/assembly/assembly.dm @@ -1,8 +1,8 @@ -#define WIRE_RECEIVE (1<<0) -#define WIRE_PULSE (1<<1) -#define WIRE_PULSE_SPECIAL (1<<2) -#define WIRE_RADIO_RECEIVE (1<<3) -#define WIRE_RADIO_PULSE (1<<4) +#define WIRE_RECEIVE (1<<0) +#define WIRE_PULSE (1<<1) +#define WIRE_PULSE_SPECIAL (1<<2) +#define WIRE_RADIO_RECEIVE (1<<3) +#define WIRE_RADIO_PULSE (1<<4) #define ASSEMBLY_BEEP_VOLUME 5 /obj/item/assembly @@ -18,7 +18,7 @@ throw_range = 7 drop_sound = 'sound/items/handling/component_drop.ogg' pickup_sound = 'sound/items/handling/component_pickup.ogg' - var/is_position_sensitive = FALSE //set to true if the device has different icons for each position. + var/is_position_sensitive = FALSE //set to true if the device has different icons for each position. //This will prevent things such as visible lasers from facing the incorrect direction when transformed by assembly_holder's update_icon() var/secured = TRUE var/list/attached_overlays = null diff --git a/code/modules/assembly/bomb.dm b/code/modules/assembly/bomb.dm index 9f486ff2d27..06e703fa4e9 100644 --- a/code/modules/assembly/bomb.dm +++ b/code/modules/assembly/bomb.dm @@ -65,14 +65,14 @@ add_fingerprint(user) return -/obj/item/onetankbomb/receive_signal() //This is mainly called by the sensor through sense() to the holder, and from the holder to here. +/obj/item/onetankbomb/receive_signal() //This is mainly called by the sensor through sense() to the holder, and from the holder to here. audible_message("[icon2html(src, hearers(src))] *beep* *beep* *beep*") playsound(src, 'sound/machines/triple_beep.ogg', ASSEMBLY_BEEP_VOLUME, TRUE) sleep(10) if(QDELETED(src)) return if(status) - bombtank.ignite() //if its not a dud, boom (or not boom if you made shitty mix) the ignite proc is below, in this file + bombtank.ignite() //if its not a dud, boom (or not boom if you made shitty mix) the ignite proc is below, in this file else bombtank.release() @@ -128,20 +128,20 @@ user.transferItemToLoc(src, bomb) user.transferItemToLoc(assembly, bomb) - bomb.bombassembly = assembly //Tell the bomb about its assembly part - assembly.master = bomb //Tell the assembly about its new owner + bomb.bombassembly = assembly //Tell the bomb about its assembly part + assembly.master = bomb //Tell the assembly about its new owner - bomb.bombtank = src //Same for tank + bomb.bombtank = src //Same for tank master = bomb forceMove(bomb) bomb.update_icon() - user.put_in_hands(bomb) //Equips the bomb if possible, or puts it on the floor. + user.put_in_hands(bomb) //Equips the bomb if possible, or puts it on the floor. to_chat(user, "You attach [assembly] to [src].") return -/obj/item/tank/proc/ignite() //This happens when a bomb is told to explode +/obj/item/tank/proc/ignite() //This happens when a bomb is told to explode air_contents.assert_gases(/datum/gas/plasma, /datum/gas/oxygen) var/fuel_moles = air_contents.gases[/datum/gas/plasma][MOLES] + air_contents.gases[/datum/gas/oxygen][MOLES]/6 air_contents.garbage_collect() @@ -195,7 +195,7 @@ ground_zero.air_update_turf(FALSE, FALSE) -/obj/item/tank/proc/release() //This happens when the bomb is not welded. Tank contents are just spat out. +/obj/item/tank/proc/release() //This happens when the bomb is not welded. Tank contents are just spat out. var/datum/gas_mixture/removed = air_contents.remove(air_contents.total_moles()) var/turf/T = get_turf(src) if(!T) diff --git a/code/modules/assembly/doorcontrol.dm b/code/modules/assembly/doorcontrol.dm index c13613935e6..bf9aacf5721 100644 --- a/code/modules/assembly/doorcontrol.dm +++ b/code/modules/assembly/doorcontrol.dm @@ -59,7 +59,7 @@ id = "badmin" // Set it to null for MEGAFUN. var/specialfunctions = OPEN /* - Bitflag, 1= open (OPEN) + Bitflag, 1= open (OPEN) 2= idscan (IDSCAN) 4= bolts (BOLTS) 8= shock (SHOCK) diff --git a/code/modules/assembly/flash.dm b/code/modules/assembly/flash.dm index e3804922e24..52d42b920b5 100644 --- a/code/modules/assembly/flash.dm +++ b/code/modules/assembly/flash.dm @@ -125,11 +125,11 @@ /** * Handles actual flashing part of the attack * - * This proc is awful in every sense of the way, someone should definately refactor this whole code. + * This proc is awful in every sense of the way, someone should definately refactor this whole code. * Arguments: * * M - Victim * * user - Attacker - * * power - handles the amount of confusion it gives you + * * power - handles the amount of confusion it gives you * * targeted - determines if it was aoe or targeted * * generic_message - checks if it should display default message. */ @@ -183,7 +183,7 @@ /** * Handles the directionality of the attack * - * Returns the amount of 'deviation', 0 being facing eachother, 1 being sideways, 2 being facing away from eachother. + * Returns the amount of 'deviation', 0 being facing eachother, 1 being sideways, 2 being facing away from eachother. * Arguments: * * victim - Victim * * attacker - Attacker diff --git a/code/modules/assembly/helpers.dm b/code/modules/assembly/helpers.dm index 2c39751a8bc..76d63966f96 100644 --- a/code/modules/assembly/helpers.dm +++ b/code/modules/assembly/helpers.dm @@ -1,16 +1,16 @@ // See _DEFINES/is_helpers.dm for type helpers /* -Name: IsSpecialAssembly -Desc: If true is an object that can be attached to an assembly holder but is a special thing like a plasma can or door +Name: IsSpecialAssembly +Desc: If true is an object that can be attached to an assembly holder but is a special thing like a plasma can or door */ /obj/proc/IsSpecialAssembly() return FALSE /* -Name: IsAssemblyHolder -Desc: If true is an object that can hold an assemblyholder object +Name: IsAssemblyHolder +Desc: If true is an object that can hold an assemblyholder object */ /obj/proc/IsAssemblyHolder() return FALSE diff --git a/code/modules/assembly/mousetrap.dm b/code/modules/assembly/mousetrap.dm index e6e4ed22d8f..de8c60e5c7a 100644 --- a/code/modules/assembly/mousetrap.dm +++ b/code/modules/assembly/mousetrap.dm @@ -131,7 +131,7 @@ finder.visible_message("[finder] accidentally sets off [src], breaking their fingers.", \ "You accidentally trigger [src]!") triggered(finder, (finder.active_hand_index % 2 == 0) ? BODY_ZONE_PRECISE_R_HAND : BODY_ZONE_PRECISE_L_HAND) - return TRUE //end the search! + return TRUE //end the search! else visible_message("[src] snaps shut!") triggered(loc) diff --git a/code/modules/asset_cache/asset_list_items.dm b/code/modules/asset_cache/asset_list_items.dm index dd2bc8d4632..f72a05cd762 100644 --- a/code/modules/asset_cache/asset_list_items.dm +++ b/code/modules/asset_cache/asset_list_items.dm @@ -188,7 +188,7 @@ ) /datum/asset/simple/namespaced/common - assets = list("padlock.png" = 'html/padlock.png') + assets = list("padlock.png" = 'html/padlock.png') parents = list("common.css" = 'html/browser/common.css') /datum/asset/simple/permissions @@ -452,7 +452,7 @@ /datum/asset/simple/orbit assets = list( - "ghost.png" = 'html/ghost.png' + "ghost.png" = 'html/ghost.png' ) /datum/asset/simple/vv diff --git a/code/modules/atmospherics/environmental/LINDA_system.dm b/code/modules/atmospherics/environmental/LINDA_system.dm index 5955b6bbb92..c23574e5472 100644 --- a/code/modules/atmospherics/environmental/LINDA_system.dm +++ b/code/modules/atmospherics/environmental/LINDA_system.dm @@ -31,10 +31,10 @@ var/turf/other = (O.loc == src ? T : src) if(!(vertical? (CANVERTICALATMOSPASS(O, other)) : (CANATMOSPASS(O, other)))) R = TRUE - if(O.BlockSuperconductivity()) //the direction and open/closed are already checked on CanAtmosPass() so there are no arguments + if(O.BlockSuperconductivity()) //the direction and open/closed are already checked on CanAtmosPass() so there are no arguments atmos_supeconductivity |= dir T.atmos_supeconductivity |= opp - return FALSE //no need to keep going, we got all we asked + return FALSE //no need to keep going, we got all we asked atmos_supeconductivity &= ~dir T.atmos_supeconductivity &= ~opp @@ -67,7 +67,7 @@ //returns a list of adjacent turfs that can share air with this one. //alldir includes adjacent diagonal tiles that can share -// air with both of the related adjacent cardinal tiles +// air with both of the related adjacent cardinal tiles /turf/proc/GetAtmosAdjacentTurfs(alldir = 0) var/adjacent_turfs if (atmos_adjacent_turfs) diff --git a/code/modules/atmospherics/gasmixtures/gas_mixture.dm b/code/modules/atmospherics/gasmixtures/gas_mixture.dm index bc028ec2da0..64a7ec92bb1 100644 --- a/code/modules/atmospherics/gasmixtures/gas_mixture.dm +++ b/code/modules/atmospherics/gasmixtures/gas_mixture.dm @@ -3,8 +3,8 @@ What are the archived variables for? Calculations are done using the archived variables with the results merged into the regular variables. This prevents race conditions that arise based on the order of tile processing. */ -#define MINIMUM_HEAT_CAPACITY 0.0003 -#define MINIMUM_MOLE_COUNT 0.01 +#define MINIMUM_HEAT_CAPACITY 0.0003 +#define MINIMUM_MOLE_COUNT 0.01 #define MOLAR_ACCURACY 1E-7 /** *I feel the need to document what happens here. Basically this is used @@ -347,10 +347,10 @@ GLOBAL_LIST_INIT(gaslist_cache, init_gaslist_cache()) else heat_capacity_sharer_to_self -= gas_heat_capacity //subtract here instead of adding the absolute value because we know that delta is negative. - gas[MOLES] -= delta - sharergas[MOLES] += delta - moved_moles += delta - abs_moved_moles += abs(delta) + gas[MOLES] -= delta + sharergas[MOLES] += delta + moved_moles += delta + abs_moved_moles += abs(delta) last_share = abs_moved_moles @@ -458,7 +458,7 @@ GLOBAL_LIST_INIT(gaslist_cache, init_gaslist_cache()) var/datum/gas_reaction/reaction = r var/list/min_reqs = reaction.min_requirements - if( (min_reqs["TEMP"] && temp < min_reqs["TEMP"]) || \ + if( (min_reqs["TEMP"] && temp < min_reqs["TEMP"]) || \ (min_reqs["ENER"] && ener < min_reqs["ENER"]) || \ (min_reqs["MAX_TEMP"] && temp > min_reqs["MAX_TEMP"]) ) diff --git a/code/modules/atmospherics/gasmixtures/reactions.dm b/code/modules/atmospherics/gasmixtures/reactions.dm index 541e3feb977..ca6957156a1 100644 --- a/code/modules/atmospherics/gasmixtures/reactions.dm +++ b/code/modules/atmospherics/gasmixtures/reactions.dm @@ -530,7 +530,7 @@ nobiliumsuppression = INFINITY /datum/gas_reaction/metalhydrogen/init_reqs() min_requirements = list( /datum/gas/hydrogen = 100, - /datum/gas/bz = 5, + /datum/gas/bz = 5, "TEMP" = METAL_HYDROGEN_MINIMUM_HEAT ) @@ -658,7 +658,7 @@ nobiliumsuppression = INFINITY air.temperature = max(((air.temperature * old_heat_capacity + energy_produced) / new_heat_capacity), TCMB) -/datum/gas_reaction/miaster //dry heat sterilization: clears out pathogens in the air +/datum/gas_reaction/miaster //dry heat sterilization: clears out pathogens in the air priority = -10 //after all the heating from fires etc. is done name = "Dry Heat Sterilization" id = "sterilization" diff --git a/code/modules/atmospherics/machinery/airalarm.dm b/code/modules/atmospherics/machinery/airalarm.dm index 17a9fa39d97..eac5d29f852 100644 --- a/code/modules/atmospherics/machinery/airalarm.dm +++ b/code/modules/atmospherics/machinery/airalarm.dm @@ -84,83 +84,83 @@ var/datum/radio_frequency/radio_connection var/list/TLV = list( // Breathable air. - "pressure" = new/datum/tlv(HAZARD_LOW_PRESSURE, WARNING_LOW_PRESSURE, WARNING_HIGH_PRESSURE, HAZARD_HIGH_PRESSURE), // kPa. Values are min2, min1, max1, max2 - "temperature" = new/datum/tlv(T0C, T0C+10, T0C+40, T0C+66), - /datum/gas/oxygen = new/datum/tlv(16, 19, 135, 140), // Partial pressure, kpa - /datum/gas/nitrogen = new/datum/tlv(-1, -1, 1000, 1000), - /datum/gas/carbon_dioxide = new/datum/tlv(-1, -1, 5, 10), - /datum/gas/miasma = new/datum/tlv/(-1, -1, 15, 30), - /datum/gas/plasma = new/datum/tlv/dangerous, - /datum/gas/nitrous_oxide = new/datum/tlv/dangerous, - /datum/gas/bz = new/datum/tlv/dangerous, - /datum/gas/hypernoblium = new/datum/tlv(-1, -1, 1000, 1000), // Hyper-Noblium is inert and nontoxic - /datum/gas/water_vapor = new/datum/tlv/dangerous, - /datum/gas/tritium = new/datum/tlv/dangerous, - /datum/gas/stimulum = new/datum/tlv/dangerous, - /datum/gas/nitryl = new/datum/tlv/dangerous, - /datum/gas/pluoxium = new/datum/tlv(-1, -1, 1000, 1000), // Unlike oxygen, pluoxium does not fuel plasma/tritium fires - /datum/gas/freon = new/datum/tlv/dangerous, - /datum/gas/hydrogen = new/datum/tlv/dangerous, - /datum/gas/healium = new/datum/tlv/dangerous, - /datum/gas/proto_nitrate = new/datum/tlv/dangerous, - /datum/gas/zauker = new/datum/tlv/dangerous, - /datum/gas/helium = new/datum/tlv/dangerous, - /datum/gas/antinoblium = new/datum/tlv/dangerous, - /datum/gas/halon = new/datum/tlv/dangerous + "pressure" = new/datum/tlv(HAZARD_LOW_PRESSURE, WARNING_LOW_PRESSURE, WARNING_HIGH_PRESSURE, HAZARD_HIGH_PRESSURE), // kPa. Values are min2, min1, max1, max2 + "temperature" = new/datum/tlv(T0C, T0C+10, T0C+40, T0C+66), + /datum/gas/oxygen = new/datum/tlv(16, 19, 135, 140), // Partial pressure, kpa + /datum/gas/nitrogen = new/datum/tlv(-1, -1, 1000, 1000), + /datum/gas/carbon_dioxide = new/datum/tlv(-1, -1, 5, 10), + /datum/gas/miasma = new/datum/tlv/(-1, -1, 15, 30), + /datum/gas/plasma = new/datum/tlv/dangerous, + /datum/gas/nitrous_oxide = new/datum/tlv/dangerous, + /datum/gas/bz = new/datum/tlv/dangerous, + /datum/gas/hypernoblium = new/datum/tlv(-1, -1, 1000, 1000), // Hyper-Noblium is inert and nontoxic + /datum/gas/water_vapor = new/datum/tlv/dangerous, + /datum/gas/tritium = new/datum/tlv/dangerous, + /datum/gas/stimulum = new/datum/tlv/dangerous, + /datum/gas/nitryl = new/datum/tlv/dangerous, + /datum/gas/pluoxium = new/datum/tlv(-1, -1, 1000, 1000), // Unlike oxygen, pluoxium does not fuel plasma/tritium fires + /datum/gas/freon = new/datum/tlv/dangerous, + /datum/gas/hydrogen = new/datum/tlv/dangerous, + /datum/gas/healium = new/datum/tlv/dangerous, + /datum/gas/proto_nitrate = new/datum/tlv/dangerous, + /datum/gas/zauker = new/datum/tlv/dangerous, + /datum/gas/helium = new/datum/tlv/dangerous, + /datum/gas/antinoblium = new/datum/tlv/dangerous, + /datum/gas/halon = new/datum/tlv/dangerous ) /obj/machinery/airalarm/server // No checks here. TLV = list( - "pressure" = new/datum/tlv/no_checks, - "temperature" = new/datum/tlv/no_checks, - /datum/gas/oxygen = new/datum/tlv/no_checks, - /datum/gas/nitrogen = new/datum/tlv/no_checks, - /datum/gas/carbon_dioxide = new/datum/tlv/no_checks, - /datum/gas/miasma = new/datum/tlv/no_checks, - /datum/gas/plasma = new/datum/tlv/no_checks, - /datum/gas/nitrous_oxide = new/datum/tlv/no_checks, - /datum/gas/bz = new/datum/tlv/no_checks, - /datum/gas/hypernoblium = new/datum/tlv/no_checks, - /datum/gas/water_vapor = new/datum/tlv/no_checks, - /datum/gas/tritium = new/datum/tlv/no_checks, - /datum/gas/stimulum = new/datum/tlv/no_checks, - /datum/gas/nitryl = new/datum/tlv/no_checks, - /datum/gas/pluoxium = new/datum/tlv/no_checks, - /datum/gas/freon = new/datum/tlv/no_checks, - /datum/gas/hydrogen = new/datum/tlv/no_checks, - /datum/gas/healium = new/datum/tlv/dangerous, - /datum/gas/proto_nitrate = new/datum/tlv/dangerous, - /datum/gas/zauker = new/datum/tlv/dangerous, - /datum/gas/helium = new/datum/tlv/dangerous, - /datum/gas/antinoblium = new/datum/tlv/dangerous, - /datum/gas/halon = new/datum/tlv/dangerous + "pressure" = new/datum/tlv/no_checks, + "temperature" = new/datum/tlv/no_checks, + /datum/gas/oxygen = new/datum/tlv/no_checks, + /datum/gas/nitrogen = new/datum/tlv/no_checks, + /datum/gas/carbon_dioxide = new/datum/tlv/no_checks, + /datum/gas/miasma = new/datum/tlv/no_checks, + /datum/gas/plasma = new/datum/tlv/no_checks, + /datum/gas/nitrous_oxide = new/datum/tlv/no_checks, + /datum/gas/bz = new/datum/tlv/no_checks, + /datum/gas/hypernoblium = new/datum/tlv/no_checks, + /datum/gas/water_vapor = new/datum/tlv/no_checks, + /datum/gas/tritium = new/datum/tlv/no_checks, + /datum/gas/stimulum = new/datum/tlv/no_checks, + /datum/gas/nitryl = new/datum/tlv/no_checks, + /datum/gas/pluoxium = new/datum/tlv/no_checks, + /datum/gas/freon = new/datum/tlv/no_checks, + /datum/gas/hydrogen = new/datum/tlv/no_checks, + /datum/gas/healium = new/datum/tlv/dangerous, + /datum/gas/proto_nitrate = new/datum/tlv/dangerous, + /datum/gas/zauker = new/datum/tlv/dangerous, + /datum/gas/helium = new/datum/tlv/dangerous, + /datum/gas/antinoblium = new/datum/tlv/dangerous, + /datum/gas/halon = new/datum/tlv/dangerous ) /obj/machinery/airalarm/kitchen_cold_room // Kitchen cold rooms start off at -14°C or 259.15°K. TLV = list( - "pressure" = new/datum/tlv(ONE_ATMOSPHERE * 0.8, ONE_ATMOSPHERE * 0.9, ONE_ATMOSPHERE * 1.1, ONE_ATMOSPHERE * 1.2), // kPa - "temperature" = new/datum/tlv(COLD_ROOM_TEMP-40, COLD_ROOM_TEMP-20, COLD_ROOM_TEMP+20, COLD_ROOM_TEMP+40), - /datum/gas/oxygen = new/datum/tlv(16, 19, 135, 140), // Partial pressure, kpa - /datum/gas/nitrogen = new/datum/tlv(-1, -1, 1000, 1000), - /datum/gas/carbon_dioxide = new/datum/tlv(-1, -1, 5, 10), - /datum/gas/miasma = new/datum/tlv/(-1, -1, 2, 5), - /datum/gas/plasma = new/datum/tlv/dangerous, - /datum/gas/nitrous_oxide = new/datum/tlv/dangerous, - /datum/gas/bz = new/datum/tlv/dangerous, - /datum/gas/hypernoblium = new/datum/tlv(-1, -1, 1000, 1000), // Hyper-Noblium is inert and nontoxic - /datum/gas/water_vapor = new/datum/tlv/dangerous, - /datum/gas/tritium = new/datum/tlv/dangerous, - /datum/gas/stimulum = new/datum/tlv/dangerous, - /datum/gas/nitryl = new/datum/tlv/dangerous, - /datum/gas/pluoxium = new/datum/tlv(-1, -1, 1000, 1000), // Unlike oxygen, pluoxium does not fuel plasma/tritium fires - /datum/gas/freon = new/datum/tlv/dangerous, - /datum/gas/hydrogen = new/datum/tlv/dangerous, - /datum/gas/healium = new/datum/tlv/dangerous, - /datum/gas/proto_nitrate = new/datum/tlv/dangerous, - /datum/gas/zauker = new/datum/tlv/dangerous, - /datum/gas/helium = new/datum/tlv/dangerous, - /datum/gas/antinoblium = new/datum/tlv/dangerous, - /datum/gas/halon = new/datum/tlv/dangerous + "pressure" = new/datum/tlv(ONE_ATMOSPHERE * 0.8, ONE_ATMOSPHERE * 0.9, ONE_ATMOSPHERE * 1.1, ONE_ATMOSPHERE * 1.2), // kPa + "temperature" = new/datum/tlv(COLD_ROOM_TEMP-40, COLD_ROOM_TEMP-20, COLD_ROOM_TEMP+20, COLD_ROOM_TEMP+40), + /datum/gas/oxygen = new/datum/tlv(16, 19, 135, 140), // Partial pressure, kpa + /datum/gas/nitrogen = new/datum/tlv(-1, -1, 1000, 1000), + /datum/gas/carbon_dioxide = new/datum/tlv(-1, -1, 5, 10), + /datum/gas/miasma = new/datum/tlv/(-1, -1, 2, 5), + /datum/gas/plasma = new/datum/tlv/dangerous, + /datum/gas/nitrous_oxide = new/datum/tlv/dangerous, + /datum/gas/bz = new/datum/tlv/dangerous, + /datum/gas/hypernoblium = new/datum/tlv(-1, -1, 1000, 1000), // Hyper-Noblium is inert and nontoxic + /datum/gas/water_vapor = new/datum/tlv/dangerous, + /datum/gas/tritium = new/datum/tlv/dangerous, + /datum/gas/stimulum = new/datum/tlv/dangerous, + /datum/gas/nitryl = new/datum/tlv/dangerous, + /datum/gas/pluoxium = new/datum/tlv(-1, -1, 1000, 1000), // Unlike oxygen, pluoxium does not fuel plasma/tritium fires + /datum/gas/freon = new/datum/tlv/dangerous, + /datum/gas/hydrogen = new/datum/tlv/dangerous, + /datum/gas/healium = new/datum/tlv/dangerous, + /datum/gas/proto_nitrate = new/datum/tlv/dangerous, + /datum/gas/zauker = new/datum/tlv/dangerous, + /datum/gas/helium = new/datum/tlv/dangerous, + /datum/gas/antinoblium = new/datum/tlv/dangerous, + /datum/gas/halon = new/datum/tlv/dangerous ) /obj/machinery/airalarm/unlocked @@ -317,15 +317,15 @@ if(!info || info["frequency"] != frequency) continue data["vents"] += list(list( - "id_tag" = id_tag, + "id_tag" = id_tag, "long_name" = sanitize(long_name), - "power" = info["power"], - "checks" = info["checks"], - "excheck" = info["checks"]&1, - "incheck" = info["checks"]&2, - "direction" = info["direction"], - "external" = info["external"], - "internal" = info["internal"], + "power" = info["power"], + "checks" = info["checks"], + "excheck" = info["checks"]&1, + "incheck" = info["checks"]&2, + "direction" = info["direction"], + "external" = info["external"], + "internal" = info["internal"], "extdefault"= (info["external"] == ONE_ATMOSPHERE), "intdefault"= (info["internal"] == 0) )) @@ -336,25 +336,25 @@ if(!info || info["frequency"] != frequency) continue data["scrubbers"] += list(list( - "id_tag" = id_tag, - "long_name" = sanitize(long_name), - "power" = info["power"], - "scrubbing" = info["scrubbing"], - "widenet" = info["widenet"], - "filter_types" = info["filter_types"] + "id_tag" = id_tag, + "long_name" = sanitize(long_name), + "power" = info["power"], + "scrubbing" = info["scrubbing"], + "widenet" = info["widenet"], + "filter_types" = info["filter_types"] )) data["mode"] = mode data["modes"] = list() - data["modes"] += list(list("name" = "Filtering - Scrubs out contaminants", "mode" = AALARM_MODE_SCRUBBING, "selected" = mode == AALARM_MODE_SCRUBBING, "danger" = 0)) - data["modes"] += list(list("name" = "Contaminated - Scrubs out ALL contaminants quickly","mode" = AALARM_MODE_CONTAMINATED, "selected" = mode == AALARM_MODE_CONTAMINATED, "danger" = 0)) - data["modes"] += list(list("name" = "Draught - Siphons out air while replacing", "mode" = AALARM_MODE_VENTING, "selected" = mode == AALARM_MODE_VENTING, "danger" = 0)) - data["modes"] += list(list("name" = "Refill - Triple vent output", "mode" = AALARM_MODE_REFILL, "selected" = mode == AALARM_MODE_REFILL, "danger" = 1)) - data["modes"] += list(list("name" = "Cycle - Siphons air before replacing", "mode" = AALARM_MODE_REPLACEMENT, "selected" = mode == AALARM_MODE_REPLACEMENT, "danger" = 1)) - data["modes"] += list(list("name" = "Siphon - Siphons air out of the room", "mode" = AALARM_MODE_SIPHON, "selected" = mode == AALARM_MODE_SIPHON, "danger" = 1)) - data["modes"] += list(list("name" = "Panic Siphon - Siphons air out of the room quickly","mode" = AALARM_MODE_PANIC, "selected" = mode == AALARM_MODE_PANIC, "danger" = 1)) - data["modes"] += list(list("name" = "Off - Shuts off vents and scrubbers", "mode" = AALARM_MODE_OFF, "selected" = mode == AALARM_MODE_OFF, "danger" = 0)) + data["modes"] += list(list("name" = "Filtering - Scrubs out contaminants", "mode" = AALARM_MODE_SCRUBBING, "selected" = mode == AALARM_MODE_SCRUBBING, "danger" = 0)) + data["modes"] += list(list("name" = "Contaminated - Scrubs out ALL contaminants quickly","mode" = AALARM_MODE_CONTAMINATED, "selected" = mode == AALARM_MODE_CONTAMINATED, "danger" = 0)) + data["modes"] += list(list("name" = "Draught - Siphons out air while replacing", "mode" = AALARM_MODE_VENTING, "selected" = mode == AALARM_MODE_VENTING, "danger" = 0)) + data["modes"] += list(list("name" = "Refill - Triple vent output", "mode" = AALARM_MODE_REFILL, "selected" = mode == AALARM_MODE_REFILL, "danger" = 1)) + data["modes"] += list(list("name" = "Cycle - Siphons air before replacing", "mode" = AALARM_MODE_REPLACEMENT, "selected" = mode == AALARM_MODE_REPLACEMENT, "danger" = 1)) + data["modes"] += list(list("name" = "Siphon - Siphons air out of the room", "mode" = AALARM_MODE_SIPHON, "selected" = mode == AALARM_MODE_SIPHON, "danger" = 1)) + data["modes"] += list(list("name" = "Panic Siphon - Siphons air out of the room quickly","mode" = AALARM_MODE_PANIC, "selected" = mode == AALARM_MODE_PANIC, "danger" = 1)) + data["modes"] += list(list("name" = "Off - Shuts off vents and scrubbers", "mode" = AALARM_MODE_OFF, "selected" = mode == AALARM_MODE_OFF, "danger" = 0)) if(obj_flags & EMAGGED) - data["modes"] += list(list("name" = "Flood - Shuts off scrubbers and opens vents", "mode" = AALARM_MODE_FLOOD, "selected" = mode == AALARM_MODE_FLOOD, "danger" = 1)) + data["modes"] += list(list("name" = "Flood - Shuts off scrubbers and opens vents", "mode" = AALARM_MODE_FLOOD, "selected" = mode == AALARM_MODE_FLOOD, "danger" = 1)) var/datum/tlv/selected var/list/thresholds = list() @@ -466,7 +466,7 @@ /obj/machinery/airalarm/proc/shock(mob/user, prb) - if((machine_stat & (NOPOWER))) // unpowered, no shock + if((machine_stat & (NOPOWER))) // unpowered, no shock return FALSE if(!prob(prb)) return FALSE //you lucked out, no shock for you diff --git a/code/modules/atmospherics/machinery/atmosmachinery.dm b/code/modules/atmospherics/machinery/atmosmachinery.dm index 80c33bcb38d..6a8e51dfeae 100644 --- a/code/modules/atmospherics/machinery/atmosmachinery.dm +++ b/code/modules/atmospherics/machinery/atmosmachinery.dm @@ -12,7 +12,7 @@ /obj/machinery/atmospherics anchored = TRUE - move_resist = INFINITY //Moving a connected machine without actually doing the normal (dis)connection things will probably cause a LOT of issues. (this imply moving machines with something that can push turfs like a megafauna) + move_resist = INFINITY //Moving a connected machine without actually doing the normal (dis)connection things will probably cause a LOT of issues. (this imply moving machines with something that can push turfs like a megafauna) idle_power_usage = 0 active_power_usage = 0 power_channel = AREA_USAGE_ENVIRON diff --git a/code/modules/atmospherics/machinery/components/binary_devices/dp_vent_pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/dp_vent_pump.dm index 854996ba910..d7225502e54 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/dp_vent_pump.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/dp_vent_pump.dm @@ -1,8 +1,8 @@ //Acts like a normal vent, but has an input AND output. -#define EXT_BOUND 1 -#define INPUT_MIN 2 -#define OUTPUT_MAX 4 +#define EXT_BOUND 1 +#define INPUT_MIN 2 +#define OUTPUT_MAX 4 /obj/machinery/atmospherics/components/binary/dp_vent_pump icon = 'icons/obj/atmospherics/components/unary_devices.dmi' //We reuse the normal vent icons! diff --git a/code/modules/atmospherics/machinery/components/binary_devices/pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/pump.dm index b5647f39cfa..12fcc827fa9 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/pump.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/pump.dm @@ -52,7 +52,7 @@ icon_state = (on && is_operational) ? "pump_on-[set_overlay_offset(piping_layer)]" : "pump_off-[set_overlay_offset(piping_layer)]" /obj/machinery/atmospherics/components/binary/pump/process_atmos() -// ..() +// ..() if(!on || !is_operational) return diff --git a/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm index 1aeceb8f6ed..0e05d8ef81b 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm @@ -51,7 +51,7 @@ icon_state = on && is_operational ? "volpump_on-[set_overlay_offset(piping_layer)]" : "volpump_off-[set_overlay_offset(piping_layer)]" /obj/machinery/atmospherics/components/binary/volume_pump/process_atmos(delta_time) -// ..() +// ..() if(!on || !is_operational) return diff --git a/code/modules/atmospherics/machinery/components/components_base.dm b/code/modules/atmospherics/machinery/components/components_base.dm index d0919030a0c..2d89c177914 100644 --- a/code/modules/atmospherics/machinery/components/components_base.dm +++ b/code/modules/atmospherics/machinery/components/components_base.dm @@ -100,7 +100,7 @@ * is projected to have no member and cause GC problems. * We have to do this because components don't qdel pipelines * while pipes must and will happily wreck and rebuild everything - * again every time they are qdeleted. + * again every time they are qdeleted. */ if(!length(reference.other_atmosmch) && !length(reference.members)) if(QDESTROYING(reference)) diff --git a/code/modules/atmospherics/machinery/components/fusion/hypertorus.dm b/code/modules/atmospherics/machinery/components/fusion/hypertorus.dm index 55d322acd20..b9dd26be81b 100644 --- a/code/modules/atmospherics/machinery/components/fusion/hypertorus.dm +++ b/code/modules/atmospherics/machinery/components/fusion/hypertorus.dm @@ -1,51 +1,51 @@ ///Max amount of radiation that can be emitted per reaction cycle -#define FUSION_RAD_MAX 5000 +#define FUSION_RAD_MAX 5000 ///Maximum instability before the reaction goes endothermic #define FUSION_INSTABILITY_ENDOTHERMALITY 4 ///Maximum reachable fusion temperature -#define FUSION_MAXIMUM_TEMPERATURE 1e8 +#define FUSION_MAXIMUM_TEMPERATURE 1e8 ///Speed of light, in m/s -#define LIGHT_SPEED 299792458 +#define LIGHT_SPEED 299792458 ///Calculation between the plank constant and the lambda of the lightwave -#define PLANCK_LIGHT_CONSTANT 2e-16 +#define PLANCK_LIGHT_CONSTANT 2e-16 ///Radius of the h2 calculated based on the amount of number of atom in a mole (and some addition for balancing issues) -#define CALCULATED_H2RADIUS 120e-4 +#define CALCULATED_H2RADIUS 120e-4 ///Radius of the trit calculated based on the amount of number of atom in a mole (and some addition for balancing issues) -#define CALCULATED_TRITRADIUS 230e-3 +#define CALCULATED_TRITRADIUS 230e-3 ///Power conduction in the void, used to calculate the efficiency of the reaction -#define VOID_CONDUCTION 1e-2 +#define VOID_CONDUCTION 1e-2 ///Max reaction point per reaction cycle -#define MAX_FUSION_RESEARCH 1000 +#define MAX_FUSION_RESEARCH 1000 ///Min amount of allowed heat change -#define MIN_HEAT_VARIATION -1e5 +#define MIN_HEAT_VARIATION -1e5 ///Max amount of allowed heat change -#define MAX_HEAT_VARIATION 1e5 +#define MAX_HEAT_VARIATION 1e5 ///Max mole consumption per reaction cycle -#define MAX_FUEL_USAGE 36 +#define MAX_FUEL_USAGE 36 ///Mole count required (tritium/hydrogen) to start a fusion reaction -#define FUSION_MOLE_THRESHOLD 25 +#define FUSION_MOLE_THRESHOLD 25 ///Used to reduce the gas_power to a more useful amount -#define INSTABILITY_GAS_POWER_FACTOR 0.003 +#define INSTABILITY_GAS_POWER_FACTOR 0.003 ///Used to calculate the toroidal_size for the instability -#define TOROID_VOLUME_BREAKEVEN 1000 +#define TOROID_VOLUME_BREAKEVEN 1000 ///Constant used when calculating the chance of emitting a radioactive particle -#define PARTICLE_CHANCE_CONSTANT (-20000000) +#define PARTICLE_CHANCE_CONSTANT (-20000000) ///Conduction of heat inside the fusion reactor -#define METALLIC_VOID_CONDUCTIVITY 0.15 +#define METALLIC_VOID_CONDUCTIVITY 0.15 ///Conduction of heat near the external cooling loop -#define HIGH_EFFICIENCY_CONDUCTIVITY 0.95 +#define HIGH_EFFICIENCY_CONDUCTIVITY 0.95 ///Sets the range of the hallucinations -#define HALLUCINATION_RANGE(P) (min(7, round(abs(P) ** 0.25))) +#define HALLUCINATION_RANGE(P) (min(7, round(abs(P) ** 0.25))) ///Sets the minimum amount of power the machine uses -#define MIN_POWER_USAGE 50000 +#define MIN_POWER_USAGE 50000 -#define DAMAGE_CAP_MULTIPLIER 0.005 +#define DAMAGE_CAP_MULTIPLIER 0.005 //If integrity percent remaining is less than these values, the monitor sets off the relevant alarm. -#define HYPERTORUS_MELTING_PERCENT 5 -#define HYPERTORUS_EMERGENCY_PERCENT 25 -#define HYPERTORUS_DANGER_PERCENT 50 -#define HYPERTORUS_WARNING_PERCENT 100 +#define HYPERTORUS_MELTING_PERCENT 5 +#define HYPERTORUS_EMERGENCY_PERCENT 25 +#define HYPERTORUS_DANGER_PERCENT 50 +#define HYPERTORUS_WARNING_PERCENT 100 #define WARNING_TIME_DELAY 60 ///to prevent accent sounds from layering @@ -848,7 +848,7 @@ *Modifiers */ ///Those are the scaled gases that gets consumed and releases energy or help increase that energy - var/positive_modifiers = scaled_hydrogen + \ + var/positive_modifiers = scaled_hydrogen + \ scaled_tritium + \ scaled_m_nitrogen * 0.35 + \ scaled_m_co2 * 0.55 + \ @@ -857,14 +857,14 @@ scaled_m_antinoblium * 10 - \ scaled_m_hypernoblium * 10 //Hypernob decreases the amount of energy ///Those are the scaled gases that gets produced and consumes energy or help decrease that energy - var/negative_modifiers = scaled_helium + \ + var/negative_modifiers = scaled_helium + \ scaled_m_h2o * 0.75 + \ scaled_m_no2 * 0.15 + \ scaled_m_healium * 0.45 + \ scaled_m_freon * 1.15 - \ scaled_m_antinoblium * 10 ///Between 0.25 and 100, this value is used to modify the behaviour of the internal energy and the core temperature based on the gases present in the mix - var/power_modifier = clamp( scaled_tritium * 1.05 + \ + var/power_modifier = clamp( scaled_tritium * 1.05 + \ scaled_m_oxygen * 0.55 + \ scaled_m_co2 * 0.95 + \ scaled_m_no2 * 1.45 + \ @@ -875,7 +875,7 @@ scaled_m_freon * 0.75, \ 0.25, 100) ///Minimum 0.25, this value is used to modify the behaviour of the energy emission based on the gases present in the mix - var/heat_modifier = clamp( scaled_hydrogen * 1.15 + \ + var/heat_modifier = clamp( scaled_hydrogen * 1.15 + \ scaled_helium * 1.05 + \ scaled_m_plasma * 1.25 - \ scaled_m_nitrogen * 0.75 - \ @@ -883,7 +883,7 @@ scaled_m_freon * 0.95, \ 0.25, 100) ///Between 0.005 and 1000, this value modify the radiation emission of the reaction, higher values increase the emission - var/radiation_modifier = clamp( scaled_helium * 0.55 - \ + var/radiation_modifier = clamp( scaled_helium * 0.55 - \ scaled_m_freon * 1.15 - \ scaled_m_nitrogen * 0.45 - \ scaled_m_plasma * 0.95 + \ @@ -1326,7 +1326,7 @@ var/gas = gas_id2path(params["mode"]) if(gas in GLOB.meta_gas_info) connected_core.filter_type = gas - filter_name = GLOB.meta_gas_info[gas][META_GAS_NAME] + filter_name = GLOB.meta_gas_info[gas][META_GAS_NAME] investigate_log("was set to filter [filter_name] by [key_name(usr)]", INVESTIGATE_ATMOS) . = TRUE diff --git a/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm b/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm index fcb2b3d8f26..056407756db 100644 --- a/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm +++ b/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm @@ -165,7 +165,7 @@ var/gas = gas_id2path(params["mode"]) if(gas in GLOB.meta_gas_info) filter_type = gas - filter_name = GLOB.meta_gas_info[gas][META_GAS_NAME] + filter_name = GLOB.meta_gas_info[gas][META_GAS_NAME] investigate_log("was set to filter [filter_name] by [key_name(usr)]", INVESTIGATE_ATMOS) . = TRUE update_icon() diff --git a/code/modules/atmospherics/machinery/components/unary_devices/tank.dm b/code/modules/atmospherics/machinery/components/unary_devices/tank.dm index 8d9df3984c7..7bc46e1433a 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/tank.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/tank.dm @@ -1,4 +1,4 @@ -#define AIR_CONTENTS ((25*ONE_ATMOSPHERE)*(air_contents.volume)/(R_IDEAL_GAS_EQUATION*air_contents.temperature)) +#define AIR_CONTENTS ((25*ONE_ATMOSPHERE)*(air_contents.volume)/(R_IDEAL_GAS_EQUATION*air_contents.temperature)) /obj/machinery/atmospherics/components/unary/tank icon = 'icons/obj/atmospherics/pipes/pressure_tank.dmi' icon_state = "generic" diff --git a/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm b/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm index d4f0959ffa9..6c234b2df68 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm @@ -1,9 +1,9 @@ -#define EXT_BOUND 1 -#define INT_BOUND 2 -#define NO_BOUND 3 +#define EXT_BOUND 1 +#define INT_BOUND 2 +#define NO_BOUND 3 -#define SIPHONING 0 -#define RELEASING 1 +#define SIPHONING 0 +#define RELEASING 1 /obj/machinery/atmospherics/components/unary/vent_pump icon_state = "vent_map-3" 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 6ffacc63ec0..f6d110fcf83 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm @@ -1,5 +1,5 @@ -#define SIPHONING 0 -#define SCRUBBING 1 +#define SIPHONING 0 +#define SCRUBBING 1 /obj/machinery/atmospherics/components/unary/vent_scrubber icon_state = "scrub_map-3" @@ -203,13 +203,13 @@ return TRUE //There is no easy way for an object to be notified of changes to atmos can pass flags -// So we check every machinery process (2 seconds) +// So we check every machinery process (2 seconds) /obj/machinery/atmospherics/components/unary/vent_scrubber/process() if(widenet) check_turfs() //we populate a list of turfs with nonatmos-blocked cardinal turfs AND -// diagonal turfs that can share atmos with *both* of the cardinal turfs +// diagonal turfs that can share atmos with *both* of the cardinal turfs /obj/machinery/atmospherics/components/unary/vent_scrubber/proc/check_turfs() adjacent_turfs.Cut() diff --git a/code/modules/atmospherics/machinery/other/meter.dm b/code/modules/atmospherics/machinery/other/meter.dm index c36468b6b2d..59943db9f52 100644 --- a/code/modules/atmospherics/machinery/other/meter.dm +++ b/code/modules/atmospherics/machinery/other/meter.dm @@ -144,7 +144,7 @@ deconstruct() // TURF METER - REPORTS A TILE'S AIR CONTENTS -// why are you yelling? +// why are you yelling? /obj/machinery/meter/turf /obj/machinery/meter/turf/reattach_to_layer() diff --git a/code/modules/atmospherics/machinery/other/miner.dm b/code/modules/atmospherics/machinery/other/miner.dm index 3e918ef61ed..51dd4b02685 100644 --- a/code/modules/atmospherics/machinery/other/miner.dm +++ b/code/modules/atmospherics/machinery/other/miner.dm @@ -1,7 +1,7 @@ #define GASMINER_POWER_NONE 0 #define GASMINER_POWER_STATIC 1 -#define GASMINER_POWER_MOLES 2 //Scaled from here on down. +#define GASMINER_POWER_MOLES 2 //Scaled from here on down. #define GASMINER_POWER_KPA 3 #define GASMINER_POWER_FULLSCALE 4 @@ -22,7 +22,7 @@ var/active = TRUE var/power_draw = 0 var/power_draw_static = 2000 - var/power_draw_dynamic_mol_coeff = 5 //DO NOT USE DYNAMIC SETTINGS UNTIL SOMEONE MAKES A USER INTERFACE/CONTROLLER FOR THIS! + var/power_draw_dynamic_mol_coeff = 5 //DO NOT USE DYNAMIC SETTINGS UNTIL SOMEONE MAKES A USER INTERFACE/CONTROLLER FOR THIS! var/power_draw_dynamic_kpa_coeff = 0.5 var/broken = FALSE var/broken_message = "ERROR" @@ -31,7 +31,7 @@ /obj/machinery/atmospherics/miner/Initialize() . = ..() - set_active(active) //Force overlay update. + set_active(active) //Force overlay update. /obj/machinery/atmospherics/miner/examine(mob/user) . = ..() diff --git a/code/modules/atmospherics/machinery/pipes/layermanifold.dm b/code/modules/atmospherics/machinery/pipes/layermanifold.dm index 01fdd54b867..977164282c0 100644 --- a/code/modules/atmospherics/machinery/pipes/layermanifold.dm +++ b/code/modules/atmospherics/machinery/pipes/layermanifold.dm @@ -40,7 +40,7 @@ /obj/machinery/atmospherics/pipe/layer_manifold/update_icon() cut_overlays() - layer = initial(layer) + (PIPING_LAYER_MAX * PIPING_LAYER_LCHANGE) //This is above everything else. + layer = initial(layer) + (PIPING_LAYER_MAX * PIPING_LAYER_LCHANGE) //This is above everything else. for(var/node in front_nodes) add_attached_images(node) diff --git a/code/modules/atmospherics/machinery/pipes/mapping.dm b/code/modules/atmospherics/machinery/pipes/mapping.dm index 5e919a1e9ca..d51526b173b 100644 --- a/code/modules/atmospherics/machinery/pipes/mapping.dm +++ b/code/modules/atmospherics/machinery/pipes/mapping.dm @@ -1,65 +1,65 @@ //Colored pipes, use these for mapping #define HELPER_PARTIAL(Fulltype, Iconbase, Color) \ - ##Fulltype { \ - pipe_color = Color; \ - color = Color; \ - } \ - ##Fulltype/visible { \ - hide = FALSE; \ - layer = GAS_PIPE_VISIBLE_LAYER; \ - } \ - ##Fulltype/visible/layer2 { \ - piping_layer = 2; \ - icon_state = Iconbase + "-2"; \ - } \ - ##Fulltype/visible/layer4 { \ - piping_layer = 4; \ - icon_state = Iconbase + "-4"; \ - } \ - ##Fulltype/visible/layer1 { \ - piping_layer = 1; \ - icon_state = Iconbase + "-1"; \ - } \ - ##Fulltype/visible/layer5 { \ - piping_layer = 5; \ - icon_state = Iconbase + "-5"; \ - } \ - ##Fulltype/hidden { \ - hide = TRUE; \ - } \ - ##Fulltype/hidden/layer2 { \ - piping_layer = 2; \ - icon_state = Iconbase + "-2"; \ - } \ - ##Fulltype/hidden/layer4 { \ - piping_layer = 4; \ - icon_state = Iconbase + "-4"; \ - } \ - ##Fulltype/hidden/layer1 { \ - piping_layer = 1; \ - icon_state = Iconbase + "-1"; \ - } \ - ##Fulltype/hidden/layer5 { \ - piping_layer = 5; \ - icon_state = Iconbase + "-5"; \ + ##Fulltype { \ + pipe_color = Color; \ + color = Color; \ + } \ + ##Fulltype/visible { \ + hide = FALSE; \ + layer = GAS_PIPE_VISIBLE_LAYER; \ + } \ + ##Fulltype/visible/layer2 { \ + piping_layer = 2; \ + icon_state = Iconbase + "-2"; \ + } \ + ##Fulltype/visible/layer4 { \ + piping_layer = 4; \ + icon_state = Iconbase + "-4"; \ + } \ + ##Fulltype/visible/layer1 { \ + piping_layer = 1; \ + icon_state = Iconbase + "-1"; \ + } \ + ##Fulltype/visible/layer5 { \ + piping_layer = 5; \ + icon_state = Iconbase + "-5"; \ + } \ + ##Fulltype/hidden { \ + hide = TRUE; \ + } \ + ##Fulltype/hidden/layer2 { \ + piping_layer = 2; \ + icon_state = Iconbase + "-2"; \ + } \ + ##Fulltype/hidden/layer4 { \ + piping_layer = 4; \ + icon_state = Iconbase + "-4"; \ + } \ + ##Fulltype/hidden/layer1 { \ + piping_layer = 1; \ + icon_state = Iconbase + "-1"; \ + } \ + ##Fulltype/hidden/layer5 { \ + piping_layer = 5; \ + icon_state = Iconbase + "-5"; \ } #define HELPER_PARTIAL_NAMED(Fulltype, Iconbase, Name, Color) \ - HELPER_PARTIAL(Fulltype, Iconbase, Color) \ - ##Fulltype { \ - name = Name; \ + HELPER_PARTIAL(Fulltype, Iconbase, Color) \ + ##Fulltype { \ + name = Name; \ } #define HELPER(Type, Color) \ - HELPER_PARTIAL(/obj/machinery/atmospherics/pipe/simple/##Type, "pipe11", Color) \ - HELPER_PARTIAL(/obj/machinery/atmospherics/pipe/manifold/##Type, "manifold", Color) \ + HELPER_PARTIAL(/obj/machinery/atmospherics/pipe/simple/##Type, "pipe11", Color) \ + HELPER_PARTIAL(/obj/machinery/atmospherics/pipe/manifold/##Type, "manifold", Color) \ HELPER_PARTIAL(/obj/machinery/atmospherics/pipe/manifold4w/##Type, "manifold4w", Color) \ HELPER_PARTIAL(/obj/effect/mapping_helpers/simple_pipes/##Type,"pipe",Color) #define HELPER_NAMED(Type, Name, Color) \ - HELPER_PARTIAL_NAMED(/obj/machinery/atmospherics/pipe/simple/##Type, "pipe11", Name, Color) \ - HELPER_PARTIAL_NAMED(/obj/machinery/atmospherics/pipe/manifold/##Type, "manifold", Name, Color) \ + HELPER_PARTIAL_NAMED(/obj/machinery/atmospherics/pipe/simple/##Type, "pipe11", Name, Color) \ + HELPER_PARTIAL_NAMED(/obj/machinery/atmospherics/pipe/manifold/##Type, "manifold", Name, Color) \ HELPER_PARTIAL_NAMED(/obj/machinery/atmospherics/pipe/manifold4w/##Type, "manifold4w", Name, Color) \ HELPER_PARTIAL_NAMED(/obj/effect/mapping_helpers/simple_pipes/##Type,"pipe", Name, Color) diff --git a/code/modules/atmospherics/machinery/portable/canister.dm b/code/modules/atmospherics/machinery/portable/canister.dm index 4da5e52fc06..67473db5796 100644 --- a/code/modules/atmospherics/machinery/portable/canister.dm +++ b/code/modules/atmospherics/machinery/portable/canister.dm @@ -1,9 +1,9 @@ -#define CAN_DEFAULT_RELEASE_PRESSURE (ONE_ATMOSPHERE) +#define CAN_DEFAULT_RELEASE_PRESSURE (ONE_ATMOSPHERE) ///Used when setting the mode of the canisters, enabling us to switch the overlays //These are used as icon states later down the line for tier overlays -#define CANISTER_TIER_1 1 -#define CANISTER_TIER_2 2 -#define CANISTER_TIER_3 3 +#define CANISTER_TIER_1 1 +#define CANISTER_TIER_2 2 +#define CANISTER_TIER_3 3 /obj/machinery/portable_atmospherics/canister //SKYRAT EDIT - ICON OVERRIDEN BY AESTHETICS - SEE MODULE name = "canister" diff --git a/code/modules/awaymissions/capture_the_flag.dm b/code/modules/awaymissions/capture_the_flag.dm index ff165caf544..995386304e2 100644 --- a/code/modules/awaymissions/capture_the_flag.dm +++ b/code/modules/awaymissions/capture_the_flag.dm @@ -464,7 +464,7 @@ /obj/projectile/bullet/ctf/prehit_pierce(atom/target) if(is_ctf_target(target)) damage = 60 - return PROJECTILE_PIERCE_NONE /// hey uhh don't hit anyone behind them + return PROJECTILE_PIERCE_NONE /// hey uhh don't hit anyone behind them . = ..() /obj/item/gun/ballistic/automatic/laser/ctf @@ -501,7 +501,7 @@ /obj/projectile/beam/ctf/prehit_pierce(atom/target) if(is_ctf_target(target)) damage = 150 - return PROJECTILE_PIERCE_NONE /// hey uhhh don't hit anyone behind them + return PROJECTILE_PIERCE_NONE /// hey uhhh don't hit anyone behind them . = ..() /proc/is_ctf_target(atom/target) diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm index c6a2456fe7f..8ffa1e7a9db 100644 --- a/code/modules/awaymissions/corpse.dm +++ b/code/modules/awaymissions/corpse.dm @@ -16,16 +16,16 @@ var/mob_gender = null var/death = TRUE //Kill the mob var/roundstart = TRUE //fires on initialize - var/instant = FALSE //fires on New + var/instant = FALSE //fires on New var/short_desc = "The mapper forgot to set this!" var/flavour_text = "" var/important_info = "" var/faction = null - var/permanent = FALSE //If true, the spawner will not disappear upon running out of uses. - var/random = FALSE //Don't set a name or gender, just go random + var/permanent = FALSE //If true, the spawner will not disappear upon running out of uses. + var/random = FALSE //Don't set a name or gender, just go random var/antagonist_type var/objectives = null - var/uses = 1 //how many times can we spawn from it. set to -1 for infinite. + var/uses = 1 //how many times can we spawn from it. set to -1 for infinite. var/brute_damage = 0 var/oxy_damage = 0 var/burn_damage = 0 @@ -176,15 +176,15 @@ /obj/effect/mob_spawn/human mob_type = /mob/living/carbon/human //Human specific stuff. - //var/mob_species = null //Set to make them a mutant race such as lizard or skeleton. Uses the datum typepath instead of the ID. //ORIGINAL + //var/mob_species = null //Set to make them a mutant race such as lizard or skeleton. Uses the datum typepath instead of the ID. //ORIGINAL var/mob_species = /datum/species/human //SKYRAT EDIT CHANGE var/datum/outfit/outfit = /datum/outfit //If this is a path, it will be instanced in Initialize() var/disable_pda = TRUE var/disable_sensors = TRUE //All of these only affect the ID that the outfit has placed in the ID slot - var/id_job = null //Such as "Clown" or "Chef." This just determines what the ID reads as, not their access - var/id_access = null //This is for access. See access.dm for which jobs give what access. Use "Captain" if you want it to be all access. - var/id_access_list = null //Allows you to manually add access to an ID card. + var/id_job = null //Such as "Clown" or "Chef." This just determines what the ID reads as, not their access + var/id_access = null //This is for access. See access.dm for which jobs give what access. Use "Captain" if you want it to be all access. + var/id_access_list = null //Allows you to manually add access to an ID card. assignedrole = "Ghost Role" var/husk = null @@ -423,7 +423,7 @@ qdel(src) /obj/effect/mob_spawn/slime - mob_type = /mob/living/simple_animal/slime + mob_type = /mob/living/simple_animal/slime var/mobcolour = "grey" icon = 'icons/mob/slimes.dmi' icon_state = "grey baby slime" //sets the icon in the map editor diff --git a/code/modules/awaymissions/mission_code/snowdin.dm b/code/modules/awaymissions/mission_code/snowdin.dm index 5be2f3432c1..4ccb89dff2f 100644 --- a/code/modules/awaymissions/mission_code/snowdin.dm +++ b/code/modules/awaymissions/mission_code/snowdin.dm @@ -193,7 +193,7 @@ . = 1 var/mob/living/L = thing if(L.movement_type & FLYING) - continue //YOU'RE FLYING OVER IT + continue //YOU'RE FLYING OVER IT if("snow" in L.weather_immunities) continue @@ -257,7 +257,7 @@ icon = 'icons/obj/lavaland/dragonboat.dmi' resistance_flags = FREEZE_PROOF can_buckle = TRUE -/////////// papers +/////////// papers /obj/item/paper/crumpled/ruins/snowdin/foreshadowing diff --git a/code/modules/awaymissions/mission_code/stationCollision.dm b/code/modules/awaymissions/mission_code/stationCollision.dm index 859654c0cb7..ae0437532a6 100644 --- a/code/modules/awaymissions/mission_code/stationCollision.dm +++ b/code/modules/awaymissions/mission_code/stationCollision.dm @@ -1,17 +1,17 @@ /* Station-Collision(sc) away mission map specific stuff * * Notes: - * Feel free to use parts of this map, or even all of it for your own project. Just include me in the credits :) + * Feel free to use parts of this map, or even all of it for your own project. Just include me in the credits :) * - * Some of this code unnecessary, but the intent is to add a little bit of everything to serve as examples - * for anyone who wants to make their own stuff. + * Some of this code unnecessary, but the intent is to add a little bit of everything to serve as examples + * for anyone who wants to make their own stuff. * * Contains: - * Landmarks - * Guns - * Safe code hints - * Captain's safe - * Modified Nar'Sie + * Landmarks + * Guns + * Safe code hints + * Captain's safe + * Modified Nar'Sie */ diff --git a/code/modules/awaymissions/mission_code/wildwest.dm b/code/modules/awaymissions/mission_code/wildwest.dm index 0c6f6197a4e..b2bf3bbd747 100644 --- a/code/modules/awaymissions/mission_code/wildwest.dm +++ b/code/modules/awaymissions/mission_code/wildwest.dm @@ -1,7 +1,7 @@ /* Code for the Wild West map by Brotemis * Contains: - * Wish Granter - * Meat Grinder + * Wish Granter + * Meat Grinder */ //Areas diff --git a/code/modules/buildmode/buildmode.dm b/code/modules/buildmode/buildmode.dm index e0703201a13..921d1e057bb 100644 --- a/code/modules/buildmode/buildmode.dm +++ b/code/modules/buildmode/buildmode.dm @@ -1,6 +1,6 @@ -#define BM_SWITCHSTATE_NONE 0 -#define BM_SWITCHSTATE_MODE 1 -#define BM_SWITCHSTATE_DIR 2 +#define BM_SWITCHSTATE_NONE 0 +#define BM_SWITCHSTATE_MODE 1 +#define BM_SWITCHSTATE_DIR 2 /datum/buildmode var/build_dir = SOUTH diff --git a/code/modules/buildmode/submodes/delete.dm b/code/modules/buildmode/submodes/delete.dm index 92148de9d69..8a4129fc40f 100644 --- a/code/modules/buildmode/submodes/delete.dm +++ b/code/modules/buildmode/submodes/delete.dm @@ -18,7 +18,7 @@ qdel(object) if(LAZYACCESS(modifiers, RIGHT_CLICK)) - if(check_rights(R_DEBUG|R_SERVER)) //Prevents buildmoded non-admins from breaking everything. + if(check_rights(R_DEBUG|R_SERVER)) //Prevents buildmoded non-admins from breaking everything. if(isturf(object)) return var/atom/deleting = object diff --git a/code/modules/cargo/blackmarket/blackmarket_item.dm b/code/modules/cargo/blackmarket/blackmarket_item.dm index fddbcc1682f..ea6f3560f4d 100644 --- a/code/modules/cargo/blackmarket/blackmarket_item.dm +++ b/code/modules/cargo/blackmarket/blackmarket_item.dm @@ -17,13 +17,13 @@ var/item /// Minimum price for the item if generated randomly. - var/price_min = 0 + var/price_min = 0 /// Maximum price for the item if generated randomly. - var/price_max = 0 + var/price_max = 0 /// Minimum amount that there should be of this item in the market if generated randomly. This defaults to 1 as most items will have it as 1. - var/stock_min = 1 + var/stock_min = 1 /// Maximum amount that there should be of this item in the market if generated randomly. - var/stock_max = 0 + var/stock_max = 0 /// Probability for this item to be available. Used by SSblackmarket on init. var/availability_prob = 0 diff --git a/code/modules/cargo/blackmarket/blackmarket_market.dm b/code/modules/cargo/blackmarket/blackmarket_market.dm index e70a8af715b..2a56ce688fd 100644 --- a/code/modules/cargo/blackmarket/blackmarket_market.dm +++ b/code/modules/cargo/blackmarket/blackmarket_market.dm @@ -10,7 +10,7 @@ /// Items available from this market, populated by SSblackmarket on initialization. var/list/available_items = list() /// Item categories available from this market, only items which are in these categories can be gotten from this market. - var/list/categories = list() + var/list/categories = list() /// Adds item to the available items and add it's category if it is not in categories yet. /datum/blackmarket_market/proc/add_item(datum/blackmarket_item/item) @@ -48,6 +48,6 @@ /datum/blackmarket_market/blackmarket name = "Black Market" - shipping = list(SHIPPING_METHOD_LTSRBT =50, - SHIPPING_METHOD_LAUNCH =10, + shipping = list(SHIPPING_METHOD_LTSRBT =50, + SHIPPING_METHOD_LAUNCH =10, SHIPPING_METHOD_TELEPORT=75) diff --git a/code/modules/cargo/centcom_podlauncher.dm b/code/modules/cargo/centcom_podlauncher.dm index beebdf4efc0..4385e1053c2 100644 --- a/code/modules/cargo/centcom_podlauncher.dm +++ b/code/modules/cargo/centcom_podlauncher.dm @@ -640,7 +640,7 @@ /datum/centcom_podlauncher/proc/refreshBay() //Called whenever the bay is switched, as well as wheneber a pod is launched bay = GLOB.supplypod_loading_bays[bayNumber] orderedArea = createOrderedArea(bay) //Create an ordered list full of turfs form the bay - preLaunch() //Fill acceptable turfs from orderedArea, then fill launchList from acceptableTurfs (see proc for more info) + preLaunch() //Fill acceptable turfs from orderedArea, then fill launchList from acceptableTurfs (see proc for more info) refreshView() /area/centcom/supplypod/pod_storage/Initialize(mapload) //temp_pod holding area diff --git a/code/modules/cargo/exports.dm b/code/modules/cargo/exports.dm index 7232815846c..19ccb8fdfce 100644 --- a/code/modules/cargo/exports.dm +++ b/code/modules/cargo/exports.dm @@ -21,10 +21,10 @@ Then the player gets the profit from selling his own wasted time. // Simple holder datum to pass export results around /datum/export_report - var/list/exported_atoms = list() //names of atoms sold/deleted by export - var/list/total_amount = list() //export instance => total count of sold objects of its type, only exists if any were sold - var/list/total_value = list() //export instance => total value of sold objects - var/list/exported_atoms_ref = list() //if they're not deleted they go in here for use. + var/list/exported_atoms = list() //names of atoms sold/deleted by export + var/list/total_amount = list() //export instance => total count of sold objects of its type, only exists if any were sold + var/list/total_value = list() //export instance => total value of sold objects + var/list/exported_atoms_ref = list() //if they're not deleted they go in here for use. // external_report works as "transaction" object, pass same one in if you're doing more than one export in single go /proc/export_item_and_contents(atom/movable/AM, apply_elastic = TRUE, delete_unsold = TRUE, dry_run=FALSE, datum/export_report/external_report) @@ -64,13 +64,13 @@ Then the player gets the profit from selling his own wasted time. return report /datum/export - var/unit_name = "" // Unit name. Only used in "Received [total_amount] [name]s [message]." message + var/unit_name = "" // Unit name. Only used in "Received [total_amount] [name]s [message]." message var/message = "" - var/cost = 1 // Cost of item, in cargo credits. Must not alow for infinite price dupes, see above. - var/k_elasticity = 1/30 //coefficient used in marginal price calculation that roughly corresponds to the inverse of price elasticity, or "quantity elasticity" - var/list/export_types = list() // Type of the exported object. If none, the export datum is considered base type. - var/include_subtypes = TRUE // Set to FALSE to make the datum apply only to a strict type. - var/list/exclude_types = list() // Types excluded from export + var/cost = 1 // Cost of item, in cargo credits. Must not alow for infinite price dupes, see above. + var/k_elasticity = 1/30 //coefficient used in marginal price calculation that roughly corresponds to the inverse of price elasticity, or "quantity elasticity" + var/list/export_types = list() // Type of the exported object. If none, the export datum is considered base type. + var/include_subtypes = TRUE // Set to FALSE to make the datum apply only to a strict type. + var/list/exclude_types = list() // Types excluded from export //cost includes elasticity, this does not. var/init_cost @@ -99,9 +99,9 @@ Then the player gets the profit from selling his own wasted time. var/amount = get_amount(O) if(apply_elastic) if(k_elasticity!=0) - return round((cost/k_elasticity) * (1 - NUM_E**(-1 * k_elasticity * amount))) //anti-derivative of the marginal cost function + return round((cost/k_elasticity) * (1 - NUM_E**(-1 * k_elasticity * amount))) //anti-derivative of the marginal cost function else - return round(cost * amount) //alternative form derived from L'Hopital to avoid division by 0 + return round(cost * amount) //alternative form derived from L'Hopital to avoid division by 0 else return round(init_cost * amount) @@ -156,7 +156,7 @@ Then the player gets the profit from selling his own wasted time. if(!dry_run) if(apply_elastic) - cost *= NUM_E**(-1*k_elasticity*amount) //marginal cost modifier + cost *= NUM_E**(-1*k_elasticity*amount) //marginal cost modifier SSblackbox.record_feedback("nested tally", "export_sold_cost", 1, list("[O.type]", "[the_cost]")) return TRUE diff --git a/code/modules/cargo/exports/organs.dm b/code/modules/cargo/exports/organs.dm index d3a877061c2..de4d8429df3 100644 --- a/code/modules/cargo/exports/organs.dm +++ b/code/modules/cargo/exports/organs.dm @@ -1,5 +1,5 @@ /datum/export/organ - include_subtypes = FALSE //CentCom doesn't need organs from non-humans. + include_subtypes = FALSE //CentCom doesn't need organs from non-humans. /datum/export/organ/heart cost = CARGO_CRATE_VALUE * 0.2 //For the man who has everything and nothing. diff --git a/code/modules/cargo/exports/seeds.dm b/code/modules/cargo/exports/seeds.dm index 067ee6af8b8..2415fde99ba 100644 --- a/code/modules/cargo/exports/seeds.dm +++ b/code/modules/cargo/exports/seeds.dm @@ -1,6 +1,6 @@ /datum/export/seed cost = CARGO_CRATE_VALUE * 0.25 // Gets multiplied by potency - k_elasticity = 1 //price inelastic/quantity elastic, only need to export a few samples + k_elasticity = 1 //price inelastic/quantity elastic, only need to export a few samples unit_name = "new plant species sample" export_types = list(/obj/item/seeds) var/needs_discovery = FALSE // Only for undiscovered species diff --git a/code/modules/cargo/exports/tools.dm b/code/modules/cargo/exports/tools.dm index 2c46fdbffba..4714099a8af 100644 --- a/code/modules/cargo/exports/tools.dm +++ b/code/modules/cargo/exports/tools.dm @@ -3,9 +3,9 @@ unit_name = "toolbox" export_types = list(/obj/item/storage/toolbox) -// mechanical toolbox: 22cr -// emergency toolbox: 17-20cr -// electrical toolbox: 36cr +// mechanical toolbox: 22cr +// emergency toolbox: 17-20cr +// electrical toolbox: 36cr // robust: priceless // Basic tools diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index b1a8e307c0a..ce5d8bd614c 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -732,7 +732,7 @@ /datum/supply_pack/engineering/powergamermitts name = "Insulated Gloves Crate" desc = "The backbone of modern society. Barely ever ordered for actual engineering. Contains three insulated gloves." - cost = CARGO_CRATE_VALUE * 8 //Made of pure-grade bullshittinium + cost = CARGO_CRATE_VALUE * 8 //Made of pure-grade bullshittinium access_view = ACCESS_ENGINE_EQUIP contains = list(/obj/item/clothing/gloves/color/yellow, /obj/item/clothing/gloves/color/yellow, @@ -2372,7 +2372,7 @@ if(prob(30)) //Not all mafioso have mustaches, some people also find this item annoying. new /obj/item/clothing/mask/fakemoustache/italian(C) if(prob(10)) //A little extra sugar every now and then to shake things up. - new /obj/item/switchblade(C) + new /obj/item/switchblade(C) /datum/supply_pack/costumes_toys/randomised/tcg name = "Big-Ass Booster Pack Pack" @@ -2535,7 +2535,7 @@ /datum/supply_pack/misc/religious_supplies name = "Religious Supplies Crate" desc = "Keep your local chaplain happy and well-supplied, lest they call down judgement upon your cargo bay. Contains two bottles of holywater, bibles, chaplain robes, and burial garmets." - cost = CARGO_CRATE_VALUE * 6 // it costs so much because the Space Church needs funding to build a cathedral + cost = CARGO_CRATE_VALUE * 6 // it costs so much because the Space Church needs funding to build a cathedral access_view = ACCESS_CHAPEL_OFFICE contains = list(/obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/reagent_containers/food/drinks/bottle/holywater, diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm index 19b2443e471..a8c3886ce37 100644 --- a/code/modules/client/client_procs.dm +++ b/code/modules/client/client_procs.dm @@ -1,8 +1,8 @@ //////////// //SECURITY// //////////// -#define UPLOAD_LIMIT 524288 //Restricts client uploads to the server to 0.5MB -#define UPLOAD_LIMIT_ADMIN 2621440 //Restricts admin client uploads to the server to 2.5MB +#define UPLOAD_LIMIT 524288 //Restricts client uploads to the server to 0.5MB +#define UPLOAD_LIMIT_ADMIN 2621440 //Restricts admin client uploads to the server to 2.5MB GLOBAL_LIST_INIT(blacklisted_builds, list( "1407" = "bug preventing client display overrides from working leads to clients being able to see things/mobs they shouldn't be able to see", @@ -11,12 +11,12 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( )) -#define LIMITER_SIZE 5 -#define CURRENT_SECOND 1 -#define SECOND_COUNT 2 -#define CURRENT_MINUTE 3 -#define MINUTE_COUNT 4 -#define ADMINSWARNED_AT 5 +#define LIMITER_SIZE 5 +#define CURRENT_SECOND 1 +#define SECOND_COUNT 2 +#define CURRENT_MINUTE 3 +#define MINUTE_COUNT 4 +#define ADMINSWARNED_AT 5 /* When somebody clicks a link in game, this Topic is called first. It does the stuff in this proc and then is redirected to the Topic() proc for the src=[0xWhatever] @@ -34,7 +34,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( */ /client/Topic(href, href_list, hsrc) - if(!usr || usr != mob) //stops us calling Topic for somebody else's client. Also helps prevent usr=null + if(!usr || usr != mob) //stops us calling Topic for somebody else's client. Also helps prevent usr=null return //SKYRAT EDIT ADDITION BEGIN - MENTOR if(mentor_client_procs(href_list)) @@ -128,7 +128,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( if(QDELETED(real_src)) return - ..() //redirect to hsrc.Topic() + ..() //redirect to hsrc.Topic() /client/proc/is_content_unlocked() if(!prefs.unlock_content) @@ -204,7 +204,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( /client/New(TopicData) var/tdata = TopicData //save this for later use - TopicData = null //Prevent calls to client.Topic from connect + TopicData = null //Prevent calls to client.Topic from connect if(connection != "seeker" && connection != "web")//Invalid connection type. return null @@ -252,8 +252,8 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( else prefs = new /datum/preferences(src) GLOB.preferences_datums[ckey] = prefs - prefs.last_ip = address //these are gonna be used for banning - prefs.last_id = computer_id //these are gonna be used for banning + prefs.last_ip = address //these are gonna be used for banning + prefs.last_id = computer_id //these are gonna be used for banning fps = (prefs.clientfps < 0) ? RECOMMENDED_FPS : prefs.clientfps if(fexists(roundend_report_file())) @@ -298,7 +298,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( GLOB.player_details[ckey] = player_details - . = ..() //calls mob.Login() + . = ..() //calls mob.Login() if (length(GLOB.stickybanadminexemptions)) GLOB.stickybanadminexemptions -= ckey if (!length(GLOB.stickybanadminexemptions)) @@ -341,7 +341,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( var/cev = CONFIG_GET(number/client_error_version) var/ceb = CONFIG_GET(number/client_error_build) var/cwv = CONFIG_GET(number/client_warn_version) - if (byond_version < cev || (byond_version == cev && byond_build < ceb)) //Out of date client. + if (byond_version < cev || (byond_version == cev && byond_build < ceb)) //Out of date client. to_chat(src, "Your version of BYOND is too old:") to_chat(src, CONFIG_GET(string/client_error_message)) to_chat(src, "Your version: [byond_version].[byond_build]") @@ -352,7 +352,7 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( else qdel(src) return - else if (byond_version < cwv) //We have words for this client. + else if (byond_version < cwv) //We have words for this client. if(CONFIG_GET(flag/client_warn_popup)) var/msg = "Your version of byond may be getting out of date:
      " msg += CONFIG_GET(string/client_warn_message) + "

      " @@ -1046,11 +1046,11 @@ GLOBAL_LIST_INIT(blacklisted_builds, list( ///Redirect proc that makes it easier to call the unlock achievement proc. Achievement type is the typepath to the award, user is the mob getting the award, and value is an optional variable used for leaderboard value increments /client/proc/give_award(achievement_type, mob/user, value = 1) - return player_details.achievements.unlock(achievement_type, user, value) + return player_details.achievements.unlock(achievement_type, user, value) ///Redirect proc that makes it easier to get the status of an achievement. Achievement type is the typepath to the award. /client/proc/get_award_status(achievement_type, mob/user, value = 1) - return player_details.achievements.get_achievement_status(achievement_type) + return player_details.achievements.get_achievement_status(achievement_type) ///Gives someone hearted status for OOC, from behavior commendations /client/proc/adjust_heart(duration = 24 HOURS) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index a47586a01ed..ad0e4b21e07 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -6,7 +6,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) var/client/parent //doohickeys for savefiles var/path - var/default_slot = 1 //Holder so it doesn't default to slot 1, rather the last one used + var/default_slot = 1 //Holder so it doesn't default to slot 1, rather the last one used var/max_save_slots = 3 //non-preference stuff @@ -15,17 +15,17 @@ GLOBAL_LIST_EMPTY(preferences_datums) var/last_id //game-preferences - var/lastchangelog = "" //Saved changlog filesize to detect if there was a change + var/lastchangelog = "" //Saved changlog filesize to detect if there was a change var/ooccolor = "#c43b23" - var/asaycolor = "#ff4500" //This won't change the color for current admins, only incoming ones. + var/asaycolor = "#ff4500" //This won't change the color for current admins, only incoming ones. /// If we spawn an ERT as an admin and choose to spawn as the briefing officer, we'll be given this outfit var/brief_outfit = /datum/outfit/centcom/commander var/enable_tips = TRUE var/tip_delay = 500 //tip delay in milliseconds //Antag preferences - var/list/be_special = list() //Special role selection - var/tmp/old_be_special = 0 //Bitflag version of be_special, used to update old savefiles and nothing more + var/list/be_special = list() //Special role selection + var/tmp/old_be_special = 0 //Bitflag version of be_special, used to update old savefiles and nothing more //If it's 0, that's good, if it's anything but 0, the owner of this prefs file's antag choices were, //autocorrected this round, not that you'd need to check that. @@ -65,23 +65,23 @@ GLOBAL_LIST_EMPTY(preferences_datums) var/uses_glasses_colour = 0 //character preferences - var/slot_randomized //keeps track of round-to-round randomization of the character slot, prevents overwriting - var/real_name //our character's name - var/gender = MALE //gender of character (well duh) - var/age = 30 //age of character - var/underwear = "Nude" //underwear type - var/underwear_color = "000" //underwear color - var/undershirt = "Nude" //undershirt type - var/socks = "Nude" //socks type - var/backpack = DBACKPACK //backpack type - var/jumpsuit_style = PREF_SUIT //suit/skirt - var/hairstyle = "Bald" //Hair type - var/hair_color = "000" //Hair color - var/facial_hairstyle = "Shaved" //Face hair type - var/facial_hair_color = "000" //Facial hair color - var/skin_tone = "caucasian1" //Skin color - var/eye_color = "000" //Eye color - var/datum/species/pref_species = new /datum/species/human() //Mutant race + var/slot_randomized //keeps track of round-to-round randomization of the character slot, prevents overwriting + var/real_name //our character's name + var/gender = MALE //gender of character (well duh) + var/age = 30 //age of character + var/underwear = "Nude" //underwear type + var/underwear_color = "000" //underwear color + var/undershirt = "Nude" //undershirt type + var/socks = "Nude" //socks type + var/backpack = DBACKPACK //backpack type + var/jumpsuit_style = PREF_SUIT //suit/skirt + var/hairstyle = "Bald" //Hair type + var/hair_color = "000" //Hair color + var/facial_hairstyle = "Shaved" //Face hair type + var/facial_hair_color = "000" //Facial hair color + var/skin_tone = "caucasian1" //Skin color + var/eye_color = "000" //Eye color + var/datum/species/pref_species = new /datum/species/human() //Mutant race var/list/features = list("mcolor" = "FFF", "ethcolor" = "9c3030", "tail_lizard" = "Smooth", "tail_human" = "None", "snout" = "Round", "horns" = "None", "ears" = "None", "wings" = "None", "frills" = "None", "spines" = "None", "body_markings" = "None", "legs" = "Normal Legs", "moth_wings" = "Plain", "moth_antennae" = "Plain", "moth_markings" = "None") var/list/randomise = list(RANDOM_UNDERWEAR = TRUE, RANDOM_UNDERWEAR_COLOR = TRUE, RANDOM_UNDERSHIRT = TRUE, RANDOM_SOCKS = TRUE, RANDOM_BACKPACK = TRUE, RANDOM_JUMPSUIT_STYLE = TRUE, RANDOM_HAIRSTYLE = TRUE, RANDOM_HAIR_COLOR = TRUE, RANDOM_FACIAL_HAIRSTYLE = TRUE, RANDOM_FACIAL_HAIR_COLOR = TRUE, RANDOM_SKIN_TONE = TRUE, RANDOM_EYE_COLOR = TRUE) var/phobia = "spiders" @@ -160,13 +160,13 @@ GLOBAL_LIST_EMPTY(preferences_datums) if(load_character()) return //we couldn't load character data so just randomize the character appearance + name - random_character() //let's create a random character then - rather than a fat, bald and naked man. + random_character() //let's create a random character then - rather than a fat, bald and naked man. key_bindings = deepCopyList(GLOB.hotkey_keybinding_list_by_key) // give them default keybinds and update their movement keys C?.set_macros() real_name = pref_species.random_name(gender,1) if(!loaded_preferences_successfully) save_preferences() - save_character() //let's save this new random character so it doesn't keep generating new ones. + save_character() //let's save this new random character so it doesn't keep generating new ones. menuoptions = list() return @@ -1113,7 +1113,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) if(GetQuirkBalance() < 0) all_quirks = list() -/datum/preferences/Topic(href, href_list, hsrc) //yeah, gotta do this I guess.. +/datum/preferences/Topic(href, href_list, hsrc) //yeah, gotta do this I guess.. . = ..() if(href_list["close"]) var/client/C = usr.client @@ -1918,7 +1918,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) if(CONFIG_GET(flag/humans_need_surnames) && (pref_species.id == "human")) var/firstspace = findtext(real_name, " ") var/name_length = length(real_name) - if(!firstspace) //we need a surname + if(!firstspace) //we need a surname real_name += " [pick(GLOB.last_names)]" else if(firstspace == name_length) real_name += "[pick(GLOB.last_names)]" diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index cc6b22e0a78..6b385a75dac 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -1,13 +1,13 @@ //This is the lowest supported version, anything below this is completely obsolete and the entire savefile will be wiped. //SKYRAT EDIT REMOVAL BEGIN - CUSTOMIZATION (moved to modular) /* -#define SAVEFILE_VERSION_MIN 32 +#define SAVEFILE_VERSION_MIN 32 //This is the current version, anything below this will attempt to update (if it's not obsolete) -// You do not need to raise this if you are adding new values that have sane defaults. -// Only raise this value when changing the meaning/format/name/layout of an existing value -// where you would want the updater procs below to run -#define SAVEFILE_VERSION_MAX 39 +// You do not need to raise this if you are adding new values that have sane defaults. +// Only raise this value when changing the meaning/format/name/layout of an existing value +// where you would want the updater procs below to run +#define SAVEFILE_VERSION_MAX 39 /* SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Carn @@ -152,7 +152,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car S.cd = "/" var/needs_update = savefile_needs_update(S) - if(needs_update == -2) //fatal, can't load any data + if(needs_update == -2) //fatal, can't load any data var/bacpath = "[path].updatebac" //todo: if the savefile version is higher then the server, check the backup, and give the player a prompt to load the backup if (fexists(bacpath)) fdel(bacpath) //only keep 1 version of backup @@ -218,44 +218,44 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car if (fexists(bacpath)) fdel(bacpath) //only keep 1 version of backup fcopy(S, bacpath) //byond helpfully lets you use a savefile for the first arg. - update_preferences(needs_update, S) //needs_update = savefile_version if we need an update (positive integer) + update_preferences(needs_update, S) //needs_update = savefile_version if we need an update (positive integer) //Sanitize - asaycolor = sanitize_ooccolor(sanitize_hexcolor(asaycolor, 6, 1, initial(asaycolor))) - ooccolor = sanitize_ooccolor(sanitize_hexcolor(ooccolor, 6, 1, initial(ooccolor))) - lastchangelog = sanitize_text(lastchangelog, initial(lastchangelog)) - UI_style = sanitize_inlist(UI_style, GLOB.available_ui_styles, GLOB.available_ui_styles[1]) - hotkeys = sanitize_integer(hotkeys, FALSE, TRUE, initial(hotkeys)) - chat_on_map = sanitize_integer(chat_on_map, FALSE, TRUE, initial(chat_on_map)) + asaycolor = sanitize_ooccolor(sanitize_hexcolor(asaycolor, 6, 1, initial(asaycolor))) + ooccolor = sanitize_ooccolor(sanitize_hexcolor(ooccolor, 6, 1, initial(ooccolor))) + lastchangelog = sanitize_text(lastchangelog, initial(lastchangelog)) + UI_style = sanitize_inlist(UI_style, GLOB.available_ui_styles, GLOB.available_ui_styles[1]) + hotkeys = sanitize_integer(hotkeys, FALSE, TRUE, initial(hotkeys)) + chat_on_map = sanitize_integer(chat_on_map, FALSE, TRUE, initial(chat_on_map)) max_chat_length = sanitize_integer(max_chat_length, 1, CHAT_MESSAGE_MAX_LENGTH, initial(max_chat_length)) - see_chat_non_mob = sanitize_integer(see_chat_non_mob, FALSE, TRUE, initial(see_chat_non_mob)) - see_rc_emotes = sanitize_integer(see_rc_emotes, FALSE, TRUE, initial(see_rc_emotes)) + see_chat_non_mob = sanitize_integer(see_chat_non_mob, FALSE, TRUE, initial(see_chat_non_mob)) + see_rc_emotes = sanitize_integer(see_rc_emotes, FALSE, TRUE, initial(see_rc_emotes)) broadcast_login_logout = sanitize_integer(broadcast_login_logout, FALSE, TRUE, initial(broadcast_login_logout)) - tgui_fancy = sanitize_integer(tgui_fancy, FALSE, TRUE, initial(tgui_fancy)) - tgui_lock = sanitize_integer(tgui_lock, FALSE, TRUE, initial(tgui_lock)) - buttons_locked = sanitize_integer(buttons_locked, FALSE, TRUE, initial(buttons_locked)) - windowflashing = sanitize_integer(windowflashing, FALSE, TRUE, initial(windowflashing)) - default_slot = sanitize_integer(default_slot, 1, max_save_slots, initial(default_slot)) - toggles = sanitize_integer(toggles, 0, (2**24)-1, initial(toggles)) - clientfps = sanitize_integer(clientfps, -1, 1000, 0) - parallax = sanitize_integer(parallax, PARALLAX_INSANE, PARALLAX_DISABLE, null) - ambientocclusion = sanitize_integer(ambientocclusion, FALSE, TRUE, initial(ambientocclusion)) - auto_fit_viewport = sanitize_integer(auto_fit_viewport, FALSE, TRUE, initial(auto_fit_viewport)) + tgui_fancy = sanitize_integer(tgui_fancy, FALSE, TRUE, initial(tgui_fancy)) + tgui_lock = sanitize_integer(tgui_lock, FALSE, TRUE, initial(tgui_lock)) + buttons_locked = sanitize_integer(buttons_locked, FALSE, TRUE, initial(buttons_locked)) + windowflashing = sanitize_integer(windowflashing, FALSE, TRUE, initial(windowflashing)) + default_slot = sanitize_integer(default_slot, 1, max_save_slots, initial(default_slot)) + toggles = sanitize_integer(toggles, 0, (2**24)-1, initial(toggles)) + clientfps = sanitize_integer(clientfps, -1, 1000, 0) + parallax = sanitize_integer(parallax, PARALLAX_INSANE, PARALLAX_DISABLE, null) + ambientocclusion = sanitize_integer(ambientocclusion, FALSE, TRUE, initial(ambientocclusion)) + auto_fit_viewport = sanitize_integer(auto_fit_viewport, FALSE, TRUE, initial(auto_fit_viewport)) widescreenpref = sanitize_integer(widescreenpref, FALSE, TRUE, initial(widescreenpref)) - pixel_size = sanitize_float(pixel_size, PIXEL_SCALING_AUTO, PIXEL_SCALING_3X, 0.5, initial(pixel_size)) + pixel_size = sanitize_float(pixel_size, PIXEL_SCALING_AUTO, PIXEL_SCALING_3X, 0.5, initial(pixel_size)) scaling_method = sanitize_text(scaling_method, initial(scaling_method)) - ghost_form = sanitize_inlist(ghost_form, GLOB.ghost_forms, initial(ghost_form)) - ghost_orbit = sanitize_inlist(ghost_orbit, GLOB.ghost_orbits, initial(ghost_orbit)) - ghost_accs = sanitize_inlist(ghost_accs, GLOB.ghost_accs_options, GHOST_ACCS_DEFAULT_OPTION) - ghost_others = sanitize_inlist(ghost_others, GLOB.ghost_others_options, GHOST_OTHERS_DEFAULT_OPTION) - menuoptions = SANITIZE_LIST(menuoptions) - be_special = SANITIZE_LIST(be_special) - brief_outfit = sanitize_inlist(brief_outfit, subtypesof(/datum/outfit), null) - pda_style = sanitize_inlist(pda_style, GLOB.pda_styles, initial(pda_style)) - pda_color = sanitize_hexcolor(pda_color, 6, 1, initial(pda_color)) - key_bindings = sanitize_keybindings(key_bindings) + ghost_form = sanitize_inlist(ghost_form, GLOB.ghost_forms, initial(ghost_form)) + ghost_orbit = sanitize_inlist(ghost_orbit, GLOB.ghost_orbits, initial(ghost_orbit)) + ghost_accs = sanitize_inlist(ghost_accs, GLOB.ghost_accs_options, GHOST_ACCS_DEFAULT_OPTION) + ghost_others = sanitize_inlist(ghost_others, GLOB.ghost_others_options, GHOST_OTHERS_DEFAULT_OPTION) + menuoptions = SANITIZE_LIST(menuoptions) + be_special = SANITIZE_LIST(be_special) + brief_outfit = sanitize_inlist(brief_outfit, subtypesof(/datum/outfit), null) + pda_style = sanitize_inlist(pda_style, GLOB.pda_styles, initial(pda_style)) + pda_color = sanitize_hexcolor(pda_color, 6, 1, initial(pda_color)) + key_bindings = sanitize_keybindings(key_bindings) if(needs_update >= 0) //save the updated version var/old_default_slot = default_slot @@ -285,7 +285,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car return FALSE S.cd = "/" - WRITE_FILE(S["version"] , SAVEFILE_VERSION_MAX) //updates (or failing that the sanity checks) will ensure data is not invalid at load. Assume up-to-date + WRITE_FILE(S["version"] , SAVEFILE_VERSION_MAX) //updates (or failing that the sanity checks) will ensure data is not invalid at load. Assume up-to-date //general preferences WRITE_FILE(S["asaycolor"], asaycolor) @@ -350,7 +350,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car S.cd = "/character[slot]" var/needs_update = savefile_needs_update(S) - if(needs_update == -2) //fatal, can't load any data + if(needs_update == -2) //fatal, can't load any data return FALSE //Species @@ -422,7 +422,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car //try to fix any outdated data if necessary //preference updating will handle saving the updated data for us. if(needs_update >= 0) - update_character(needs_update, S) //needs_update == savefile_version if we need an update (positive integer) + update_character(needs_update, S) //needs_update == savefile_version if we need an update (positive integer) //Sanitize real_name = reject_bad_name(real_name) @@ -446,50 +446,50 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car randomise = SANITIZE_LIST(randomise) if(gender == MALE) - hairstyle = sanitize_inlist(hairstyle, GLOB.hairstyles_male_list) - facial_hairstyle = sanitize_inlist(facial_hairstyle, GLOB.facial_hairstyles_male_list) - underwear = sanitize_inlist(underwear, GLOB.underwear_m) - undershirt = sanitize_inlist(undershirt, GLOB.undershirt_m) + hairstyle = sanitize_inlist(hairstyle, GLOB.hairstyles_male_list) + facial_hairstyle = sanitize_inlist(facial_hairstyle, GLOB.facial_hairstyles_male_list) + underwear = sanitize_inlist(underwear, GLOB.underwear_m) + undershirt = sanitize_inlist(undershirt, GLOB.undershirt_m) else if(gender == FEMALE) - hairstyle = sanitize_inlist(hairstyle, GLOB.hairstyles_female_list) - facial_hairstyle = sanitize_inlist(facial_hairstyle, GLOB.facial_hairstyles_female_list) - underwear = sanitize_inlist(underwear, GLOB.underwear_f) - undershirt = sanitize_inlist(undershirt, GLOB.undershirt_f) + hairstyle = sanitize_inlist(hairstyle, GLOB.hairstyles_female_list) + facial_hairstyle = sanitize_inlist(facial_hairstyle, GLOB.facial_hairstyles_female_list) + underwear = sanitize_inlist(underwear, GLOB.underwear_f) + undershirt = sanitize_inlist(undershirt, GLOB.undershirt_f) else - hairstyle = sanitize_inlist(hairstyle, GLOB.hairstyles_list) - facial_hairstyle = sanitize_inlist(facial_hairstyle, GLOB.facial_hairstyles_list) - underwear = sanitize_inlist(underwear, GLOB.underwear_list) - undershirt = sanitize_inlist(undershirt, GLOB.undershirt_list) + hairstyle = sanitize_inlist(hairstyle, GLOB.hairstyles_list) + facial_hairstyle = sanitize_inlist(facial_hairstyle, GLOB.facial_hairstyles_list) + underwear = sanitize_inlist(underwear, GLOB.underwear_list) + undershirt = sanitize_inlist(undershirt, GLOB.undershirt_list) - socks = sanitize_inlist(socks, GLOB.socks_list) - age = sanitize_integer(age, AGE_MIN, AGE_MAX, initial(age)) - hair_color = sanitize_hexcolor(hair_color, 3, 0) - facial_hair_color = sanitize_hexcolor(facial_hair_color, 3, 0) - underwear_color = sanitize_hexcolor(underwear_color, 3, 0) - eye_color = sanitize_hexcolor(eye_color, 3, 0) - skin_tone = sanitize_inlist(skin_tone, GLOB.skin_tones) - backpack = sanitize_inlist(backpack, GLOB.backpacklist, initial(backpack)) - jumpsuit_style = sanitize_inlist(jumpsuit_style, GLOB.jumpsuitlist, initial(jumpsuit_style)) + socks = sanitize_inlist(socks, GLOB.socks_list) + age = sanitize_integer(age, AGE_MIN, AGE_MAX, initial(age)) + hair_color = sanitize_hexcolor(hair_color, 3, 0) + facial_hair_color = sanitize_hexcolor(facial_hair_color, 3, 0) + underwear_color = sanitize_hexcolor(underwear_color, 3, 0) + eye_color = sanitize_hexcolor(eye_color, 3, 0) + skin_tone = sanitize_inlist(skin_tone, GLOB.skin_tones) + backpack = sanitize_inlist(backpack, GLOB.backpacklist, initial(backpack)) + jumpsuit_style = sanitize_inlist(jumpsuit_style, GLOB.jumpsuitlist, initial(jumpsuit_style)) uplink_spawn_loc = sanitize_inlist(uplink_spawn_loc, GLOB.uplink_spawn_loc_list, initial(uplink_spawn_loc)) playtime_reward_cloak = sanitize_integer(playtime_reward_cloak) - features["mcolor"] = sanitize_hexcolor(features["mcolor"], 3, 0) - features["ethcolor"] = copytext_char(features["ethcolor"], 1, 7) - features["tail_lizard"] = sanitize_inlist(features["tail_lizard"], GLOB.tails_list_lizard) - features["tail_human"] = sanitize_inlist(features["tail_human"], GLOB.tails_list_human, "None") - features["snout"] = sanitize_inlist(features["snout"], GLOB.snouts_list) - features["horns"] = sanitize_inlist(features["horns"], GLOB.horns_list) - features["ears"] = sanitize_inlist(features["ears"], GLOB.ears_list, "None") - features["frills"] = sanitize_inlist(features["frills"], GLOB.frills_list) - features["spines"] = sanitize_inlist(features["spines"], GLOB.spines_list) - features["body_markings"] = sanitize_inlist(features["body_markings"], GLOB.body_markings_list) - features["feature_lizard_legs"] = sanitize_inlist(features["legs"], GLOB.legs_list, "Normal Legs") - features["moth_wings"] = sanitize_inlist(features["moth_wings"], GLOB.moth_wings_list, "Plain") - features["moth_antennae"] = sanitize_inlist(features["moth_antennae"], GLOB.moth_antennae_list, "Plain") - features["moth_markings"] = sanitize_inlist(features["moth_markings"], GLOB.moth_markings_list, "None") + features["mcolor"] = sanitize_hexcolor(features["mcolor"], 3, 0) + features["ethcolor"] = copytext_char(features["ethcolor"], 1, 7) + features["tail_lizard"] = sanitize_inlist(features["tail_lizard"], GLOB.tails_list_lizard) + features["tail_human"] = sanitize_inlist(features["tail_human"], GLOB.tails_list_human, "None") + features["snout"] = sanitize_inlist(features["snout"], GLOB.snouts_list) + features["horns"] = sanitize_inlist(features["horns"], GLOB.horns_list) + features["ears"] = sanitize_inlist(features["ears"], GLOB.ears_list, "None") + features["frills"] = sanitize_inlist(features["frills"], GLOB.frills_list) + features["spines"] = sanitize_inlist(features["spines"], GLOB.spines_list) + features["body_markings"] = sanitize_inlist(features["body_markings"], GLOB.body_markings_list) + features["feature_lizard_legs"] = sanitize_inlist(features["legs"], GLOB.legs_list, "Normal Legs") + features["moth_wings"] = sanitize_inlist(features["moth_wings"], GLOB.moth_wings_list, "Plain") + features["moth_antennae"] = sanitize_inlist(features["moth_antennae"], GLOB.moth_antennae_list, "Plain") + features["moth_markings"] = sanitize_inlist(features["moth_markings"], GLOB.moth_markings_list, "None") persistent_scars = sanitize_integer(persistent_scars) - joblessrole = sanitize_integer(joblessrole, 1, 3, initial(joblessrole)) + joblessrole = sanitize_integer(joblessrole, 1, 3, initial(joblessrole)) //Validate job prefs for(var/j in job_preferences) if(job_preferences[j] != JP_LOW && job_preferences[j] != JP_MEDIUM && job_preferences[j] != JP_HIGH) @@ -508,45 +508,45 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car return FALSE S.cd = "/character[default_slot]" - WRITE_FILE(S["version"] , SAVEFILE_VERSION_MAX) //load_character will sanitize any bad data, so assume up-to-date.) + WRITE_FILE(S["version"] , SAVEFILE_VERSION_MAX) //load_character will sanitize any bad data, so assume up-to-date.) //Character - WRITE_FILE(S["real_name"] , real_name) - WRITE_FILE(S["gender"] , gender) - WRITE_FILE(S["body_type"] , body_type) - WRITE_FILE(S["age"] , age) - WRITE_FILE(S["hair_color"] , hair_color) - WRITE_FILE(S["facial_hair_color"] , facial_hair_color) - WRITE_FILE(S["eye_color"] , eye_color) - WRITE_FILE(S["skin_tone"] , skin_tone) - WRITE_FILE(S["hairstyle_name"] , hairstyle) - WRITE_FILE(S["facial_style_name"] , facial_hairstyle) - WRITE_FILE(S["underwear"] , underwear) - WRITE_FILE(S["underwear_color"] , underwear_color) - WRITE_FILE(S["undershirt"] , undershirt) - WRITE_FILE(S["socks"] , socks) - WRITE_FILE(S["backpack"] , backpack) - WRITE_FILE(S["jumpsuit_style"] , jumpsuit_style) - WRITE_FILE(S["uplink_loc"] , uplink_spawn_loc) - WRITE_FILE(S["playtime_reward_cloak"] , playtime_reward_cloak) - WRITE_FILE(S["randomise"] , randomise) - WRITE_FILE(S["species"] , pref_species.id) + WRITE_FILE(S["real_name"] , real_name) + WRITE_FILE(S["gender"] , gender) + WRITE_FILE(S["body_type"] , body_type) + WRITE_FILE(S["age"] , age) + WRITE_FILE(S["hair_color"] , hair_color) + WRITE_FILE(S["facial_hair_color"] , facial_hair_color) + WRITE_FILE(S["eye_color"] , eye_color) + WRITE_FILE(S["skin_tone"] , skin_tone) + WRITE_FILE(S["hairstyle_name"] , hairstyle) + WRITE_FILE(S["facial_style_name"] , facial_hairstyle) + WRITE_FILE(S["underwear"] , underwear) + WRITE_FILE(S["underwear_color"] , underwear_color) + WRITE_FILE(S["undershirt"] , undershirt) + WRITE_FILE(S["socks"] , socks) + WRITE_FILE(S["backpack"] , backpack) + WRITE_FILE(S["jumpsuit_style"] , jumpsuit_style) + WRITE_FILE(S["uplink_loc"] , uplink_spawn_loc) + WRITE_FILE(S["playtime_reward_cloak"] , playtime_reward_cloak) + WRITE_FILE(S["randomise"] , randomise) + WRITE_FILE(S["species"] , pref_species.id) WRITE_FILE(S["phobia"], phobia) - WRITE_FILE(S["feature_mcolor"] , features["mcolor"]) - WRITE_FILE(S["feature_ethcolor"] , features["ethcolor"]) - WRITE_FILE(S["feature_lizard_tail"] , features["tail_lizard"]) - WRITE_FILE(S["feature_human_tail"] , features["tail_human"]) - WRITE_FILE(S["feature_lizard_snout"] , features["snout"]) - WRITE_FILE(S["feature_lizard_horns"] , features["horns"]) - WRITE_FILE(S["feature_human_ears"] , features["ears"]) - WRITE_FILE(S["feature_lizard_frills"] , features["frills"]) - WRITE_FILE(S["feature_lizard_spines"] , features["spines"]) - WRITE_FILE(S["feature_lizard_body_markings"] , features["body_markings"]) - WRITE_FILE(S["feature_lizard_legs"] , features["legs"]) - WRITE_FILE(S["feature_moth_wings"] , features["moth_wings"]) - WRITE_FILE(S["feature_moth_antennae"] , features["moth_antennae"]) - WRITE_FILE(S["feature_moth_markings"] , features["moth_markings"]) - WRITE_FILE(S["persistent_scars"] , persistent_scars) + WRITE_FILE(S["feature_mcolor"] , features["mcolor"]) + WRITE_FILE(S["feature_ethcolor"] , features["ethcolor"]) + WRITE_FILE(S["feature_lizard_tail"] , features["tail_lizard"]) + WRITE_FILE(S["feature_human_tail"] , features["tail_human"]) + WRITE_FILE(S["feature_lizard_snout"] , features["snout"]) + WRITE_FILE(S["feature_lizard_horns"] , features["horns"]) + WRITE_FILE(S["feature_human_ears"] , features["ears"]) + WRITE_FILE(S["feature_lizard_frills"] , features["frills"]) + WRITE_FILE(S["feature_lizard_spines"] , features["spines"]) + WRITE_FILE(S["feature_lizard_body_markings"] , features["body_markings"]) + WRITE_FILE(S["feature_lizard_legs"] , features["legs"]) + WRITE_FILE(S["feature_moth_wings"] , features["moth_wings"]) + WRITE_FILE(S["feature_moth_antennae"] , features["moth_antennae"]) + WRITE_FILE(S["feature_moth_markings"] , features["moth_markings"]) + WRITE_FILE(S["persistent_scars"] , persistent_scars) //Custom names for(var/custom_name_id in GLOB.preferences_custom_names) @@ -557,12 +557,12 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car WRITE_FILE(S["prefered_security_department"] , prefered_security_department) //Jobs - WRITE_FILE(S["joblessrole"] , joblessrole) + WRITE_FILE(S["joblessrole"] , joblessrole) //Write prefs WRITE_FILE(S["job_preferences"] , job_preferences) //Quirks - WRITE_FILE(S["all_quirks"] , all_quirks) + WRITE_FILE(S["all_quirks"] , all_quirks) return TRUE diff --git a/code/modules/client/verbs/ooc.dm b/code/modules/client/verbs/ooc.dm index 3e591487a9d..2a3f486d7a1 100644 --- a/code/modules/client/verbs/ooc.dm +++ b/code/modules/client/verbs/ooc.dm @@ -5,7 +5,7 @@ GLOBAL_VAR_INIT(normal_ooc_colour, "#002eb8") set name = "OOC" //Gave this shit a shorter name so you only have to time out "ooc" rather than "ooc message" to use it --NeoFite set category = "OOC" - if(GLOB.say_disabled) //This is here to try to identify lag problems + if(GLOB.say_disabled) //This is here to try to identify lag problems to_chat(usr, "Speech is currently admin-disabled.") return diff --git a/code/modules/client/verbs/suicide.dm b/code/modules/client/verbs/suicide.dm index bc6ce38f07d..7d9c86104a6 100644 --- a/code/modules/client/verbs/suicide.dm +++ b/code/modules/client/verbs/suicide.dm @@ -69,7 +69,7 @@ if(damagetype & OXYLOSS) adjustOxyLoss(200/damage_mod) - if(damagetype & MANUAL_SUICIDE) //Assume the object will handle the death. + if(damagetype & MANUAL_SUICIDE) //Assume the object will handle the death. return //If something went wrong, just do normal oxyloss @@ -77,7 +77,7 @@ adjustOxyLoss(max(200 - getToxLoss() - getFireLoss() - getBruteLoss() - getOxyLoss(), 0)) death(FALSE) - ghostize(FALSE) // Disallows reentering body and disassociates mind + ghostize(FALSE) // Disallows reentering body and disassociates mind return @@ -108,7 +108,7 @@ adjustOxyLoss(max(200 - getToxLoss() - getFireLoss() - getBruteLoss() - getOxyLoss(), 0)) death(FALSE) - ghostize(FALSE) // Disallows reentering body and disassociates mind + ghostize(FALSE) // Disallows reentering body and disassociates mind /mob/living/brain/verb/suicide() set hidden = TRUE @@ -125,7 +125,7 @@ suicide_log() death(FALSE) - ghostize(FALSE) // Disallows reentering body and disassociates mind + ghostize(FALSE) // Disallows reentering body and disassociates mind /mob/living/silicon/ai/verb/suicide() set hidden = TRUE @@ -144,7 +144,7 @@ //put em at -175 adjustOxyLoss(max(maxHealth * 2 - getToxLoss() - getFireLoss() - getBruteLoss() - getOxyLoss(), 0)) death(FALSE) - ghostize(FALSE) // Disallows reentering body and disassociates mind + ghostize(FALSE) // Disallows reentering body and disassociates mind /mob/living/silicon/robot/verb/suicide() set hidden = TRUE @@ -163,7 +163,7 @@ //put em at -175 adjustOxyLoss(max(maxHealth * 2 - getToxLoss() - getFireLoss() - getBruteLoss() - getOxyLoss(), 0)) death(FALSE) - ghostize(FALSE) // Disallows reentering body and disassociates mind + ghostize(FALSE) // Disallows reentering body and disassociates mind /mob/living/silicon/pai/verb/suicide() set hidden = TRUE @@ -176,7 +176,7 @@ suicide_log() death(FALSE) - ghostize(FALSE) // Disallows reentering body and disassociates mind + ghostize(FALSE) // Disallows reentering body and disassociates mind else to_chat(src, "Aborting suicide attempt.") @@ -198,7 +198,7 @@ //put em at -175 adjustOxyLoss(max(200 - getFireLoss() - getBruteLoss() - getOxyLoss(), 0)) death(FALSE) - ghostize(FALSE) // Disallows reentering body and disassociates mind + ghostize(FALSE) // Disallows reentering body and disassociates mind /mob/living/simple_animal/verb/suicide() set hidden = TRUE @@ -244,7 +244,7 @@ /mob/living/carbon/canSuicide() if(!..()) return - if(!(mobility_flags & MOBILITY_USE)) //just while I finish up the new 'fun' suiciding verb. This is to prevent metagaming via suicide + if(!(mobility_flags & MOBILITY_USE)) //just while I finish up the new 'fun' suiciding verb. This is to prevent metagaming via suicide to_chat(src, "You can't commit suicide whilst immobile! ((You can type Ghost instead however.))") return return TRUE diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 293c730ade4..dc2c1c4aee3 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -9,11 +9,11 @@ ///What level of bright light protection item has. var/flash_protect = FLASH_PROTECTION_NONE - var/tint = 0 //Sets the item's level of visual impairment tint, normally set to the same as flash_protect - var/up = 0 //but separated to allow items to protect but not impair vision, like space helmets - var/visor_flags = 0 //flags that are added/removed when an item is adjusted up/down - var/visor_flags_inv = 0 //same as visor_flags, but for flags_inv - var/visor_flags_cover = 0 //same as above, but for flags_cover + var/tint = 0 //Sets the item's level of visual impairment tint, normally set to the same as flash_protect + var/up = 0 //but separated to allow items to protect but not impair vision, like space helmets + var/visor_flags = 0 //flags that are added/removed when an item is adjusted up/down + var/visor_flags_inv = 0 //same as visor_flags, but for flags_inv + var/visor_flags_cover = 0 //same as above, but for flags_cover //what to toggle when toggled with weldingvisortoggle() var/visor_vars_to_toggle = VISOR_FLASHPROTECT | VISOR_TINT | VISOR_VISIONFLAGS | VISOR_DARKNESSVIEW | VISOR_INVISVIEW lefthand_file = 'icons/mob/inhands/clothing_lefthand.dmi' @@ -171,7 +171,7 @@ /** * take_damage_zone() is used for dealing damage to specific bodyparts on a worn piece of clothing, meant to be called from [/obj/item/bodypart/proc/check_woundings_mods] * - * This proc only matters when a bodypart that this clothing is covering is harmed by a direct attack (being on fire or in space need not apply), and only if this clothing covers + * This proc only matters when a bodypart that this clothing is covering is harmed by a direct attack (being on fire or in space need not apply), and only if this clothing covers * more than one bodypart to begin with. No point in tracking damage by zone for a hat, and I'm not cruel enough to let you fully break them in a few shots. * Also if limb_integrity is 0, then this clothing doesn't have bodypart damage enabled so skip it. * @@ -416,8 +416,8 @@ var/static/list/damaged_clothes_icons = list() var/icon/damaged_clothes_icon = damaged_clothes_icons[index] if(!damaged_clothes_icon) - damaged_clothes_icon = icon(initial(icon), initial(icon_state), , 1) //we only want to apply damaged effect to the initial icon_state for each object - damaged_clothes_icon.Blend("#fff", ICON_ADD) //fills the icon_state with white (except where it's transparent) + damaged_clothes_icon = icon(initial(icon), initial(icon_state), , 1) //we only want to apply damaged effect to the initial icon_state for each object + damaged_clothes_icon.Blend("#fff", ICON_ADD) //fills the icon_state with white (except where it's transparent) damaged_clothes_icon.Blend(icon('icons/effects/item_damage.dmi', "itemdamaged"), ICON_MULTIPLY) //adds damage effect and the remaining white areas become transparant damaged_clothes_icon = fcopy_rsc(damaged_clothes_icon) damaged_clothes_icons[index] = damaged_clothes_icon @@ -434,10 +434,10 @@ BLIND // can't see anything */ /proc/generate_female_clothing(index,t_color,icon,type) - var/icon/female_clothing_icon = icon("icon"=icon, "icon_state"=t_color) - var/icon/female_s = icon("icon"='icons/mob/clothing/under/masking_helpers.dmi', "icon_state"="[(type == FEMALE_UNIFORM_FULL) ? "female_full" : "female_top"]") + var/icon/female_clothing_icon = icon("icon"=icon, "icon_state"=t_color) + var/icon/female_s = icon("icon"='icons/mob/clothing/under/masking_helpers.dmi', "icon_state"="[(type == FEMALE_UNIFORM_FULL) ? "female_full" : "female_top"]") female_clothing_icon.Blend(female_s, ICON_MULTIPLY) - female_clothing_icon = fcopy_rsc(female_clothing_icon) + female_clothing_icon = fcopy_rsc(female_clothing_icon) GLOB.female_clothing_icons[index] = female_clothing_icon /obj/item/clothing/proc/weldingvisortoggle(mob/user) //proc to toggle welding visors on helmets, masks, goggles, etc. diff --git a/code/modules/clothing/glasses/_glasses.dm b/code/modules/clothing/glasses/_glasses.dm index 9f69d07509b..cd2e2b3a23c 100644 --- a/code/modules/clothing/glasses/_glasses.dm +++ b/code/modules/clothing/glasses/_glasses.dm @@ -11,7 +11,7 @@ custom_materials = list(/datum/material/glass = 250) var/vision_flags = 0 var/darkness_view = 2//Base human is 2 - var/invis_view = SEE_INVISIBLE_LIVING //admin only for now + var/invis_view = SEE_INVISIBLE_LIVING //admin only for now var/invis_override = 0 //Override to allow glasses to set higher than normal see_invis var/lighting_alpha var/list/icon/current = list() //the current hud icons @@ -385,7 +385,7 @@ desc = "A pair of xray goggles manufactured by the Syndicate." vision_flags = SEE_TURFS|SEE_MOBS|SEE_OBJS -/obj/item/clothing/glasses/thermal/syndi //These are now a traitor item, concealed as mesons. -Pete +/obj/item/clothing/glasses/thermal/syndi //These are now a traitor item, concealed as mesons. -Pete name = "chameleon thermals" desc = "A pair of thermal optic goggles with an onboard chameleon generator." special_desc_requirement = EXAMINE_CHECK_SYNDICATE // SKYRAT EDIT diff --git a/code/modules/clothing/glasses/engine_goggles.dm b/code/modules/clothing/glasses/engine_goggles.dm index e37ad48eabc..bc5dcbeec43 100644 --- a/code/modules/clothing/glasses/engine_goggles.dm +++ b/code/modules/clothing/glasses/engine_goggles.dm @@ -101,7 +101,7 @@ for(var/i in rad_places) var/turf/place = i - if(get_dist(user, place) >= range*5) //Rads are easier to see than wires under the floor + if(get_dist(user, place) >= range*5) //Rads are easier to see than wires under the floor continue var/strength = round(rad_places[i] / 1000, 0.1) var/image/pic = image(loc = place) diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm index b0610642f2c..0621bb44457 100644 --- a/code/modules/clothing/gloves/color.dm +++ b/code/modules/clothing/gloves/color.dm @@ -65,7 +65,7 @@ name = "budget insulated gloves" icon_state = "yellow" inhand_icon_state = "ygloves" - siemens_coefficient = 1 //Set to a default of 1, gets overridden in Initialize() + siemens_coefficient = 1 //Set to a default of 1, gets overridden in Initialize() permeability_coefficient = 0.05 resistance_flags = NONE cut_type = /obj/item/clothing/gloves/cut diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index 9a0aec75315..95e0315a93b 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -1,8 +1,8 @@ //defines the drill hat's yelling setting -#define DRILL_DEFAULT "default" -#define DRILL_SHOUTING "shouting" -#define DRILL_YELLING "yelling" -#define DRILL_CANADIAN "canadian" +#define DRILL_DEFAULT "default" +#define DRILL_SHOUTING "shouting" +#define DRILL_YELLING "yelling" +#define DRILL_CANADIAN "canadian" //Chef /obj/item/clothing/head/chefhat diff --git a/code/modules/clothing/head/misc_special.dm b/code/modules/clothing/head/misc_special.dm index d24a71bbcfb..e1f52c61e6e 100644 --- a/code/modules/clothing/head/misc_special.dm +++ b/code/modules/clothing/head/misc_special.dm @@ -1,13 +1,13 @@ /* * Contents: - * Welding mask - * Cakehat - * Ushanka - * Pumpkin head - * Kitty ears - * Cardborg disguise - * Wig - * Bronze hat + * Welding mask + * Cakehat + * Ushanka + * Pumpkin head + * Kitty ears + * Cardborg disguise + * Wig + * Bronze hat */ /* @@ -217,7 +217,7 @@ /obj/item/clothing/head/wig name = "wig" desc = "A bunch of hair without a head attached." - icon = 'icons/mob/human_face.dmi' // default icon for all hairs + icon = 'icons/mob/human_face.dmi' // default icon for all hairs icon_state = "hair_vlong" inhand_icon_state = "pwig" worn_icon_state = "wig" diff --git a/code/modules/clothing/head/soft_caps.dm b/code/modules/clothing/head/soft_caps.dm index 2f49cabc025..2f84d6bb942 100644 --- a/code/modules/clothing/head/soft_caps.dm +++ b/code/modules/clothing/head/soft_caps.dm @@ -36,7 +36,7 @@ else icon_state = "[soft_type]soft" to_chat(user, "You flip the hat back in normal position.") - usr.update_inv_head() //so our mob-overlays update + usr.update_inv_head() //so our mob-overlays update /obj/item/clothing/head/soft/examine(mob/user) . = ..() diff --git a/code/modules/clothing/masks/boxing.dm b/code/modules/clothing/masks/boxing.dm index fbd73dd22e7..861dd961b9e 100644 --- a/code/modules/clothing/masks/boxing.dm +++ b/code/modules/clothing/masks/boxing.dm @@ -71,7 +71,7 @@ message = replacetext(message, "library", "biblioteca") message = replacetext(message, "traitor", "traidor") message = replacetext(message, "wizard", "mago") - message = uppertext(message) //Things end up looking better this way (no mixed cases), and it fits the macho wrestler image. + message = uppertext(message) //Things end up looking better this way (no mixed cases), and it fits the macho wrestler image. if(prob(25)) message += " OLE!" speech_args[SPEECH_MESSAGE] = message diff --git a/code/modules/clothing/masks/hailer.dm b/code/modules/clothing/masks/hailer.dm index 273f32b7ce7..7fe8b6b4f91 100644 --- a/code/modules/clothing/masks/hailer.dm +++ b/code/modules/clothing/masks/hailer.dm @@ -2,21 +2,21 @@ // **** Security gas mask **** // Cooldown times -#define PHRASE_COOLDOWN 30 -#define OVERUSE_COOLDOWN 180 +#define PHRASE_COOLDOWN 30 +#define OVERUSE_COOLDOWN 180 // Aggression levels -#define AGGR_GOOD_COP 1 -#define AGGR_BAD_COP 2 -#define AGGR_SHIT_COP 3 -#define AGGR_BROKEN 4 +#define AGGR_GOOD_COP 1 +#define AGGR_BAD_COP 2 +#define AGGR_SHIT_COP 3 +#define AGGR_BROKEN 4 // Phrase list index markers -#define EMAG_PHRASE 1 // index of emagged phrase -#define GOOD_COP_PHRASES 6 // final index of good cop phrases -#define BAD_COP_PHRASES 12 // final index of bad cop phrases -#define BROKE_PHRASES 13 // starting index of broken phrases -#define ALL_PHRASES 19 // total phrases +#define EMAG_PHRASE 1 // index of emagged phrase +#define GOOD_COP_PHRASES 6 // final index of good cop phrases +#define BAD_COP_PHRASES 12 // final index of bad cop phrases +#define BROKE_PHRASES 13 // starting index of broken phrases +#define ALL_PHRASES 19 // total phrases // All possible hailer phrases // Remember to modify above index markers if changing contents diff --git a/code/modules/clothing/neck/_neck.dm b/code/modules/clothing/neck/_neck.dm index b2a1dcb88f1..bba3309f90c 100644 --- a/code/modules/clothing/neck/_neck.dm +++ b/code/modules/clothing/neck/_neck.dm @@ -20,7 +20,7 @@ desc = "A neosilk clip-on tie." icon = 'icons/obj/clothing/neck.dmi' icon_state = "bluetie" - inhand_icon_state = "" //no inhands + inhand_icon_state = "" //no inhands w_class = WEIGHT_CLASS_SMALL custom_price = PAYCHECK_EASY diff --git a/code/modules/clothing/shoes/magboots.dm b/code/modules/clothing/shoes/magboots.dm index c3ea63da314..28631ea9ce3 100644 --- a/code/modules/clothing/shoes/magboots.dm +++ b/code/modules/clothing/shoes/magboots.dm @@ -30,7 +30,7 @@ magpulse = !magpulse icon_state = "[magboot_state][magpulse]" to_chat(user, "You [magpulse ? "enable" : "disable"] the mag-pulse traction system.") - user.update_inv_shoes() //so our mob-overlays update + user.update_inv_shoes() //so our mob-overlays update user.update_gravity(user.has_gravity()) user.update_equipment_speed_mods() //we want to update our speed so we arent running at max speed in regular magboots for(var/X in actions) diff --git a/code/modules/clothing/spacesuits/_spacesuits.dm b/code/modules/clothing/spacesuits/_spacesuits.dm index 0ba58085462..8b748ce21da 100644 --- a/code/modules/clothing/spacesuits/_spacesuits.dm +++ b/code/modules/clothing/spacesuits/_spacesuits.dm @@ -61,7 +61,7 @@ . = ..() if(slot == ITEM_SLOT_OCLOTHING) // Check that the slot is valid START_PROCESSING(SSobj, src) - update_hud_icon(user) // update the hud + update_hud_icon(user) // update the hud // On removal stop processing, save battery /obj/item/clothing/suit/space/dropped(mob/user) diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm index 6f2eb47f2c8..735b84c8204 100644 --- a/code/modules/clothing/spacesuits/hardsuit.dm +++ b/code/modules/clothing/spacesuits/hardsuit.dm @@ -18,7 +18,7 @@ var/obj/item/clothing/suit/space/hardsuit/suit var/hardsuit_type = "engineering" //Determines used sprites: hardsuit[on]-[type] actions_types = list(/datum/action/item_action/toggle_helmet_light) - flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH | PEPPERPROOF + flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH | PEPPERPROOF visor_flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH | PEPPERPROOF var/current_tick_amount = 0 var/radiation_count = 0 @@ -38,7 +38,7 @@ /obj/item/clothing/head/helmet/space/hardsuit/attack_self(mob/user) on = !on icon_state = "[basestate][on]-[hardsuit_type]" - user.update_inv_head() //so our mob-overlays update + user.update_inv_head() //so our mob-overlays update set_light_on(on) @@ -231,7 +231,7 @@ inhand_icon_state = "atmo_helm" hardsuit_type = "atmospherics" armor = list(MELEE = 30, BULLET = 5, LASER = 10, ENERGY = 20, BOMB = 10, BIO = 100, RAD = 25, FIRE = 100, ACID = 75, WOUND = 10) - heat_protection = HEAD //Uncomment to enable firesuit protection + heat_protection = HEAD //Uncomment to enable firesuit protection max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT /obj/item/clothing/suit/space/hardsuit/engine/atmos @@ -240,7 +240,7 @@ icon_state = "hardsuit-atmospherics" inhand_icon_state = "atmo_hardsuit" armor = list(MELEE = 30, BULLET = 5, LASER = 10, ENERGY = 20, BOMB = 10, BIO = 100, RAD = 25, FIRE = 100, ACID = 75, WOUND = 10) - heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS //Uncomment to enable firesuit protection + heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS //Uncomment to enable firesuit protection max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT helmettype = /obj/item/clothing/head/helmet/space/hardsuit/engine/atmos @@ -505,7 +505,7 @@ hardsuit_type = "wiz" resistance_flags = FIRE_PROOF | ACID_PROOF //No longer shall our kind be foiled by lone chemists with spray bottles! armor = list(MELEE = 40, BULLET = 40, LASER = 40, ENERGY = 50, BOMB = 35, BIO = 100, RAD = 50, FIRE = 100, ACID = 100, WOUND = 30) - heat_protection = HEAD //Uncomment to enable firesuit protection + heat_protection = HEAD //Uncomment to enable firesuit protection max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT /obj/item/clothing/suit/space/hardsuit/wizard @@ -517,7 +517,7 @@ resistance_flags = FIRE_PROOF | ACID_PROOF armor = list(MELEE = 40, BULLET = 40, LASER = 40, ENERGY = 50, BOMB = 35, BIO = 100, RAD = 50, FIRE = 100, ACID = 100, WOUND = 30) allowed = list(/obj/item/teleportation_scroll, /obj/item/tank/internals) - heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS //Uncomment to enable firesuit protection + heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS //Uncomment to enable firesuit protection max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT helmettype = /obj/item/clothing/head/helmet/space/hardsuit/wizard cell = /obj/item/stock_parts/cell/hyper diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm index 3d4060f7608..b6b921f8f2a 100644 --- a/code/modules/clothing/spacesuits/miscellaneous.dm +++ b/code/modules/clothing/spacesuits/miscellaneous.dm @@ -310,7 +310,7 @@ Contains: desc = "Spaceworthy and it looks like a space carp's head, smells like one too." icon_state = "carp_helm" inhand_icon_state = "syndicate" - armor = list(MELEE = -20, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 100, RAD = 75, FIRE = 60, ACID = 75) //As whimpy as a space carp + armor = list(MELEE = -20, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 100, RAD = 75, FIRE = 60, ACID = 75) //As whimpy as a space carp light_system = NO_LIGHT_SUPPORT light_range = 0 //luminosity when on actions_types = list() @@ -325,9 +325,9 @@ Contains: desc = "A slimming piece of dubious space carp technology, you suspect it won't stand up to hand-to-hand blows." icon_state = "carp_suit" inhand_icon_state = "space_suit_syndicate" - slowdown = 0 //Space carp magic, never stop believing + slowdown = 0 //Space carp magic, never stop believing armor = list(MELEE = -20, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 100, RAD = 75, FIRE = 60, ACID = 75) //As whimpy whimpy whoo - allowed = list(/obj/item/tank/internals, /obj/item/gun/ballistic/rifle/boltaction/harpoon) //I'm giving you a hint here + allowed = list(/obj/item/tank/internals, /obj/item/gun/ballistic/rifle/boltaction/harpoon) //I'm giving you a hint here helmettype = /obj/item/clothing/head/helmet/space/hardsuit/carp /obj/item/clothing/head/helmet/space/hardsuit/carp/equipped(mob/living/carbon/human/user, slot) diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 09e7d4cec7a..ec5339d8e63 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -234,7 +234,7 @@ /obj/item/clothing/suit/armor/tdome/green name = "thunderdome suit" - desc = "Pukish armor." //classy. + desc = "Pukish armor." //classy. icon_state = "tdgreen" inhand_icon_state = "tdgreen" diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index 0423b87460c..b7523cea88c 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -1,8 +1,8 @@ /* * Contains: - * Lasertag - * Costume - * Misc + * Lasertag + * Costume + * Misc */ /* @@ -261,7 +261,7 @@ inhand_icon_state = "labcoat" body_parts_covered = CHEST|GROIN|ARMS cold_protection = CHEST|GROIN|ARMS - min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT //Space carp like space, so you should too + min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT //Space carp like space, so you should too allowed = list(/obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/gun/ballistic/rifle/boltaction/harpoon) hoodtype = /obj/item/clothing/head/hooded/carp_hood @@ -284,7 +284,7 @@ if (user.head == src) user.faction -= "carp" -/obj/item/clothing/suit/hooded/ian_costume //It's Ian, rub his bell- oh god what happened to his inside parts? +/obj/item/clothing/suit/hooded/ian_costume //It's Ian, rub his bell- oh god what happened to his inside parts? name = "corgi costume" desc = "A costume that looks like someone made a human-like corgi, it won't guarantee belly rubs." icon_state = "ian" @@ -323,7 +323,7 @@ flags_inv = HIDEHAIR|HIDEEARS dynamic_hair_suffix = "" -/obj/item/clothing/suit/hooded/bloated_human //OH MY GOD WHAT HAVE YOU DONE!?!?!? +/obj/item/clothing/suit/hooded/bloated_human //OH MY GOD WHAT HAVE YOU DONE!?!?!? name = "bloated human suit" desc = "A horribly bloated suit made from human skins." icon_state = "lingspacesuit" diff --git a/code/modules/clothing/suits/reactive_armour.dm b/code/modules/clothing/suits/reactive_armour.dm index efa70c5b271..835349add6a 100644 --- a/code/modules/clothing/suits/reactive_armour.dm +++ b/code/modules/clothing/suits/reactive_armour.dm @@ -8,9 +8,9 @@ /obj/item/reactive_armour_shell/attackby(obj/item/I, mob/user, params) ..() var/static/list/anomaly_armour_types = list( - /obj/effect/anomaly/grav = /obj/item/clothing/suit/armor/reactive/repulse, - /obj/effect/anomaly/flux = /obj/item/clothing/suit/armor/reactive/tesla, - /obj/effect/anomaly/bluespace = /obj/item/clothing/suit/armor/reactive/teleport + /obj/effect/anomaly/grav = /obj/item/clothing/suit/armor/reactive/repulse, + /obj/effect/anomaly/flux = /obj/item/clothing/suit/armor/reactive/tesla, + /obj/effect/anomaly/bluespace = /obj/item/clothing/suit/armor/reactive/teleport ) if(istype(I, /obj/item/assembly/signaler/anomaly)) diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm index 5ac587d75fa..001732ae5d8 100644 --- a/code/modules/clothing/suits/utility.dm +++ b/code/modules/clothing/suits/utility.dm @@ -1,8 +1,8 @@ /* * Contains: - * Fire protection - * Bomb protection - * Radiation protection + * Fire protection + * Bomb protection + * Radiation protection */ /* diff --git a/code/modules/clothing/under/accessories.dm b/code/modules/clothing/under/accessories.dm index b95d875864c..62d06a41da7 100755 --- a/code/modules/clothing/under/accessories.dm +++ b/code/modules/clothing/under/accessories.dm @@ -3,7 +3,7 @@ desc = "Something has gone wrong!" icon = 'icons/obj/clothing/accessories.dmi' icon_state = "plasma" - inhand_icon_state = "" //no inhands + inhand_icon_state = "" //no inhands slot_flags = 0 w_class = WEIGHT_CLASS_SMALL var/above_suit = FALSE @@ -29,13 +29,13 @@ layer = FLOAT_LAYER plane = FLOAT_PLANE if(minimize_when_attached) - transform *= 0.5 //halve the size so it doesn't overpower the under + transform *= 0.5 //halve the size so it doesn't overpower the under pixel_x += 8 pixel_y -= 8 U.add_overlay(src) - if (islist(U.armor) || isnull(U.armor)) // This proc can run before /obj/Initialize has run for U and src, - U.armor = getArmor(arglist(U.armor)) // we have to check that the armor list has been transformed into a datum before we try to call a proc on it + if (islist(U.armor) || isnull(U.armor)) // This proc can run before /obj/Initialize has run for U and src, + U.armor = getArmor(arglist(U.armor)) // we have to check that the armor list has been transformed into a datum before we try to call a proc on it // This is safe to do as /obj/Initialize only handles setting up the datum if actually needed. if (islist(armor) || isnull(armor)) armor = getArmor(arglist(armor)) diff --git a/code/modules/clothing/under/color.dm b/code/modules/clothing/under/color.dm index f4f62d6b0d0..b705b014b37 100644 --- a/code/modules/clothing/under/color.dm +++ b/code/modules/clothing/under/color.dm @@ -23,7 +23,7 @@ return INITIALIZE_HINT_QDEL /obj/item/clothing/under/color/jumpskirt/random - icon_state = "random_jumpsuit" //Skirt variant needed + icon_state = "random_jumpsuit" //Skirt variant needed /obj/item/clothing/under/color/jumpskirt/random/Initialize() ..() diff --git a/code/modules/clothing/under/jobs/security.dm b/code/modules/clothing/under/jobs/security.dm index 5cab587f8dc..1716cb67d78 100644 --- a/code/modules/clothing/under/jobs/security.dm +++ b/code/modules/clothing/under/jobs/security.dm @@ -1,8 +1,8 @@ /* * Contains: - * Security - * Detective - * Navy uniforms + * Security + * Detective + * Navy uniforms */ /* diff --git a/code/modules/detectivework/detective_work.dm b/code/modules/detectivework/detective_work.dm index 98df8ad72d9..57e8e0c3a81 100644 --- a/code/modules/detectivework/detective_work.dm +++ b/code/modules/detectivework/detective_work.dm @@ -25,7 +25,7 @@ if(D) . = D.fibers -/atom/proc/add_fingerprint_list(list/fingerprints) //ASSOC LIST FINGERPRINT = FINGERPRINT +/atom/proc/add_fingerprint_list(list/fingerprints) //ASSOC LIST FINGERPRINT = FINGERPRINT if(length(fingerprints)) . = AddComponent(/datum/component/forensics, fingerprints) @@ -34,7 +34,7 @@ var/datum/component/forensics/D = AddComponent(/datum/component/forensics) . = D.add_fingerprint(M, ignoregloves) -/atom/proc/add_fiber_list(list/fibertext) //ASSOC LIST FIBERTEXT = FIBERTEXT +/atom/proc/add_fiber_list(list/fibertext) //ASSOC LIST FIBERTEXT = FIBERTEXT if(length(fibertext)) . = AddComponent(/datum/component/forensics, null, null, null, fibertext) @@ -53,7 +53,7 @@ var/datum/component/forensics/D = AddComponent(/datum/component/forensics) . = D.add_fibers(M) -/atom/proc/add_hiddenprint_list(list/hiddenprints) //NOTE: THIS IS FOR ADMINISTRATION FINGERPRINTS, YOU MUST CUSTOM SET THIS TO INCLUDE CKEY/REAL NAMES! CHECK FORENSICS.DM +/atom/proc/add_hiddenprint_list(list/hiddenprints) //NOTE: THIS IS FOR ADMINISTRATION FINGERPRINTS, YOU MUST CUSTOM SET THIS TO INCLUDE CKEY/REAL NAMES! CHECK FORENSICS.DM if(length(hiddenprints)) . = AddComponent(/datum/component/forensics, null, hiddenprints) @@ -61,7 +61,7 @@ var/datum/component/forensics/D = AddComponent(/datum/component/forensics) . = D.add_hiddenprint(M) -/atom/proc/add_blood_DNA(list/dna) //ASSOC LIST DNA = BLOODTYPE +/atom/proc/add_blood_DNA(list/dna) //ASSOC LIST DNA = BLOODTYPE return FALSE /obj/add_blood_DNA(list/dna) @@ -93,7 +93,7 @@ else if(length(blood_dna)) AddComponent(/datum/component/forensics, null, null, blood_dna) blood_in_hands = rand(2, 4) - update_inv_gloves() //handles bloody hands overlays and updating + update_inv_gloves() //handles bloody hands overlays and updating return TRUE /atom/proc/transfer_fingerprints_to(atom/A) diff --git a/code/modules/detectivework/evidence.dm b/code/modules/detectivework/evidence.dm index 1e0c5df0c3d..10f267be2ce 100644 --- a/code/modules/detectivework/evidence.dm +++ b/code/modules/detectivework/evidence.dm @@ -30,7 +30,7 @@ if(SEND_SIGNAL(loc, COMSIG_CONTAINS_STORAGE) && SEND_SIGNAL(I, COMSIG_CONTAINS_STORAGE)) to_chat(user, "No matter what way you try, you can't get [I] to fit inside [src].") - return TRUE //begone infinite storage ghosts, begone from me + return TRUE //begone infinite storage ghosts, begone from me if(istype(I, /obj/item/evidencebag)) to_chat(user, "You find putting an evidence bag in another evidence bag to be slightly absurd.") @@ -49,7 +49,7 @@ return if(!isturf(I.loc)) //If it isn't on the floor. Do some checks to see if it's in our hands or a box. Otherwise give up. - if(SEND_SIGNAL(I.loc, COMSIG_CONTAINS_STORAGE)) //in a container. + if(SEND_SIGNAL(I.loc, COMSIG_CONTAINS_STORAGE)) //in a container. SEND_SIGNAL(I.loc, COMSIG_TRY_STORAGE_TAKE, I, src) if(!user.dropItemToGround(I)) return @@ -65,7 +65,7 @@ in_evidence.pixel_x = 0 in_evidence.pixel_y = 0 add_overlay(in_evidence) - add_overlay("evidence") //should look nicer for transparent stuff. not really that important, but hey. + add_overlay("evidence") //should look nicer for transparent stuff. not really that important, but hey. desc = "An evidence bag containing [I]. [I.desc]" I.forceMove(src) @@ -77,7 +77,7 @@ var/obj/item/I = contents[1] user.visible_message("[user] takes [I] out of [src].", "You take [I] out of [src].",\ "You hear someone rustle around in a plastic bag, and remove something.") - cut_overlays() //remove the overlays + cut_overlays() //remove the overlays user.put_in_hands(I) w_class = WEIGHT_CLASS_TINY icon_state = "evidenceobj" diff --git a/code/modules/events/_event.dm b/code/modules/events/_event.dm index 89e7bc8da11..fff0ffadbef 100644 --- a/code/modules/events/_event.dm +++ b/code/modules/events/_event.dm @@ -1,30 +1,30 @@ //this singleton datum is used by the events controller to dictate how it selects events /datum/round_event_control - var/name //The human-readable name of the event - var/typepath //The typepath of the event datum /datum/round_event + var/name //The human-readable name of the event + var/typepath //The typepath of the event datum /datum/round_event - var/weight = 10 //The weight this event has in the random-selection process. + var/weight = 10 //The weight this event has in the random-selection process. //Higher weights are more likely to be picked. //10 is the default weight. 20 is twice more likely; 5 is half as likely as this default. //0 here does NOT disable the event, it just makes it extremely unlikely - var/earliest_start = 20 MINUTES //The earliest world.time that an event can start (round-duration in deciseconds) default: 20 mins - var/min_players = 0 //The minimum amount of alive, non-AFK human players on server required to start the event. + var/earliest_start = 20 MINUTES //The earliest world.time that an event can start (round-duration in deciseconds) default: 20 mins + var/min_players = 0 //The minimum amount of alive, non-AFK human players on server required to start the event. - var/occurrences = 0 //How many times this event has occured - var/max_occurrences = 20 //The maximum number of times this event can occur (naturally), it can still be forced. + var/occurrences = 0 //How many times this event has occured + var/max_occurrences = 20 //The maximum number of times this event can occur (naturally), it can still be forced. //By setting this to 0 you can effectively disable an event. - var/holidayID = "" //string which should be in the SSeventss.holidays list if you wish this event to be holiday-specific + var/holidayID = "" //string which should be in the SSeventss.holidays list if you wish this event to be holiday-specific //anything with a (non-null) holidayID which does not match holiday, cannot run. var/wizardevent = FALSE - var/alert_observers = TRUE //should we let the ghosts and admins know this event is firing + var/alert_observers = TRUE //should we let the ghosts and admins know this event is firing //should be disabled on events that fire a lot var/list/gamemode_blacklist = list() // Event won't happen in these gamemodes var/list/gamemode_whitelist = list() // Event will happen ONLY in these gamemodes if not empty - var/triggering //admin cancellation + var/triggering //admin cancellation /datum/round_event_control/New() if(config && !wizardevent) // Magic is unaffected by configs @@ -74,7 +74,7 @@ return EVENT_INTERRUPTED if(!triggering) - return EVENT_CANCELLED //admin cancelled + return EVENT_CANCELLED //admin cancelled triggering = FALSE return EVENT_READY @@ -107,18 +107,18 @@ /datum/round_event_control/proc/admin_setup() return -/datum/round_event //NOTE: Times are measured in master controller ticks! +/datum/round_event //NOTE: Times are measured in master controller ticks! var/processing = TRUE var/datum/round_event_control/control - var/startWhen = 0 //When in the lifetime to call start(). - var/announceWhen = 0 //When in the lifetime to call announce(). If you don't want it to announce use announceChance, below. - var/announceChance = 100 // Probability of announcing, used in prob(), 0 to 100, default 100. Used in ion storms currently. - var/endWhen = 0 //When in the lifetime the event should end. + var/startWhen = 0 //When in the lifetime to call start(). + var/announceWhen = 0 //When in the lifetime to call announce(). If you don't want it to announce use announceChance, below. + var/announceChance = 100 // Probability of announcing, used in prob(), 0 to 100, default 100. Used in ion storms currently. + var/endWhen = 0 //When in the lifetime the event should end. - var/activeFor = 0 //How long the event has existed. You don't need to change this. - var/current_players = 0 //Amount of of alive, non-AFK human players on server at the time of event start - var/fakeable = TRUE //Can be faked by fake news event. + var/activeFor = 0 //How long the event has existed. You don't need to change this. + var/current_players = 0 //Amount of of alive, non-AFK human players on server at the time of event start + var/fakeable = TRUE //Can be faked by fake news event. //Called first before processing. //Allows you to setup your event, such as randomly diff --git a/code/modules/events/alien_infestation.dm b/code/modules/events/alien_infestation.dm index bb5484cfdcb..e34d2cece49 100644 --- a/code/modules/events/alien_infestation.dm +++ b/code/modules/events/alien_infestation.dm @@ -5,7 +5,7 @@ //weight = 5 - SKYRAT EDIT - ORIGINAL weight = 2 //SKYRAT EDIT CHANGE END - + min_players = 10 /datum/round_event_control/alien_infestation/canSpawnEvent() @@ -18,7 +18,7 @@ return FALSE /datum/round_event/ghost_role/alien_infestation - announceWhen = 400 + announceWhen = 400 //SKYRAT EDIT CHANGE BEGIN //minimum_required = 1 - SKYRAT EDIT - ORIGINAL minimum_required = 2 diff --git a/code/modules/events/anomaly.dm b/code/modules/events/anomaly.dm index 2823c19d144..5a5da83fe81 100644 --- a/code/modules/events/anomaly.dm +++ b/code/modules/events/anomaly.dm @@ -9,7 +9,7 @@ /datum/round_event/anomaly var/area/impact_area var/obj/effect/anomaly/anomaly_path = /obj/effect/anomaly/flux - announceWhen = 1 + announceWhen = 1 /datum/round_event/anomaly/proc/findEventArea() diff --git a/code/modules/events/blob.dm b/code/modules/events/blob.dm index 52bf8eabb27..492ba317064 100644 --- a/code/modules/events/blob.dm +++ b/code/modules/events/blob.dm @@ -15,7 +15,7 @@ return ..() /datum/round_event/ghost_role/blob - announceChance = 0 + announceChance = 0 role_name = "blob overmind" fakeable = TRUE diff --git a/code/modules/events/brand_intelligence.dm b/code/modules/events/brand_intelligence.dm index adf7be1915d..9dcb4cdd27d 100644 --- a/code/modules/events/brand_intelligence.dm +++ b/code/modules/events/brand_intelligence.dm @@ -8,8 +8,8 @@ max_occurrences = 0 //SKYRAT EDIT CHANGE /datum/round_event/brand_intelligence - announceWhen = 21 - endWhen = 1000 //Ends when all vending machines are subverted anyway. + announceWhen = 21 + endWhen = 1000 //Ends when all vending machines are subverted anyway. var/list/obj/machinery/vending/vendingMachines = list() var/list/obj/machinery/vending/infectedMachines = list() var/obj/machinery/vending/originMachine @@ -47,7 +47,7 @@ announce_to_ghosts(originMachine) /datum/round_event/brand_intelligence/tick() - if(!originMachine || QDELETED(originMachine) || originMachine.shut_up || originMachine.wires.is_all_cut()) //if the original vending machine is missing or has it's voice switch flipped + if(!originMachine || QDELETED(originMachine) || originMachine.shut_up || originMachine.wires.is_all_cut()) //if the original vending machine is missing or has it's voice switch flipped for(var/obj/machinery/vending/saved in infectedMachines) saved.shoot_inventory = 0 if(originMachine) @@ -56,7 +56,7 @@ kill() return vendingMachines = removeNullsFromList(vendingMachines) - if(!vendingMachines.len) //if every machine is infected + if(!vendingMachines.len) //if every machine is infected for(var/obj/machinery/vending/upriser in infectedMachines) if(prob(70) && !QDELETED(upriser)) upriser.ai_controller = new /datum/ai_controller/vending_machine(upriser) diff --git a/code/modules/events/bureaucratic_error.dm b/code/modules/events/bureaucratic_error.dm index b7e7726d935..2a5292b4b88 100644 --- a/code/modules/events/bureaucratic_error.dm +++ b/code/modules/events/bureaucratic_error.dm @@ -12,7 +12,7 @@ /datum/round_event/bureaucratic_error/start() var/list/jobs = SSjob.occupations.Copy() - if(prob(33)) // Only allows latejoining as a single role. Add latejoin AI bluespace pods for fun later. + if(prob(33)) // Only allows latejoining as a single role. Add latejoin AI bluespace pods for fun later. var/datum/job/overflow = pick_n_take(jobs) overflow.spawn_positions = -1 overflow.total_positions = -1 // Ensures infinite slots as this role. Assistant will still be open for those that cant play it. @@ -21,7 +21,7 @@ if(!current.allow_bureaucratic_error) continue current.total_positions = 0 - else // Adds/removes a random amount of job slots from all jobs. + else // Adds/removes a random amount of job slots from all jobs. for(var/job in jobs) var/datum/job/current = job if(!current.allow_bureaucratic_error) diff --git a/code/modules/events/carp_migration.dm b/code/modules/events/carp_migration.dm index bbf199498e6..a8cb9867be1 100644 --- a/code/modules/events/carp_migration.dm +++ b/code/modules/events/carp_migration.dm @@ -16,7 +16,7 @@ /datum/round_event/carp_migration - announceWhen = 3 + announceWhen = 3 startWhen = 50 var/hasAnnounced = FALSE diff --git a/code/modules/events/communications_blackout.dm b/code/modules/events/communications_blackout.dm index e77b86e8a15..3ad325f9005 100644 --- a/code/modules/events/communications_blackout.dm +++ b/code/modules/events/communications_blackout.dm @@ -4,20 +4,20 @@ weight = 30 /datum/round_event/communications_blackout - announceWhen = 1 + announceWhen = 1 /datum/round_event/communications_blackout/announce(fake) - var/alert = pick( "Ionospheric anomalies detected. Temporary telecommunication failure imminent. Please contact you*%fj00)`5vc-BZZT", \ + var/alert = pick( "Ionospheric anomalies detected. Temporary telecommunication failure imminent. Please contact you*%fj00)`5vc-BZZT", \ "Ionospheric anomalies detected. Temporary telecommunication failu*3mga;b4;'1v¬-BZZZT", \ "Ionospheric anomalies detected. Temporary telec#MCi46:5.;@63-BZZZZT", \ "Ionospheric anomalies dete'fZ\\kg5_0-BZZZZZT", \ "Ionospheri:%£ MCayj^j<.3-BZZZZZZT", \ "#4nd%;f4y6,>£%-BZZZZZZZT") - for(var/mob/living/silicon/ai/A in GLOB.ai_list) //AIs are always aware of communication blackouts. + for(var/mob/living/silicon/ai/A in GLOB.ai_list) //AIs are always aware of communication blackouts. to_chat(A, "
      [alert]
      ") - if(prob(30) || fake) //most of the time, we don't want an announcement, so as to allow AIs to fake blackouts. + if(prob(30) || fake) //most of the time, we don't want an announcement, so as to allow AIs to fake blackouts. priority_announce(alert) diff --git a/code/modules/events/disease_outbreak.dm b/code/modules/events/disease_outbreak.dm index 8e68a0b837d..72493ab6a71 100644 --- a/code/modules/events/disease_outbreak.dm +++ b/code/modules/events/disease_outbreak.dm @@ -6,7 +6,7 @@ weight = 5 /datum/round_event/disease_outbreak - announceWhen = 15 + announceWhen = 15 var/virus_type @@ -41,7 +41,7 @@ continue if(HAS_TRAIT(H, TRAIT_VIRUSIMMUNE)) //Don't pick someone who's virus immune, only for it to not do anything. continue - var/foundAlready = FALSE // don't infect someone that already has a disease + var/foundAlready = FALSE // don't infect someone that already has a disease for(var/thing in H.diseases) foundAlready = TRUE break @@ -50,8 +50,8 @@ var/datum/disease/D if(!advanced_virus) - if(virus_type == /datum/disease/dnaspread) //Dnaspread needs strain_data set to work. - if(!H.dna || (HAS_TRAIT(H, TRAIT_BLIND))) //A blindness disease would be the worst. + if(virus_type == /datum/disease/dnaspread) //Dnaspread needs strain_data set to work. + if(!H.dna || (HAS_TRAIT(H, TRAIT_BLIND))) //A blindness disease would be the worst. continue D = new virus_type() var/datum/disease/dnaspread/DS = D diff --git a/code/modules/events/dust.dm b/code/modules/events/dust.dm index eb7edcafbf8..06c75c0c07f 100644 --- a/code/modules/events/dust.dm +++ b/code/modules/events/dust.dm @@ -7,8 +7,8 @@ alert_observers = FALSE /datum/round_event/space_dust - startWhen = 1 - endWhen = 2 + startWhen = 1 + endWhen = 2 fakeable = FALSE /datum/round_event/space_dust/start() diff --git a/code/modules/events/electrical_storm.dm b/code/modules/events/electrical_storm.dm index a769bad1588..39b7039ed28 100644 --- a/code/modules/events/electrical_storm.dm +++ b/code/modules/events/electrical_storm.dm @@ -7,9 +7,9 @@ alert_observers = FALSE /datum/round_event/electrical_storm - var/lightsoutAmount = 1 - var/lightsoutRange = 25 - announceWhen = 1 + var/lightsoutAmount = 1 + var/lightsoutRange = 25 + announceWhen = 1 /datum/round_event/electrical_storm/announce(fake) priority_announce("An electrical storm has been detected in your area, please repair potential electronic overloads.", "Electrical Storm Alert") diff --git a/code/modules/events/false_alarm.dm b/code/modules/events/false_alarm.dm index e68f5a0e3f5..d60bf3c7367 100644 --- a/code/modules/events/false_alarm.dm +++ b/code/modules/events/false_alarm.dm @@ -1,7 +1,7 @@ /datum/round_event_control/falsealarm - name = "False Alarm" - typepath = /datum/round_event/falsealarm - weight = 20 + name = "False Alarm" + typepath = /datum/round_event/falsealarm + weight = 20 max_occurrences = 5 var/forced_type //Admin abuse @@ -45,8 +45,8 @@ if(event_control) var/datum/round_event/Event = new event_control.typepath() message_admins("False Alarm: [Event]") - Event.kill() //do not process this event - no starts, no ticks, no ends - Event.announce(TRUE) //just announce it like it's happening + Event.kill() //do not process this event - no starts, no ticks, no ends + Event.announce(TRUE) //just announce it like it's happening /proc/gather_false_events(players_amt, gamemode) . = list() diff --git a/code/modules/events/ghost_role.dm b/code/modules/events/ghost_role.dm index 5d763733235..b5d0ba35903 100644 --- a/code/modules/events/ghost_role.dm +++ b/code/modules/events/ghost_role.dm @@ -22,7 +22,7 @@ if((status == WAITING_FOR_SOMETHING)) if(retry >= MAX_SPAWN_ATTEMPT) message_admins("[role_name] event has exceeded maximum spawn attempts. Aborting and refunding.") - if(control && control.occurrences > 0) //Don't refund if it hasn't + if(control && control.occurrences > 0) //Don't refund if it hasn't control.occurrences-- return var/waittime = 300 * (2^retry) diff --git a/code/modules/events/grid_check.dm b/code/modules/events/grid_check.dm index eaef2e0d110..9d6913299ad 100644 --- a/code/modules/events/grid_check.dm +++ b/code/modules/events/grid_check.dm @@ -5,7 +5,7 @@ max_occurrences = 3 /datum/round_event/grid_check - announceWhen = 1 + announceWhen = 1 startWhen = 1 /datum/round_event/grid_check/announce(fake) diff --git a/code/modules/events/holiday/halloween.dm b/code/modules/events/holiday/halloween.dm index 07edf1053e8..32eed690d30 100644 --- a/code/modules/events/holiday/halloween.dm +++ b/code/modules/events/holiday/halloween.dm @@ -2,7 +2,7 @@ name = "2 SPOOKY! (Halloween)" holidayID = HALLOWEEN typepath = /datum/round_event/spooky - weight = -1 //forces it to be called, regardless of weight + weight = -1 //forces it to be called, regardless of weight max_occurrences = 1 earliest_start = 0 MINUTES diff --git a/code/modules/events/holiday/vday.dm b/code/modules/events/holiday/vday.dm index a35b4acc60e..7e68b26ea72 100644 --- a/code/modules/events/holiday/vday.dm +++ b/code/modules/events/holiday/vday.dm @@ -9,7 +9,7 @@ name = "Valentines!" holidayID = VALENTINES typepath = /datum/round_event/valentines - weight = -1 //forces it to be called, regardless of weight + weight = -1 //forces it to be called, regardless of weight max_occurrences = 1 earliest_start = 0 MINUTES diff --git a/code/modules/events/ion_storm.dm b/code/modules/events/ion_storm.dm index e4272a6440d..222ec7b04df 100644 --- a/code/modules/events/ion_storm.dm +++ b/code/modules/events/ion_storm.dm @@ -11,7 +11,7 @@ var/shuffleLawsChance = 10 //chance the AI's laws are shuffled afterwards var/botEmagChance = 1 var/ionMessage = null - announceWhen = 1 + announceWhen = 1 announceChance = 33 /datum/round_event/ion_storm/add_law_only // special subtype that adds a law only diff --git a/code/modules/events/mass_hallucination.dm b/code/modules/events/mass_hallucination.dm index 7e32289fed0..2e40878d633 100644 --- a/code/modules/events/mass_hallucination.dm +++ b/code/modules/events/mass_hallucination.dm @@ -29,7 +29,7 @@ continue new /datum/hallucination/stationmessage(C, TRUE, stationmessage) if(4 to 6) - var/picked_hallucination = pick( /datum/hallucination/bolts, + var/picked_hallucination = pick( /datum/hallucination/bolts, /datum/hallucination/chat, /datum/hallucination/message, /datum/hallucination/bolts, diff --git a/code/modules/events/meteor_wave.dm b/code/modules/events/meteor_wave.dm index 2c30e2a5e99..a32615bbc9e 100644 --- a/code/modules/events/meteor_wave.dm +++ b/code/modules/events/meteor_wave.dm @@ -9,9 +9,9 @@ earliest_start = 25 MINUTES /datum/round_event/meteor_wave - startWhen = 6 - endWhen = 66 - announceWhen = 1 + startWhen = 6 + endWhen = 66 + announceWhen = 1 var/list/wave_type var/wave_name = "normal" diff --git a/code/modules/events/pirates.dm b/code/modules/events/pirates.dm index a5a0a2a753c..0edb6054578 100644 --- a/code/modules/events/pirates.dm +++ b/code/modules/events/pirates.dm @@ -176,7 +176,7 @@ new /obj/effect/temp_visual/emp(get_turf(S)) /obj/machinery/shuttle_scrambler/proc/dump_loot(mob/user) - if(credits_stored) // Prevents spamming empty holochips + if(credits_stored) // Prevents spamming empty holochips new /obj/item/holochip(drop_location(), credits_stored) to_chat(user,"You retrieve the siphoned credits!") credits_stored = 0 diff --git a/code/modules/events/processor_overload.dm b/code/modules/events/processor_overload.dm index 741ae0092cd..742af87fb2c 100644 --- a/code/modules/events/processor_overload.dm +++ b/code/modules/events/processor_overload.dm @@ -5,10 +5,10 @@ min_players = 20 /datum/round_event/processor_overload - announceWhen = 1 + announceWhen = 1 /datum/round_event/processor_overload/announce(fake) - var/alert = pick( "Exospheric bubble inbound. Processor overload is likely. Please contact you*%xp25)`6cq-BZZT", \ + var/alert = pick( "Exospheric bubble inbound. Processor overload is likely. Please contact you*%xp25)`6cq-BZZT", \ "Exospheric bubble inbound. Processor overload is likel*1eta;c5;'1v¬-BZZZT", \ "Exospheric bubble inbound. Processor ov#MCi46:5.;@63-BZZZZT", \ "Exospheric bubble inbo'Fz\\k55_@-BZZZZZT", \ diff --git a/code/modules/events/radiation_storm.dm b/code/modules/events/radiation_storm.dm index 96e400fa67c..945daa9f901 100644 --- a/code/modules/events/radiation_storm.dm +++ b/code/modules/events/radiation_storm.dm @@ -10,7 +10,7 @@ /datum/round_event/radiation_storm/setup() startWhen = 3 endWhen = startWhen + 1 - announceWhen = 1 + announceWhen = 1 /datum/round_event/radiation_storm/announce(fake) priority_announce("High levels of radiation detected near the station. Maintenance is best shielded from radiation.", "Anomaly Alert", ANNOUNCER_RADIATION) diff --git a/code/modules/events/shuttle_loan.dm b/code/modules/events/shuttle_loan.dm index 7c4b242fd4f..8dfc896aef9 100644 --- a/code/modules/events/shuttle_loan.dm +++ b/code/modules/events/shuttle_loan.dm @@ -135,7 +135,7 @@ pack.generate(pick_n_take(empty_shuttle_turfs)) shuttle_spawns.Add(/mob/living/simple_animal/hostile/russian) - shuttle_spawns.Add(/mob/living/simple_animal/hostile/russian/ranged) //drops a mateba + shuttle_spawns.Add(/mob/living/simple_animal/hostile/russian/ranged) //drops a mateba shuttle_spawns.Add(/mob/living/simple_animal/hostile/bear/russian) if(prob(75)) shuttle_spawns.Add(/mob/living/simple_animal/hostile/russian) diff --git a/code/modules/events/spacevine.dm b/code/modules/events/spacevine.dm index 11dcb4c1fba..ccab978ad0a 100644 --- a/code/modules/events/spacevine.dm +++ b/code/modules/events/spacevine.dm @@ -282,7 +282,7 @@ var/mob/living/M = hitter M.adjustBruteLoss(5) to_chat(M, "You cut yourself on the thorny vines.") - . = expected_damage + . = expected_damage /datum/spacevine_mutation/woodening name = "hardened" @@ -454,8 +454,8 @@ if(alert(usr, "Are you sure you want to delete this spacevine cluster?", "Delete Vines", "Yes", "No") == "Yes") DeleteVines() -/datum/spacevine_controller/proc/DeleteVines() //this is kill - QDEL_LIST(vines) //this will also qdel us +/datum/spacevine_controller/proc/DeleteVines() //this is kill + QDEL_LIST(vines) //this will also qdel us /datum/spacevine_controller/Destroy() STOP_PROCESSING(SSobj, src) diff --git a/code/modules/events/spontaneous_appendicitis.dm b/code/modules/events/spontaneous_appendicitis.dm index 66d399d3d59..13e930a73db 100644 --- a/code/modules/events/spontaneous_appendicitis.dm +++ b/code/modules/events/spontaneous_appendicitis.dm @@ -22,7 +22,7 @@ continue if(H.z in SSmapping.levels_by_trait(ZTRAIT_CENTCOM))//not for admin/ooc stuff continue - var/foundAlready = FALSE //don't infect someone that already has appendicitis + var/foundAlready = FALSE //don't infect someone that already has appendicitis for(var/datum/disease/appendicitis/A in H.diseases) foundAlready = TRUE break diff --git a/code/modules/events/wizard/curseditems.dm b/code/modules/events/wizard/curseditems.dm index 44359d4baa9..29987f4d9fd 100644 --- a/code/modules/events/wizard/curseditems.dm +++ b/code/modules/events/wizard/curseditems.dm @@ -39,7 +39,7 @@ for(var/mob/living/carbon/human/H in GLOB.alive_mob_list) if(ruins_spaceworthiness && !is_station_level(H.z) || isspaceturf(H.loc) || isplasmaman(H)) - continue //#savetheminers + continue //#savetheminers if(ruins_wizard_loadout && iswizard(H)) continue if(item_set == "catgirls2015") //Wizard code means never having to say you're sorry diff --git a/code/modules/events/wizard/departmentrevolt.dm b/code/modules/events/wizard/departmentrevolt.dm index d21570f8423..063657b50ca 100644 --- a/code/modules/events/wizard/departmentrevolt.dm +++ b/code/modules/events/wizard/departmentrevolt.dm @@ -50,7 +50,7 @@ department = pick(list("Uprising of Assistants", "Medical", "Engineering", "Science", "Supply", "Service", "Security") - cannot_pick) if(!department) message_admins("Department Revolt could not create a nation, as all the departments are independent! You have created nations, you madman!") - var/list/jobs_to_revolt = list() + var/list/jobs_to_revolt = list() var/nation_name var/list/citizens = list() diff --git a/code/modules/events/wizard/greentext.dm b/code/modules/events/wizard/greentext.dm index 5a90845f3cf..a4c6c80ac9e 100644 --- a/code/modules/events/wizard/greentext.dm +++ b/code/modules/events/wizard/greentext.dm @@ -56,8 +56,8 @@ if(user in color_altered_mobs) to_chat(user, "A sudden wave of failure washes over you...") user.add_atom_colour("#FF0000", ADMIN_COLOUR_PRIORITY) //ya blew it - last_holder = null - new_holder = null + last_holder = null + new_holder = null STOP_PROCESSING(SSobj, src) ..() diff --git a/code/modules/events/wizard/magicarp.dm b/code/modules/events/wizard/magicarp.dm index 7f9f3413c64..e956f11c039 100644 --- a/code/modules/events/wizard/magicarp.dm +++ b/code/modules/events/wizard/magicarp.dm @@ -6,7 +6,7 @@ earliest_start = 0 MINUTES /datum/round_event/wizard/magicarp - announceWhen = 3 + announceWhen = 3 startWhen = 50 /datum/round_event/wizard/magicarp/setup() diff --git a/code/modules/events/wizard/shuffle.dm b/code/modules/events/wizard/shuffle.dm index 55dc909abf7..e56ab993c3e 100644 --- a/code/modules/events/wizard/shuffle.dm +++ b/code/modules/events/wizard/shuffle.dm @@ -10,7 +10,7 @@ /datum/round_event/wizard/shuffleloc/start() var/list/moblocs = list() - var/list/mobs = list() + var/list/mobs = list() for(var/mob/living/carbon/human/H in GLOB.alive_mob_list) if(!is_station_level(H.z)) @@ -46,7 +46,7 @@ /datum/round_event/wizard/shufflenames/start() var/list/mobnames = list() - var/list/mobs = list() + var/list/mobs = list() for(var/mob/living/carbon/human/H in GLOB.alive_mob_list) mobnames += H.real_name @@ -79,7 +79,7 @@ earliest_start = 0 MINUTES /datum/round_event/wizard/shuffleminds/start() - var/list/mobs = list() + var/list/mobs = list() for(var/mob/living/carbon/human/H in GLOB.alive_mob_list) if(H.stat || !H.mind || iswizard(H)) diff --git a/code/modules/events/wormholes.dm b/code/modules/events/wormholes.dm index 8172ffd15ff..36f58e25158 100644 --- a/code/modules/events/wormholes.dm +++ b/code/modules/events/wormholes.dm @@ -61,7 +61,7 @@ GLOBAL_LIST_EMPTY(all_wormholes) // So we can pick wormholes to teleport to GLOB.all_wormholes -= src /obj/effect/portal/wormhole/teleport(atom/movable/M) - if(iseffect(M)) //sparks don't teleport + if(iseffect(M)) //sparks don't teleport return if(M.anchored) if(!(ismecha(M) && mech_sized)) diff --git a/code/modules/fields/fields.dm b/code/modules/fields/fields.dm index cb8d3e8dcf6..7e25d500fd1 100644 --- a/code/modules/fields/fields.dm +++ b/code/modules/fields/fields.dm @@ -4,9 +4,9 @@ //If there's any way to make this less CPU intensive than I've managed, gimme a call or do it yourself! - kevinz000 //Field shapes -#define FIELD_NO_SHAPE 0 //Does not update turfs automatically -#define FIELD_SHAPE_RADIUS_SQUARE 1 //Uses current_range and square_depth_up/down -#define FIELD_SHAPE_CUSTOM_SQUARE 2 //Uses square_height and square_width and square_depth_up/down +#define FIELD_NO_SHAPE 0 //Does not update turfs automatically +#define FIELD_SHAPE_RADIUS_SQUARE 1 //Uses current_range and square_depth_up/down +#define FIELD_SHAPE_CUSTOM_SQUARE 2 //Uses square_height and square_width and square_depth_up/down //Proc to make fields. make_field(field_type, field_params_in_associative_list) /proc/make_field(field_type, list/field_params, override_checks = FALSE, start_field = TRUE) @@ -28,12 +28,12 @@ var/square_depth_up = 0 var/square_depth_down = 0 //Processing - var/process_inner_turfs = FALSE //Don't do this unless it's absolutely necessary - var/process_edge_turfs = FALSE //Don't do this either unless it's absolutely necessary, you can just track what things are inside manually or on the initial setup. + var/process_inner_turfs = FALSE //Don't do this unless it's absolutely necessary + var/process_edge_turfs = FALSE //Don't do this either unless it's absolutely necessary, you can just track what things are inside manually or on the initial setup. var/requires_processing = FALSE - var/setup_edge_turfs = FALSE //Setup edge turfs/all field turfs. Set either or both to ON when you need it, it's defaulting to off unless you do to save CPU. + var/setup_edge_turfs = FALSE //Setup edge turfs/all field turfs. Set either or both to ON when you need it, it's defaulting to off unless you do to save CPU. var/setup_field_turfs = FALSE - var/use_host_turf = FALSE //For fields from items carried on mobs to check turf instead of loc... + var/use_host_turf = FALSE //For fields from items carried on mobs to check turf instead of loc... var/list/turf/field_turfs = list() var/list/turf/edge_turfs = list() @@ -56,7 +56,7 @@ /datum/proximity_monitor/advanced/proc/check_variables() var/pass = TRUE - if(field_shape == FIELD_NO_SHAPE) //If you're going to make a manually updated field you shouldn't be using automatic checks so don't. + if(field_shape == FIELD_NO_SHAPE) //If you're going to make a manually updated field you shouldn't be using automatic checks so don't. pass = FALSE if(current_range < 0 || square_height < 0 || square_width < 0 || square_depth_up < 0 || square_depth_down < 0) pass = FALSE @@ -68,11 +68,11 @@ if(process_inner_turfs) for(var/turf/T in field_turfs) process_inner_turf(T) - CHECK_TICK //Really crappy lagchecks, needs improvement once someone starts using processed fields. + CHECK_TICK //Really crappy lagchecks, needs improvement once someone starts using processed fields. if(process_edge_turfs) for(var/turf/T in edge_turfs) process_edge_turf(T) - CHECK_TICK //Same here. + CHECK_TICK //Same here. /datum/proximity_monitor/advanced/proc/process_inner_turf(turf/T) @@ -86,7 +86,7 @@ setup_field() post_setup_field() -/datum/proximity_monitor/advanced/proc/full_cleanup() //Full cleanup for when you change something that would require complete resetting. +/datum/proximity_monitor/advanced/proc/full_cleanup() //Full cleanup for when you change something that would require complete resetting. for(var/turf/T in edge_turfs) cleanup_edge_turf(T) for(var/turf/T in field_turfs) @@ -103,7 +103,7 @@ return TRUE return FALSE -/datum/proximity_monitor/advanced/proc/recalculate_field(ignore_movement_check = FALSE) //Call every time the field moves (done automatically if you use update_center) or a setup specification is changed. +/datum/proximity_monitor/advanced/proc/recalculate_field(ignore_movement_check = FALSE) //Call every time the field moves (done automatically if you use update_center) or a setup specification is changed. if(!(ignore_movement_check || check_movement()) && (field_shape != FIELD_NO_SHAPE)) return update_new_turfs() diff --git a/code/modules/fields/peaceborg_dampener.dm b/code/modules/fields/peaceborg_dampener.dm index c743270d2f1..c3edae0050c 100644 --- a/code/modules/fields/peaceborg_dampener.dm +++ b/code/modules/fields/peaceborg_dampener.dm @@ -41,7 +41,7 @@ for(var/mob/living/silicon/robot/R in range(current_range, get_turf(host))) if(R.has_buckled_mobs()) for(var/mob/living/L in R.buckled_mobs) - L.visible_message("[L] is knocked off of [R] by the charge in [R]'s chassis induced by [name]!") //I know it's bad. + L.visible_message("[L] is knocked off of [R] by the charge in [R]'s chassis induced by [name]!") //I know it's bad. L.Paralyze(10) R.unbuckle_mob(L) do_sparks(5, 0, L) @@ -111,4 +111,4 @@ staging[AM] = get_turf(AM) . = ..() if(!.) - staging -= AM //This one ain't goin' through. + staging -= AM //This one ain't goin' through. diff --git a/code/modules/fields/timestop.dm b/code/modules/fields/timestop.dm index 40014d2f157..c6aff1fc8da 100644 --- a/code/modules/fields/timestop.dm +++ b/code/modules/fields/timestop.dm @@ -18,7 +18,7 @@ var/check_anti_magic = FALSE var/check_holy = FALSE -/obj/effect/timestop/Initialize(mapload, radius, time, list/immune_atoms, start = TRUE) //Immune atoms assoc list atom = TRUE +/obj/effect/timestop/Initialize(mapload, radius, time, list/immune_atoms, start = TRUE) //Immune atoms assoc list atom = TRUE . = ..() if(!isnull(time)) duration = time diff --git a/code/modules/fields/turf_objects.dm b/code/modules/fields/turf_objects.dm index f8d139a45dd..d82febe6f79 100644 --- a/code/modules/fields/turf_objects.dm +++ b/code/modules/fields/turf_objects.dm @@ -69,7 +69,7 @@ return parent.field_edge_uncrossed(AM, src) return TRUE -/proc/is_turf_in_field(turf/T, datum/proximity_monitor/advanced/F) //Looking for ways to optimize this! +/proc/is_turf_in_field(turf/T, datum/proximity_monitor/advanced/F) //Looking for ways to optimize this! for(var/obj/effect/abstract/proximity_checker/advanced/O in T) if(istype(O, /obj/effect/abstract/proximity_checker/advanced/field_edge)) if(O.parent == F) diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm index cefd2bff537..3514a6f1156 100644 --- a/code/modules/food_and_drinks/drinks/drinks.dm +++ b/code/modules/food_and_drinks/drinks/drinks.dm @@ -126,7 +126,7 @@ /obj/item/reagent_containers/food/drinks/proc/smash(atom/target, mob/thrower, ranged = FALSE) if(!isGlass) return - if(QDELING(src) || !target) //Invalid loc + if(QDELING(src) || !target) //Invalid loc return if(bartender_check(target) && ranged) return @@ -211,8 +211,8 @@ ///////////////////////////////////////////////Drinks //Notes by Darem: Drinks are simply containers that start preloaded. Unlike condiments, the contents can be ingested directly -// rather then having to add it to something else first. They should only contain liquids. They have a default container size of 50. -// Formatting is the same as food. +// rather then having to add it to something else first. They should only contain liquids. They have a default container size of 50. +// Formatting is the same as food. /obj/item/reagent_containers/food/drinks/coffee name = "robust coffee" @@ -560,8 +560,8 @@ //////////////////////////drinkingglass and shaker// //Note by Darem: This code handles the mixing of drinks. New drinks go in three places: In Chemistry-Reagents.dm (for the drink -// itself), in Chemistry-Recipes.dm (for the reaction that changes the components into the drink), and here (for the drinking glass -// icon states. +// itself), in Chemistry-Recipes.dm (for the reaction that changes the components into the drink), and here (for the drinking glass +// icon states. /obj/item/reagent_containers/food/drinks/shaker name = "shaker" diff --git a/code/modules/food_and_drinks/drinks/drinks/bottle.dm b/code/modules/food_and_drinks/drinks/drinks/bottle.dm index acb013d0d1c..cee7a9cf6d7 100644 --- a/code/modules/food_and_drinks/drinks/drinks/bottle.dm +++ b/code/modules/food_and_drinks/drinks/drinks/bottle.dm @@ -523,7 +523,7 @@ desc = "A throwing weapon used to ignite things, typically filled with an accelerant. Recommended highly by rioters and revolutionaries. Light and toss." icon_state = "vodkabottle" list_reagents = list() - var/list/accelerants = list( /datum/reagent/consumable/ethanol, /datum/reagent/fuel, /datum/reagent/clf3, /datum/reagent/phlogiston, + var/list/accelerants = list( /datum/reagent/consumable/ethanol, /datum/reagent/fuel, /datum/reagent/clf3, /datum/reagent/phlogiston, /datum/reagent/napalm, /datum/reagent/hellwater, /datum/reagent/toxin/plasma, /datum/reagent/toxin/spore_burning) var/active = 0 @@ -589,7 +589,7 @@ list_reagents = list(/datum/reagent/consumable/prunomix = 50) var/fermentation_time = 30 SECONDS /// time it takes to ferment var/fermentation_time_remaining /// for partial fermentation - var/fermentation_timer /// store the timer id of fermentation + var/fermentation_timer /// store the timer id of fermentation /obj/item/reagent_containers/food/drinks/bottle/pruno/Initialize() . = ..() diff --git a/code/modules/food_and_drinks/food.dm b/code/modules/food_and_drinks/food.dm index e2402d5fd4b..afec8213f00 100644 --- a/code/modules/food_and_drinks/food.dm +++ b/code/modules/food_and_drinks/food.dm @@ -8,7 +8,7 @@ /obj/item/reagent_containers/food possible_transfer_amounts = list() - volume = 50 //Sets the default container amount for all food items. + volume = 50 //Sets the default container amount for all food items. reagent_flags = INJECTABLE resistance_flags = FLAMMABLE var/foodtype = NONE diff --git a/code/modules/food_and_drinks/food/condiment.dm b/code/modules/food_and_drinks/food/condiment.dm index 35f4b688ea9..e7896ba448c 100644 --- a/code/modules/food_and_drinks/food/condiment.dm +++ b/code/modules/food_and_drinks/food/condiment.dm @@ -1,8 +1,8 @@ ///////////////////////////////////////////////Condiments //Notes by Darem: The condiments food-subtype is for stuff you don't actually eat but you use to modify existing food. They all -// leave empty containers when used up and can be filled/re-filled with other items. Formatting for first section is identical -// to mixed-drinks code. If you want an object that starts pre-loaded, you need to make it in addition to the other code. +// leave empty containers when used up and can be filled/re-filled with other items. Formatting for first section is identical +// to mixed-drinks code. If you want an object that starts pre-loaded, you need to make it in addition to the other code. //Food items that aren't eaten normally and leave an empty container behind. /obj/item/reagent_containers/food/condiment @@ -109,8 +109,8 @@ list_reagents = list(/datum/reagent/consumable/sugar = 50) fill_icon_thresholds = null -/obj/item/reagent_containers/food/condiment/saltshaker //Separate from above since it's a small shaker rather then - name = "salt shaker" // a large one. +/obj/item/reagent_containers/food/condiment/saltshaker //Separate from above since it's a small shaker rather then + name = "salt shaker" // a large one. desc = "Salt. From space oceans, presumably." icon_state = "saltshakersmall" icon_empty = "emptyshaker" diff --git a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm index 352c6438d13..a7abd1b4fc8 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm @@ -20,7 +20,7 @@ GLOBAL_LIST_INIT(oilfry_blacklisted_items, typecacheof(list( idle_power_usage = 5 layer = BELOW_OBJ_LAYER circuit = /obj/item/circuitboard/machine/deep_fryer - var/obj/item/food/deepfryholder/frying //What's being fried RIGHT NOW? + var/obj/item/food/deepfryholder/frying //What's being fried RIGHT NOW? var/cook_time = 0 var/oil_use = 0.025 //How much cooking oil is used per second var/fry_speed = 1 //How quickly we fry food @@ -75,7 +75,7 @@ GLOBAL_LIST_INIT(oilfry_blacklisted_items, typecacheof(list( return if(default_unfasten_wrench(user, I)) return - else if(default_deconstruction_screwdriver(user, "fryer_off", "fryer_off" ,I)) //where's the open maint panel icon?! + else if(default_deconstruction_screwdriver(user, "fryer_off", "fryer_off" ,I)) //where's the open maint panel icon?! return else if(is_type_in_typecache(I, deepfry_blacklisted_items) || is_type_in_typecache(I, GLOB.oilfry_blacklisted_items) || HAS_TRAIT(I, TRAIT_NODROP) || (I.item_flags & (ABSTRACT | DROPDEL))) diff --git a/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm b/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm index 3c01e913a2b..6f615c85aee 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/monkeyrecycler.dm @@ -13,7 +13,7 @@ GLOBAL_LIST_EMPTY(monkey_recyclers) circuit = /obj/item/circuitboard/machine/monkey_recycler var/stored_matter = 0 var/cube_production = 0.2 - var/list/connected = list() //Keeps track of connected xenobio consoles, for deletion in /Destroy() + var/list/connected = list() //Keeps track of connected xenobio consoles, for deletion in /Destroy() /obj/machinery/monkey_recycler/Initialize(mapload) . = ..() @@ -28,7 +28,7 @@ GLOBAL_LIST_EMPTY(monkey_recyclers) connected.Cut() return ..() -/obj/machinery/monkey_recycler/RefreshParts() //Ranges from 0.2 to 0.8 per monkey recycled +/obj/machinery/monkey_recycler/RefreshParts() //Ranges from 0.2 to 0.8 per monkey recycled cube_production = 0 for(var/obj/item/stock_parts/manipulator/B in component_parts) //cube_production += B.rating * 0.1 //ORIGINAL diff --git a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm index 071d1c089d0..7a2950856df 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm @@ -179,9 +179,9 @@ var/atom/movable/O = I if (!QDELETED(O)) - var/md5name = md5(O.name) // This needs to happen because of a bug in a TGUI component, https://github.com/ractivejs/ractive/issues/744 - if (listofitems[md5name]) // which is fixed in a version we cannot use due to ie8 incompatibility - listofitems[md5name]["amount"]++ // The good news is, #30519 made smartfridge UIs non-auto-updating + var/md5name = md5(O.name) // This needs to happen because of a bug in a TGUI component, https://github.com/ractivejs/ractive/issues/744 + if (listofitems[md5name]) // which is fixed in a version we cannot use due to ie8 incompatibility + listofitems[md5name]["amount"]++ // The good news is, #30519 made smartfridge UIs non-auto-updating else listofitems[md5name] = list("name" = O.name, "type" = O.type, "amount" = 1) sortList(listofitems) @@ -419,7 +419,7 @@ /obj/machinery/smartfridge/organ name = "smart organ storage" desc = "A refrigerated storage unit for organ storage." - max_n_of_items = 20 //vastly lower to prevent processing too long + max_n_of_items = 20 //vastly lower to prevent processing too long base_build_path = /obj/machinery/smartfridge/organ var/repair_rate = 0 @@ -430,7 +430,7 @@ /obj/machinery/smartfridge/organ/load(obj/item/O) . = ..() - if(!.) //if the item loads, clear can_decompose + if(!.) //if the item loads, clear can_decompose return if(isorgan(O)) var/obj/item/organ/organ = O diff --git a/code/modules/food_and_drinks/recipes/drinks_recipes.dm b/code/modules/food_and_drinks/recipes/drinks_recipes.dm index da378521c4a..456fffce5c6 100644 --- a/code/modules/food_and_drinks/recipes/drinks_recipes.dm +++ b/code/modules/food_and_drinks/recipes/drinks_recipes.dm @@ -273,7 +273,7 @@ /datum/chemical_reaction/drink/acidspit results = list(/datum/reagent/consumable/ethanol/acid_spit = 6) required_reagents = list(/datum/reagent/toxin/acid = 1, /datum/reagent/consumable/ethanol/wine = 5) - optimal_ph_min = 0 //Our reaction is very acidic, so lets shift our range + optimal_ph_min = 0 //Our reaction is very acidic, so lets shift our range /datum/chemical_reaction/drink/amasec results = list(/datum/reagent/consumable/ethanol/amasec = 10) @@ -358,7 +358,7 @@ /datum/chemical_reaction/drink/triple_citrus results = list(/datum/reagent/consumable/triple_citrus = 5) required_reagents = list(/datum/reagent/consumable/lemonjuice = 1, /datum/reagent/consumable/limejuice = 1, /datum/reagent/consumable/orangejuice = 1) - optimal_ph_min = 0//Our reaction is very acidic, so lets shift our range + optimal_ph_min = 0//Our reaction is very acidic, so lets shift our range /datum/chemical_reaction/drink/grape_soda results = list(/datum/reagent/consumable/grape_soda = 2) diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm index 3494543fbb9..8ad024430c5 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pastry.dm @@ -493,7 +493,7 @@ /obj/item/food/pastrybase = 1, /obj/item/paper = 1 ) - parts = list( + parts = list( /obj/item/paper = 1 ) result = /obj/item/food/fortunecookie diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pie.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pie.dm index d187ca65b93..f52c8d563bc 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_pie.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_pie.dm @@ -201,7 +201,7 @@ name = "Baklava pie" reqs = list( /obj/item/food/butter = 2, - /obj/item/food/tortilla = 4, //Layers + /obj/item/food/tortilla = 4, //Layers /obj/item/seeds/wheat/oat = 4 ) result = /obj/item/food/pie/baklava diff --git a/code/modules/holiday/halloween.dm b/code/modules/holiday/halloween.dm index f4b74981ad4..2e97ec34ad8 100644 --- a/code/modules/holiday/halloween.dm +++ b/code/modules/holiday/halloween.dm @@ -25,9 +25,9 @@ #define SPOOKY_SKELETON 1 #define ANGRY_FAITHLESS 2 -#define SCARY_BATS 3 -#define INSANE_CLOWN 4 -#define HOWLING_GHOST 5 +#define SCARY_BATS 3 +#define INSANE_CLOWN 4 +#define HOWLING_GHOST 5 //Spookoween variables /obj/structure/closet diff --git a/code/modules/holodeck/area_copy.dm b/code/modules/holodeck/area_copy.dm index bca19aaeeea..07641f5f152 100644 --- a/code/modules/holodeck/area_copy.dm +++ b/code/modules/holodeck/area_copy.dm @@ -24,7 +24,7 @@ GLOBAL_LIST_INIT(duplicate_forbidden_vars,list( var/list/L = original.vars[V] O.vars[V] = L.Copy() else if(istype(original.vars[V], /datum) || ismob(original.vars[V])) - continue // this would reference the original's object, that will break when it is used or deleted. + continue // this would reference the original's object, that will break when it is used or deleted. else O.vars[V] = original.vars[V] @@ -56,7 +56,7 @@ GLOBAL_LIST_INIT(duplicate_forbidden_vars,list( if(M.circuit) M.circuit.flags_1 |= HOLOGRAM_1 - if(ismob(O)) //Overlays are carried over despite disallowing them, if a fix is found remove this. + if(ismob(O)) //Overlays are carried over despite disallowing them, if a fix is found remove this. var/mob/M = O M.cut_overlays() M.regenerate_icons() @@ -68,7 +68,7 @@ GLOBAL_LIST_INIT(duplicate_forbidden_vars,list( //Returns: Nothing. //Notes: Attempts to move the contents of one area to another area. // Movement based on lower left corner. Tiles that do not fit - // into the new area will not be moved. + // into the new area will not be moved. if(!A || !src) return 0 diff --git a/code/modules/hydroponics/beekeeping/beebox.dm b/code/modules/hydroponics/beekeeping/beebox.dm index b290f07b79b..076a5a54931 100644 --- a/code/modules/hydroponics/beekeeping/beebox.dm +++ b/code/modules/hydroponics/beekeeping/beebox.dm @@ -1,9 +1,9 @@ -#define BEEBOX_MAX_FRAMES 3 //Max frames per box -#define BEES_RATIO 0.5 //Multiplied by the max number of honeycombs to find the max number of bees -#define BEE_PROB_NEW_BEE 20 //The chance for spare bee_resources to be turned into new bees -#define BEE_RESOURCE_HONEYCOMB_COST 100 //The amount of bee_resources for a new honeycomb to be produced, percentage cost 1-100 -#define BEE_RESOURCE_NEW_BEE_COST 50 //The amount of bee_resources for a new bee to be produced, percentage cost 1-100 +#define BEEBOX_MAX_FRAMES 3 //Max frames per box +#define BEES_RATIO 0.5 //Multiplied by the max number of honeycombs to find the max number of bees +#define BEE_PROB_NEW_BEE 20 //The chance for spare bee_resources to be turned into new bees +#define BEE_RESOURCE_HONEYCOMB_COST 100 //The amount of bee_resources for a new honeycomb to be produced, percentage cost 1-100 +#define BEE_RESOURCE_NEW_BEE_COST 50 //The amount of bee_resources for a new bee to be produced, percentage cost 1-100 diff --git a/code/modules/hydroponics/grown/onion.dm b/code/modules/hydroponics/grown/onion.dm index 6a5702ad32e..b1349d20357 100644 --- a/code/modules/hydroponics/grown/onion.dm +++ b/code/modules/hydroponics/grown/onion.dm @@ -50,8 +50,8 @@ AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/onion_slice/red, 2, 15) /obj/item/food/grown/onion/UsedforProcessing(mob/living/user, obj/item/I, list/chosen_option) - var/datum/effect_system/smoke_spread/chem/S = new //Since the onion is destroyed when it's sliced, - var/splat_location = get_turf(src) //we need to set up the smoke beforehand + var/datum/effect_system/smoke_spread/chem/S = new //Since the onion is destroyed when it's sliced, + var/splat_location = get_turf(src) //we need to set up the smoke beforehand S.attach(splat_location) S.set_up(reagents, 0, splat_location, 0) S.start() diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm index a3e7cba10b9..b190124de93 100644 --- a/code/modules/hydroponics/hydroponics.dm +++ b/code/modules/hydroponics/hydroponics.dm @@ -379,7 +379,7 @@ myseed = null else oldPlantName = "empty tray" - switch(rand(1,18)) // randomly pick predominative weed + switch(rand(1,18)) // randomly pick predominative weed if(16 to 18) myseed = new /obj/item/seeds/reishi(src) if(14 to 15) diff --git a/code/modules/hydroponics/seeds.dm b/code/modules/hydroponics/seeds.dm index d72edc502cc..84b93087652 100644 --- a/code/modules/hydroponics/seeds.dm +++ b/code/modules/hydroponics/seeds.dm @@ -4,7 +4,7 @@ /obj/item/seeds icon = 'icons/obj/hydroponics/seeds.dmi' - icon_state = "seed" // Unknown plant seed - these shouldn't exist in-game. + icon_state = "seed" // Unknown plant seed - these shouldn't exist in-game. worn_icon_state = "seed" w_class = WEIGHT_CLASS_TINY resistance_flags = FLAMMABLE diff --git a/code/modules/instruments/instrument_data/_instrument_data.dm b/code/modules/instruments/instrument_data/_instrument_data.dm index 5af78a995f4..39d16e499f2 100644 --- a/code/modules/instruments/instrument_data/_instrument_data.dm +++ b/code/modules/instruments/instrument_data/_instrument_data.dm @@ -96,7 +96,7 @@ var/to_key = real_keys[i+1] var/sample1 = real_samples[num2text(from_key)] var/sample2 = real_samples[num2text(to_key)] - var/pivot = FLOOR((from_key + to_key) / 2, 1) //original code was a round but I replaced it because that's effectively a floor, thanks Baystation! who knows what was intended. + var/pivot = FLOOR((from_key + to_key) / 2, 1) //original code was a round but I replaced it because that's effectively a floor, thanks Baystation! who knows what was intended. for(var/key in from_key to pivot) samples[num2text(key)] = new /datum/instrument_key(sample1, key, key - from_key) for(var/key in (pivot + 1) to to_key) diff --git a/code/modules/instruments/instrument_data/hardcoded.dm b/code/modules/instruments/instrument_data/hardcoded.dm index 5db7e8b3bb4..c770f9569e3 100644 --- a/code/modules/instruments/instrument_data/hardcoded.dm +++ b/code/modules/instruments/instrument_data/hardcoded.dm @@ -5,7 +5,7 @@ abstract_type = /datum/instrument/hardcoded category = "Non-Synthesized" instrument_flags = INSTRUMENT_LEGACY - volume_multiplier = 1 //not as loud as synth'd + volume_multiplier = 1 //not as loud as synth'd /datum/instrument/hardcoded/accordion name = "Accordion" diff --git a/code/modules/instruments/items.dm b/code/modules/instruments/items.dm index 990f6ba3a90..31dff351c19 100644 --- a/code/modules/instruments/items.dm +++ b/code/modules/instruments/items.dm @@ -17,14 +17,14 @@ /obj/item/instrument/Initialize(mapload) . = ..() song = new(src, allowed_instrument_ids, instrument_range) - allowed_instrument_ids = null //We don't need this clogging memory after it's used. + allowed_instrument_ids = null //We don't need this clogging memory after it's used. /obj/item/instrument/Destroy() QDEL_NULL(song) return ..() /obj/item/instrument/proc/should_stop_playing(mob/user) - return user.incapacitated() || !((loc == user) || (isturf(loc) && Adjacent(user))) // sorry, no more TK playing. + return user.incapacitated() || !((loc == user) || (isturf(loc) && Adjacent(user))) // sorry, no more TK playing. /obj/item/instrument/suicide_act(mob/user) user.visible_message("[user] begins to play 'Gloomy Sunday'! It looks like [user.p_theyre()] trying to commit suicide!") diff --git a/code/modules/instruments/songs/_song.dm b/code/modules/instruments/songs/_song.dm index eb6bc977329..d7766e9263c 100644 --- a/code/modules/instruments/songs/_song.dm +++ b/code/modules/instruments/songs/_song.dm @@ -265,7 +265,7 @@ */ /datum/song/proc/tempodiv_to_delay(tempodiv) if(!tempodiv) - tempodiv = 1 // no division by 0. some song converters tend to use 0 for when it wants to have no div, for whatever reason. + tempodiv = 1 // no division by 0. some song converters tend to use 0 for when it wants to have no div, for whatever reason. return max(1, round((tempo/tempodiv) / world.tick_lag, 1)) /** diff --git a/code/modules/instruments/songs/editor.dm b/code/modules/instruments/songs/editor.dm index f672c0ecac6..c7c5e449ecb 100644 --- a/code/modules/instruments/songs/editor.dm +++ b/code/modules/instruments/songs/editor.dm @@ -112,7 +112,7 @@ lines.Remove(l) else linenum++ - updateDialog(usr) // make sure updates when complete + updateDialog(usr) // make sure updates when complete /datum/song/Topic(href, href_list) if(!usr.canUseTopic(parent, TRUE, FALSE, FALSE, FALSE)) @@ -228,7 +228,7 @@ var/choice = input(usr, "Select Instrument", "Instrument Selection") as null|anything in instruments if(!choice) return - choice = instruments[choice] //get id + choice = instruments[choice] //get id if(choice) set_instrument(choice) diff --git a/code/modules/instruments/songs/play_legacy.dm b/code/modules/instruments/songs/play_legacy.dm index 1b6b58139dc..bcd9935ab4c 100644 --- a/code/modules/instruments/songs/play_legacy.dm +++ b/code/modules/instruments/songs/play_legacy.dm @@ -4,7 +4,7 @@ /datum/song/proc/compile_legacy() if(!length(src.lines)) return - var/list/lines = src.lines //cache for hyepr speed! + var/list/lines = src.lines //cache for hyepr speed! compiled_chords = list() var/list/octaves = list(3, 3, 3, 3, 3, 3, 3) var/list/accents = list("n", "n", "n", "n", "n", "n", "n") @@ -17,7 +17,7 @@ var/len = length(notes_tempodiv) if(len >= 2) tempodiv = text2num(notes_tempodiv[2]) - if(len) //some dunkass is going to do ,,,, to make 3 rests instead of ,/1 because there's no standardization so let's be prepared for that. + if(len) //some dunkass is going to do ,,,, to make 3 rests instead of ,/1 because there's no standardization so let's be prepared for that. var/list/notes = splittext(notes_tempodiv[1], "-") for(var/note in notes) if(length(note) == 0) @@ -29,12 +29,12 @@ for(var/i in 2 to length(note)) var/oct_acc = copytext(note, i, i + 1) var/num = text2num(oct_acc) - if(!num) //it's an accidental - accents[key] = oct_acc //if they misspelled it/fucked up that's on them lmao, no safety checks. - else //octave + if(!num) //it's an accidental + accents[key] = oct_acc //if they misspelled it/fucked up that's on them lmao, no safety checks. + else //octave octaves[key] = clamp(num, octave_min, octave_max) compiled_chord[++compiled_chord.len] = list(key, accents[key], octaves[key]) - compiled_chord += tempodiv //this goes last + compiled_chord += tempodiv //this goes last if(length(compiled_chord)) compiled_chords[++compiled_chords.len] = compiled_chord diff --git a/code/modules/instruments/songs/play_synthesized.dm b/code/modules/instruments/songs/play_synthesized.dm index fbe146bd793..649368b61ba 100644 --- a/code/modules/instruments/songs/play_synthesized.dm +++ b/code/modules/instruments/songs/play_synthesized.dm @@ -4,7 +4,7 @@ /datum/song/proc/compile_synthesized() if(!length(src.lines)) return - var/list/lines = src.lines //cache for hyepr speed! + var/list/lines = src.lines //cache for hyepr speed! compiled_chords = list() var/list/octaves = list(3, 3, 3, 3, 3, 3, 3) var/list/accents = list("n", "n", "n", "n", "n", "n", "n") @@ -17,7 +17,7 @@ var/len = length(notes_tempodiv) if(len >= 2) tempodiv = text2num(notes_tempodiv[2]) - if(len) //some dunkass is going to do ,,,, to make 3 rests instead of ,/1 because there's no standardization so let's be prepared for that. + if(len) //some dunkass is going to do ,,,, to make 3 rests instead of ,/1 because there's no standardization so let's be prepared for that. var/list/notes = splittext(notes_tempodiv[1], "-") for(var/note in notes) if(length(note) == 0) @@ -29,12 +29,12 @@ for(var/i in 2 to length(note)) var/oct_acc = copytext(note, i, i + 1) var/num = text2num(oct_acc) - if(!num) //it's an accidental - accents[key] = oct_acc //if they misspelled it/fucked up that's on them lmao, no safety checks. - else //octave + if(!num) //it's an accidental + accents[key] = oct_acc //if they misspelled it/fucked up that's on them lmao, no safety checks. + else //octave octaves[key] = clamp(num, octave_min, octave_max) compiled_chord += clamp((note_offset_lookup[key] + octaves[key] * 12 + accent_lookup[accents[key]]), key_min, key_max) - compiled_chord += tempodiv //this goes last + compiled_chord += tempodiv //this goes last if(length(compiled_chord)) compiled_chords[++compiled_chords.len] = compiled_chord @@ -47,7 +47,7 @@ key = clamp(key + note_shift, key_min, key_max) if((world.time - MUSICIAN_HEARCHECK_MINDELAY) > last_hearcheck) do_hearcheck() - var/datum/instrument_key/K = using_instrument.samples[num2text(key)] //See how fucking easy it is to make a number text? You don't need a complicated 9 line proc! + var/datum/instrument_key/K = using_instrument.samples[num2text(key)] //See how fucking easy it is to make a number text? You don't need a complicated 9 line proc! //Should probably add channel limiters here at some point but I don't care right now. var/channel = pop_channel() if(isnull(channel)) @@ -94,7 +94,7 @@ * Pops a channel we have reserved so we don't have to release and re-request them from SSsounds every time we play a note. This is faster. */ /datum/song/proc/pop_channel() - if(length(channels_idle)) //just pop one off of here if we have one available + if(length(channels_idle)) //just pop one off of here if we have one available . = text2num(channels_idle[1]) channels_idle.Cut(1,2) return diff --git a/code/modules/instruments/stationary.dm b/code/modules/instruments/stationary.dm index 009e02494e7..41d2c0e7284 100644 --- a/code/modules/instruments/stationary.dm +++ b/code/modules/instruments/stationary.dm @@ -20,7 +20,7 @@ return TRUE if(!user) return FALSE - return !user.canUseTopic(src, FALSE, TRUE, FALSE, FALSE) //can play with TK and while resting because fun. + return !user.canUseTopic(src, FALSE, TRUE, FALSE, FALSE) //can play with TK and while resting because fun. /obj/structure/musician/ui_interact(mob/user) . = ..() diff --git a/code/modules/interview/interview.dm b/code/modules/interview/interview.dm index 924704c604c..58507798178 100644 --- a/code/modules/interview/interview.dm +++ b/code/modules/interview/interview.dm @@ -1,9 +1,9 @@ /// State when an interview has been approved -#define INTERVIEW_APPROVED "interview_approved" +#define INTERVIEW_APPROVED "interview_approved" /// State when an interview as been denied -#define INTERVIEW_DENIED "interview_denied" +#define INTERVIEW_DENIED "interview_denied" /// State when an interview has had no action on it yet -#define INTERVIEW_PENDING "interview_pending" +#define INTERVIEW_PENDING "interview_pending" /** * Represents a new-player interview form diff --git a/code/modules/jobs/access.dm b/code/modules/jobs/access.dm index d34964d56ba..5cf4124e128 100644 --- a/code/modules/jobs/access.dm +++ b/code/modules/jobs/access.dm @@ -7,7 +7,7 @@ if(issilicon(M)) if(ispAI(M)) return FALSE - return TRUE //AI can do whatever it wants + return TRUE //AI can do whatever it wants if(isAdminGhostAI(M)) //Access can't stop the abuse return TRUE diff --git a/code/modules/jobs/job_exp.dm b/code/modules/jobs/job_exp.dm index 7be2fcb76e2..d1ffb238ae9 100644 --- a/code/modules/jobs/job_exp.dm +++ b/code/modules/jobs/job_exp.dm @@ -185,7 +185,7 @@ GLOBAL_PROTECT(exp_to_update) play_records[EXP_TYPE_GHOST] += minutes if(announce_changes) to_chat(src,"You got: [minutes] Ghost EXP!") - else if(minutes) //Let "refresh" checks go through + else if(minutes) //Let "refresh" checks go through return for(var/jtype in play_records) @@ -220,6 +220,6 @@ GLOBAL_PROTECT(exp_to_update) if(flags_read.NextRow()) prefs.db_flags = text2num(flags_read.item[1]) else if(isnull(prefs.db_flags)) - prefs.db_flags = 0 //This PROBABLY won't happen, but better safe than sorry. + prefs.db_flags = 0 //This PROBABLY won't happen, but better safe than sorry. qdel(flags_read) return TRUE diff --git a/code/modules/jobs/job_types/_job.dm b/code/modules/jobs/job_types/_job.dm index 76c2558bed8..3ac455146ec 100644 --- a/code/modules/jobs/job_types/_job.dm +++ b/code/modules/jobs/job_types/_job.dm @@ -3,8 +3,8 @@ var/title = "NOPE" //Job access. The use of minimal_access or access is determined by a config setting: config.jobs_have_minimal_access - var/list/minimal_access = list() //Useful for servers which prefer to only have access given to the places a job absolutely needs (Larger server population) - var/list/access = list() //Useful for servers which either have fewer players, so each person needs to fill more than one role, or servers which like to give more access, so players can't hide forever in their super secure departments (I'm looking at you, chemistry!) + var/list/minimal_access = list() //Useful for servers which prefer to only have access given to the places a job absolutely needs (Larger server population) + var/list/access = list() //Useful for servers which either have fewer players, so each person needs to fill more than one role, or servers which like to give more access, so players can't hide forever in their super secure departments (I'm looking at you, chemistry!) /// Innate skill levels unlocked at roundstart. Based on config.jobs_have_minimal_access config setting, for example with a skeleton crew. Format is list(/datum/skill/foo = SKILL_EXP_NOVICE) with exp as an integer or as per code/_DEFINES/skills.dm var/list/skills @@ -105,7 +105,7 @@ if(!ishuman(H)) return - if(!config) //Needed for robots. + if(!config) //Needed for robots. roundstart_experience = minimal_skills if(CONFIG_GET(flag/jobs_have_minimal_access)) @@ -122,7 +122,7 @@ if(head_announce) announce_head(H, head_announce) -/datum/job/proc/override_latejoin_spawn(mob/living/carbon/human/H) //Return TRUE to force latejoining to not automatically place the person in latejoin shuttle/whatever. +/datum/job/proc/override_latejoin_spawn(mob/living/carbon/human/H) //Return TRUE to force latejoining to not automatically place the person in latejoin shuttle/whatever. return FALSE //Used for a special check of whether to allow a client to latejoin as this job. @@ -159,7 +159,7 @@ announce(H) /datum/job/proc/get_access() - if(!config) //Needed for robots. + if(!config) //Needed for robots. return src.minimal_access.Copy() . = list() @@ -180,7 +180,7 @@ //If the configuration option is set to require players to be logged as old enough to play certain jobs, then this proc checks that they are, otherwise it just returns 1 /datum/job/proc/player_old_enough(client/C) if(available_in_days(C) == 0) - return TRUE //Available in 0 days = available right now = player is old enough to play. + return TRUE //Available in 0 days = available right now = player is old enough to play. return FALSE diff --git a/code/modules/jobs/job_types/ai.dm b/code/modules/jobs/job_types/ai.dm index e29e44e4f46..7b2b6990fcc 100644 --- a/code/modules/jobs/job_types/ai.dm +++ b/code/modules/jobs/job_types/ai.dm @@ -37,7 +37,7 @@ if(SSticker.anonymousnames) AI.fully_replace_character_name(AI.real_name, SSticker.anonymousnames.anonymous_ai_name(TRUE)) else - AI.apply_pref_name("ai", M.client) //If this runtimes oh well jobcode is fucked. //what is this no energy attitude man + AI.apply_pref_name("ai", M.client) //If this runtimes oh well jobcode is fucked. //what is this no energy attitude man AI.set_core_display_icon(null, M.client) //we may have been created after our borg diff --git a/code/modules/jobs/job_types/assistant.dm b/code/modules/jobs/job_types/assistant.dm index 366f1ca94e0..aa0a99fde8e 100644 --- a/code/modules/jobs/job_types/assistant.dm +++ b/code/modules/jobs/job_types/assistant.dm @@ -8,8 +8,8 @@ Assistant spawn_positions = 5 supervisors = "absolutely everyone" selection_color = "#dddddd" - access = list() //See /datum/job/assistant/get_access() - minimal_access = list() //See /datum/job/assistant/get_access() + access = list() //See /datum/job/assistant/get_access() + minimal_access = list() //See /datum/job/assistant/get_access() outfit = /datum/outfit/job/assistant antag_rep = 7 paycheck = PAYCHECK_ASSISTANT // Get a job. Job reassignment changes your paycheck now. Get over it. diff --git a/code/modules/jobs/job_types/captain.dm b/code/modules/jobs/job_types/captain.dm index bacc99fcaec..e48a23f0757 100755 --- a/code/modules/jobs/job_types/captain.dm +++ b/code/modules/jobs/job_types/captain.dm @@ -15,8 +15,8 @@ outfit = /datum/outfit/job/captain - access = list() //See get_access() - minimal_access = list() //See get_access() + access = list() //See get_access() + minimal_access = list() //See get_access() paycheck = PAYCHECK_COMMAND paycheck_department = ACCOUNT_SEC diff --git a/code/modules/jobs/job_types/cyborg.dm b/code/modules/jobs/job_types/cyborg.dm index 6510f4c301e..67f0f3f926e 100644 --- a/code/modules/jobs/job_types/cyborg.dm +++ b/code/modules/jobs/job_types/cyborg.dm @@ -2,9 +2,9 @@ title = "Cyborg" auto_deadmin_role_flags = DEADMIN_POSITION_SILICON faction = "Station" - total_positions = 3 // SKYRAT EDIT: Original value (0) - spawn_positions = 3 // SKYRAT EDIT: Original value (1) - supervisors = "your laws and the AI" //Nodrak + total_positions = 3 // SKYRAT EDIT: Original value (0) + spawn_positions = 3 // SKYRAT EDIT: Original value (1) + supervisors = "your laws and the AI" //Nodrak selection_color = "#ddffdd" minimal_player_age = 21 exp_requirements = 120 diff --git a/code/modules/jobs/job_types/shaft_miner.dm b/code/modules/jobs/job_types/shaft_miner.dm index e36472c8ad1..f773e71295d 100644 --- a/code/modules/jobs/job_types/shaft_miner.dm +++ b/code/modules/jobs/job_types/shaft_miner.dm @@ -27,7 +27,7 @@ gloves = /obj/item/clothing/gloves/color/black uniform = /obj/item/clothing/under/rank/cargo/miner/lavaland l_pocket = /obj/item/reagent_containers/hypospray/medipen/survival - r_pocket = /obj/item/storage/bag/ore //causes issues if spawned in backpack + r_pocket = /obj/item/storage/bag/ore //causes issues if spawned in backpack backpack_contents = list( /obj/item/flashlight/seclite=1,\ /obj/item/kitchen/knife/combat/survival=1,\ diff --git a/code/modules/language/language_holder.dm b/code/modules/language/language_holder.dm index 456610dbf90..05decf701a5 100644 --- a/code/modules/language/language_holder.dm +++ b/code/modules/language/language_holder.dm @@ -82,7 +82,7 @@ Key procs /datum/language_holder/proc/grant_all_languages(understood = TRUE, spoken = TRUE, grant_omnitongue = TRUE, source = LANGUAGE_MIND) for(var/language in GLOB.all_languages) grant_language(language, understood, spoken, source) - if(grant_omnitongue) // Overrides tongue limitations. + if(grant_omnitongue) // Overrides tongue limitations. omnitongue = TRUE return TRUE @@ -194,8 +194,8 @@ Key procs /// Empties out the atom specific languages and updates them according to the supplied atoms language holder. /datum/language_holder/proc/update_atom_languages(atom/movable/thing) - var/datum/language_holder/from_atom = thing.get_language_holder(FALSE) //Gets the atoms language holder - if(from_atom == src) //This could happen if called on an atom without a mind. + var/datum/language_holder/from_atom = thing.get_language_holder(FALSE) //Gets the atoms language holder + if(from_atom == src) //This could happen if called on an atom without a mind. return FALSE for(var/language in understood_languages) remove_language(language, TRUE, FALSE, LANGUAGE_ATOM) @@ -211,7 +211,7 @@ Key procs /// Copies all languages from the supplied atom/language holder. Source should be overridden when you /// do not want the language overwritten by later atom updates or want to avoid blocked languages. /datum/language_holder/proc/copy_languages(datum/language_holder/from_holder, source_override) - if(source_override) //No blocked languages here, for now only used by ling absorb. + if(source_override) //No blocked languages here, for now only used by ling absorb. for(var/language in from_holder.understood_languages) grant_language(language, TRUE, FALSE, source_override) for(var/language in from_holder.spoken_languages) diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm index e98c23c7de1..a2507516e31 100644 --- a/code/modules/library/lib_items.dm +++ b/code/modules/library/lib_items.dm @@ -5,9 +5,9 @@ /* Library Items * * Contains: - * Bookcase - * Book - * Barcode Scanner + * Bookcase + * Book + * Barcode Scanner */ /* @@ -208,17 +208,17 @@ desc = "Crack it open, inhale the musk of its pages, and learn something new." throw_speed = 1 throw_range = 5 - w_class = WEIGHT_CLASS_NORMAL //upped to three because books are, y'know, pretty big. (and you could hide them inside eachother recursively forever) + w_class = WEIGHT_CLASS_NORMAL //upped to three because books are, y'know, pretty big. (and you could hide them inside eachother recursively forever) attack_verb_continuous = list("bashes", "whacks", "educates") attack_verb_simple = list("bash", "whack", "educate") resistance_flags = FLAMMABLE drop_sound = 'sound/items/handling/book_drop.ogg' pickup_sound = 'sound/items/handling/book_pickup.ogg' - var/dat //Actual page content - var/due_date = 0 //Game time in 1/10th seconds - var/author //Who wrote the thing, can be changed by pen or PC. It is not automatically assigned - var/unique = FALSE //false - Normal book, true - Should not be treated as normal book, unable to be copied, unable to be modified - var/title //The real name of the book. + var/dat //Actual page content + var/due_date = 0 //Game time in 1/10th seconds + var/author //Who wrote the thing, can be changed by pen or PC. It is not automatically assigned + var/unique = FALSE //false - Normal book, true - Should not be treated as normal book, unable to be copied, unable to be modified + var/title //The real name of the book. var/window_size = null // Specific window size for the book, i.e: "1920x1080", Size x Width @@ -349,9 +349,9 @@ throw_speed = 3 throw_range = 5 w_class = WEIGHT_CLASS_TINY - var/obj/machinery/computer/bookmanagement/computer //Associated computer - Modes 1 to 3 use this - var/obj/item/book/book //Currently scanned book - var/mode = 0 //0 - Scan only, 1 - Scan and Set Buffer, 2 - Scan and Attempt to Check In, 3 - Scan and Attempt to Add to Inventory + var/obj/machinery/computer/bookmanagement/computer //Associated computer - Modes 1 to 3 use this + var/obj/item/book/book //Currently scanned book + var/mode = 0 //0 - Scan only, 1 - Scan and Set Buffer, 2 - Scan and Attempt to Check In, 3 - Scan and Attempt to Add to Inventory /obj/item/barcodescanner/attack_self(mob/user) mode += 1 diff --git a/code/modules/library/lib_machines.dm b/code/modules/library/lib_machines.dm index d659153407c..b274c594c1e 100644 --- a/code/modules/library/lib_machines.dm +++ b/code/modules/library/lib_machines.dm @@ -1,12 +1,12 @@ /* Library Machines * * Contains: - * Borrowbook datum - * Library Public Computer - * Cachedbook datum - * Library Computer - * Library Scanner - * Book Binder + * Borrowbook datum + * Library Public Computer + * Cachedbook datum + * Library Computer + * Library Scanner + * Book Binder */ @@ -185,7 +185,7 @@ var/list/inventory = list() var/checkoutperiod = 5 // In minutes var/obj/machinery/libraryscanner/scanner // Book scanner that will be used when uploading books to the Archive - var/page = 1 //current page of the external archives + var/page = 1 //current page of the external archives var/printer_cooldown = 0 COOLDOWN_DECLARE(library_console_topic_cooldown) @@ -517,7 +517,7 @@ icon_state = "bigscanner" desc = "It servers the purpose of scanning stuff." density = TRUE - var/obj/item/book/cache // Last scanned book + var/obj/item/book/cache // Last scanned book /obj/machinery/libraryscanner/attackby(obj/O, mob/user, params) if(istype(O, /obj/item/book)) diff --git a/code/modules/library/random_books.dm b/code/modules/library/random_books.dm index d60609147af..bd2bbafa76b 100644 --- a/code/modules/library/random_books.dm +++ b/code/modules/library/random_books.dm @@ -59,12 +59,12 @@ while(query_get_random_books.NextRow()) var/obj/item/book/B B = existing_book ? existing_book : new(location) - B.author = query_get_random_books.item[1] - B.title = query_get_random_books.item[2] - B.dat = query_get_random_books.item[3] - B.name = "Book: [B.title]" + B.author = query_get_random_books.item[1] + B.title = query_get_random_books.item[2] + B.dat = query_get_random_books.item[3] + B.name = "Book: [B.title]" if(!existing_book) - B.icon_state= "book[rand(1,8)]" + B.icon_state= "book[rand(1,8)]" qdel(query_get_random_books) /obj/structure/bookcase/random/fiction diff --git a/code/modules/lighting/lighting_atom.dm b/code/modules/lighting/lighting_atom.dm index 47a80ca4d96..79a2fea1ac2 100644 --- a/code/modules/lighting/lighting_atom.dm +++ b/code/modules/lighting/lighting_atom.dm @@ -4,7 +4,7 @@ #define NONSENSICAL_VALUE -99999 /atom/proc/set_light(l_range, l_power, l_color = NONSENSICAL_VALUE, l_on) if(l_range > 0 && l_range < MINIMUM_USEFUL_LIGHT_RANGE) - l_range = MINIMUM_USEFUL_LIGHT_RANGE //Brings the range up to 1.4, which is just barely brighter than the soft lighting that surrounds players. + l_range = MINIMUM_USEFUL_LIGHT_RANGE //Brings the range up to 1.4, which is just barely brighter than the soft lighting that surrounds players. if (!isnull(l_power)) light_power = l_power diff --git a/code/modules/mafia/_defines.dm b/code/modules/mafia/_defines.dm index e8626997517..6c0c73e0d0f 100644 --- a/code/modules/mafia/_defines.dm +++ b/code/modules/mafia/_defines.dm @@ -29,17 +29,17 @@ //role flags (special status of roles like detection immune) ///to all forms of detection, shows themselves as an assistant. -#define ROLE_UNDETECTABLE (1<<0) +#define ROLE_UNDETECTABLE (1<<0) ///has the ability to kill at night and thus, blocks the game from ending with other teams alive. -#define ROLE_CAN_KILL (1<<1) +#define ROLE_CAN_KILL (1<<1) ///can only be one in a randomly generated game -#define ROLE_UNIQUE (1<<2) +#define ROLE_UNIQUE (1<<2) ///role is public to all other players in the game. -#define ROLE_REVEALED (1<<3) +#define ROLE_REVEALED (1<<3) ///can not be defended, protected, or any other form of protection. all kills succeed no matter what. -#define ROLE_VULNERABLE (1<<4) +#define ROLE_VULNERABLE (1<<4) ///cannot perform any actions that night, preselected actions fail -#define ROLE_ROLEBLOCKED (1<<5) +#define ROLE_ROLEBLOCKED (1<<5) #define MAFIA_PHASE_SETUP 1 #define MAFIA_PHASE_DAY 2 diff --git a/code/modules/mapping/map_template.dm b/code/modules/mapping/map_template.dm index 27b305841c9..83b5a590fff 100644 --- a/code/modules/mapping/map_template.dm +++ b/code/modules/mapping/map_template.dm @@ -134,8 +134,8 @@ if(T.y+height > world.maxy) return - var/list/border = block(locate(max(T.x-1, 1), max(T.y-1, 1), T.z), - locate(min(T.x+width+1, world.maxx), min(T.y+height+1, world.maxy), T.z)) + var/list/border = block(locate(max(T.x-1, 1), max(T.y-1, 1), T.z), + locate(min(T.x+width+1, world.maxx), min(T.y+height+1, world.maxy), T.z)) for(var/L in border) var/turf/turf_to_disable = L SSair.remove_from_active(turf_to_disable) //stop processing turfs along the border to prevent runtimes, we return it in initTemplateBounds() diff --git a/code/modules/mapping/reader.dm b/code/modules/mapping/reader.dm index 0dbe35beaf4..8c21f9256a7 100644 --- a/code/modules/mapping/reader.dm +++ b/code/modules/mapping/reader.dm @@ -165,15 +165,15 @@ WARNING("Z-level expansion occurred without no_changeturf set, this may cause problems when /turf/AfterChange is called") for(var/line in gset.gridLines) - if((ycrd - y_offset + 1) < y_lower || (ycrd - y_offset + 1) > y_upper) //Reverse operation and check if it is out of bounds of cropping. + if((ycrd - y_offset + 1) < y_lower || (ycrd - y_offset + 1) > y_upper) //Reverse operation and check if it is out of bounds of cropping. --ycrd continue if(ycrd <= world.maxy && ycrd >= 1) var/xcrd = gset.xcrd + x_offset - 1 for(var/tpos = 1 to length(line) - key_len + 1 step key_len) - if((xcrd - x_offset + 1) < x_lower || (xcrd - x_offset + 1) > x_upper) //Same as above. + if((xcrd - x_offset + 1) < x_lower || (xcrd - x_offset + 1) > x_upper) //Same as above. ++xcrd - continue //X cropping. + continue //X cropping. if(xcrd > world.maxx) if(cropMap) break diff --git a/code/modules/mapping/ruins.dm b/code/modules/mapping/ruins.dm index b322fe0cf7a..76c3a4670cc 100644 --- a/code/modules/mapping/ruins.dm +++ b/code/modules/mapping/ruins.dm @@ -71,8 +71,8 @@ var/list/ruins = potentialRuins.Copy() - var/list/forced_ruins = list() //These go first on the z level associated (same random one by default) or if the assoc value is a turf to the specified turf. - var/list/ruins_available = list() //we can try these in the current pass + var/list/forced_ruins = list() //These go first on the z level associated (same random one by default) or if the assoc value is a turf to the specified turf. + var/list/ruins_available = list() //we can try these in the current pass //Set up the starting ruin list for(var/key in ruins) @@ -87,7 +87,7 @@ while(budget > 0 && (ruins_available.len || forced_ruins.len)) var/datum/map_template/ruin/current_pick var/forced = FALSE - var/forced_z //If set we won't pick z level and use this one instead. + var/forced_z //If set we won't pick z level and use this one instead. var/forced_turf //If set we place the ruin centered on the given turf if(forced_ruins.len) //We have something we need to load right now, so just pick it for(var/ruin in forced_ruins) diff --git a/code/modules/mapping/space_management/space_transition.dm b/code/modules/mapping/space_management/space_transition.dm index 5a9d52033c1..4542b8bb2ad 100644 --- a/code/modules/mapping/space_management/space_transition.dm +++ b/code/modules/mapping/space_management/space_transition.dm @@ -96,10 +96,10 @@ var/list/x_pos_beginning = list(1, 1, world.maxx - TRANSITIONEDGE, 1) //x values of the lowest-leftest turfs of the respective 4 blocks on each side of zlevel var/list/y_pos_beginning = list(world.maxy - TRANSITIONEDGE, 1, 1 + TRANSITIONEDGE, 1 + TRANSITIONEDGE) //y values respectively - var/list/x_pos_ending = list(world.maxx, world.maxx, world.maxx, 1 + TRANSITIONEDGE) //x values of the highest-rightest turfs of the respective 4 blocks on each side of zlevel - var/list/y_pos_ending = list(world.maxy, 1 + TRANSITIONEDGE, world.maxy - TRANSITIONEDGE, world.maxy - TRANSITIONEDGE) //y values respectively - var/list/x_pos_transition = list(1, 1, TRANSITIONEDGE + 2, world.maxx - TRANSITIONEDGE - 1) //values of x for the transition from respective blocks on the side of zlevel, 1 is being translated into turfs respective x value later in the code - var/list/y_pos_transition = list(TRANSITIONEDGE + 2, world.maxy - TRANSITIONEDGE - 1, 1, 1) //values of y for the transition from respective blocks on the side of zlevel, 1 is being translated into turfs respective y value later in the code + var/list/x_pos_ending = list(world.maxx, world.maxx, world.maxx, 1 + TRANSITIONEDGE) //x values of the highest-rightest turfs of the respective 4 blocks on each side of zlevel + var/list/y_pos_ending = list(world.maxy, 1 + TRANSITIONEDGE, world.maxy - TRANSITIONEDGE, world.maxy - TRANSITIONEDGE) //y values respectively + var/list/x_pos_transition = list(1, 1, TRANSITIONEDGE + 2, world.maxx - TRANSITIONEDGE - 1) //values of x for the transition from respective blocks on the side of zlevel, 1 is being translated into turfs respective x value later in the code + var/list/y_pos_transition = list(TRANSITIONEDGE + 2, world.maxy - TRANSITIONEDGE - 1, 1, 1) //values of y for the transition from respective blocks on the side of zlevel, 1 is being translated into turfs respective y value later in the code for(var/I in cached_z_list) var/datum/space_level/D = I diff --git a/code/modules/mining/aux_base.dm b/code/modules/mining/aux_base.dm index 07b82332548..d8ce7e3359f 100644 --- a/code/modules/mining/aux_base.dm +++ b/code/modules/mining/aux_base.dm @@ -1,10 +1,10 @@ ///Mining Base//// -#define ZONE_SET 0 -#define BAD_ZLEVEL 1 -#define BAD_AREA 2 -#define BAD_COORDS 3 -#define BAD_TURF 4 +#define ZONE_SET 0 +#define BAD_ZLEVEL 1 +#define BAD_AREA 2 +#define BAD_COORDS 3 +#define BAD_TURF 4 /area/shuttle/auxiliary_base name = "Auxiliary Base" diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm index 9ac3f955ce8..983379dfd41 100644 --- a/code/modules/mining/lavaland/necropolis_chests.dm +++ b/code/modules/mining/lavaland/necropolis_chests.dm @@ -971,11 +971,11 @@ stage_prob = 20 severity = DISEASE_SEVERITY_BIOHAZARD visibility_flags = 0 - stage1 = list("Your bones ache.") - stage2 = list("Your skin feels scaly.") - stage3 = list("You have an overwhelming urge to terrorize some peasants.", "Your teeth feel sharper.") - stage4 = list("Your blood burns.") - stage5 = list("You're a fucking dragon. However, any previous allegiances you held still apply. It'd be incredibly rude to eat your still human friends for no reason.") + stage1 = list("Your bones ache.") + stage2 = list("Your skin feels scaly.") + stage3 = list("You have an overwhelming urge to terrorize some peasants.", "Your teeth feel sharper.") + stage4 = list("Your blood burns.") + stage5 = list("You're a fucking dragon. However, any previous allegiances you held still apply. It'd be incredibly rude to eat your still human friends for no reason.") new_form = /mob/living/simple_animal/hostile/megafauna/dragon/lesser diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm index 69e11246fab..3fcbede322c 100644 --- a/code/modules/mining/machine_vending.dm +++ b/code/modules/mining/machine_vending.dm @@ -10,58 +10,58 @@ var/icon_deny = "mining-deny" var/obj/item/card/id/inserted_id var/list/prize_list = list( //if you add something to this, please, for the love of god, sort it by price/type. use tabs and not spaces. - new /datum/data/mining_equipment("1 Marker Beacon", /obj/item/stack/marker_beacon, 10), - new /datum/data/mining_equipment("10 Marker Beacons", /obj/item/stack/marker_beacon/ten, 100), - new /datum/data/mining_equipment("30 Marker Beacons", /obj/item/stack/marker_beacon/thirty, 300), - new /datum/data/mining_equipment("Skeleton Key", /obj/item/skeleton_key, 777), - new /datum/data/mining_equipment("Whiskey", /obj/item/reagent_containers/food/drinks/bottle/whiskey, 100), - new /datum/data/mining_equipment("Absinthe", /obj/item/reagent_containers/food/drinks/bottle/absinthe/premium, 100), - new /datum/data/mining_equipment("Bubblegum Gum Packet", /obj/item/storage/box/gum/bubblegum, 100), - new /datum/data/mining_equipment("Cigar", /obj/item/clothing/mask/cigarette/cigar/havana, 150), - new /datum/data/mining_equipment("Soap", /obj/item/soap/nanotrasen, 200), - new /datum/data/mining_equipment("Laser Pointer", /obj/item/laser_pointer, 300), - new /datum/data/mining_equipment("Alien Toy", /obj/item/clothing/mask/facehugger/toy, 300), - new /datum/data/mining_equipment("Stabilizing Serum", /obj/item/hivelordstabilizer, 400), - new /datum/data/mining_equipment("Fulton Beacon", /obj/item/fulton_core, 400), - new /datum/data/mining_equipment("Shelter Capsule", /obj/item/survivalcapsule, 400), - new /datum/data/mining_equipment("GAR Meson Scanners", /obj/item/clothing/glasses/meson/gar, 500), - new /datum/data/mining_equipment("Explorer's Webbing", /obj/item/storage/belt/mining, 500), - new /datum/data/mining_equipment("Point Transfer Card", /obj/item/card/mining_point_card, 500), - new /datum/data/mining_equipment("Survival Medipen", /obj/item/reagent_containers/hypospray/medipen/survival, 500), - new /datum/data/mining_equipment("Brute First-Aid Kit", /obj/item/storage/firstaid/brute, 600), - new /datum/data/mining_equipment("Tracking Implant Kit", /obj/item/storage/box/minertracker, 600), - new /datum/data/mining_equipment("Jaunter", /obj/item/wormhole_jaunter, 750), - new /datum/data/mining_equipment("Kinetic Crusher", /obj/item/kinetic_crusher, 750), - new /datum/data/mining_equipment("Kinetic Accelerator", /obj/item/gun/energy/kinetic_accelerator, 750), - new /datum/data/mining_equipment("Advanced Scanner", /obj/item/t_scanner/adv_mining_scanner, 800), - new /datum/data/mining_equipment("Resonator", /obj/item/resonator, 800), - new /datum/data/mining_equipment("Luxury Medipen", /obj/item/reagent_containers/hypospray/medipen/survival/luxury, 1000), - new /datum/data/mining_equipment("Fulton Pack", /obj/item/extraction_pack, 1000), - new /datum/data/mining_equipment("Lazarus Injector", /obj/item/lazarus_injector, 1000), - new /datum/data/mining_equipment("Silver Pickaxe", /obj/item/pickaxe/silver, 1000), - new /datum/data/mining_equipment("Mining Conscription Kit", /obj/item/storage/backpack/duffelbag/mining_conscript, 1500), - new /datum/data/mining_equipment("Jetpack Upgrade", /obj/item/tank/jetpack/suit, 2000), - new /datum/data/mining_equipment("Space Cash", /obj/item/stack/spacecash/c1000, 2000), - new /datum/data/mining_equipment("Mining Hardsuit", /obj/item/clothing/suit/space/hardsuit/mining, 2000), - new /datum/data/mining_equipment("Diamond Pickaxe", /obj/item/pickaxe/diamond, 2000), - new /datum/data/mining_equipment("Super Resonator", /obj/item/resonator/upgraded, 2500), - new /datum/data/mining_equipment("Jump Boots", /obj/item/clothing/shoes/bhop, 2500), - new /datum/data/mining_equipment("Luxury Shelter Capsule", /obj/item/survivalcapsule/luxury, 3000), - new /datum/data/mining_equipment("Luxury Bar Capsule", /obj/item/survivalcapsule/luxuryelite, 10000), - new /datum/data/mining_equipment("Nanotrasen Minebot", /mob/living/simple_animal/hostile/mining_drone, 800), - new /datum/data/mining_equipment("Minebot Melee Upgrade", /obj/item/mine_bot_upgrade, 400), - new /datum/data/mining_equipment("Minebot Armor Upgrade", /obj/item/mine_bot_upgrade/health, 400), - new /datum/data/mining_equipment("Minebot Cooldown Upgrade", /obj/item/borg/upgrade/modkit/cooldown/minebot, 600), - new /datum/data/mining_equipment("Minebot AI Upgrade", /obj/item/slimepotion/slime/sentience/mining, 1000), - new /datum/data/mining_equipment("KA Minebot Passthrough", /obj/item/borg/upgrade/modkit/minebot_passthrough, 100), - new /datum/data/mining_equipment("KA White Tracer Rounds", /obj/item/borg/upgrade/modkit/tracer, 100), - new /datum/data/mining_equipment("KA Adjustable Tracer Rounds", /obj/item/borg/upgrade/modkit/tracer/adjustable, 150), - new /datum/data/mining_equipment("KA Super Chassis", /obj/item/borg/upgrade/modkit/chassis_mod, 250), - new /datum/data/mining_equipment("KA Hyper Chassis", /obj/item/borg/upgrade/modkit/chassis_mod/orange, 300), - new /datum/data/mining_equipment("KA Range Increase", /obj/item/borg/upgrade/modkit/range, 1000), - new /datum/data/mining_equipment("KA Damage Increase", /obj/item/borg/upgrade/modkit/damage, 1000), - new /datum/data/mining_equipment("KA Cooldown Decrease", /obj/item/borg/upgrade/modkit/cooldown, 1000), - new /datum/data/mining_equipment("KA AoE Damage", /obj/item/borg/upgrade/modkit/aoe/mobs, 2000) + new /datum/data/mining_equipment("1 Marker Beacon", /obj/item/stack/marker_beacon, 10), + new /datum/data/mining_equipment("10 Marker Beacons", /obj/item/stack/marker_beacon/ten, 100), + new /datum/data/mining_equipment("30 Marker Beacons", /obj/item/stack/marker_beacon/thirty, 300), + new /datum/data/mining_equipment("Skeleton Key", /obj/item/skeleton_key, 777), + new /datum/data/mining_equipment("Whiskey", /obj/item/reagent_containers/food/drinks/bottle/whiskey, 100), + new /datum/data/mining_equipment("Absinthe", /obj/item/reagent_containers/food/drinks/bottle/absinthe/premium, 100), + new /datum/data/mining_equipment("Bubblegum Gum Packet", /obj/item/storage/box/gum/bubblegum, 100), + new /datum/data/mining_equipment("Cigar", /obj/item/clothing/mask/cigarette/cigar/havana, 150), + new /datum/data/mining_equipment("Soap", /obj/item/soap/nanotrasen, 200), + new /datum/data/mining_equipment("Laser Pointer", /obj/item/laser_pointer, 300), + new /datum/data/mining_equipment("Alien Toy", /obj/item/clothing/mask/facehugger/toy, 300), + new /datum/data/mining_equipment("Stabilizing Serum", /obj/item/hivelordstabilizer, 400), + new /datum/data/mining_equipment("Fulton Beacon", /obj/item/fulton_core, 400), + new /datum/data/mining_equipment("Shelter Capsule", /obj/item/survivalcapsule, 400), + new /datum/data/mining_equipment("GAR Meson Scanners", /obj/item/clothing/glasses/meson/gar, 500), + new /datum/data/mining_equipment("Explorer's Webbing", /obj/item/storage/belt/mining, 500), + new /datum/data/mining_equipment("Point Transfer Card", /obj/item/card/mining_point_card, 500), + new /datum/data/mining_equipment("Survival Medipen", /obj/item/reagent_containers/hypospray/medipen/survival, 500), + new /datum/data/mining_equipment("Brute First-Aid Kit", /obj/item/storage/firstaid/brute, 600), + new /datum/data/mining_equipment("Tracking Implant Kit", /obj/item/storage/box/minertracker, 600), + new /datum/data/mining_equipment("Jaunter", /obj/item/wormhole_jaunter, 750), + new /datum/data/mining_equipment("Kinetic Crusher", /obj/item/kinetic_crusher, 750), + new /datum/data/mining_equipment("Kinetic Accelerator", /obj/item/gun/energy/kinetic_accelerator, 750), + new /datum/data/mining_equipment("Advanced Scanner", /obj/item/t_scanner/adv_mining_scanner, 800), + new /datum/data/mining_equipment("Resonator", /obj/item/resonator, 800), + new /datum/data/mining_equipment("Luxury Medipen", /obj/item/reagent_containers/hypospray/medipen/survival/luxury, 1000), + new /datum/data/mining_equipment("Fulton Pack", /obj/item/extraction_pack, 1000), + new /datum/data/mining_equipment("Lazarus Injector", /obj/item/lazarus_injector, 1000), + new /datum/data/mining_equipment("Silver Pickaxe", /obj/item/pickaxe/silver, 1000), + new /datum/data/mining_equipment("Mining Conscription Kit", /obj/item/storage/backpack/duffelbag/mining_conscript, 1500), + new /datum/data/mining_equipment("Jetpack Upgrade", /obj/item/tank/jetpack/suit, 2000), + new /datum/data/mining_equipment("Space Cash", /obj/item/stack/spacecash/c1000, 2000), + new /datum/data/mining_equipment("Mining Hardsuit", /obj/item/clothing/suit/space/hardsuit/mining, 2000), + new /datum/data/mining_equipment("Diamond Pickaxe", /obj/item/pickaxe/diamond, 2000), + new /datum/data/mining_equipment("Super Resonator", /obj/item/resonator/upgraded, 2500), + new /datum/data/mining_equipment("Jump Boots", /obj/item/clothing/shoes/bhop, 2500), + new /datum/data/mining_equipment("Luxury Shelter Capsule", /obj/item/survivalcapsule/luxury, 3000), + new /datum/data/mining_equipment("Luxury Bar Capsule", /obj/item/survivalcapsule/luxuryelite, 10000), + new /datum/data/mining_equipment("Nanotrasen Minebot", /mob/living/simple_animal/hostile/mining_drone, 800), + new /datum/data/mining_equipment("Minebot Melee Upgrade", /obj/item/mine_bot_upgrade, 400), + new /datum/data/mining_equipment("Minebot Armor Upgrade", /obj/item/mine_bot_upgrade/health, 400), + new /datum/data/mining_equipment("Minebot Cooldown Upgrade", /obj/item/borg/upgrade/modkit/cooldown/minebot, 600), + new /datum/data/mining_equipment("Minebot AI Upgrade", /obj/item/slimepotion/slime/sentience/mining, 1000), + new /datum/data/mining_equipment("KA Minebot Passthrough", /obj/item/borg/upgrade/modkit/minebot_passthrough, 100), + new /datum/data/mining_equipment("KA White Tracer Rounds", /obj/item/borg/upgrade/modkit/tracer, 100), + new /datum/data/mining_equipment("KA Adjustable Tracer Rounds", /obj/item/borg/upgrade/modkit/tracer/adjustable, 150), + new /datum/data/mining_equipment("KA Super Chassis", /obj/item/borg/upgrade/modkit/chassis_mod, 250), + new /datum/data/mining_equipment("KA Hyper Chassis", /obj/item/borg/upgrade/modkit/chassis_mod/orange, 300), + new /datum/data/mining_equipment("KA Range Increase", /obj/item/borg/upgrade/modkit/range, 1000), + new /datum/data/mining_equipment("KA Damage Increase", /obj/item/borg/upgrade/modkit/damage, 1000), + new /datum/data/mining_equipment("KA Cooldown Decrease", /obj/item/borg/upgrade/modkit/cooldown, 1000), + new /datum/data/mining_equipment("KA AoE Damage", /obj/item/borg/upgrade/modkit/aoe/mobs, 2000) ) /datum/data/mining_equipment @@ -213,14 +213,14 @@ /obj/machinery/mineral/equipment_vendor/golem/Initialize() desc += "\nIt seems a few selections have been added." prize_list += list( - new /datum/data/mining_equipment("Extra Id", /obj/item/card/id/mining, 250), - new /datum/data/mining_equipment("Science Goggles", /obj/item/clothing/glasses/science, 250), - new /datum/data/mining_equipment("Monkey Cube", /obj/item/food/monkeycube, 300), - new /datum/data/mining_equipment("Toolbelt", /obj/item/storage/belt/utility, 350), - new /datum/data/mining_equipment("Royal Cape of the Liberator", /obj/item/bedsheet/rd/royal_cape, 500), - new /datum/data/mining_equipment("Grey Slime Extract", /obj/item/slime_extract/grey, 1000), - new /datum/data/mining_equipment("Modification Kit", /obj/item/borg/upgrade/modkit/trigger_guard, 1700), - new /datum/data/mining_equipment("The Liberator's Legacy", /obj/item/storage/box/rndboards, 2000) + new /datum/data/mining_equipment("Extra Id", /obj/item/card/id/mining, 250), + new /datum/data/mining_equipment("Science Goggles", /obj/item/clothing/glasses/science, 250), + new /datum/data/mining_equipment("Monkey Cube", /obj/item/food/monkeycube, 300), + new /datum/data/mining_equipment("Toolbelt", /obj/item/storage/belt/utility, 350), + new /datum/data/mining_equipment("Royal Cape of the Liberator", /obj/item/bedsheet/rd/royal_cape, 500), + new /datum/data/mining_equipment("Grey Slime Extract", /obj/item/slime_extract/grey, 1000), + new /datum/data/mining_equipment("Modification Kit", /obj/item/borg/upgrade/modkit/trigger_guard, 1700), + new /datum/data/mining_equipment("The Liberator's Legacy", /obj/item/storage/box/rndboards, 2000) ) return ..() @@ -268,7 +268,7 @@ . = ..() if(istype(AM, /obj/item/card/id) && proximity) var/obj/item/card/id/I = AM - I.access |= ACCESS_MINING + I.access |= ACCESS_MINING I.access |= ACCESS_MINING_STATION I.access |= ACCESS_MECH_MINING I.access |= ACCESS_MINERAL_STOREROOM diff --git a/code/modules/mining/ores_coins.dm b/code/modules/mining/ores_coins.dm index 3e3639cada2..ad6d09ead06 100644 --- a/code/modules/mining/ores_coins.dm +++ b/code/modules/mining/ores_coins.dm @@ -27,12 +27,12 @@ var/difference = min(ORESTACK_OVERLAYS_MAX, amount) - (LAZYLEN(stack_overlays)+1) if(difference == 0) return - else if(difference < 0 && LAZYLEN(stack_overlays)) //amount < stack_overlays, remove excess. + else if(difference < 0 && LAZYLEN(stack_overlays)) //amount < stack_overlays, remove excess. if (LAZYLEN(stack_overlays)-difference <= 0) stack_overlays = null else stack_overlays.len += difference - else if(difference > 0) //amount > stack_overlays, add some. + else if(difference > 0) //amount > stack_overlays, add some. for(var/i in 1 to difference) var/mutable_appearance/newore = mutable_appearance(icon, icon_state) newore.pixel_x = rand(-8,8) diff --git a/code/modules/mob/dead/dead.dm b/code/modules/mob/dead/dead.dm index d0f6244b5af..3f6fe0c7f7d 100644 --- a/code/modules/mob/dead/dead.dm +++ b/code/modules/mob/dead/dead.dm @@ -85,7 +85,7 @@ INITIALIZE_IMMEDIATE(/mob/dead) new /atom/movable/screen/splash(C) notransform = TRUE - sleep(29) //let the animation play + sleep(29) //let the animation play notransform = FALSE if(!C) diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm index 8ba934e0773..c6cb01748d8 100644 --- a/code/modules/mob/dead/new_player/new_player.dm +++ b/code/modules/mob/dead/new_player/new_player.dm @@ -12,7 +12,7 @@ stat = DEAD hud_possible = list() - var/mob/living/new_character //for instant transfer once the round is set up + var/mob/living/new_character //for instant transfer once the round is set up //Used to make sure someone doesn't get spammed with messages if they're ineligible for roles var/ineligible_for_roles = FALSE @@ -313,7 +313,7 @@ var/arrivals_docked = TRUE if(SSshuttle.arrivals) - close_spawn_windows() //In case we get held up + close_spawn_windows() //In case we get held up if(SSshuttle.arrivals.damaged && CONFIG_GET(flag/arrivals_shuttle_require_safe_latejoin)) src << alert("The arrivals shuttle is currently malfunctioning! You cannot join.") return FALSE @@ -328,9 +328,9 @@ SSjob.AssignRole(src, rank, 1) - var/mob/living/character = create_character(TRUE) //creates the human and transfers vars and mind + var/mob/living/character = create_character(TRUE) //creates the human and transfers vars and mind var/equip = SSjob.EquipRank(character, rank, TRUE) - if(isliving(equip)) //Borgs get borged in the equip, so we need to make sure we handle the new mob. + if(isliving(equip)) //Borgs get borged in the equip, so we need to make sure we handle the new mob. character = equip var/datum/job/job = SSjob.GetJob(rank) @@ -357,9 +357,9 @@ //SKYRAT EDIT ADDITION END if(ishuman(character)) - humanc = character //Let's retypecast the var to be human, + humanc = character //Let's retypecast the var to be human, - if(humanc) //These procs all expect humans + if(humanc) //These procs all expect humans GLOB.data_core.manifest_inject(humanc) if(SSshuttle.arrivals) SSshuttle.arrivals.QueueAnnounce(humanc, rank) @@ -384,7 +384,7 @@ GLOB.joined_player_list += character.ckey - if(CONFIG_GET(flag/allow_latejoin_antagonists) && humanc) //Borgs aren't allowed to be antags. Will need to be tweaked if we get true latejoin ais. + if(CONFIG_GET(flag/allow_latejoin_antagonists) && humanc) //Borgs aren't allowed to be antags. Will need to be tweaked if we get true latejoin ais. if(SSshuttle.emergency) switch(SSshuttle.emergency.mode) if(SHUTTLE_RECALL, SHUTTLE_IDLE) @@ -484,9 +484,9 @@ if(mind) if(transfer_after) mind.late_joiner = TRUE - mind.active = FALSE //we wish to transfer the key manually + mind.active = FALSE //we wish to transfer the key manually mind.original_character_slot_index = client.prefs.default_slot - mind.transfer_to(H) //won't transfer key since the mind is not active + mind.transfer_to(H) //won't transfer key since the mind is not active mind.original_character = H H.name = real_name @@ -499,7 +499,7 @@ /mob/dead/new_player/proc/transfer_character() . = new_character if(.) - new_character.key = key //Manually transfer the key to log them in, + new_character.key = key //Manually transfer the key to log them in, new_character.stop_sound_channel(CHANNEL_LOBBYMUSIC) new_character = null qdel(src) diff --git a/code/modules/mob/dead/new_player/sprite_accessories.dm b/code/modules/mob/dead/new_player/sprite_accessories.dm index 7472a160b8a..3afcd11bf35 100644 --- a/code/modules/mob/dead/new_player/sprite_accessories.dm +++ b/code/modules/mob/dead/new_player/sprite_accessories.dm @@ -47,24 +47,24 @@ return L /datum/sprite_accessory - var/icon //the icon file the accessory is located in - var/icon_state //the icon_state of the accessory - var/name //the preview name of the accessory - var/gender = NEUTER //Determines if the accessory will be skipped or included in random hair generations + var/icon //the icon file the accessory is located in + var/icon_state //the icon_state of the accessory + var/name //the preview name of the accessory + var/gender = NEUTER //Determines if the accessory will be skipped or included in random hair generations var/gender_specific //Something that can be worn by either gender, but looks different on each - var/use_static //determines if the accessory will be skipped by color preferences - var/color_src = MUTCOLORS //Currently only used by mutantparts so don't worry about hair and stuff. This is the source that this accessory will get its color from. Default is MUTCOLOR, but can also be HAIR, FACEHAIR, EYECOLOR and 0 if none. - var/hasinner //Decides if this sprite has an "inner" part, such as the fleshy parts on ears. - var/locked = FALSE //Is this part locked from roundstart selection? Used for parts that apply effects + var/use_static //determines if the accessory will be skipped by color preferences + var/color_src = MUTCOLORS //Currently only used by mutantparts so don't worry about hair and stuff. This is the source that this accessory will get its color from. Default is MUTCOLOR, but can also be HAIR, FACEHAIR, EYECOLOR and 0 if none. + var/hasinner //Decides if this sprite has an "inner" part, such as the fleshy parts on ears. + var/locked = FALSE //Is this part locked from roundstart selection? Used for parts that apply effects var/dimension_x = 32 var/dimension_y = 32 - var/center = FALSE //Should we center the sprite? + var/center = FALSE //Should we center the sprite? ////////////////////// // Hair Definitions // ////////////////////// /datum/sprite_accessory/hair - icon = 'icons/mob/human_face.dmi' // default icon for all hairs + icon = 'icons/mob/human_face.dmi' // default icon for all hairs // please make sure they're sorted alphabetically and, where needed, categorized // try to capitalize the names please~ @@ -1814,8 +1814,8 @@ name = "Aquatic" icon_state = "aqua" -/datum/sprite_accessory/legs //legs are a special case, they aren't actually sprite_accessories but are updated with them. - icon = null //These datums exist for selecting legs on preference, and little else +/datum/sprite_accessory/legs //legs are a special case, they aren't actually sprite_accessories but are updated with them. + icon = null //These datums exist for selecting legs on preference, and little else /datum/sprite_accessory/legs/none name = "Normal Legs" diff --git a/code/modules/mob/dead/observer/logout.dm b/code/modules/mob/dead/observer/logout.dm index 3ca6405a0cf..1bc86a7ce2d 100644 --- a/code/modules/mob/dead/observer/logout.dm +++ b/code/modules/mob/dead/observer/logout.dm @@ -12,5 +12,5 @@ observetarget = null ..() spawn(0) - if(src && !key) //we've transferred to another mob. This ghost should be deleted. + if(src && !key) //we've transferred to another mob. This ghost should be deleted. qdel(src) diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index af079ebd87e..68c99fe1013 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -33,7 +33,7 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER) var/image/ghostimage_default = null //this mobs ghost image without accessories and dirs var/image/ghostimage_simple = null //this mob with the simple white ghost sprite var/ghostvision = 1 //is the ghost able to see things humans can't? - var/mob/observetarget = null //The target mob that the ghost is observing. Used as a reference in logout() + var/mob/observetarget = null //The target mob that the ghost is observing. Used as a reference in logout() var/ghost_hud_enabled = 1 //did this ghost disable the on-screen HUD? var/data_huds_on = 0 //Are data HUDs currently enabled? var/health_scan = FALSE //Are health scans currently enabled? @@ -50,8 +50,8 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER) var/facial_hair_color var/mutable_appearance/facial_hair_overlay - var/updatedir = 1 //Do we have to update our dir as the ghost moves around? - var/lastsetting = null //Stores the last setting that ghost_others was set to, for a little more efficiency when we update ghost images. Null means no update is necessary + var/updatedir = 1 //Do we have to update our dir as the ghost moves around? + var/lastsetting = null //Stores the last setting that ghost_others was set to, for a little more efficiency when we update ghost images. Null means no update is necessary //We store copies of the ghost display preferences locally so they can be referred to even if no client is connected. //If there's a bug with changing your ghost settings, it's probably related to this. @@ -87,7 +87,7 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER) var/turf/T var/mob/body = loc if(ismob(body)) - T = get_turf(body) //Where is the body located? + T = get_turf(body) //Where is the body located? gender = body.gender if(body.mind && body.mind.name) @@ -101,7 +101,7 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER) else name = random_unique_name(gender) - mind = body.mind //we don't transfer the mind but we keep a reference to it. + mind = body.mind //we don't transfer the mind but we keep a reference to it. set_suicide(body.suiciding) // Transfer whether they committed suicide. @@ -125,7 +125,7 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER) forceMove(T) - if(!name) //To prevent nameless ghosts + if(!name) //To prevent nameless ghosts name = random_unique_name(gender) real_name = name @@ -213,8 +213,8 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER) if(ghost_accs >= GHOST_ACCS_DIR && (icon_state in GLOB.ghost_forms_with_directions_list)) //if this icon has dirs AND the client wants to show them, we make sure we update the dir on movement updatedir = 1 else - updatedir = 0 //stop updating the dir in case we want to show accessories with dirs on a ghost sprite without dirs - setDir(2 )//reset the dir to its default so the sprites all properly align up + updatedir = 0 //stop updating the dir in case we want to show accessories with dirs on a ghost sprite without dirs + setDir(2 )//reset the dir to its default so the sprites all properly align up if(ghost_accs == GHOST_ACCS_FULL && (icon_state in GLOB.ghost_forms_with_accessories_list)) //check if this form supports accessories and if the client wants to show them var/datum/sprite_accessory/S @@ -280,12 +280,12 @@ Works together with spawning an observer, noted above. if(key) if(key[1] != "@") // Skip aghosts. stop_sound_channel(CHANNEL_HEARTBEAT) //Stop heartbeat sounds because You Are A Ghost Now - var/mob/dead/observer/ghost = new(src) // Transfer safety to observer spawning proc. + var/mob/dead/observer/ghost = new(src) // Transfer safety to observer spawning proc. SStgui.on_transfer(src, ghost) // Transfer NanoUIs. ghost.can_reenter_corpse = can_reenter_corpse ghost.key = key ghost.client.init_verbs() - if(!can_reenter_corpse) // Disassociates observer mind from the body mind + if(!can_reenter_corpse) // Disassociates observer mind from the body mind ghost.mind = null return ghost @@ -311,7 +311,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp var/response = alert(src, "Are you -sure- you want to ghost?\n(You are alive. If you ghost whilst still alive you may not play again this round! You can't change your mind so choose wisely!!)","Are you sure you want to ghost?","Ghost","Stay in body") if(response != "Ghost") return FALSE//didn't want to ghost after-all - ghostize(FALSE) // FALSE parameter is so we can never re-enter our body. U ded. + ghostize(FALSE) // FALSE parameter is so we can never re-enter our body. U ded. return TRUE /mob/camera/verb/ghost() @@ -358,7 +358,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp if(!can_reenter_corpse) to_chat(src, "You cannot re-enter your body.") return - if(mind.current.key && mind.current.key[1] != "@") //makes sure we don't accidentally kick any clients + if(mind.current.key && mind.current.key[1] != "@") //makes sure we don't accidentally kick any clients to_chat(usr, "Another consciousness is in your body...It is resisting you.") return client.view_size.setDefault(getScreenSize(client.prefs.widescreenpref))//Let's reset so people can't become allseeing gods @@ -495,7 +495,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp var/list/dest = list() //List of possible destinations (mobs) - var/target = null //Chosen target. + var/target = null //Chosen target. dest += getpois(mobs_only = TRUE) //Fill list, prompt user with list target = input("Please, select a player!", "Jump to Mob", null, null) as null|anything in dest @@ -504,10 +504,10 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp return else var/mob/M = dest[target] //Destination mob - var/mob/A = src //Source mob + var/mob/A = src //Source mob var/turf/T = get_turf(M) //Turf of the destination mob - if(T && isturf(T)) //Make sure the turf exists, then move the source to that destination. + if(T && isturf(T)) //Make sure the turf exists, then move the source to that destination. A.forceMove(T) A.update_parallax_contents() else diff --git a/code/modules/mob/inventory.dm b/code/modules/mob/inventory.dm index a3a027958a0..00816a45189 100644 --- a/code/modules/mob/inventory.dm +++ b/code/modules/mob/inventory.dm @@ -186,7 +186,7 @@ return put_in_hand(I, get_empty_held_index_for_side(RIGHT_HANDS)) /mob/proc/put_in_hand_check(obj/item/I) - return FALSE //nonliving mobs don't have hands + return FALSE //nonliving mobs don't have hands /mob/living/put_in_hand_check(obj/item/I) if(istype(I) && ((mobility_flags & MOBILITY_PICKUP) || (I.item_flags & ABSTRACT))) @@ -319,7 +319,7 @@ I.layer = initial(I.layer) I.plane = initial(I.plane) I.appearance_flags &= ~NO_CLIENT_COLOR - if(!no_move && !(I.item_flags & DROPDEL)) //item may be moved/qdel'd immedietely, don't bother moving it + if(!no_move && !(I.item_flags & DROPDEL)) //item may be moved/qdel'd immedietely, don't bother moving it if (isnull(newloc)) I.moveToNullspace() else diff --git a/code/modules/mob/living/brain/brain.dm b/code/modules/mob/living/brain/brain.dm index 8f49ad99421..9656d6ae420 100644 --- a/code/modules/mob/living/brain/brain.dm +++ b/code/modules/mob/living/brain/brain.dm @@ -27,12 +27,12 @@ stored_dna.species = new rando_race() /mob/living/brain/Destroy() - if(key) //If there is a mob connected to this thing. Have to check key twice to avoid false death reporting. - if(stat!=DEAD) //If not dead. - death(1) //Brains can die again. AND THEY SHOULD AHA HA HA HA HA HA - if(mind) //You aren't allowed to return to brains that don't exist + if(key) //If there is a mob connected to this thing. Have to check key twice to avoid false death reporting. + if(stat!=DEAD) //If not dead. + death(1) //Brains can die again. AND THEY SHOULD AHA HA HA HA HA HA + if(mind) //You aren't allowed to return to brains that don't exist mind.current = null - ghostize() //Ghostize checks for key so nothing else is necessary. + ghostize() //Ghostize checks for key so nothing else is necessary. container = null return ..() diff --git a/code/modules/mob/living/brain/brain_item.dm b/code/modules/mob/living/brain/brain_item.dm index 72d5544ff1d..bcdc9589cbc 100644 --- a/code/modules/mob/living/brain/brain_item.dm +++ b/code/modules/mob/living/brain/brain_item.dm @@ -12,7 +12,7 @@ attack_verb_simple = list("attack", "slap", "whack") ///The brain's organ variables are significantly more different than the other organs, with half the decay rate for balance reasons, and twice the maxHealth - decay_factor = STANDARD_ORGAN_DECAY * 0.5 //30 minutes of decaying to result in a fully damaged brain, since a fast decay rate would be unfun gameplay-wise + decay_factor = STANDARD_ORGAN_DECAY * 0.5 //30 minutes of decaying to result in a fully damaged brain, since a fast decay rate would be unfun gameplay-wise maxHealth = BRAIN_DAMAGE_DEATH low_threshold = 45 @@ -20,7 +20,7 @@ var/suicided = FALSE var/mob/living/brain/brainmob = null - var/decoy_override = FALSE //if it's a fake brain with no brainmob assigned. Feedback messages will be faked as if it does have a brainmob. See changelings & dullahans. + var/decoy_override = FALSE //if it's a fake brain with no brainmob assigned. Feedback messages will be faked as if it does have a brainmob. See changelings & dullahans. //two variables necessary for calculating whether we get a brain trauma or not var/damage_delta = 0 @@ -39,7 +39,7 @@ name = "brain" - if(C.mind && C.mind.has_antag_datum(/datum/antagonist/changeling) && !no_id_transfer) //congrats, you're trapped in a body you don't control + if(C.mind && C.mind.has_antag_datum(/datum/antagonist/changeling) && !no_id_transfer) //congrats, you're trapped in a body you don't control if(brainmob && !(C.stat == DEAD || (HAS_TRAIT(C, TRAIT_DEATHCOMA)))) to_chat(brainmob, "You can't feel your body! You're still just a brain!") forceMove(C) @@ -130,7 +130,7 @@ user.visible_message("[user] pours the contents of [O] onto [src], causing it to reform its original shape and turn a slightly brighter shade of pink.", "You pour the contents of [O] onto [src], causing it to reform its original shape and turn a slightly brighter shade of pink.") var/healby = O.reagents.get_reagent_amount(/datum/reagent/medicine/mannitol) - setOrganDamage(damage - healby*2) //heals 2 damage per unit of mannitol, and by using "setorgandamage", we clear the failing variable if that was up + setOrganDamage(damage - healby*2) //heals 2 damage per unit of mannitol, and by using "setorgandamage", we clear the failing variable if that was up O.reagents.clear_reagents() return @@ -213,7 +213,7 @@ to_chat(C, "[user] inserts [src] into your head.") to_chat(user, "You insert [src] into [C]'s head.") else - to_chat(user, "You insert [src] into your head." ) + to_chat(user, "You insert [src] into your head." ) Insert(C) else @@ -225,7 +225,7 @@ QDEL_LIST(traumas) destroy_all_skillchips() - if(owner?.mind) //You aren't allowed to return to brains that don't exist + if(owner?.mind) //You aren't allowed to return to brains that don't exist owner.mind.current = null return ..() diff --git a/code/modules/mob/living/carbon/alien/alien_defense.dm b/code/modules/mob/living/carbon/alien/alien_defense.dm index 73d6a6a83e3..8473b14635f 100644 --- a/code/modules/mob/living/carbon/alien/alien_defense.dm +++ b/code/modules/mob/living/carbon/alien/alien_defense.dm @@ -49,7 +49,7 @@ In all, this is a lot like the monkey code. /N /mob/living/carbon/alien/attack_hand(mob/living/carbon/human/M, modifiers) . = ..() - if(.) //to allow surgery to return properly. + if(.) //to allow surgery to return properly. return FALSE if(M.combat_mode) diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm index c80c80d88fc..b3c8ed8a46b 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm @@ -5,7 +5,7 @@ butcher_results = list(/obj/item/food/meat/slab/xeno = 5, /obj/item/stack/sheet/animalhide/xeno = 1) limb_destroyer = 1 hud_type = /datum/hud/alien - melee_damage_lower = 20 //Refers to unarmed damage, aliens do unarmed attacks. + melee_damage_lower = 20 //Refers to unarmed damage, aliens do unarmed attacks. melee_damage_upper = 20 var/obj/item/r_store = null var/obj/item/l_store = null diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid_update_icons.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid_update_icons.dm index ece2a9a46a3..bad958e07a1 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/humanoid_update_icons.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid_update_icons.dm @@ -48,7 +48,7 @@ /mob/living/carbon/alien/humanoid/regenerate_icons() if(!..()) - // update_icons() //Handled in update_transform(), leaving this here as a reminder + // update_icons() //Handled in update_transform(), leaving this here as a reminder update_transform() /mob/living/carbon/alien/humanoid/update_transform() //The old method of updating lying/standing was update_icons(). Aliens still expect that. diff --git a/code/modules/mob/living/carbon/alien/humanoid/life.dm b/code/modules/mob/living/carbon/alien/humanoid/life.dm index fd6a73ae7bf..3701de61608 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/life.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/life.dm @@ -2,13 +2,13 @@ /mob/living/carbon/alien/humanoid/proc/adjust_body_temperature(current, loc_temp, boost) var/temperature = current - var/difference = abs(current-loc_temp) //get difference - var/increments// = difference/10 //find how many increments apart they are + var/difference = abs(current-loc_temp) //get difference + var/increments// = difference/10 //find how many increments apart they are if(difference > 50) increments = difference/5 else increments = difference/10 - var/change = increments*boost // Get the amount to change by (x per increment) + var/change = increments*boost // Get the amount to change by (x per increment) var/temp_change if(current < loc_temp) temperature = min(loc_temp, temperature+change) diff --git a/code/modules/mob/living/carbon/alien/humanoid/queen.dm b/code/modules/mob/living/carbon/alien/humanoid/queen.dm index 10a57fe19b8..2db2b2649e0 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/queen.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/queen.dm @@ -36,7 +36,7 @@ if(Q.stat == DEAD) continue if(Q.client) - name = "alien princess ([rand(1, 999)])" //if this is too cutesy feel free to change it/remove it. + name = "alien princess ([rand(1, 999)])" //if this is too cutesy feel free to change it/remove it. break real_name = src.name diff --git a/code/modules/mob/living/carbon/alien/larva/powers.dm b/code/modules/mob/living/carbon/alien/larva/powers.dm index 8ec61e1f178..33551c82acd 100644 --- a/code/modules/mob/living/carbon/alien/larva/powers.dm +++ b/code/modules/mob/living/carbon/alien/larva/powers.dm @@ -36,7 +36,7 @@ to_chat(user, "You cannot evolve when you are cuffed!") return - if(L.amount_grown >= L.max_grown) //TODO ~Carn + if(L.amount_grown >= L.max_grown) //TODO ~Carn to_chat(L, "You are growing into a beautiful alien! It is time to choose a caste.") to_chat(L, "There are three to choose from:") to_chat(L, "Hunters are the most agile caste, tasked with hunting for hosts. They are faster than a human and can even pounce, but are not much tougher than a drone.") diff --git a/code/modules/mob/living/carbon/alien/special/alien_embryo.dm b/code/modules/mob/living/carbon/alien/special/alien_embryo.dm index 7f34973dfe8..705ded877e7 100644 --- a/code/modules/mob/living/carbon/alien/special/alien_embryo.dm +++ b/code/modules/mob/living/carbon/alien/special/alien_embryo.dm @@ -85,7 +85,7 @@ if(!candidates.len || !owner) bursting = FALSE - stage = 5 // If no ghosts sign up for the Larva, let's regress our growth by one minute, we will try again! + stage = 5 // If no ghosts sign up for the Larva, let's regress our growth by one minute, we will try again! addtimer(CALLBACK(src, .proc/advance_embryo_stage), growth_time) return @@ -97,7 +97,7 @@ var/atom/xeno_loc = get_turf(owner) var/mob/living/carbon/alien/larva/new_xeno = new(xeno_loc) new_xeno.key = ghost.key - SEND_SOUND(new_xeno, sound('sound/voice/hiss5.ogg',0,0,0,100)) //To get the player's attention + SEND_SOUND(new_xeno, sound('sound/voice/hiss5.ogg',0,0,0,100)) //To get the player's attention ADD_TRAIT(new_xeno, TRAIT_IMMOBILIZED, type) //so we don't move during the bursting animation ADD_TRAIT(new_xeno, TRAIT_HANDS_BLOCKED, type) new_xeno.notransform = 1 diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index fb6e571240e..644cb810330 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -559,13 +559,13 @@ /mob/living/carbon/updatehealth() if(status_flags & GODMODE) return - var/total_burn = 0 - var/total_brute = 0 + var/total_burn = 0 + var/total_brute = 0 var/total_stamina = 0 - for(var/X in bodyparts) //hardcoded to streamline things a bit + for(var/X in bodyparts) //hardcoded to streamline things a bit var/obj/item/bodypart/BP = X - total_brute += (BP.brute_dam * BP.body_damage_coeff) - total_burn += (BP.burn_dam * BP.body_damage_coeff) + total_brute += (BP.brute_dam * BP.body_damage_coeff) + total_burn += (BP.burn_dam * BP.body_damage_coeff) total_stamina += (BP.stamina_dam * BP.stam_damage_coeff) set_health(round(maxHealth - getOxyLoss() - getToxLoss() - getCloneLoss() - total_burn - total_brute, DAMAGE_PRECISION)) staminaloss = round(total_stamina, DAMAGE_PRECISION) diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm index 92aeae45970..ea8cbed4759 100644 --- a/code/modules/mob/living/carbon/carbon_defense.dm +++ b/code/modules/mob/living/carbon/carbon_defense.dm @@ -86,7 +86,7 @@ I.add_mob_blood(src) var/turf/location = get_turf(src) add_splatter_floor(location) - if(get_dist(user, src) <= 1) //people with TK won't get smeared with blood + if(get_dist(user, src) <= 1) //people with TK won't get smeared with blood user.add_mob_blood(src) if(affecting.body_zone == BODY_ZONE_HEAD) if(wear_mask) diff --git a/code/modules/mob/living/carbon/carbon_movement.dm b/code/modules/mob/living/carbon/carbon_movement.dm index 8565c17bcb3..11a1ce7f86a 100644 --- a/code/modules/mob/living/carbon/carbon_movement.dm +++ b/code/modules/mob/living/carbon/carbon_movement.dm @@ -25,7 +25,7 @@ . = ..() if(. && !(movement_type & FLOATING)) //floating is easy if(HAS_TRAIT(src, TRAIT_NOHUNGER)) - set_nutrition(NUTRITION_LEVEL_FED - 1) //just less than feeling vigorous + set_nutrition(NUTRITION_LEVEL_FED - 1) //just less than feeling vigorous else if(nutrition && stat != DEAD) adjust_nutrition(-(HUNGER_FACTOR/10)) if(m_intent == MOVE_INTENT_RUN) diff --git a/code/modules/mob/living/carbon/carbon_update_icons.dm b/code/modules/mob/living/carbon/carbon_update_icons.dm index 35e1ae6dff7..199beeeae8b 100644 --- a/code/modules/mob/living/carbon/carbon_update_icons.dm +++ b/code/modules/mob/living/carbon/carbon_update_icons.dm @@ -97,7 +97,7 @@ var/obj/item/bodypart/BP = X if(BP.dmg_overlay_type) if(BP.brutestate) - damage_overlay.add_overlay("[BP.dmg_overlay_type]_[BP.body_zone]_[BP.brutestate]0") //we're adding icon_states of the base image as overlays + damage_overlay.add_overlay("[BP.dmg_overlay_type]_[BP.body_zone]_[BP.brutestate]0") //we're adding icon_states of the base image as overlays if(BP.burnstate) damage_overlay.add_overlay("[BP.dmg_overlay_type]_[BP.body_zone]_0[BP.burnstate]") diff --git a/code/modules/mob/living/carbon/damage_procs.dm b/code/modules/mob/living/carbon/damage_procs.dm index a7064828d55..8463b9cdfd4 100644 --- a/code/modules/mob/living/carbon/damage_procs.dm +++ b/code/modules/mob/living/carbon/damage_procs.dm @@ -131,7 +131,7 @@ /** * If an organ exists in the slot requested, and we are capable of taking damage (we don't have [GODMODE] on), call the set damage proc on that organ, which can - * set or clear the failing variable on that organ, making it either cease or start functions again, unlike adjustOrganLoss. + * set or clear the failing variable on that organ, making it either cease or start functions again, unlike adjustOrganLoss. * * Arguments: * * slot - organ slot, like [ORGAN_SLOT_HEART] @@ -248,7 +248,7 @@ /// damage MANY bodyparts, in random order /mob/living/carbon/take_overall_damage(brute = 0, burn = 0, stamina = 0, updating_health = TRUE, required_status) if(status_flags & GODMODE) - return //godmode + return //godmode var/list/obj/item/bodypart/parts = get_damageable_bodyparts(required_status) var/update = 0 @@ -265,8 +265,8 @@ update |= picked.receive_damage(brute_per_part, burn_per_part, stamina_per_part, FALSE, required_status, wound_bonus = CANT_WOUND) // disabling wounds from these for now cuz your entire body snapping cause your heart stopped would suck - brute = round(brute - (picked.brute_dam - brute_was), DAMAGE_PRECISION) - burn = round(burn - (picked.burn_dam - burn_was), DAMAGE_PRECISION) + brute = round(brute - (picked.brute_dam - brute_was), DAMAGE_PRECISION) + burn = round(burn - (picked.burn_dam - burn_was), DAMAGE_PRECISION) stamina = round(stamina - (picked.stamina_dam - stamina_was), DAMAGE_PRECISION) parts -= picked diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 16e3d509778..e0116c6c960 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -2,7 +2,7 @@ add_verb(src, /mob/living/proc/mob_sleep) add_verb(src, /mob/living/proc/toggle_resting) - icon_state = "" //Remove the inherent human icon that is visible on the map editor. We're rendering ourselves limb by limb, having it still be there results in a bug where the basic human icon appears below as south in all directions and generally looks nasty. + icon_state = "" //Remove the inherent human icon that is visible on the map editor. We're rendering ourselves limb by limb, having it still be there results in a bug where the basic human icon appears below as south in all directions and generally looks nasty. //initialize limbs first create_bodyparts() @@ -117,12 +117,12 @@ if(obscured & ITEM_SLOT_EYES) dat += "      " else - dat += "" + dat += "" if(obscured & ITEM_SLOT_EARS) dat += "" else - dat += "" + dat += "" dat += "" @@ -141,7 +141,7 @@ if(obscured & ITEM_SLOT_FEET) dat += "" else - dat += "" else - dat += "" + dat += "" if(obscured & ITEM_SLOT_ICLOTHING) dat += "" @@ -379,7 +379,7 @@ if(!HAS_TRAIT(H, TRAIT_SECURITY_HUD)) return if(usr.stat || usr == src) //|| !usr.canmove || usr.restrained()) Fluff: Sechuds have eye-tracking technology and sets 'arrest' to people that the wearer looks and blinks at. - return //Non-fluff: This allows sec to set people to arrest as they get disarmed or beaten + return //Non-fluff: This allows sec to set people to arrest as they get disarmed or beaten // Checks the user has security clearence before allowing them to change arrest status via hud, comment out to enable all access var/allowed_access = null var/obj/item/clothing/glasses/hud/security/G = H.glasses @@ -421,7 +421,7 @@ return if(!HAS_TRAIT(H, TRAIT_SECURITY_HUD)) return - to_chat(usr, "Name: [R.fields["name"]] Criminal Status: [R.fields["criminal"]]") + to_chat(usr, "Name: [R.fields["name"]] Criminal Status: [R.fields["criminal"]]") for(var/datum/data/crime/c in R.fields["crim"]) to_chat(usr, "Crime: [c.crimeName]") if (c.crimeDetails) diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm index 2e74ffdbba7..fe74520074e 100644 --- a/code/modules/mob/living/carbon/human/human_defense.dm +++ b/code/modules/mob/living/carbon/human/human_defense.dm @@ -88,7 +88,7 @@ P.yo = new_y - curloc.y P.xo = new_x - curloc.x var/new_angle_s = P.Angle + rand(120,240) - while(new_angle_s > 180) // Translate to regular projectile degrees + while(new_angle_s > 180) // Translate to regular projectile degrees new_angle_s -= 360 P.setAngle(new_angle_s) @@ -207,7 +207,7 @@ apply_damage(15, BRUTE, wound_bonus=10) /mob/living/carbon/human/attack_hand(mob/user, modifiers) - if(..()) //to allow surgery to return properly. + if(..()) //to allow surgery to return properly. return if(ishuman(user)) var/mob/living/carbon/human/H = user @@ -412,12 +412,12 @@ burn_loss = 60 if(bomb_armor) brute_loss = 30*(2 - round(bomb_armor*0.01, 0.05)) - burn_loss = brute_loss //damage gets reduced from 120 to up to 60 combined brute+burn + burn_loss = brute_loss //damage gets reduced from 120 to up to 60 combined brute+burn damage_clothes(200 - bomb_armor, BRUTE, BOMB) if (ears && !HAS_TRAIT_FROM(src, TRAIT_DEAF, CLOTHING_TRAIT)) ears.adjustEarDamage(30, 120) - Unconscious(20) //short amount of time for follow up attacks against elusive enemies like wizards - Knockdown(200 - (bomb_armor * 1.6)) //between ~4 and ~20 seconds of knockdown depending on bomb armor + Unconscious(20) //short amount of time for follow up attacks against elusive enemies like wizards + Knockdown(200 - (bomb_armor * 1.6)) //between ~4 and ~20 seconds of knockdown depending on bomb armor if(EXPLODE_LIGHT) brute_loss = 30 @@ -426,7 +426,7 @@ damage_clothes(max(50 - bomb_armor, 0), BRUTE, BOMB) if (ears && !HAS_TRAIT_FROM(src, TRAIT_DEAF, CLOTHING_TRAIT)) ears.adjustEarDamage(15,60) - Knockdown(160 - (bomb_armor * 1.6)) //100 bomb armor will prevent knockdown altogether + Knockdown(160 - (bomb_armor * 1.6)) //100 bomb armor will prevent knockdown altogether take_overall_damage(brute_loss,burn_loss) @@ -858,7 +858,7 @@ broken.Insert(broken.len, "and ") broken_plural = TRUE else - var/holder = broken[1] //our one and only element + var/holder = broken[1] //our one and only element if(holder[length(holder)] == "s") broken_plural = TRUE //Put the items in that list into a string of text diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm index 5109eb51854..4d80893735b 100644 --- a/code/modules/mob/living/carbon/human/human_defines.dm +++ b/code/modules/mob/living/carbon/human/human_defines.dm @@ -28,19 +28,19 @@ //Eye colour var/eye_color = "000" - var/skin_tone = "caucasian1" //Skin tone + var/skin_tone = "caucasian1" //Skin tone - var/lip_style = null //no lipstick by default- arguably misleading, as it could be used for general makeup + var/lip_style = null //no lipstick by default- arguably misleading, as it could be used for general makeup var/lip_color = "white" - var/age = 30 //Player's age + var/age = 30 //Player's age - var/underwear = "Nude" //Which underwear the player wants + var/underwear = "Nude" //Which underwear the player wants var/underwear_color = "000" var/undershirt = "Nude" //Which undershirt the player wants var/socks = "Nude" //Which socks the player wants - var/backpack = DBACKPACK //Which backpack type the player has chosen. - var/jumpsuit_style = PREF_SUIT //suit/skirt + var/backpack = DBACKPACK //Which backpack type the player has chosen. + var/jumpsuit_style = PREF_SUIT //suit/skirt //Equipment slots var/obj/item/clothing/wear_suit = null diff --git a/code/modules/mob/living/carbon/human/human_helpers.dm b/code/modules/mob/living/carbon/human/human_helpers.dm index 7c14e6754a6..caf2b21cf5b 100644 --- a/code/modules/mob/living/carbon/human/human_helpers.dm +++ b/code/modules/mob/living/carbon/human/human_helpers.dm @@ -47,12 +47,12 @@ //Returns "Unknown" if facially disfigured and real_name if not. Useful for setting name when Fluacided or when updating a human's name variable /mob/living/carbon/human/proc/get_face_name(if_no_face="Unknown") - if( wear_mask && (wear_mask.flags_inv&HIDEFACE) ) //Wearing a mask which hides our face, use id-name if possible + if( wear_mask && (wear_mask.flags_inv&HIDEFACE) ) //Wearing a mask which hides our face, use id-name if possible return if_no_face if( head && (head.flags_inv&HIDEFACE) ) - return if_no_face //Likewise for hats + return if_no_face //Likewise for hats var/obj/item/bodypart/O = get_bodypart(BODY_ZONE_HEAD) - if( !O || (HAS_TRAIT(src, TRAIT_DISFIGURED)) || (O.brutestate+O.burnstate)>2 || cloneloss>50 || !real_name ) //disfigured. use id-name if possible + if( !O || (HAS_TRAIT(src, TRAIT_DISFIGURED)) || (O.brutestate+O.burnstate)>2 || cloneloss>50 || !real_name ) //disfigured. use id-name if possible return if_no_face return real_name @@ -74,7 +74,7 @@ if(card_slot?.stored_card) . = card_slot.stored_card.registered_name if(!.) - . = if_no_id //to prevent null-names making the mob unclickable + . = if_no_id //to prevent null-names making the mob unclickable return /mob/living/carbon/human/get_idcard(hand_first = TRUE) diff --git a/code/modules/mob/living/carbon/human/human_update_icons.dm b/code/modules/mob/living/carbon/human/human_update_icons.dm index c7d0bd9d90a..b2c63ca3813 100644 --- a/code/modules/mob/living/carbon/human/human_update_icons.dm +++ b/code/modules/mob/living/carbon/human/human_update_icons.dm @@ -6,7 +6,7 @@ This system allows you to update individual mob-overlays, without regenerating t When we generate overlays we generate the standing version and then rotate the mob as necessary.. As of the time of writing there are 20 layers within this list. Please try to keep this from increasing. //22 and counting, good job guys - var/overlays_standing[20] //For the standing stance + var/overlays_standing[20] //For the standing stance Most of the time we only wish to update one overlay: e.g. - we dropped the fireaxe out of our left hand and need to remove its icon from our mob @@ -28,7 +28,7 @@ Note: The defines for layer numbers is now kept exclusvely in __DEFINES/misc.dm All of this means that this code is more maintainable, faster and still fairly easy to use. There are several things that need to be remembered: -> Whenever we do something that should cause an overlay to update (which doesn't use standard procs +> Whenever we do something that should cause an overlay to update (which doesn't use standard procs ( i.e. you do something like l_hand = /obj/item/something new(src), rather than using the helper procs) You will need to call the relevant update_inv_* proc @@ -37,12 +37,12 @@ There are several things that need to be remembered: slime etc. Instead, it'll just return without doing any work. So no harm in calling it for slimes and such. -> There are also these special cases: - update_damage_overlays() //handles damage overlays for brute/burn damage - update_body() //Handles updating your mob's body layer and mutant bodyparts +> There are also these special cases: + update_damage_overlays() //handles damage overlays for brute/burn damage + update_body() //Handles updating your mob's body layer and mutant bodyparts as well as sprite-accessories that didn't really fit elsewhere (underwear, undershirts, socks, lips, eyes) //NOTE: update_mutantrace() is now merged into this! - update_hair() //Handles updating your hair overlay (used to be update_face, but mouth and + update_hair() //Handles updating your hair overlay (used to be update_face, but mouth and eyes were merged into update_body()) @@ -216,10 +216,10 @@ There are several things that need to be remembered: inv.update_icon() if(glasses) - glasses.screen_loc = ui_glasses //...draw the item in the inventory screen + glasses.screen_loc = ui_glasses //...draw the item in the inventory screen if(client && hud_used?.hud_shown) - if(hud_used.inventory_shown) //if the inventory is open ... - client.screen += glasses //Either way, add the item to the HUD + if(hud_used.inventory_shown) //if the inventory is open ... + client.screen += glasses //Either way, add the item to the HUD update_observer_view(glasses,1) if(!(head && (head.flags_inv & HIDEEYES)) && !(wear_mask && (wear_mask.flags_inv & HIDEEYES))) overlays_standing[GLASSES_LAYER] = glasses.build_worn_icon(default_layer = GLASSES_LAYER, default_icon_file = 'icons/mob/clothing/eyes.dmi') @@ -246,10 +246,10 @@ There are several things that need to be remembered: inv.update_icon() if(ears) - ears.screen_loc = ui_ears //move the item to the appropriate screen loc + ears.screen_loc = ui_ears //move the item to the appropriate screen loc if(client && hud_used?.hud_shown) - if(hud_used.inventory_shown) //if the inventory is open - client.screen += ears //add it to the client's screen + if(hud_used.inventory_shown) //if the inventory is open + client.screen += ears //add it to the client's screen update_observer_view(ears,1) overlays_standing[EARS_LAYER] = ears.build_worn_icon(default_layer = EARS_LAYER, default_icon_file = 'icons/mob/clothing/ears.dmi') var/mutable_appearance/ears_overlay = overlays_standing[EARS_LAYER] @@ -273,10 +273,10 @@ There are several things that need to be remembered: inv.update_icon() if(shoes) - shoes.screen_loc = ui_shoes //move the item to the appropriate screen loc + shoes.screen_loc = ui_shoes //move the item to the appropriate screen loc if(client && hud_used?.hud_shown) - if(hud_used.inventory_shown) //if the inventory is open - client.screen += shoes //add it to client's screen + if(hud_used.inventory_shown) //if the inventory is open + client.screen += shoes //add it to client's screen update_observer_view(shoes,1) overlays_standing[SHOES_LAYER] = shoes.build_worn_icon(default_layer = SHOES_LAYER, default_icon_file = 'icons/mob/clothing/feet.dmi') var/mutable_appearance/shoes_overlay = overlays_standing[SHOES_LAYER] @@ -302,7 +302,7 @@ There are several things that need to be remembered: if(client && hud_used?.hud_shown) client.screen += s_store update_observer_view(s_store) - overlays_standing[SUIT_STORE_LAYER] = s_store.build_worn_icon(default_layer = SUIT_STORE_LAYER, default_icon_file = 'icons/mob/clothing/belt_mirror.dmi') + overlays_standing[SUIT_STORE_LAYER] = s_store.build_worn_icon(default_layer = SUIT_STORE_LAYER, default_icon_file = 'icons/mob/clothing/belt_mirror.dmi') var/mutable_appearance/s_store_overlay = overlays_standing[SUIT_STORE_LAYER] if(OFFSET_S_STORE in dna.species.offset_features) s_store_overlay.pixel_x += dna.species.offset_features[OFFSET_S_STORE][1] @@ -432,7 +432,7 @@ There are several things that need to be remembered: /proc/wear_female_version(t_color, icon, layer, type) var/index = t_color var/icon/female_clothing_icon = GLOB.female_clothing_icons[index] - if(!female_clothing_icon) //Create standing/laying icons if they don't exist + if(!female_clothing_icon) //Create standing/laying icons if they don't exist generate_female_clothing(index,t_color,icon,type) return mutable_appearance(GLOB.female_clothing_icons[t_color], layer = -layer) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 119b47a8829..ccfd551d2d8 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -6,17 +6,17 @@ // Used with human/proc/get_heat_protection() and human/proc/get_cold_protection() // The values here should add up to 1. // Hands and feet have 2.5%, arms and legs 7.5%, each of the torso parts has 15% and the head has 30% -#define THERMAL_PROTECTION_HEAD 0.3 -#define THERMAL_PROTECTION_CHEST 0.15 -#define THERMAL_PROTECTION_GROIN 0.15 -#define THERMAL_PROTECTION_LEG_LEFT 0.075 -#define THERMAL_PROTECTION_LEG_RIGHT 0.075 -#define THERMAL_PROTECTION_FOOT_LEFT 0.025 -#define THERMAL_PROTECTION_FOOT_RIGHT 0.025 -#define THERMAL_PROTECTION_ARM_LEFT 0.075 -#define THERMAL_PROTECTION_ARM_RIGHT 0.075 -#define THERMAL_PROTECTION_HAND_LEFT 0.025 -#define THERMAL_PROTECTION_HAND_RIGHT 0.025 +#define THERMAL_PROTECTION_HEAD 0.3 +#define THERMAL_PROTECTION_CHEST 0.15 +#define THERMAL_PROTECTION_GROIN 0.15 +#define THERMAL_PROTECTION_LEG_LEFT 0.075 +#define THERMAL_PROTECTION_LEG_RIGHT 0.075 +#define THERMAL_PROTECTION_FOOT_LEFT 0.025 +#define THERMAL_PROTECTION_FOOT_RIGHT 0.025 +#define THERMAL_PROTECTION_ARM_LEFT 0.075 +#define THERMAL_PROTECTION_ARM_RIGHT 0.075 +#define THERMAL_PROTECTION_HAND_LEFT 0.025 +#define THERMAL_PROTECTION_HAND_RIGHT 0.025 /mob/living/carbon/human/Life() if (notransform) diff --git a/code/modules/mob/living/carbon/human/monkey/monkey.dm b/code/modules/mob/living/carbon/human/monkey/monkey.dm index e980679592d..f0ea641a031 100644 --- a/code/modules/mob/living/carbon/human/monkey/monkey.dm +++ b/code/modules/mob/living/carbon/human/monkey/monkey.dm @@ -36,7 +36,7 @@ var/ancestor_name /// The number of times Pun Pun has died since he was last gibbed var/ancestor_chain = 1 - var/relic_hat //Note: these two are paths + var/relic_hat //Note: these two are paths var/relic_mask var/memory_saved = FALSE @@ -81,10 +81,10 @@ /mob/living/carbon/human/species/monkey/punpun/proc/Read_Memory() if(fexists("data/npc_saves/Punpun.sav")) //legacy compatability to convert old format to new var/savefile/S = new /savefile("data/npc_saves/Punpun.sav") - S["ancestor_name"] >> ancestor_name + S["ancestor_name"] >> ancestor_name S["ancestor_chain"] >> ancestor_chain - S["relic_hat"] >> relic_hat - S["relic_mask"] >> relic_mask + S["relic_hat"] >> relic_hat + S["relic_mask"] >> relic_mask fdel("data/npc_saves/Punpun.sav") else var/json_file = file("data/npc_saves/Punpun.json") diff --git a/code/modules/mob/living/carbon/human/physiology.dm b/code/modules/mob/living/carbon/human/physiology.dm index 2a197b64ee2..f83cc5e6203 100644 --- a/code/modules/mob/living/carbon/human/physiology.dm +++ b/code/modules/mob/living/carbon/human/physiology.dm @@ -1,27 +1,27 @@ //Stores several modifiers in a way that isn't cleared by changing species /datum/physiology - var/brute_mod = 1 // % of brute damage taken from all sources - var/burn_mod = 1 // % of burn damage taken from all sources - var/tox_mod = 1 // % of toxin damage taken from all sources - var/oxy_mod = 1 // % of oxygen damage taken from all sources - var/clone_mod = 1 // % of clone damage taken from all sources - var/stamina_mod = 1 // % of stamina damage taken from all sources - var/brain_mod = 1 // % of brain damage taken from all sources + var/brute_mod = 1 // % of brute damage taken from all sources + var/burn_mod = 1 // % of burn damage taken from all sources + var/tox_mod = 1 // % of toxin damage taken from all sources + var/oxy_mod = 1 // % of oxygen damage taken from all sources + var/clone_mod = 1 // % of clone damage taken from all sources + var/stamina_mod = 1 // % of stamina damage taken from all sources + var/brain_mod = 1 // % of brain damage taken from all sources - var/pressure_mod = 1 // % of brute damage taken from low or high pressure (stacks with brute_mod) - var/heat_mod = 1 // % of burn damage taken from heat (stacks with burn_mod) - var/cold_mod = 1 // % of burn damage taken from cold (stacks with burn_mod) + var/pressure_mod = 1 // % of brute damage taken from low or high pressure (stacks with brute_mod) + var/heat_mod = 1 // % of burn damage taken from heat (stacks with burn_mod) + var/cold_mod = 1 // % of burn damage taken from cold (stacks with burn_mod) var/damage_resistance = 0 // %damage reduction from all sources - var/siemens_coeff = 1 // resistance to shocks + var/siemens_coeff = 1 // resistance to shocks - var/stun_mod = 1 // % stun modifier - var/bleed_mod = 1 // % bleeding modifier - var/datum/armor/armor // internal armor datum + var/stun_mod = 1 // % stun modifier + var/bleed_mod = 1 // % bleeding modifier + var/datum/armor/armor // internal armor datum - var/hunger_mod = 1 //% of hunger rate taken per tick. + var/hunger_mod = 1 //% of hunger rate taken per tick. /datum/physiology/New() armor = new diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index dcde7d3e04f..44e6a1a5059 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -106,7 +106,7 @@ GLOBAL_LIST_EMPTY(roundstart_races) ///To use MUTCOLOR with a fixed color that's independent of the mcolor feature in DNA. var/fixed_mut_color = "" ///Special mutation that can be found in the genepool exclusively in this species. Dont leave empty or changing species will be a headache - var/inert_mutation = DWARFISM + var/inert_mutation = DWARFISM ///Used to set the mob's deathsound upon species change var/deathsound ///Sounds to override barefeet walking @@ -198,7 +198,7 @@ GLOBAL_LIST_EMPTY(roundstart_races) /datum/species/New() - if(!limbs_id) //if we havent set a limbs id to use, just use our own id + if(!limbs_id) //if we havent set a limbs id to use, just use our own id limbs_id = id ..() @@ -390,7 +390,7 @@ GLOBAL_LIST_EMPTY(roundstart_races) var/obj/item/I = V if(istype(I)) C.dropItemToGround(I) - else //Entries in the list should only ever be items or null, so if it's not an item, we can assume it's an empty hand + else //Entries in the list should only ever be items or null, so if it's not an item, we can assume it's an empty hand C.put_in_hands(new mutanthands()) for(var/X in inherent_traits) @@ -749,7 +749,7 @@ GLOBAL_LIST_EMPTY(roundstart_races) /datum/species/proc/handle_mutant_bodyparts(mob/living/carbon/human/H, forced_colour) var/list/bodyparts_to_add = mutant_bodyparts.Copy() var/list/relevent_layers = list(BODY_BEHIND_LAYER, BODY_ADJ_LAYER, BODY_FRONT_LAYER) - var/list/standing = list() + var/list/standing = list() H.remove_overlay(BODY_BEHIND_LAYER) H.remove_overlay(BODY_ADJ_LAYER) @@ -1294,7 +1294,7 @@ GLOBAL_LIST_EMPTY(roundstart_races) addtimer(CALLBACK(src, .proc/go_bald, H), 50) /datum/species/proc/go_bald(mob/living/carbon/human/H) - if(QDELETED(H)) //may be called from a timer + if(QDELETED(H)) //may be called from a timer return H.facial_hairstyle = "Shaved" H.hairstyle = "Bald" @@ -1529,13 +1529,13 @@ GLOBAL_LIST_EMPTY(roundstart_races) var/bloody = FALSE if(((I.damtype == BRUTE) && I.force && prob(25 + (I.force * 2)))) if(affecting.status == BODYPART_ORGANIC) - I.add_mob_blood(H) //Make the weapon bloody, not the person. - if(prob(I.force * 2)) //blood spatter! + I.add_mob_blood(H) //Make the weapon bloody, not the person. + if(prob(I.force * 2)) //blood spatter! bloody = TRUE var/turf/location = H.loc if(istype(location)) H.add_splatter_floor(location) - if(get_dist(user, H) <= 1) //people with TK won't get smeared with blood + if(get_dist(user, H) <= 1) //people with TK won't get smeared with blood user.add_mob_blood(H) switch(hit_area) @@ -1558,7 +1558,7 @@ GLOBAL_LIST_EMPTY(roundstart_races) if(rev) rev.remove_revolutionary(FALSE, user) - if(bloody) //Apply blood + if(bloody) //Apply blood if(H.wear_mask) H.wear_mask.add_mob_blood(H) H.update_inv_wear_mask() @@ -2103,7 +2103,7 @@ GLOBAL_LIST_EMPTY(roundstart_races) /datum/species/proc/CanFly(mob/living/carbon/human/H) if(H.stat || H.body_position == LYING_DOWN) return FALSE - if(H.wear_suit && ((H.wear_suit.flags_inv & HIDEJUMPSUIT) && (!H.wear_suit.species_exception || !is_type_in_list(src, H.wear_suit.species_exception)))) //Jumpsuits have tail holes, so it makes sense they have wing holes too + if(H.wear_suit && ((H.wear_suit.flags_inv & HIDEJUMPSUIT) && (!H.wear_suit.species_exception || !is_type_in_list(src, H.wear_suit.species_exception)))) //Jumpsuits have tail holes, so it makes sense they have wing holes too to_chat(H, "Your suit blocks your wings from extending!") return FALSE var/turf/T = get_turf(H) diff --git a/code/modules/mob/living/carbon/human/species_types/felinid.dm b/code/modules/mob/living/carbon/human/species_types/felinid.dm index 6f638c7da85..265026bfc65 100644 --- a/code/modules/mob/living/carbon/human/species_types/felinid.dm +++ b/code/modules/mob/living/carbon/human/species_types/felinid.dm @@ -51,7 +51,7 @@ /datum/species/human/felinid/on_species_gain(mob/living/carbon/C, datum/species/old_species, pref_load) if(ishuman(C)) var/mob/living/carbon/human/H = C - if(!pref_load) //Hah! They got forcefully purrbation'd. Force default felinid parts on them if they have no mutant parts in those areas! + if(!pref_load) //Hah! They got forcefully purrbation'd. Force default felinid parts on them if they have no mutant parts in those areas! if(H.dna.features["tail_human"] == "None") H.dna.features["tail_human"] = "Cat" if(H.dna.features["ears"] == "None") diff --git a/code/modules/mob/living/carbon/human/species_types/golems.dm b/code/modules/mob/living/carbon/human/species_types/golems.dm index d4db440a635..dbd633338af 100644 --- a/code/modules/mob/living/carbon/human/species_types/golems.dm +++ b/code/modules/mob/living/carbon/human/species_types/golems.dm @@ -863,7 +863,7 @@ /datum/species/golem/bronze/proc/gong(mob/living/carbon/human/H) last_gong_time = world.time for(var/mob/living/M in get_hearers_in_view(7,H)) - if(M.stat == DEAD) //F + if(M.stat == DEAD) //F continue if(M == H) H.show_message("You cringe with pain as your body rings around you!", MSG_AUDIBLE) diff --git a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm index d8e0c76832f..e951c1870ed 100644 --- a/code/modules/mob/living/carbon/human/species_types/jellypeople.dm +++ b/code/modules/mob/living/carbon/human/species_types/jellypeople.dm @@ -370,24 +370,24 @@ return FALSE var/datum/species/jelly/slime/SS = H.dna.species - if(QDELETED(dupe)) //Is there a body? + if(QDELETED(dupe)) //Is there a body? SS.bodies -= dupe return FALSE - if(!isslimeperson(dupe)) //Is it a slimeperson? + if(!isslimeperson(dupe)) //Is it a slimeperson? SS.bodies -= dupe return FALSE - if(dupe.stat == DEAD) //Is it alive? + if(dupe.stat == DEAD) //Is it alive? return FALSE - if(dupe.stat != CONSCIOUS) //Is it awake? + if(dupe.stat != CONSCIOUS) //Is it awake? return FALSE - if(dupe.mind && dupe.mind.active) //Is it unoccupied? + if(dupe.mind && dupe.mind.active) //Is it unoccupied? return FALSE - if(!(dupe in SS.bodies)) //Do we actually own it? + if(!(dupe in SS.bodies)) //Do we actually own it? return FALSE return TRUE diff --git a/code/modules/mob/living/carbon/human/suicides.dm b/code/modules/mob/living/carbon/human/suicides.dm index 8aac47d188d..94c917ab6bc 100644 --- a/code/modules/mob/living/carbon/human/suicides.dm +++ b/code/modules/mob/living/carbon/human/suicides.dm @@ -2,4 +2,4 @@ suicide_log() adjustBruteLoss(max(200 - getToxLoss() - getFireLoss() - getBruteLoss() - getOxyLoss(), 0)) death(FALSE) - ghostize(FALSE) // Disallows reentering body and disassociates mind + ghostize(FALSE) // Disallows reentering body and disassociates mind diff --git a/code/modules/mob/living/life.dm b/code/modules/mob/living/life.dm index 0a99e840305..a0fd6fcae02 100644 --- a/code/modules/mob/living/life.dm +++ b/code/modules/mob/living/life.dm @@ -146,12 +146,12 @@ /mob/living/proc/handle_traits() //Eyes - if(eye_blind) //blindness, heals slowly over time + if(eye_blind) //blindness, heals slowly over time if(HAS_TRAIT_FROM(src, TRAIT_BLIND, EYES_COVERED)) //covering your eyes heals blurry eyes faster adjust_blindness(-3) else if(!stat && !(HAS_TRAIT(src, TRAIT_BLIND))) adjust_blindness(-1) - else if(eye_blurry) //blurry eyes heal slowly + else if(eye_blurry) //blurry eyes heal slowly adjust_blurriness(-1) /mob/living/proc/update_damage_hud() diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index dbb1861d8fb..d1aa2d581fa 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -241,7 +241,7 @@ if((AM.move_resist * MOVE_FORCE_CRUSH_RATIO) <= force) if(move_crush(AM, move_force, dir_to_target)) push_anchored = TRUE - if((AM.move_resist * MOVE_FORCE_FORCEPUSH_RATIO) <= force) //trigger move_crush and/or force_push regardless of if we can push it normally + if((AM.move_resist * MOVE_FORCE_FORCEPUSH_RATIO) <= force) //trigger move_crush and/or force_push regardless of if we can push it normally if(force_push(AM, move_force, dir_to_target, push_anchored)) push_anchored = TRUE if((AM.anchored && !push_anchored) || (force < (AM.move_resist * MOVE_FORCE_PUSH_RATIO))) @@ -612,11 +612,11 @@ //Recursive function to find everything a mob is holding. Really shitty proc tbh. /mob/living/get_contents() var/list/ret = list() - ret |= contents //add our contents - for(var/i in ret.Copy()) //iterate storage objects + ret |= contents //add our contents + for(var/i in ret.Copy()) //iterate storage objects var/atom/A = i SEND_SIGNAL(A, COMSIG_TRY_STORAGE_RETURN_INVENTORY, ret) - for(var/obj/item/folder/F in ret.Copy()) //very snowflakey-ly iterate folders + for(var/obj/item/folder/F in ret.Copy()) //very snowflakey-ly iterate folders ret |= F.contents return ret @@ -854,7 +854,7 @@ return var/bleed_amount = bleedDragAmount() - blood_volume = max(blood_volume - bleed_amount, 0) //that depends on our brute damage. + blood_volume = max(blood_volume - bleed_amount, 0) //that depends on our brute damage. var/newdir = get_dir(target_turf, start) if(newdir != direction) newdir = newdir | direction diff --git a/code/modules/mob/living/living_defines.dm b/code/modules/mob/living/living_defines.dm index 159170b5563..2d4c1bfb305 100644 --- a/code/modules/mob/living/living_defines.dm +++ b/code/modules/mob/living/living_defines.dm @@ -18,12 +18,12 @@ var/health = MAX_LIVING_HEALTH //Damage related vars, NOTE: THESE SHOULD ONLY BE MODIFIED BY PROCS - var/bruteloss = 0 ///Brutal damage caused by brute force (punching, being clubbed by a toolbox ect... this also accounts for pressure damage) - var/oxyloss = 0 ///Oxygen depravation damage (no air in lungs) - var/toxloss = 0 ///Toxic damage caused by being poisoned or radiated - var/fireloss = 0 ///Burn damage caused by being way too hot, too cold or burnt. - var/cloneloss = 0 ///Damage caused by being cloned or ejected from the cloner early. slimes also deal cloneloss damage to victims - var/staminaloss = 0 ///Stamina damage, or exhaustion. You recover it slowly naturally, and are knocked down if it gets too high. Holodeck and hallucinations deal this. + var/bruteloss = 0 ///Brutal damage caused by brute force (punching, being clubbed by a toolbox ect... this also accounts for pressure damage) + var/oxyloss = 0 ///Oxygen depravation damage (no air in lungs) + var/toxloss = 0 ///Toxic damage caused by being poisoned or radiated + var/fireloss = 0 ///Burn damage caused by being way too hot, too cold or burnt. + var/cloneloss = 0 ///Damage caused by being cloned or ejected from the cloner early. slimes also deal cloneloss damage to victims + var/staminaloss = 0 ///Stamina damage, or exhaustion. You recover it slowly naturally, and are knocked down if it gets too high. Holodeck and hallucinations deal this. var/crit_threshold = HEALTH_THRESHOLD_CRIT /// when the mob goes from "normal" to crit ///When the mob enters hard critical state and is fully incapacitated. var/hardcrit_threshold = HEALTH_THRESHOLD_FULLCRIT @@ -64,7 +64,7 @@ var/list/roundstart_quirks = list() - var/list/surgeries = list() ///a list of surgery datums. generally empty, they're added when the player wants them. + var/list/surgeries = list() ///a list of surgery datums. generally empty, they're added when the player wants them. var/now_pushing = null //! Used by [living/Bump()][/mob/living/proc/Bump] and [living/PushAM()][/mob/living/proc/PushAM] to prevent potential infinite loop. @@ -132,11 +132,11 @@ var/list/implants = null - var/last_words ///used for database logging + var/last_words ///used for database logging var/list/obj/effect/proc_holder/abilities = list() - var/can_be_held = FALSE //whether this can be picked up and held. + var/can_be_held = FALSE //whether this can be picked up and held. var/worn_slot_flags = NONE //if it can be held, can it be equipped to any slots? (think pAI's on head) var/radiation = 0 ///If the mob is irradiated. diff --git a/code/modules/mob/living/living_say.dm b/code/modules/mob/living/living_say.dm index 1875959eaa7..5a3e2c17895 100644 --- a/code/modules/mob/living/living_say.dm +++ b/code/modules/mob/living/living_say.dm @@ -313,8 +313,8 @@ GLOBAL_LIST_INIT(message_modes_stat_limits, list( if(client) //client is so that ghosts don't have to listen to mice for(var/_M in GLOB.player_list) var/mob/M = _M - if(QDELETED(M)) //Some times nulls and deleteds stay in this list. This is a workaround to prevent ic chat breaking for everyone when they do. - continue //Remove if underlying cause (likely byond issue) is fixed. See TG PR #49004. + if(QDELETED(M)) //Some times nulls and deleteds stay in this list. This is a workaround to prevent ic chat breaking for everyone when they do. + continue //Remove if underlying cause (likely byond issue) is fixed. See TG PR #49004. if(M.stat != DEAD) //not dead, not important continue if(get_dist(M, src) > 7 || M.z != z) //they're out of range of normal hearing diff --git a/code/modules/mob/living/logout.dm b/code/modules/mob/living/logout.dm index ca5296cdffc..1b21d7f676b 100644 --- a/code/modules/mob/living/logout.dm +++ b/code/modules/mob/living/logout.dm @@ -1,6 +1,6 @@ /mob/living/Logout() update_z(null) ..() - if(!key && mind) //key and mind have become separated. - mind.active = FALSE //This is to stop say, a mind.transfer_to call on a corpse causing a ghost to re-enter its body. + if(!key && mind) //key and mind have become separated. + mind.active = FALSE //This is to stop say, a mind.transfer_to call on a corpse causing a ghost to re-enter its body. med_hud_set_status() diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index 40a7f89deb9..321dc9ed822 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -53,14 +53,14 @@ var/datum/module_picker/malf_picker var/list/datum/ai_module/current_modules = list() var/can_dominate_mechs = FALSE - var/shunted = FALSE //1 if the AI is currently shunted. Used to differentiate between shunted and ghosted/braindead + var/shunted = FALSE //1 if the AI is currently shunted. Used to differentiate between shunted and ghosted/braindead - var/control_disabled = FALSE // Set to 1 to stop AI from interacting via Click() - var/malfhacking = FALSE // More or less a copy of the above var, so that malf AIs can hack and still get new cyborgs -- NeoFite - var/malf_cooldown = 0 //Cooldown var for malf modules, stores a worldtime + cooldown + var/control_disabled = FALSE // Set to 1 to stop AI from interacting via Click() + var/malfhacking = FALSE // More or less a copy of the above var, so that malf AIs can hack and still get new cyborgs -- NeoFite + var/malf_cooldown = 0 //Cooldown var for malf modules, stores a worldtime + cooldown var/obj/machinery/power/apc/malfhack - var/explosive = FALSE //does the AI explode when it dies? + var/explosive = FALSE //does the AI explode when it dies? var/mob/living/silicon/ai/parent var/camera_light_on = FALSE @@ -70,11 +70,11 @@ var/last_paper_seen = null var/can_shunt = TRUE - var/last_announcement = "" // For AI VOX, if enabled + var/last_announcement = "" // For AI VOX, if enabled var/turf/waypoint //Holds the turf of the currently selected waypoint. - var/waypoint_mode = FALSE //Waypoint mode is for selecting a turf via clicking. - var/call_bot_cooldown = 0 //time of next call bot command - var/obj/machinery/power/apc/apc_override //Ref of the AI's APC, used when the AI has no power in order to access their APC. + var/waypoint_mode = FALSE //Waypoint mode is for selecting a turf via clicking. + var/call_bot_cooldown = 0 //time of next call bot command + var/obj/machinery/power/apc/apc_override //Ref of the AI's APC, used when the AI has no power in order to access their APC. var/nuking = FALSE var/obj/machinery/doomsday_device/doomsday_device @@ -547,7 +547,7 @@ var/foo = 0 var/dat2 = "" for (var/obj/machinery/camera/I in CL) - dat2 += text("[][]", (!foo) ? "" : " | ", I.c_tag) //I'm not fixing this shit... + dat2 += text("[][]", (!foo) ? "" : " | ", I.c_tag) //I'm not fixing this shit... foo = 1 queueAlarm(text ("--- [] alarm detected in []! ([])", class, A.name, dat2), class) else @@ -619,7 +619,7 @@ to_chat(src, "Switched to the \"[uppertext(network)]\" camera network.") //End of code by Mord_Sith -//I am the icon meister. Bow fefore me. //>fefore +//I am the icon meister. Bow fefore me. //>fefore /mob/living/silicon/ai/proc/ai_hologram_change() set name = "Change Hologram" set desc = "Change the default hologram available to AI to something else." @@ -785,7 +785,7 @@ new_core.circuit.battery = battery ai_restore_power()//So the AI initially has power. control_disabled = TRUE //Can't control things remotely if you're stuck in a card! - radio_enabled = FALSE //No talking on the built-in radio for you either! + radio_enabled = FALSE //No talking on the built-in radio for you either! forceMove(card) card.AI = src to_chat(src, "You have been downloaded to a mobile storage device. Remote device connection severed.") diff --git a/code/modules/mob/living/silicon/ai/freelook/cameranet.dm b/code/modules/mob/living/silicon/ai/freelook/cameranet.dm index 5addbe00a89..4d40a49b77e 100644 --- a/code/modules/mob/living/silicon/ai/freelook/cameranet.dm +++ b/code/modules/mob/living/silicon/ai/freelook/cameranet.dm @@ -106,7 +106,7 @@ GLOBAL_DATUM_INIT(cameranet, /datum/cameranet, new) if(USE_STATIC_OPAQUE) client.images -= GLOB.cameranet.obscured -// Updates the chunks that the turf is located in. Use this when obstacles are destroyed or when doors open. +// Updates the chunks that the turf is located in. Use this when obstacles are destroyed or when doors open. /datum/cameranet/proc/updateVisibility(atom/A, opacity_check = 1) if(!SSticker || (opacity_check && !A.opacity)) diff --git a/code/modules/mob/living/silicon/ai/multicam.dm b/code/modules/mob/living/silicon/ai/multicam.dm index 8ed811e9265..c16fb59beaf 100644 --- a/code/modules/mob/living/silicon/ai/multicam.dm +++ b/code/modules/mob/living/silicon/ai/multicam.dm @@ -38,7 +38,7 @@ add_overlay(highlighted ? highlighted_background : standard_background) /atom/movable/screen/movable/pic_in_pic/ai/set_view_size(width, height, do_refresh = TRUE) - aiEye.static_visibility_range = (round(max(width, height) / 2) + 1) + aiEye.static_visibility_range = (round(max(width, height) / 2) + 1) if(ai) ai.camera_visibility(aiEye) ..() diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm index 92dd0c5066e..66b25adcec1 100644 --- a/code/modules/mob/living/silicon/pai/pai.dm +++ b/code/modules/mob/living/silicon/pai/pai.dm @@ -26,45 +26,45 @@ var/network = "ss13" var/obj/machinery/camera/current = null - var/ram = 100 // Used as currency to purchase different abilities + var/ram = 100 // Used as currency to purchase different abilities var/list/software = list() - var/userDNA // The DNA string of our assigned user - var/obj/item/paicard/card // The card we inhabit - var/hacking = FALSE //Are we hacking a door? + var/userDNA // The DNA string of our assigned user + var/obj/item/paicard/card // The card we inhabit + var/hacking = FALSE //Are we hacking a door? var/speakStatement = "states" var/speakExclamation = "declares" var/speakDoubleExclamation = "alarms" var/speakQuery = "queries" - var/obj/item/pai_cable/hacking_cable // The cable we produce when hacking a door + var/obj/item/pai_cable/hacking_cable // The cable we produce when hacking a door - var/master // Name of the one who commands us - var/master_dna // DNA string for owner verification + var/master // Name of the one who commands us + var/master_dna // DNA string for owner verification // Various software-specific vars - var/temp // General error reporting text contained here will typically be shown once and cleared - var/screen // Which screen our main window displays - var/subscreen // Which specific function of the main screen is being displayed + var/temp // General error reporting text contained here will typically be shown once and cleared + var/screen // Which screen our main window displays + var/subscreen // Which specific function of the main screen is being displayed - var/secHUD = 0 // Toggles whether the Security HUD is active or not - var/medHUD = 0 // Toggles whether the Medical HUD is active or not + var/secHUD = 0 // Toggles whether the Security HUD is active or not + var/medHUD = 0 // Toggles whether the Medical HUD is active or not - var/datum/data/record/medicalActive1 // Datacore record declarations for record software + var/datum/data/record/medicalActive1 // Datacore record declarations for record software var/datum/data/record/medicalActive2 - var/datum/data/record/securityActive1 // Could probably just combine all these into one + var/datum/data/record/securityActive1 // Could probably just combine all these into one var/datum/data/record/securityActive2 - var/obj/machinery/door/hackdoor // The airlock being hacked - var/hackprogress = 0 // Possible values: 0 - 100, >= 100 means the hack is complete and will be reset upon next check + var/obj/machinery/door/hackdoor // The airlock being hacked + var/hackprogress = 0 // Possible values: 0 - 100, >= 100 means the hack is complete and will be reset upon next check var/obj/item/integrated_signaler/signaler // AI's signaller var/obj/item/instrument/piano_synth/internal_instrument - var/obj/machinery/newscaster //pAI Newscaster - var/obj/item/healthanalyzer/hostscan //pAI healthanalyzer + var/obj/machinery/newscaster //pAI Newscaster + var/obj/item/healthanalyzer/hostscan //pAI healthanalyzer /// Internal pAI GPS, enabled if pAI downloads GPS software, and then uses it. var/obj/item/gps/pai/internal_gps = null @@ -75,7 +75,7 @@ var/can_transmit = TRUE var/can_receive = TRUE var/chassis = "repairbot" - var/list/possible_chassis = list("cat" = TRUE, "mouse" = TRUE, "monkey" = TRUE, "corgi" = FALSE, "fox" = FALSE, "repairbot" = TRUE, "rabbit" = TRUE, "bat" = FALSE, "butterfly" = FALSE, "hawk" = FALSE, "lizard" = FALSE, "duffel" = TRUE) //assoc value is whether it can be picked up. + var/list/possible_chassis = list("cat" = TRUE, "mouse" = TRUE, "monkey" = TRUE, "corgi" = FALSE, "fox" = FALSE, "repairbot" = TRUE, "rabbit" = TRUE, "bat" = FALSE, "butterfly" = FALSE, "hawk" = FALSE, "lizard" = FALSE, "duffel" = TRUE) //assoc value is whether it can be picked up. var/emitterhealth = 20 var/emittermaxhealth = 20 @@ -85,7 +85,7 @@ var/emittersemicd = FALSE var/overload_ventcrawl = 0 - var/overload_bulletblock = 0 //Why is this a good idea? + var/overload_bulletblock = 0 //Why is this a good idea? var/overload_maxhealth = 0 var/silent = FALSE var/brightness_power = 5 diff --git a/code/modules/mob/living/silicon/pai/pai_defense.dm b/code/modules/mob/living/silicon/pai/pai_defense.dm index cfc77011c6b..af6ae269ccd 100644 --- a/code/modules/mob/living/silicon/pai/pai_defense.dm +++ b/code/modules/mob/living/silicon/pai/pai_defense.dm @@ -30,7 +30,7 @@ /mob/living/silicon/pai/ex_act(severity, target) take_holo_damage(severity * 50) switch(severity) - if(1) //RIP + if(1) //RIP qdel(card) qdel(src) if(2) diff --git a/code/modules/mob/living/silicon/pai/software.dm b/code/modules/mob/living/silicon/pai/software.dm index 272f37d4516..3c38a1a5c7d 100644 --- a/code/modules/mob/living/silicon/pai/software.dm +++ b/code/modules/mob/living/silicon/pai/software.dm @@ -1,6 +1,6 @@ // TODO: -// - Potentially roll HUDs and Records into one -// - Shock collar/lock system for prisoner pAIs? +// - Potentially roll HUDs and Records into one +// - Shock collar/lock system for prisoner pAIs? /mob/living/silicon/pai/var/list/available_software = list( @@ -36,12 +36,12 @@ if(temp) left_part = temp - else if(stat == DEAD) // Show some flavor text if the pAI is dead + else if(stat == DEAD) // Show some flavor text if the pAI is dead left_part = "ÈRrÖR Ða†Ä ÇÖRrÚþ†Ìoñ" right_part = "
      Program index hash not found
      " else - switch(screen) // Determine which interface to show here + switch(screen) // Determine which interface to show here if("main") left_part = "" if("directives") @@ -76,7 +76,7 @@ left_part = softwareHostScan() - //usr << browse_rsc('windowbak.png') // This has been moved to the mob's Login() proc + //usr << browse_rsc('windowbak.png') // This has been moved to the mob's Login() proc // Declaring a doctype is necessary to enable BYOND's crappy browser's more advanced CSS functionality @@ -255,7 +255,7 @@ radio.subspace_transmission = TRUE if("translator") - if(href_list["toggle"]) //This is permanent. + if(href_list["toggle"]) //This is permanent. grant_all_languages(TRUE, TRUE, TRUE, LANGUAGE_SOFTWARE) if("doorjack") @@ -293,7 +293,7 @@ // MENUS -/mob/living/silicon/pai/proc/softwareMenu() // Populate the right menu +/mob/living/silicon/pai/proc/softwareMenu() // Populate the right menu var/dat = "" dat += "Refresh
      " diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 36a436bbcbc..7a2066b3866 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -10,7 +10,7 @@ robot_modules_background = new() robot_modules_background.icon_state = "block" - robot_modules_background.layer = HUD_LAYER //Objects that appear on screen are on layer ABOVE_HUD_LAYER, UI should be just below it. + robot_modules_background.layer = HUD_LAYER //Objects that appear on screen are on layer ABOVE_HUD_LAYER, UI should be just below it. robot_modules_background.plane = HUD_PLANE inv1 = new /atom/movable/screen/robot/module1() @@ -180,7 +180,7 @@ real_name = changed_name name = real_name if(!QDELETED(builtInCamera)) - builtInCamera.c_tag = real_name //update the camera name too + builtInCamera.c_tag = real_name //update the camera name too /mob/living/silicon/robot/proc/get_standard_name() return "[(designation ? "[designation] " : "")][mmi.braintype]-[ident]" @@ -784,7 +784,7 @@ real_name = name GLOB.available_ai_shells |= src if(!QDELETED(builtInCamera)) - builtInCamera.c_tag = real_name //update the camera name too + builtInCamera.c_tag = real_name //update the camera name too diag_hud_set_aishell() /** @@ -815,7 +815,7 @@ real_name = "[AI.real_name] [designation] Shell-[ident]" name = real_name if(!QDELETED(builtInCamera)) - builtInCamera.c_tag = real_name //update the camera name too + builtInCamera.c_tag = real_name //update the camera name too mainframe = AI deployed = TRUE set_connected_ai(mainframe) @@ -860,7 +860,7 @@ if(radio) //Return radio to normal radio.recalculateChannels() if(!QDELETED(builtInCamera)) - builtInCamera.c_tag = real_name //update the camera name too + builtInCamera.c_tag = real_name //update the camera name too diag_hud_set_aishell() mainframe.diag_hud_set_deployed() if(mainframe.laws) diff --git a/code/modules/mob/living/silicon/robot/robot_defense.dm b/code/modules/mob/living/silicon/robot/robot_defense.dm index f632dfcc94b..f2a05e1c9fa 100644 --- a/code/modules/mob/living/silicon/robot/robot_defense.dm +++ b/code/modules/mob/living/silicon/robot/robot_defense.dm @@ -39,7 +39,7 @@ GLOBAL_LIST_INIT(blacklisted_borg_hats, typecacheof(list( //Hats that don't real to_chat(user, "The wires seem fine, there's no need to fix them.") return - if(W.tool_behaviour == TOOL_CROWBAR) // crowbar means open or close the cover + if(W.tool_behaviour == TOOL_CROWBAR) // crowbar means open or close the cover if(opened) to_chat(user, "You close the cover.") opened = FALSE @@ -53,7 +53,7 @@ GLOBAL_LIST_INIT(blacklisted_borg_hats, typecacheof(list( //Hats that don't real update_icons() return - if(istype(W, /obj/item/stock_parts/cell) && opened) // trying to put a cell inside + if(istype(W, /obj/item/stock_parts/cell) && opened) // trying to put a cell inside if(wiresexposed) to_chat(user, "Close the cover first!") else if(cell) @@ -74,13 +74,13 @@ GLOBAL_LIST_INIT(blacklisted_borg_hats, typecacheof(list( //Hats that don't real to_chat(user, "You can't reach the wiring!") return - if(W.tool_behaviour == TOOL_SCREWDRIVER && opened) // wire hacking or radio management + if(W.tool_behaviour == TOOL_SCREWDRIVER && opened) // wire hacking or radio management if(!cell) //haxing wiresexposed = !wiresexposed to_chat(user, "The wires have been [wiresexposed ? "exposed" : "unexposed"].") else //radio if(shell) - to_chat(user, "You cannot seem to open the radio compartment!") //Prevent AI radio key theft + to_chat(user, "You cannot seem to open the radio compartment!") //Prevent AI radio key theft else if(radio) radio.attackby(W,user)//Push it to the radio to let it handle everything else @@ -163,7 +163,7 @@ GLOBAL_LIST_INIT(blacklisted_borg_hats, typecacheof(list( //Hats that don't real to_chat(user, "Unable to locate a radio!") return - if (W.GetID()) // trying to unlock the interface with an ID card + if (W.GetID()) // trying to unlock the interface with an ID card if(opened) to_chat(user, "You must close the cover to swipe an ID card!") else diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 27a43203cf6..a35b3bea94f 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -215,7 +215,7 @@ /obj/item/paint/anycolor, /obj/item/soap/nanotrasen, /obj/item/pneumatic_cannon/pie/selfcharge/cyborg, - /obj/item/razor, //killbait material + /obj/item/razor, //killbait material /obj/item/lipstick/purple, /obj/item/reagent_containers/spray/waterflower/cyborg, /obj/item/borg/cyborghug/peacekeeper, diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm index 944089a76a4..44380030e07 100644 --- a/code/modules/mob/living/silicon/silicon.dm +++ b/code/modules/mob/living/silicon/silicon.dm @@ -43,7 +43,7 @@ var/updating = FALSE //portable camera camerachunk update var/hack_software = FALSE //Will be able to use hacking actions - var/interaction_range = 7 //wireless control range + var/interaction_range = 7 //wireless control range var/obj/item/pda/ai/aiPDA /mob/living/silicon/Initialize() @@ -371,7 +371,7 @@ Autochan += " ([radio.frequency])" else if(Autochan == "None") //Prevents use of the radio for automatic annoucements. radiomod = "" - else //For department channels, if any, given by the internal radio. + else //For department channels, if any, given by the internal radio. for(var/key in GLOB.department_radio_keys) if(GLOB.department_radio_keys[key] == Autochan) radiomod = ":" + key diff --git a/code/modules/mob/living/silicon/silicon_defense.dm b/code/modules/mob/living/silicon/silicon_defense.dm index 52db1f7c58b..7aa3d01909d 100644 --- a/code/modules/mob/living/silicon/silicon_defense.dm +++ b/code/modules/mob/living/silicon/silicon_defense.dm @@ -86,7 +86,7 @@ if(buckled_mobs) for(var/mob/living/M in buckled_mobs) unbuckle_mob(M) - M.electrocute_act(shock_damage/100, source, siemens_coeff, flags) //Hard metal shell conducts! + M.electrocute_act(shock_damage/100, source, siemens_coeff, flags) //Hard metal shell conducts! return 0 //So borgs they don't die trying to fix wiring /mob/living/silicon/emp_act(severity) diff --git a/code/modules/mob/living/simple_animal/bot/SuperBeepsky.dm b/code/modules/mob/living/simple_animal/bot/SuperBeepsky.dm index c471d988413..a56015be5d2 100644 --- a/code/modules/mob/living/simple_animal/bot/SuperBeepsky.dm +++ b/code/modules/mob/living/simple_animal/bot/SuperBeepsky.dm @@ -59,13 +59,13 @@ if(!on) return switch(mode) - if(BOT_IDLE) // idle + if(BOT_IDLE) // idle update_icon() walk_to(src,0) - look_for_perp() // see if any criminals are in range - if(!mode && auto_patrol) // still idle, and set to patrol - mode = BOT_START_PATROL // switch to patrol mode - if(BOT_HUNT) // hunting for perp + look_for_perp() // see if any criminals are in range + if(!mode && auto_patrol) // still idle, and set to patrol + mode = BOT_START_PATROL // switch to patrol mode + if(BOT_HUNT) // hunting for perp update_icon() playsound(src,'sound/effects/beepskyspinsabre.ogg',100,TRUE,-1) // general beepsky doesn't give up so easily, jedi scum @@ -73,13 +73,13 @@ walk_to(src,0) back_to_idle() return - if(target) // make sure target exists - if(Adjacent(target) && isturf(target.loc)) // if right next to perp + if(target) // make sure target exists + if(Adjacent(target) && isturf(target.loc)) // if right next to perp target_lastloc = target.loc //stun_attack() can clear the target if they're dead, so this needs to be set first stun_attack(target) set_anchored(TRUE) return - else // not next to perp + else // not next to perp var/turf/olddist = get_dist(src, target) walk_to(src, target,1,4) if((get_dist(src, target)) >= (olddist)) diff --git a/code/modules/mob/living/simple_animal/bot/bot.dm b/code/modules/mob/living/simple_animal/bot/bot.dm index c3d4b82bbaa..f920ee86ec6 100644 --- a/code/modules/mob/living/simple_animal/bot/bot.dm +++ b/code/modules/mob/living/simple_animal/bot/bot.dm @@ -45,8 +45,8 @@ var/open = FALSE//Maint panel var/locked = TRUE var/hacked = FALSE //Used to differentiate between being hacked by silicons and emagged by humans. - var/text_hack = "" //Custom text returned to a silicon upon hacking a bot. - var/text_dehack = "" //Text shown when resetting a bots hacked status to normal. + var/text_hack = "" //Custom text returned to a silicon upon hacking a bot. + var/text_dehack = "" //Text shown when resetting a bots hacked status to normal. var/text_dehack_fail = "" //Shown when a silicon tries to reset a bot emagged with the emag item, which cannot be reset. var/declare_message = "" //What the bot will display to the HUD user. var/frustration = 0 //Used by some bots for tracking failures to reach their target. @@ -63,18 +63,18 @@ var/radio_key = null //which channels can the bot listen to var/radio_channel = RADIO_CHANNEL_COMMON //The bot's default radio channel var/auto_patrol = 0// set to make bot automatically patrol - var/turf/patrol_target // this is turf to navigate to (location of beacon) - var/turf/summon_target // The turf of a user summoning a bot. - var/new_destination // pending new destination (waiting for beacon response) - var/destination // destination description tag - var/next_destination // the next destination in the patrol route - var/shuffle = FALSE // If we should shuffle our adjacency checking + var/turf/patrol_target // this is turf to navigate to (location of beacon) + var/turf/summon_target // The turf of a user summoning a bot. + var/new_destination // pending new destination (waiting for beacon response) + var/destination // destination description tag + var/next_destination // the next destination in the patrol route + var/shuffle = FALSE // If we should shuffle our adjacency checking - var/blockcount = 0 //number of times retried a blocked path - var/awaiting_beacon = 0 // count of pticks awaiting a beacon response + var/blockcount = 0 //number of times retried a blocked path + var/awaiting_beacon = 0 // count of pticks awaiting a beacon response - var/nearest_beacon // the nearest beacon's tag - var/turf/nearest_beacon_loc // the nearest beacon's location + var/nearest_beacon // the nearest beacon's tag + var/turf/nearest_beacon_loc // the nearest beacon's location var/beacon_freq = FREQ_NAV_BEACON var/model = "" //The type of bot it is. @@ -282,10 +282,10 @@ break switch(mode) //High-priority overrides are processed first. Bots can do nothing else while under direct command. - if(BOT_RESPONDING) //Called by the AI. + if(BOT_RESPONDING) //Called by the AI. call_mode() return - if(BOT_SUMMON) //Called by PDA + if(BOT_SUMMON) //Called by PDA bot_summon() return return TRUE //Successful completion. Used to prevent child process() continuing if this one is ended early. @@ -456,13 +456,13 @@ Pass the desired type path itself, declaring a temporary var beforehand is not r if(!T) return var/list/adjacent = T.GetAtmosAdjacentTurfs(1) - if(shuffle) //If we were on the same tile as another bot, let's randomize our choices so we dont both go the same way + if(shuffle) //If we were on the same tile as another bot, let's randomize our choices so we dont both go the same way adjacent = shuffle(adjacent) shuffle = FALSE for(var/scan in adjacent)//Let's see if there's something right next to us first! - if(check_bot(scan)) //Is there another bot there? Then let's just skip it + if(check_bot(scan)) //Is there another bot there? Then let's just skip it continue - if(isturf(scan_type)) //If we're lookeing for a turf we can just run the checks directly! + if(isturf(scan_type)) //If we're lookeing for a turf we can just run the checks directly! var/final_result = checkscan(scan,scan_type,old_target) if(final_result) return final_result @@ -493,8 +493,8 @@ Pass the desired type path itself, declaring a temporary var beforehand is not r var/turf/T = get_turf(targ) if(T) for(var/C in T.contents) - if(istype(C,type) && (C != src)) //Is there another bot there already? If so, let's skip it so we dont all atack on top of eachother. - return TRUE //Let's abort if we find a bot so we dont have to keep rechecking + if(istype(C,type) && (C != src)) //Is there another bot there already? If so, let's skip it so we dont all atack on top of eachother. + return TRUE //Let's abort if we find a bot so we dont have to keep rechecking //When the scan finds a target, run bot specific processing to select it for the next step. Empty by default. /mob/living/simple_animal/bot/proc/process_scan(scan_target) @@ -640,14 +640,14 @@ Pass a positive integer as an argument to override a bot's default speed. if(patrol_target) // has patrol target INVOKE_ASYNC(src, .proc/target_patrol) - else // no patrol target, so need a new one + else // no patrol target, so need a new one speak("Engaging patrol mode.") find_patrol_target() tries++ return /mob/living/simple_animal/bot/proc/target_patrol() - calc_path() // Find a route to it + calc_path() // Find a route to it if(!path.len) patrol_target = null return @@ -656,26 +656,26 @@ Pass a positive integer as an argument to override a bot's default speed. /mob/living/simple_animal/bot/proc/patrol_step() - if(client) // In use by player, don't actually move. + if(client) // In use by player, don't actually move. return - if(loc == patrol_target) // reached target + if(loc == patrol_target) // reached target //Find the next beacon matching the target. if(!get_next_patrol_target()) find_patrol_target() //If it fails, look for the nearest one instead. return - else if(path.len > 0 && patrol_target) // valid path + else if(path.len > 0 && patrol_target) // valid path if(path[1] == loc) increment_path() return - var/moved = bot_move(patrol_target)//step_towards(src, next) // attempt to move + var/moved = bot_move(patrol_target)//step_towards(src, next) // attempt to move if(!moved) //Couldn't proceed the next step of the path BOT_STEP_MAX_RETRIES times addtimer(CALLBACK(src, .proc/patrol_step_not_moved), 2) - else // no path, so calculate new one + else // no path, so calculate new one mode = BOT_START_PATROL /mob/living/simple_animal/bot/proc/patrol_step_not_moved() @@ -732,7 +732,7 @@ Pass a positive integer as an argument to override a bot's default speed. // process control input switch(command) if("patroloff") - bot_reset() //HOLD IT!! //OBJECTION!! + bot_reset() //HOLD IT!! //OBJECTION!! auto_patrol = FALSE if("patrolon") @@ -794,23 +794,23 @@ Pass a positive integer as an argument to override a bot's default speed. /mob/living/simple_animal/bot/proc/summon_step() - if(client) // In use by player, don't actually move. + if(client) // In use by player, don't actually move. return - if(loc == summon_target) // Arrived to summon location. + if(loc == summon_target) // Arrived to summon location. bot_reset() return - else if(path.len > 0 && summon_target) //Proper path acquired! + else if(path.len > 0 && summon_target) //Proper path acquired! if(path[1] == loc) increment_path() return - var/moved = bot_move(summon_target, 3) // Move attempt + var/moved = bot_move(summon_target, 3) // Move attempt if(!moved) addtimer(CALLBACK(src, .proc/summon_step_not_moved), 2) - else // no path, so calculate new one + else // no path, so calculate new one calc_summon_path() /mob/living/simple_animal/bot/proc/summon_step_not_moved() diff --git a/code/modules/mob/living/simple_animal/bot/cleanbot.dm b/code/modules/mob/living/simple_animal/bot/cleanbot.dm index 539509a116b..ecc0f740960 100644 --- a/code/modules/mob/living/simple_animal/bot/cleanbot.dm +++ b/code/modules/mob/living/simple_animal/bot/cleanbot.dm @@ -253,14 +253,14 @@ return if(loc == get_turf(target)) - if(!(check_bot(target) && prob(50))) //Target is not defined at the parent. 50% chance to still try and clean so we dont get stuck on the last blood drop. - UnarmedAttack(target) //Rather than check at every step of the way, let's check before we do an action, so we can rescan before the other bot. + if(!(check_bot(target) && prob(50))) //Target is not defined at the parent. 50% chance to still try and clean so we dont get stuck on the last blood drop. + UnarmedAttack(target) //Rather than check at every step of the way, let's check before we do an action, so we can rescan before the other bot. if(QDELETED(target)) //We done here. target = null mode = BOT_IDLE return else - shuffle = TRUE //Shuffle the list the next time we scan so we dont both go the same way. + shuffle = TRUE //Shuffle the list the next time we scan so we dont both go the same way. path = list() if(!path || path.len == 0) //No path, need a new one diff --git a/code/modules/mob/living/simple_animal/bot/floorbot.dm b/code/modules/mob/living/simple_animal/bot/floorbot.dm index faed479a3e8..faa9f306522 100644 --- a/code/modules/mob/living/simple_animal/bot/floorbot.dm +++ b/code/modules/mob/living/simple_animal/bot/floorbot.dm @@ -31,13 +31,13 @@ var/toolbox = /obj/item/storage/toolbox/mechanical var/toolbox_color = "" - #define HULL_BREACH 1 - #define LINE_SPACE_MODE 2 - #define FIX_TILE 3 - #define AUTO_TILE 4 - #define PLACE_TILE 5 - #define REPLACE_TILE 6 - #define TILE_EMAG 7 + #define HULL_BREACH 1 + #define LINE_SPACE_MODE 2 + #define FIX_TILE 3 + #define AUTO_TILE 4 + #define PLACE_TILE 5 + #define REPLACE_TILE 6 + #define TILE_EMAG 7 /mob/living/simple_animal/bot/floorbot/Initialize(mapload, new_toolbox_color) . = ..() @@ -242,9 +242,9 @@ if(target) if(loc == target || loc == get_turf(target)) - if(check_bot(target)) //Target is not defined at the parent + if(check_bot(target)) //Target is not defined at the parent shuffle = TRUE - if(prob(50)) //50% chance to still try to repair so we dont end up with 2 floorbots failing to fix the last breach + if(prob(50)) //50% chance to still try to repair so we dont end up with 2 floorbots failing to fix the last breach target = null path = list() return @@ -317,7 +317,7 @@ F = scan_target if(isfloorturf(F) && !isplatingturf(F)) //The floor must already have a tile. result = F - if(FIX_TILE) //Selects only damaged floors. + if(FIX_TILE) //Selects only damaged floors. F = scan_target if(istype(F) && (F.broken || F.burnt)) result = F diff --git a/code/modules/mob/living/simple_animal/bot/honkbot.dm b/code/modules/mob/living/simple_animal/bot/honkbot.dm index 5b0bcf652a8..e3f97f978b5 100644 --- a/code/modules/mob/living/simple_animal/bot/honkbot.dm +++ b/code/modules/mob/living/simple_animal/bot/honkbot.dm @@ -26,8 +26,8 @@ var/cooldowntimehorn = 10 var/mob/living/carbon/target var/oldtarget_name - var/target_lastloc = FALSE //Loc of target when arrested. - var/last_found = FALSE //There's a delay + var/target_lastloc = FALSE //Loc of target when arrested. + var/last_found = FALSE //There's a delay var/threatlevel = FALSE var/declare_arrests = FALSE // speak, you shall not, unless to Honk var/idcheck = TRUE @@ -94,7 +94,7 @@ Maintenance panel panel is [open ? "opened" : "closed"]"}, dat += text({"
      Auto Patrol: []"}, "[auto_patrol ? "On" : "Off"]" ) - return dat + return dat /mob/living/simple_animal/bot/honkbot/proc/judgement_criteria() var/final = NONE @@ -228,7 +228,7 @@ Maintenance panel panel is [open ? "opened" : "closed"]"}, switch(mode) - if(BOT_IDLE) // idle + if(BOT_IDLE) // idle walk_to(src,0) look_for_perp() @@ -243,7 +243,7 @@ Maintenance panel panel is [open ? "opened" : "closed"]"}, back_to_idle() return - if(target) // make sure target exists + if(target) // make sure target exists if(Adjacent(target) && isturf(target.loc)) if(threatlevel <= 4) @@ -256,7 +256,7 @@ Maintenance panel panel is [open ? "opened" : "closed"]"}, target_lastloc = target.loc return - else // not next to perp + else // not next to perp var/turf/olddist = get_dist(src, target) walk_to(src, target,1,4) if((get_dist(src, target)) >= (olddist)) diff --git a/code/modules/mob/living/simple_animal/bot/hygienebot.dm b/code/modules/mob/living/simple_animal/bot/hygienebot.dm index 38a3ed64da8..4212fcf9476 100644 --- a/code/modules/mob/living/simple_animal/bot/hygienebot.dm +++ b/code/modules/mob/living/simple_animal/bot/hygienebot.dm @@ -107,13 +107,13 @@ tile.MakeSlippery(TURF_WET_WATER, min_wet_time = 10 SECONDS, wet_time_to_add = 5 SECONDS) switch(mode) - if(BOT_IDLE) // idle + if(BOT_IDLE) // idle walk_to(src,0) - look_for_lowhygiene() // see if any disgusting fucks are in range - if(!mode && auto_patrol) // still idle, and set to patrol - mode = BOT_START_PATROL // switch to patrol mode + look_for_lowhygiene() // see if any disgusting fucks are in range + if(!mode && auto_patrol) // still idle, and set to patrol + mode = BOT_START_PATROL // switch to patrol mode - if(BOT_HUNT) // hunting for stinkman + if(BOT_HUNT) // hunting for stinkman if(emagged) //lol fuck em up currentspeed = 3.5 start_washing() @@ -224,7 +224,7 @@ Maintenance panel is [open ? "opened" : "closed"]"} if(!locked || issilicon(user) || isAdminGhostAI(user)) dat += {"
      Auto Patrol: ["[auto_patrol ? "On" : "Off"]"]"} - return dat.Join("") + return dat.Join("") /mob/living/simple_animal/bot/hygienebot/proc/check_purity(mob/living/L) if((emagged == 2) && L.stat != DEAD) diff --git a/code/modules/mob/living/simple_animal/bot/medbot.dm b/code/modules/mob/living/simple_animal/bot/medbot.dm index f730d58baa6..d321fb7522d 100644 --- a/code/modules/mob/living/simple_animal/bot/medbot.dm +++ b/code/modules/mob/living/simple_animal/bot/medbot.dm @@ -1,13 +1,13 @@ //MEDBOT //MEDBOT PATHFINDING //MEDBOT ASSEMBLY -#define MEDBOT_PANIC_NONE 0 -#define MEDBOT_PANIC_LOW 15 -#define MEDBOT_PANIC_MED 35 -#define MEDBOT_PANIC_HIGH 55 -#define MEDBOT_PANIC_FUCK 70 -#define MEDBOT_PANIC_ENDING 90 -#define MEDBOT_PANIC_END 100 +#define MEDBOT_PANIC_NONE 0 +#define MEDBOT_PANIC_LOW 15 +#define MEDBOT_PANIC_MED 35 +#define MEDBOT_PANIC_HIGH 55 +#define MEDBOT_PANIC_FUCK 70 +#define MEDBOT_PANIC_ENDING 90 +#define MEDBOT_PANIC_END 100 /mob/living/simple_animal/bot/medbot name = "\improper Medibot" @@ -405,7 +405,7 @@ if(stationary_mode && !Adjacent(C)) //YOU come to ME, BRO return FALSE if(C.stat == DEAD || (HAS_TRAIT(C, TRAIT_FAKEDEATH))) - return FALSE //welp too late for them! + return FALSE //welp too late for them! if(!(loc == C.loc) && !(isturf(C.loc) && isturf(loc))) return FALSE diff --git a/code/modules/mob/living/simple_animal/bot/mulebot.dm b/code/modules/mob/living/simple_animal/bot/mulebot.dm index b595e5cf049..e9e516af886 100644 --- a/code/modules/mob/living/simple_animal/bot/mulebot.dm +++ b/code/modules/mob/living/simple_animal/bot/mulebot.dm @@ -41,14 +41,14 @@ var/base_icon = "mulebot" /// icon_state to use in update_icon_state var/atom/movable/load /// what we're transporting var/mob/living/passenger /// who's riding us - var/turf/target /// this is turf to navigate to (location of beacon) - var/loaddir = 0 /// this the direction to unload onto/load from - var/home_destination = "" /// tag of home delivery beacon + var/turf/target /// this is turf to navigate to (location of beacon) + var/loaddir = 0 /// this the direction to unload onto/load from + var/home_destination = "" /// tag of home delivery beacon - var/reached_target = TRUE ///true if already reached the target + var/reached_target = TRUE ///true if already reached the target - var/auto_return = TRUE /// true if auto return to home beacon after unload - var/auto_pickup = TRUE /// true if auto-pickup at beacon + var/auto_return = TRUE /// true if auto return to home beacon after unload + var/auto_pickup = TRUE /// true if auto-pickup at beacon var/report_delivery = TRUE /// true if bot will announce an arrival to a location. var/obj/item/stock_parts/cell/cell /// Internal Powercell @@ -433,7 +433,7 @@ if(!istype(crate)) if(!wires.is_cut(WIRE_LOADCHECK)) buzz(SIGH) - return // if not hacked, only allow crates to be loaded + return // if not hacked, only allow crates to be loaded crate = null if(crate || isobj(AM)) @@ -578,8 +578,8 @@ return if(isturf(next)) var/oldloc = loc - var/moved = step_towards(src, next) // attempt to move - if(moved && oldloc!=loc) // successful move + var/moved = step_towards(src, next) // attempt to move + if(moved && oldloc!=loc) // successful move blockcount = 0 path -= loc @@ -588,14 +588,14 @@ else mode = BOT_DELIVER - else // failed to move + else // failed to move blockcount++ mode = BOT_BLOCKED if(blockcount == 3) buzz(ANNOYED) - if(blockcount > 10) // attempt 10 times before recomputing + if(blockcount > 10) // attempt 10 times before recomputing // find new path excluding blocked turf buzz(SIGH) mode = BOT_WAIT_FOR_NAV @@ -611,7 +611,7 @@ mode = BOT_NAV return - if(BOT_NAV) // calculate new path + if(BOT_NAV) // calculate new path mode = BOT_WAIT_FOR_NAV INVOKE_ASYNC(src, .proc/process_nav) @@ -682,7 +682,7 @@ calling_ai = null radio_channel = RADIO_CHANNEL_AI_PRIVATE //Report on AI Private instead if the AI is controlling us. - if(load) // if loaded, unload at target + if(load) // if loaded, unload at target if(report_delivery) speak("Destination [destination] reached. Unloading [load].",radio_channel) unload(loaddir) @@ -695,7 +695,7 @@ if(!A.anchored) AM = A break - else // otherwise, look for crates only + else // otherwise, look for crates only AM = locate(/obj/structure/closet/crate) in get_step(loc,loaddir) if(AM?.Adjacent(src)) load(AM) @@ -708,7 +708,7 @@ start_home() mode = BOT_BLOCKED else - bot_reset() // otherwise go idle + bot_reset() // otherwise go idle /mob/living/simple_animal/bot/mulebot/MobBump(mob/M) // called when the bot bumps into a mob @@ -760,11 +760,11 @@ return for(var/obj/machinery/navbeacon/NB in GLOB.deliverybeacons) - if(NB.location == new_destination) // if the beacon location matches the set destination + if(NB.location == new_destination) // if the beacon location matches the set destination // the we will navigate there destination = new_destination target = NB.loc - var/direction = NB.dir // this will be the load/unload dir + var/direction = NB.dir // this will be the load/unload dir if(direction) loaddir = text2num(direction) else @@ -851,7 +851,7 @@ else if(!wires.is_cut(WIRE_LOADCHECK)) buzz(SIGH) - return // if not hacked, only allow ghosts to be loaded + return // if not hacked, only allow ghosts to be loaded else if(isobj(AM)) var/obj/O = AM diff --git a/code/modules/mob/living/simple_animal/bot/secbot.dm b/code/modules/mob/living/simple_animal/bot/secbot.dm index 147be489bcc..5a00b0990c9 100644 --- a/code/modules/mob/living/simple_animal/bot/secbot.dm +++ b/code/modules/mob/living/simple_animal/bot/secbot.dm @@ -148,7 +148,7 @@ Auto Patrol: []"}, "[declare_arrests ? "Yes" : "No"]", "[auto_patrol ? "On" : "Off"]" ) - return dat + return dat /mob/living/simple_animal/bot/secbot/Topic(href, href_list) if(..()) @@ -314,14 +314,14 @@ Auto Patrol: []"}, switch(mode) - if(BOT_IDLE) // idle + if(BOT_IDLE) // idle walk_to(src,0) - look_for_perp() // see if any criminals are in range - if(!mode && auto_patrol) // still idle, and set to patrol - mode = BOT_START_PATROL // switch to patrol mode + look_for_perp() // see if any criminals are in range + if(!mode && auto_patrol) // still idle, and set to patrol + mode = BOT_START_PATROL // switch to patrol mode - if(BOT_HUNT) // hunting for perp + if(BOT_HUNT) // hunting for perp // if can't reach perp for long enough, go idle if(frustration >= 8) @@ -329,8 +329,8 @@ Auto Patrol: []"}, back_to_idle() return - if(target) // make sure target exists - if(Adjacent(target) && isturf(target.loc)) // if right next to perp + if(target) // make sure target exists + if(Adjacent(target) && isturf(target.loc)) // if right next to perp if(!check_nap_violations()) stun_attack(target, TRUE) else @@ -342,7 +342,7 @@ Auto Patrol: []"}, set_anchored(TRUE) return - else // not next to perp + else // not next to perp var/turf/olddist = get_dist(src, target) walk_to(src, target,1,4) if((get_dist(src, target)) >= (olddist)) @@ -352,7 +352,7 @@ Auto Patrol: []"}, else back_to_idle() - if(BOT_PREP_ARREST) // preparing to arrest target + if(BOT_PREP_ARREST) // preparing to arrest target // see if he got away. If he's no no longer adjacent or inside a closet or about to get up, we hunt again. if( !Adjacent(target) || !isturf(target.loc) || (target.AmountParalyzed() < 40 && target.staminaloss < STAMINA_THRESHOLD_SOFTCRIT)) //SKYRAT EDIT CHANGE: if( !Adjacent(target) || !isturf(target.loc) || target.AmountParalyzed() < 40) diff --git a/code/modules/mob/living/simple_animal/constructs.dm b/code/modules/mob/living/simple_animal/constructs.dm index c5c9f4eca73..a1ddc7722d0 100644 --- a/code/modules/mob/living/simple_animal/constructs.dm +++ b/code/modules/mob/living/simple_animal/constructs.dm @@ -175,7 +175,7 @@ P.yo = new_y - curloc.y P.xo = new_x - curloc.x var/new_angle_s = P.Angle + rand(120,240) - while(new_angle_s > 180) // Translate to regular projectile degrees + while(new_angle_s > 180) // Translate to regular projectile degrees new_angle_s -= 360 P.setAngle(new_angle_s) @@ -391,7 +391,7 @@ if(iscarbon(target)) var/mob/living/carbon/C = target if(HAS_TRAIT(C, TRAIT_NODISMEMBER)) - return ..() //ATTACK! + return ..() //ATTACK! var/list/parts = list() var/undismembermerable_limbs = 0 for(var/X in C.bodyparts) diff --git a/code/modules/mob/living/simple_animal/friendly/crab.dm b/code/modules/mob/living/simple_animal/friendly/crab.dm index 33a3868c7f3..a83a8b1bb57 100644 --- a/code/modules/mob/living/simple_animal/friendly/crab.dm +++ b/code/modules/mob/living/simple_animal/friendly/crab.dm @@ -32,7 +32,7 @@ ..() //CRAB movement if(!ckey && !stat) - if(isturf(loc) && !resting && !buckled) //This is so it only moves if it's not inside a closet, gentics machine, etc. + if(isturf(loc) && !resting && !buckled) //This is so it only moves if it's not inside a closet, gentics machine, etc. turns_since_move++ if(turns_since_move >= turns_per_move) var/east_vs_west = pick(4,8) diff --git a/code/modules/mob/living/simple_animal/friendly/dog.dm b/code/modules/mob/living/simple_animal/friendly/dog.dm index 9853b1ef980..0c38f56c5e0 100644 --- a/code/modules/mob/living/simple_animal/friendly/dog.dm +++ b/code/modules/mob/living/simple_animal/friendly/dog.dm @@ -54,7 +54,7 @@ sleep(3) step_to(src,movement_target,1) - if(movement_target) //Not redundant due to sleeps, Item can be gone in 6 decisecomds + if(movement_target) //Not redundant due to sleeps, Item can be gone in 6 decisecomds var/turf/T = get_turf(movement_target) if(!T) return @@ -100,7 +100,7 @@ var/obj/item/inventory_head var/obj/item/inventory_back var/shaved = FALSE - var/nofur = FALSE //Corgis that have risen past the material plane of existence. + var/nofur = FALSE //Corgis that have risen past the material plane of existence. /mob/living/simple_animal/pet/dog/corgi/add_cell_sample() AddElement(/datum/element/swabable, CELL_LINE_TABLE_CORGI, CELL_VIRUS_TABLE_GENERIC_MOB, 1, 5) @@ -413,7 +413,7 @@ //IAN! SQUEEEEEEEEE~ /mob/living/simple_animal/pet/dog/corgi/ian name = "Ian" - real_name = "Ian" //Intended to hold the name without altering it. + real_name = "Ian" //Intended to hold the name without altering it. gender = MALE desc = "It's the HoP's beloved corgi." response_help_continuous = "pets" @@ -462,8 +462,8 @@ /mob/living/simple_animal/pet/dog/corgi/ian/proc/Read_Memory() if(fexists("data/npc_saves/Ian.sav")) //legacy compatability to convert old format to new var/savefile/S = new /savefile("data/npc_saves/Ian.sav") - S["age"] >> age - S["record_age"] >> record_age + S["age"] >> age + S["record_age"] >> record_age S["saved_head"] >> saved_head fdel("data/npc_saves/Ian.sav") else @@ -612,7 +612,7 @@ desc = "It's the HoP's beloved corgi puppy." -/mob/living/simple_animal/pet/dog/corgi/puppy/void //Tribute to the corgis born in nullspace +/mob/living/simple_animal/pet/dog/corgi/puppy/void //Tribute to the corgis born in nullspace name = "\improper void puppy" real_name = "voidy" desc = "A corgi puppy that has been infused with deep space energy. It's staring back..." @@ -626,7 +626,7 @@ held_state = "void_puppy" /mob/living/simple_animal/pet/dog/corgi/puppy/void/Process_Spacemove(movement_dir = 0) - return 1 //Void puppies can navigate space. + return 1 //Void puppies can navigate space. //LISA! SQUEEEEEEEEE~ diff --git a/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm b/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm index ec3cc37e826..b70a21eccc9 100644 --- a/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm +++ b/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm @@ -9,13 +9,13 @@ #define DRONE_NET_DISCONNECT "DRONE NETWORK: [name] is not responding." /// Maintenance Drone icon_state (multiple colors) -#define MAINTDRONE "drone_maint" +#define MAINTDRONE "drone_maint" /// Repair Drone icon_state -#define REPAIRDRONE "drone_repair" +#define REPAIRDRONE "drone_repair" /// Scout Drone icon_state -#define SCOUTDRONE "drone_scout" +#define SCOUTDRONE "drone_scout" /// Clockwork Drone icon_state -#define CLOCKDRONE "drone_clock" +#define CLOCKDRONE "drone_clock" /// [MAINTDRONE] hacked icon_state #define MAINTDRONE_HACKED "drone_maint_red" diff --git a/code/modules/mob/living/simple_animal/hostile/bees.dm b/code/modules/mob/living/simple_animal/hostile/bees.dm index 6e7d1c7ab11..df0a4c19391 100644 --- a/code/modules/mob/living/simple_animal/hostile/bees.dm +++ b/code/modules/mob/living/simple_animal/hostile/bees.dm @@ -1,14 +1,14 @@ -#define BEE_IDLE_ROAMING 70 //The value of idle at which a bee in a beebox will try to wander -#define BEE_IDLE_GOHOME 0 //The value of idle at which a bee will try to go home -#define BEE_PROB_GOHOME 35 //Probability to go home when idle is below BEE_IDLE_GOHOME -#define BEE_PROB_GOROAM 5 //Probability to go roaming when idle is above BEE_IDLE_ROAMING -#define BEE_TRAY_RECENT_VISIT 200 //How long in deciseconds until a tray can be visited by a bee again -#define BEE_DEFAULT_COLOUR "#e5e500" //the colour we make the stripes of the bee if our reagent has no colour (or we have no reagent) +#define BEE_IDLE_ROAMING 70 //The value of idle at which a bee in a beebox will try to wander +#define BEE_IDLE_GOHOME 0 //The value of idle at which a bee will try to go home +#define BEE_PROB_GOHOME 35 //Probability to go home when idle is below BEE_IDLE_GOHOME +#define BEE_PROB_GOROAM 5 //Probability to go roaming when idle is above BEE_IDLE_ROAMING +#define BEE_TRAY_RECENT_VISIT 200 //How long in deciseconds until a tray can be visited by a bee again +#define BEE_DEFAULT_COLOUR "#e5e500" //the colour we make the stripes of the bee if our reagent has no colour (or we have no reagent) -#define BEE_POLLINATE_YIELD_CHANCE 33 -#define BEE_POLLINATE_PEST_CHANCE 33 -#define BEE_POLLINATE_POTENCY_CHANCE 50 +#define BEE_POLLINATE_YIELD_CHANCE 33 +#define BEE_POLLINATE_PEST_CHANCE 33 +#define BEE_POLLINATE_POTENCY_CHANCE 50 /mob/living/simple_animal/hostile/poison/bees name = "bee" diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm index 390f3c5f85e..693751aaf37 100644 --- a/code/modules/mob/living/simple_animal/hostile/hostile.dm +++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm @@ -10,19 +10,19 @@ var/dodging = FALSE var/approaching_target = FALSE //We should dodge now - var/in_melee = FALSE //We should sidestep now + var/in_melee = FALSE //We should sidestep now var/dodge_prob = 30 var/sidestep_per_cycle = 1 //How many sidesteps per npcpool cycle when in melee - var/projectiletype //set ONLY it and NULLIFY casingtype var, if we have ONLY projectile + var/projectiletype //set ONLY it and NULLIFY casingtype var, if we have ONLY projectile var/projectilesound - var/casingtype //set ONLY it and NULLIFY projectiletype, if we have projectile IN CASING + var/casingtype //set ONLY it and NULLIFY projectiletype, if we have projectile IN CASING var/move_to_delay = 3 //delay for the automated movement. var/list/friends = list() var/list/emote_taunt = list() var/taunt_chance = 0 - var/rapid_melee = 1 //Number of melee attacks between each npc pool tick. Spread evenly. + var/rapid_melee = 1 //Number of melee attacks between each npc pool tick. Spread evenly. var/melee_queue_distance = 4 //If target is close enough start preparing to hit them if we have rapid_melee enabled var/ranged_message = "fires" //Fluff text for ranged mobs @@ -93,8 +93,8 @@ if(!QDELETED(target) && !targets_from.Adjacent(target)) DestroyPathToTarget() if(!MoveToTarget(possible_targets)) //if we lose our target - if(AIShouldSleep(possible_targets)) // we try to acquire a new one - toggle_ai(AI_IDLE) // otherwise we go idle + if(AIShouldSleep(possible_targets)) // we try to acquire a new one + toggle_ai(AI_IDLE) // otherwise we go idle return 1 /mob/living/simple_animal/hostile/handle_automated_movement() diff --git a/code/modules/mob/living/simple_animal/hostile/mecha_pilot.dm b/code/modules/mob/living/simple_animal/hostile/mecha_pilot.dm index d6bf03ea700..4d3ecf0b2ef 100644 --- a/code/modules/mob/living/simple_animal/hostile/mecha_pilot.dm +++ b/code/modules/mob/living/simple_animal/hostile/mecha_pilot.dm @@ -219,7 +219,7 @@ exit_mecha(mecha) return - //Smoke if there's too many targets - Smoke Power + //Smoke if there's too many targets - Smoke Power if(threat_count >= threat_use_mecha_smoke && prob(smoke_chance)) if(LAZYACCESSASSOC(mecha.occupant_actions, src, /datum/action/vehicle/sealed/mecha/mech_smoke) && !mecha.smoke_charges) var/datum/action/action = mecha.occupant_actions[src][/datum/action/vehicle/sealed/mecha/mech_smoke] @@ -263,7 +263,7 @@ if(ismecha(the_target)) var/obj/vehicle/sealed/mecha/M = the_target if(mecha) - if(M == mecha) //Dont kill yourself + if(M == mecha) //Dont kill yourself return FALSE else //we're not in a mecha, so we check if we can steal it instead. if(is_valid_mecha(M)) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm index 928ad200f9f..996a132aed2 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm @@ -91,7 +91,7 @@ var/tab = "megafauna_kills" if(crusher_kill) tab = "megafauna_kills_crusher" - if(!elimination) //used so the achievment only occurs for the last legion to die. + if(!elimination) //used so the achievment only occurs for the last legion to die. grant_achievement(achievement_type, score_achievement_type, crusher_kill, force_grant) SSblackbox.record_feedback("tally", tab, 1, "[initial(name)]") return ..() diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/swarmer.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/swarmer.dm index 34be37cdb80..8e336ebd51c 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/swarmer.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/swarmer.dm @@ -188,7 +188,7 @@ GLOBAL_LIST_INIT(AISwarmerCapsByType, list(/mob/living/simple_animal/hostile/swa if(is_type_in_typecache(the_target, sharedWanted)) //always eat return TRUE - return ..() //else, have a nibble, see if it's food + return ..() //else, have a nibble, see if it's food /mob/living/simple_animal/hostile/swarmer/ai/resource/OpenFire(atom/A) diff --git a/code/modules/mob/living/simple_animal/hostile/mimic.dm b/code/modules/mob/living/simple_animal/hostile/mimic.dm index a5618ee83d7..d4f84ffceb6 100644 --- a/code/modules/mob/living/simple_animal/hostile/mimic.dm +++ b/code/modules/mob/living/simple_animal/hostile/mimic.dm @@ -47,7 +47,7 @@ // Pickup loot /mob/living/simple_animal/hostile/mimic/crate/Initialize(mapload) . = ..() - if(mapload) //eat shit + if(mapload) //eat shit for(var/obj/item/I in loc) I.forceMove(src) diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/lobstrosity.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/lobstrosity.dm index 0f876ed5c49..0ca32a1a687 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/lobstrosity.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/lobstrosity.dm @@ -1,5 +1,5 @@ /** - * Lobstrosities, the poster boy of charging AI mobs. Drops crab meat and bones. + * Lobstrosities, the poster boy of charging AI mobs. Drops crab meat and bones. * Outside of charging, it's intended behavior is that it is generally slow moving, but makes up for that with a knockdown attack to score additional hits. */ /mob/living/simple_animal/hostile/asteroid/lobstrosity diff --git a/code/modules/mob/living/simple_animal/hostile/space_dragon.dm b/code/modules/mob/living/simple_animal/hostile/space_dragon.dm index af22c291290..8c32f679941 100644 --- a/code/modules/mob/living/simple_animal/hostile/space_dragon.dm +++ b/code/modules/mob/living/simple_animal/hostile/space_dragon.dm @@ -1,11 +1,11 @@ /// The carp rift is currently charging. -#define CHARGE_ONGOING 0 +#define CHARGE_ONGOING 0 /// The carp rift is currently charging and has output a final warning. -#define CHARGE_FINALWARNING 1 +#define CHARGE_FINALWARNING 1 /// The carp rift is now fully charged. -#define CHARGE_COMPLETED 2 +#define CHARGE_COMPLETED 2 /// The darkness threshold for space dragon when choosing a color -#define DARKNESS_THRESHOLD 50 +#define DARKNESS_THRESHOLD 50 /** * # Space Dragon diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm index e79d902c343..0a87a50f1c4 100644 --- a/code/modules/mob/living/simple_animal/parrot.dm +++ b/code/modules/mob/living/simple_animal/parrot.dm @@ -1,12 +1,12 @@ /* Parrots! * Contains - * Defines - * Inventory (headset stuff) - * Attack responces - * AI - * Procs / Verbs (usable by players) - * Sub-types - * Hear & say (the things we do for gimmicks) + * Defines + * Inventory (headset stuff) + * Attack responces + * AI + * Procs / Verbs (usable by players) + * Sub-types + * Hear & say (the things we do for gimmicks) */ /* @@ -15,15 +15,15 @@ //Only a maximum of one action and one intent should be active at any given time. //Actions -#define PARROT_PERCH (1<<0) //Sitting/sleeping, not moving -#define PARROT_SWOOP (1<<1) //Moving towards or away from a target -#define PARROT_WANDER (1<<2) //Moving without a specific target in mind +#define PARROT_PERCH (1<<0) //Sitting/sleeping, not moving +#define PARROT_SWOOP (1<<1) //Moving towards or away from a target +#define PARROT_WANDER (1<<2) //Moving without a specific target in mind //Intents -#define PARROT_STEAL (1<<3) //Flying towards a target to steal it/from it -#define PARROT_ATTACK (1<<4) //Flying towards a target to attack it -#define PARROT_RETURN (1<<5) //Flying towards its perch -#define PARROT_FLEE (1<<6) //Flying away from its attacker +#define PARROT_STEAL (1<<3) //Flying towards a target to steal it/from it +#define PARROT_ATTACK (1<<4) //Flying towards a target to attack it +#define PARROT_RETURN (1<<5) //Flying towards its perch +#define PARROT_FLEE (1<<6) //Flying away from its attacker /mob/living/simple_animal/parrot @@ -74,7 +74,7 @@ var/parrot_speed = 5 //"Delay in world ticks between movement." according to byond. Yeah, that's BS but it does directly affect movement. Higher number = slower. var/parrot_lastmove = null //Updates/Stores position of the parrot while it's moving - var/parrot_stuck = 0 //If parrot_lastmove hasn't changed, this will increment until it reaches parrot_stuck_threshold + var/parrot_stuck = 0 //If parrot_lastmove hasn't changed, this will increment until it reaches parrot_stuck_threshold var/parrot_stuck_threshold = 10 //if this == parrot_stuck, it'll force the parrot back to wandering var/list/speech_buffer = list() @@ -299,7 +299,7 @@ if(health > 30) //Let's get in there and squawk it up! parrot_state |= PARROT_ATTACK else - parrot_state |= PARROT_FLEE //Otherwise, fly like a bat out of hell! + parrot_state |= PARROT_FLEE //Otherwise, fly like a bat out of hell! drop_held_item(0) if(stat != DEAD && !M.combat_mode) handle_automated_speech(1) //assured speak/emote @@ -470,12 +470,12 @@ if(!held_item && !parrot_perch) //If we've got nothing to do.. look for something to do. var/atom/movable/AM = search_for_perch_and_item() //This handles checking through lists so we know it's either a perch or stealable item if(AM) - if(istype(AM, /obj/item) || isliving(AM)) //If stealable item + if(istype(AM, /obj/item) || isliving(AM)) //If stealable item parrot_interest = AM manual_emote("turns and flies towards [parrot_interest].") parrot_state = PARROT_SWOOP | PARROT_STEAL return - else //Else it's a perch + else //Else it's a perch parrot_perch = AM parrot_state = PARROT_SWOOP | PARROT_RETURN return @@ -929,9 +929,9 @@ /mob/living/simple_animal/parrot/poly/proc/Read_Memory() if(fexists("data/npc_saves/Poly.sav")) //legacy compatability to convert old format to new var/savefile/S = new /savefile("data/npc_saves/Poly.sav") - S["phrases"] >> speech_buffer - S["roundssurvived"] >> rounds_survived - S["longestsurvival"] >> longest_survival + S["phrases"] >> speech_buffer + S["roundssurvived"] >> rounds_survived + S["longestsurvival"] >> longest_survival S["longestdeathstreak"] >> longest_deathstreak fdel("data/npc_saves/Poly.sav") else diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index 941c5718446..c99709fd718 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -295,7 +295,7 @@ /mob/living/simple_animal/proc/handle_automated_movement() set waitfor = FALSE if(!stop_automated_movement && wander) - if((isturf(loc) || allow_movement_on_non_turfs) && (mobility_flags & MOBILITY_MOVE)) //This is so it only moves if it's not inside a closet, gentics machine, etc. + if((isturf(loc) || allow_movement_on_non_turfs) && (mobility_flags & MOBILITY_MOVE)) //This is so it only moves if it's not inside a closet, gentics machine, etc. turns_since_move++ if(turns_since_move >= turns_per_move) if(!(stop_automated_movement_when_pulled && pulledby)) //Some animals don't move when pulled diff --git a/code/modules/mob/living/simple_animal/slime/powers.dm b/code/modules/mob/living/simple_animal/slime/powers.dm index 0aad2e96937..d78bf02e6c9 100644 --- a/code/modules/mob/living/simple_animal/slime/powers.dm +++ b/code/modules/mob/living/simple_animal/slime/powers.dm @@ -1,9 +1,9 @@ -#define SIZE_DOESNT_MATTER -1 -#define BABIES_ONLY 0 -#define ADULTS_ONLY 1 +#define SIZE_DOESNT_MATTER -1 +#define BABIES_ONLY 0 +#define ADULTS_ONLY 1 -#define NO_GROWTH_NEEDED 0 -#define GROWTH_NEEDED 1 +#define NO_GROWTH_NEEDED 0 +#define GROWTH_NEEDED 1 /datum/action/innate/slime check_flags = AB_CHECK_CONSCIOUS diff --git a/code/modules/mob/living/simple_animal/slime/slime.dm b/code/modules/mob/living/simple_animal/slime/slime.dm index 84097d7a564..c4eb7572638 100644 --- a/code/modules/mob/living/simple_animal/slime/slime.dm +++ b/code/modules/mob/living/simple_animal/slime/slime.dm @@ -187,7 +187,7 @@ . = ..() var/mod = 0 if(bodytemperature >= 330.23) // 135 F or 57.08 C - mod = -1 // slimes become supercharged at high temperatures + mod = -1 // slimes become supercharged at high temperatures else if(bodytemperature < 283.222) mod = ((283.222 - bodytemperature) / 10) * 1.75 if(mod) diff --git a/code/modules/mob/login.dm b/code/modules/mob/login.dm index 269d0608327..a8f06200af0 100644 --- a/code/modules/mob/login.dm +++ b/code/modules/mob/login.dm @@ -26,11 +26,11 @@ if(!client) return FALSE add_to_player_list() - lastKnownIP = client.address - computer_id = client.computer_id + lastKnownIP = client.address + computer_id = client.computer_id log_access("Mob Login: [key_name(src)] was assigned to a [type]") world.update_status() - client.screen = list() //remove hud items just in case + client.screen = list() //remove hud items just in case client.images = list() client.set_right_click_menu_mode(shift_to_open_context_menu) diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 1987d308b05..0735d3e8f25 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -118,8 +118,8 @@ var/datum/gas_mixture/environment = loc.return_air() - var/t = "Coordinates: [x],[y] \n" - t += "Temperature: [environment.temperature] \n" + var/t = "Coordinates: [x],[y] \n" + t += "Temperature: [environment.temperature] \n" for(var/id in environment.gases) var/gas = environment.gases[id] if(gas[MOLES]) @@ -544,7 +544,7 @@ * * Note that if either party has their face obscured, the other won't get the notice about the eye contact * Also note that examine_more() doesn't proc this or extend the timer, just because it's simpler this way and doesn't lose much. - * The nice part about relying on examining is that we don't bother checking visibility, because we already know they were both visible to each other within the last second, and the one who triggers it is currently seeing them + * The nice part about relying on examining is that we don't bother checking visibility, because we already know they were both visible to each other within the last second, and the one who triggers it is currently seeing them */ /mob/proc/handle_eye_contact(mob/living/examined_mob) return @@ -603,7 +603,7 @@ ///Can this mob resist (default FALSE) /mob/proc/can_resist() - return FALSE //overridden in living.dm + return FALSE //overridden in living.dm ///Spin this mob around it's central axis /mob/proc/spin(spintime, speed) diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm index b4cda48aa86..6f159451956 100644 --- a/code/modules/mob/mob_defines.dm +++ b/code/modules/mob/mob_defines.dm @@ -28,15 +28,15 @@ var/static/next_mob_id = 0 /// List of movement speed modifiers applying to this mob - var/list/movespeed_modification //Lazy list, see mob_movespeed.dm + var/list/movespeed_modification //Lazy list, see mob_movespeed.dm /// List of movement speed modifiers ignored by this mob. List -> List (id) -> List (sources) - var/list/movespeed_mod_immunities //Lazy list, see mob_movespeed.dm + var/list/movespeed_mod_immunities //Lazy list, see mob_movespeed.dm /// The calculated mob speed slowdown based on the modifiers list var/cached_multiplicative_slowdown /// List of action speed modifiers applying to this mob - var/list/actionspeed_modification //Lazy list, see mob_movespeed.dm + var/list/actionspeed_modification //Lazy list, see mob_movespeed.dm /// List of action speed modifiers ignored by this mob. List -> List (id) -> List (sources) - var/list/actionspeed_mod_immunities //Lazy list, see mob_movespeed.dm + var/list/actionspeed_mod_immunities //Lazy list, see mob_movespeed.dm /// The calculated mob action speed slowdown based on the modifiers list var/cached_multiplicative_actions_slowdown /// List of action hud items the user has @@ -74,12 +74,12 @@ * Set when you're being turned into something else and also used in a bunch of places * it probably shouldn't really be */ - var/notransform = null //Carbon + var/notransform = null //Carbon /// Is the mob blind - var/eye_blind = 0 //Carbon + var/eye_blind = 0 //Carbon /// Does the mob have blurry sight - var/eye_blurry = 0 //Carbon + var/eye_blurry = 0 //Carbon /// What is the mobs real name (name is overridden for disguises etc) var/real_name = null @@ -93,7 +93,7 @@ var/name_archive //For admin things like possession /// Default body temperature - var/bodytemperature = BODYTEMP_NORMAL //310.15K / 98.6F + var/bodytemperature = BODYTEMP_NORMAL //310.15K / 98.6F /// Drowsyness level of the mob var/drowsyness = 0//Carbon /// Dizziness level of the mob @@ -106,7 +106,7 @@ var/satiety = 0//Carbon /// How many ticks this mob has been over reating - var/overeatduration = 0 // How long this guy is overeating //Carbon + var/overeatduration = 0 // How long this guy is overeating //Carbon /// The movement intent of the mob (run/wal) var/m_intent = MOVE_INTENT_RUN//Living @@ -192,7 +192,7 @@ var/list/observers = null ///List of progress bars this mob is currently seeing for actions - var/list/progressbars = null //for stacking do_after bars + var/list/progressbars = null //for stacking do_after bars ///For storing what do_after's someone has, key = string, value = amount of interactions of that type happening. var/list/do_afters diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index ebb55692c13..5ce06f4bc94 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -304,7 +304,7 @@ * * notify_volume How loud the sound should be to spook the user */ /proc/notify_ghosts(message, ghost_sound = null, enter_link = null, atom/source = null, mutable_appearance/alert_overlay = null, action = NOTIFY_JUMP, flashwindow = TRUE, ignore_mapload = TRUE, ignore_key, header = null, notify_suiciders = TRUE, notify_volume = 100) //Easy notification of ghosts. - if(ignore_mapload && SSatoms.initialized != INITIALIZATION_INNEW_REGULAR) //don't notify for objects created during a map load + if(ignore_mapload && SSatoms.initialized != INITIALIZATION_INNEW_REGULAR) //don't notify for objects created during a map load return for(var/mob/dead/observer/O in GLOB.player_list) if(!notify_suiciders && (O in GLOB.suicided_mob_list)) @@ -357,7 +357,7 @@ ///Is the passed in mob a ghost with admin powers, doesn't check for AI interact like isAdminGhost() used to /proc/isAdminObserver(mob/user) - if(!user) //Are they a mob? Auto interface updates call this with a null src + if(!user) //Are they a mob? Auto interface updates call this with a null src return if(!user.client) // Do they have a client? return diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm index 341504fbbbd..ea745736fbd 100644 --- a/code/modules/mob/mob_movement.dm +++ b/code/modules/mob/mob_movement.dm @@ -79,7 +79,7 @@ if(!n || !direct) return FALSE if(mob.notransform) - return FALSE //This is sota the goto stop mobs from moving var + return FALSE //This is sota the goto stop mobs from moving var if(mob.control_object) return Move_object(direct) if(!isliving(mob)) @@ -98,11 +98,11 @@ //SKYRAT EDIT ADDITION END var/mob/living/L = mob //Already checked for isliving earlier - if(L.incorporeal_move) //Move though walls + if(L.incorporeal_move) //Move though walls Process_Incorpmove(direct) return FALSE - if(mob.remote_control) //we're controlling something, our movement is relayed to it + if(mob.remote_control) //we're controlling something, our movement is relayed to it return mob.remote_control.relaymove(mob, direct) if(isAI(mob)) @@ -111,13 +111,13 @@ if(Process_Grab()) //are we restrained by someone's grip? return - if(mob.buckled) //if we're buckled to something, tell it we moved. + if(mob.buckled) //if we're buckled to something, tell it we moved. return mob.buckled.relaymove(mob, direct) if(!(L.mobility_flags & MOBILITY_MOVE)) return FALSE - if(isobj(mob.loc) || ismob(mob.loc)) //Inside an object, tell it we moved + if(isobj(mob.loc) || ismob(mob.loc)) //Inside an object, tell it we moved var/atom/O = mob.loc return O.relaymove(mob, direct) diff --git a/code/modules/mob/mob_say.dm b/code/modules/mob/mob_say.dm index a7b01aa7af3..e375abaf22f 100644 --- a/code/modules/mob/mob_say.dm +++ b/code/modules/mob/mob_say.dm @@ -8,7 +8,7 @@ if(typing_indicator) set_typing_indicator(FALSE) //SKYRAT EDIT ADDITION END - if(GLOB.say_disabled) //This is here to try to identify lag problems + if(GLOB.say_disabled) //This is here to try to identify lag problems to_chat(usr, "Speech is currently admin-disabled.") return if(message) @@ -18,7 +18,7 @@ /mob/verb/whisper_verb(message as text) set name = "Whisper" set category = "IC" - if(GLOB.say_disabled) //This is here to try to identify lag problems + if(GLOB.say_disabled) //This is here to try to identify lag problems to_chat(usr, "Speech is currently admin-disabled.") return whisper(message) @@ -39,7 +39,7 @@ set_typing_indicator(FALSE) //SKYRAT EDIT ADDITION END - if(GLOB.say_disabled) //This is here to try to identify lag problems + if(GLOB.say_disabled) //This is here to try to identify lag problems to_chat(usr, "Speech is currently admin-disabled.") return @@ -52,7 +52,7 @@ var/name = real_name var/alt_name = "" - if(GLOB.say_disabled) //This is here to try to identify lag problems + if(GLOB.say_disabled) //This is here to try to identify lag problems to_chat(usr, "Speech is currently admin-disabled.") return diff --git a/code/modules/mob/mob_update_icons.dm b/code/modules/mob/mob_update_icons.dm index baa849705bb..9fceade1af5 100644 --- a/code/modules/mob/mob_update_icons.dm +++ b/code/modules/mob/mob_update_icons.dm @@ -1,7 +1,7 @@ //Most of these are defined at this level to reduce on checks elsewhere in the code. //Having them here also makes for a nice reference list of the various overlay-updating procs available -/mob/proc/regenerate_icons() //TODO: phase this out completely if possible +/mob/proc/regenerate_icons() //TODO: phase this out completely if possible return /mob/proc/update_icons() diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm index e243a654d00..584a161378a 100644 --- a/code/modules/mob/transform_procs.dm +++ b/code/modules/mob/transform_procs.dm @@ -138,7 +138,7 @@ if(client) R.updatename(client) - if(mind) //TODO //TODO WHAT + if(mind) //TODO //TODO WHAT if(!transfer_after) mind.active = FALSE mind.transfer_to(R) @@ -208,7 +208,7 @@ var/mob/living/simple_animal/slime/new_slime if(reproduce) - var/number = pick(14;2,3,4) //reproduce (has a small chance of producing 3 or 4 offspring) + var/number = pick(14;2,3,4) //reproduce (has a small chance of producing 3 or 4 offspring) var/list/babies = list() for(var/i=1,i<=number,i++) var/mob/living/simple_animal/slime/M = new/mob/living/simple_animal/slime(loc) @@ -242,7 +242,7 @@ regenerate_icons() icon = null invisibility = INVISIBILITY_MAXIMUM - for(var/t in bodyparts) //this really should not be necessary + for(var/t in bodyparts) //this really should not be necessary qdel(t) var/mob/living/simple_animal/pet/dog/corgi/new_corgi = new /mob/living/simple_animal/pet/dog/corgi (loc) @@ -339,7 +339,7 @@ //Bad mobs! - Remember to add a comment explaining what's wrong with the mob if(!MP) - return FALSE //Sanity, this should never happen. + return FALSE //Sanity, this should never happen. if(ispath(MP, /mob/living/simple_animal/hostile/construct)) return FALSE //Verbs do not appear for players. diff --git a/code/modules/modular_computers/computers/item/computer.dm b/code/modules/modular_computers/computers/item/computer.dm index 583ead83aef..2769479e0a7 100644 --- a/code/modules/modular_computers/computers/item/computer.dm +++ b/code/modules/modular_computers/computers/item/computer.dm @@ -11,13 +11,13 @@ max_integrity = 100 armor = list(MELEE = 0, BULLET = 20, LASER = 20, ENERGY = 100, BOMB = 0, BIO = 100, RAD = 100, FIRE = 0, ACID = 0) - var/enabled = 0 // Whether the computer is turned on. - var/screen_on = 1 // Whether the computer is active/opened/it's screen is on. - var/device_theme = "ntos" // Sets the theme for the main menu, hardware config, and file browser apps. Overridden by certain non-NT devices. - var/datum/computer_file/program/active_program = null // A currently active program running on the computer. - var/hardware_flag = 0 // A flag that describes this device type + var/enabled = 0 // Whether the computer is turned on. + var/screen_on = 1 // Whether the computer is active/opened/it's screen is on. + var/device_theme = "ntos" // Sets the theme for the main menu, hardware config, and file browser apps. Overridden by certain non-NT devices. + var/datum/computer_file/program/active_program = null // A currently active program running on the computer. + var/hardware_flag = 0 // A flag that describes this device type var/last_power_usage = 0 - var/last_battery_percent = 0 // Used for deciding if battery percentage has chandged + var/last_battery_percent = 0 // Used for deciding if battery percentage has chandged var/last_world_time = "00:00" var/list/last_header_icons ///Looping sound for when the computer is on @@ -25,19 +25,19 @@ ///Whether or not this modular computer uses the looping sound var/looping_sound = TRUE - var/base_active_power_usage = 50 // Power usage when the computer is open (screen is active) and can be interacted with. Remember hardware can use power too. - var/base_idle_power_usage = 5 // Power usage when the computer is idle and screen is off (currently only applies to laptops) + var/base_active_power_usage = 50 // Power usage when the computer is open (screen is active) and can be interacted with. Remember hardware can use power too. + var/base_idle_power_usage = 5 // Power usage when the computer is idle and screen is off (currently only applies to laptops) // Modular computers can run on various devices. Each DEVICE (Laptop, Console, Tablet,..) // must have it's own DMI file. Icon states must be called exactly the same in all files, but may look differently // If you create a program which is limited to Laptops and Consoles you don't have to add it's icon_state overlay for Tablets too, for example. - var/icon_state_unpowered = null // Icon state when the computer is turned off. - var/icon_state_powered = null // Icon state when the computer is turned on. - var/icon_state_menu = "menu" // Icon state overlay when the computer is turned on, but no program is loaded that would override the screen. - var/display_overlays = TRUE // If FALSE, don't draw overlays on this device at all - var/max_hardware_size = 0 // Maximal hardware w_class. Tablets/PDAs have 1, laptops 2, consoles 4. - var/steel_sheet_cost = 5 // Amount of steel sheets refunded when disassembling an empty frame of this computer. + var/icon_state_unpowered = null // Icon state when the computer is turned off. + var/icon_state_powered = null // Icon state when the computer is turned on. + var/icon_state_menu = "menu" // Icon state overlay when the computer is turned on, but no program is loaded that would override the screen. + var/display_overlays = TRUE // If FALSE, don't draw overlays on this device at all + var/max_hardware_size = 0 // Maximal hardware w_class. Tablets/PDAs have 1, laptops 2, consoles 4. + var/steel_sheet_cost = 5 // Amount of steel sheets refunded when disassembling an empty frame of this computer. /// List of "connection ports" in this computer and the components with which they are plugged var/list/all_components = list() @@ -46,11 +46,11 @@ /// Number of total expansion bays this computer has available. var/max_bays = 0 - var/list/idle_threads // Idle programs on background. They still receive process calls but can't be interacted with. - var/obj/physical = null // Object that represents our computer. It's used for Adjacent() and UI visibility checks. - var/has_light = FALSE //If the computer has a flashlight/LED light/what-have-you installed - var/comp_light_luminosity = 3 //The brightness of that light - var/comp_light_color //The color of that light + var/list/idle_threads // Idle programs on background. They still receive process calls but can't be interacted with. + var/obj/physical = null // Object that represents our computer. It's used for Adjacent() and UI visibility checks. + var/has_light = FALSE //If the computer has a flashlight/LED light/what-have-you installed + var/comp_light_luminosity = 3 //The brightness of that light + var/comp_light_color //The color of that light /obj/item/modular_computer/Initialize() diff --git a/code/modules/modular_computers/computers/item/laptop.dm b/code/modules/modular_computers/computers/item/laptop.dm index 2f7ff827a2e..904a3d4cf62 100644 --- a/code/modules/modular_computers/computers/item/laptop.dm +++ b/code/modules/modular_computers/computers/item/laptop.dm @@ -17,8 +17,8 @@ // No running around with open laptops in hands. item_flags = SLOWS_WHILE_IN_HAND - screen_on = FALSE // Starts closed - var/start_open = TRUE // unless this var is set to 1 + screen_on = FALSE // Starts closed + var/start_open = TRUE // unless this var is set to 1 var/icon_state_closed = "laptop-closed" var/w_class_open = WEIGHT_CLASS_BULKY var/slowdown_open = TRUE diff --git a/code/modules/modular_computers/computers/machinery/modular_computer.dm b/code/modules/modular_computers/computers/machinery/modular_computer.dm index daabe7b7eb4..06af3e31d9f 100644 --- a/code/modules/modular_computers/computers/machinery/modular_computer.dm +++ b/code/modules/modular_computers/computers/machinery/modular_computer.dm @@ -6,8 +6,8 @@ use_power = IDLE_POWER_USE idle_power_usage = 5 - var/hardware_flag = 0 // A flag that describes this device type - var/last_power_usage = 0 // Power usage during last tick + var/hardware_flag = 0 // A flag that describes this device type + var/last_power_usage = 0 // Power usage during last tick // Modular computers can run on various devices. Each DEVICE (Laptop, Console, Tablet,..) // must have it's own DMI file. Icon states must be called exactly the same in all files, but may look differently @@ -15,17 +15,17 @@ icon = null icon_state = null - var/icon_state_unpowered = null // Icon state when the computer is turned off. - var/icon_state_powered = null // Icon state when the computer is turned on. - var/screen_icon_state_menu = "menu" // Icon state overlay when the computer is turned on, but no program is loaded that would override the screen. - var/screen_icon_screensaver = "standby" // Icon state overlay when the computer is powered, but not 'switched on'. - var/max_hardware_size = 0 // Maximal hardware size. Currently, tablets have 1, laptops 2 and consoles 3. Limits what hardware types can be installed. - var/steel_sheet_cost = 10 // Amount of steel sheets refunded when disassembling an empty frame of this computer. - var/light_strength = 0 // Light luminosity when turned on - var/base_active_power_usage = 100 // Power usage when the computer is open (screen is active) and can be interacted with. Remember hardware can use power too. - var/base_idle_power_usage = 10 // Power usage when the computer is idle and screen is off (currently only applies to laptops) + var/icon_state_unpowered = null // Icon state when the computer is turned off. + var/icon_state_powered = null // Icon state when the computer is turned on. + var/screen_icon_state_menu = "menu" // Icon state overlay when the computer is turned on, but no program is loaded that would override the screen. + var/screen_icon_screensaver = "standby" // Icon state overlay when the computer is powered, but not 'switched on'. + var/max_hardware_size = 0 // Maximal hardware size. Currently, tablets have 1, laptops 2 and consoles 3. Limits what hardware types can be installed. + var/steel_sheet_cost = 10 // Amount of steel sheets refunded when disassembling an empty frame of this computer. + var/light_strength = 0 // Light luminosity when turned on + var/base_active_power_usage = 100 // Power usage when the computer is open (screen is active) and can be interacted with. Remember hardware can use power too. + var/base_idle_power_usage = 10 // Power usage when the computer is idle and screen is off (currently only applies to laptops) - var/obj/item/modular_computer/processor/cpu = null // CPU that handles most logic while this type only handles power and other specific things. + var/obj/item/modular_computer/processor/cpu = null // CPU that handles most logic while this type only handles power and other specific things. /obj/machinery/modular_computer/Initialize() . = ..() diff --git a/code/modules/modular_computers/file_system/computer_file.dm b/code/modules/modular_computers/file_system/computer_file.dm index 4e862c4ae35..08e77b8a9bb 100644 --- a/code/modules/modular_computers/file_system/computer_file.dm +++ b/code/modules/modular_computers/file_system/computer_file.dm @@ -1,11 +1,11 @@ /datum/computer_file - var/filename = "NewFile" // Placeholder. No spacebars - var/filetype = "XXX" // File full names are [filename].[filetype] so like NewFile.XXX in this case - var/size = 1 // File size in GQ. Integers only! - var/obj/item/computer_hardware/hard_drive/holder // Holder that contains this file. - var/unsendable = FALSE // Whether the file may be sent to someone via NTNet transfer or other means. - var/undeletable = FALSE // Whether the file may be deleted. Setting to TRUE prevents deletion/renaming/etc. - var/uid // UID of this file + var/filename = "NewFile" // Placeholder. No spacebars + var/filetype = "XXX" // File full names are [filename].[filetype] so like NewFile.XXX in this case + var/size = 1 // File size in GQ. Integers only! + var/obj/item/computer_hardware/hard_drive/holder // Holder that contains this file. + var/unsendable = FALSE // Whether the file may be sent to someone via NTNet transfer or other means. + var/undeletable = FALSE // Whether the file may be deleted. Setting to TRUE prevents deletion/renaming/etc. + var/uid // UID of this file var/static/file_uid = 0 /datum/computer_file/New() diff --git a/code/modules/modular_computers/file_system/data.dm b/code/modules/modular_computers/file_system/data.dm index 32ef6f53dd1..e0404e787fb 100644 --- a/code/modules/modular_computers/file_system/data.dm +++ b/code/modules/modular_computers/file_system/data.dm @@ -1,10 +1,10 @@ // /data/ files store data in string format. // They don't contain other logic for now. /datum/computer_file/data - var/stored_data = "" // Stored data in string format. + var/stored_data = "" // Stored data in string format. filetype = "DAT" var/block_size = 250 - var/do_not_edit = 0 // Whether the user will be reminded that the file probably shouldn't be edited. + var/do_not_edit = 0 // Whether the user will be reminded that the file probably shouldn't be edited. /datum/computer_file/data/clone() var/datum/computer_file/data/temp = ..() diff --git a/code/modules/modular_computers/file_system/program.dm b/code/modules/modular_computers/file_system/program.dm index 751332c8623..0bce722a5b3 100644 --- a/code/modules/modular_computers/file_system/program.dm +++ b/code/modules/modular_computers/file_system/program.dm @@ -111,7 +111,7 @@ if(!access_to_check) // No required_access, allow it. return TRUE - if(!transfer && computer && (computer.obj_flags & EMAGGED)) //emags can bypass the execution locks but not the download ones. + if(!transfer && computer && (computer.obj_flags & EMAGGED)) //emags can bypass the execution locks but not the download ones. return TRUE if(isAdminGhostAI(user)) diff --git a/code/modules/modular_computers/file_system/programs/airestorer.dm b/code/modules/modular_computers/file_system/programs/airestorer.dm index eafbcb6126d..bec4ab7dd1e 100644 --- a/code/modules/modular_computers/file_system/programs/airestorer.dm +++ b/code/modules/modular_computers/file_system/programs/airestorer.dm @@ -56,7 +56,7 @@ /datum/computer_file/program/aidiag/process_tick() . = ..() - if(!restoring) //Put the check here so we don't check for an ai all the time + if(!restoring) //Put the check here so we don't check for an ai all the time return var/obj/item/aicard/cardhold = get_ai(2) @@ -65,7 +65,7 @@ var/mob/living/silicon/ai/A = get_ai() if(!A || !cardhold) - restoring = FALSE // If the AI was removed, stop the restoration sequence. + restoring = FALSE // If the AI was removed, stop the restoration sequence. if(ai_slot) ai_slot.locked = FALSE return diff --git a/code/modules/modular_computers/file_system/programs/budgetordering.dm b/code/modules/modular_computers/file_system/programs/budgetordering.dm index 307483c209b..5e1afe8c4d7 100644 --- a/code/modules/modular_computers/file_system/programs/budgetordering.dm +++ b/code/modules/modular_computers/file_system/programs/budgetordering.dm @@ -105,7 +105,7 @@ data["docked"] = SSshuttle.supply.mode == SHUTTLE_IDLE data["loan"] = !!SSshuttle.shuttle_loan data["loan_dispatched"] = SSshuttle.shuttle_loan && SSshuttle.shuttle_loan.dispatched - data["can_send"] = FALSE //There is no situation where I want the app to be able to send the shuttle AWAY from the station, but conversely is fine. + data["can_send"] = FALSE //There is no situation where I want the app to be able to send the shuttle AWAY from the station, but conversely is fine. data["can_approve_requests"] = can_approve_requests data["app_cost"] = TRUE var/message = "Remember to stamp and send back the supply manifests." diff --git a/code/modules/modular_computers/file_system/programs/ntmonitor.dm b/code/modules/modular_computers/file_system/programs/ntmonitor.dm index d508317008a..22d3f20346c 100644 --- a/code/modules/modular_computers/file_system/programs/ntmonitor.dm +++ b/code/modules/modular_computers/file_system/programs/ntmonitor.dm @@ -6,7 +6,7 @@ extended_desc = "This program monitors stationwide NTNet network, provides access to logging systems, and allows for configuration changes" size = 12 requires_ntnet = TRUE - required_access = ACCESS_NETWORK //NETWORK CONTROL IS A MORE SECURE PROGRAM. + required_access = ACCESS_NETWORK //NETWORK CONTROL IS A MORE SECURE PROGRAM. available_on_ntnet = TRUE tgui_id = "NtosNetMonitor" program_icon = "network-wired" diff --git a/code/modules/modular_computers/file_system/programs/ntnrc_client.dm b/code/modules/modular_computers/file_system/programs/ntnrc_client.dm index b4e48d0e79a..8779414e397 100644 --- a/code/modules/modular_computers/file_system/programs/ntnrc_client.dm +++ b/code/modules/modular_computers/file_system/programs/ntnrc_client.dm @@ -11,12 +11,12 @@ available_on_ntnet = 1 tgui_id = "NtosNetChat" program_icon = "comment-alt" - var/last_message // Used to generate the toolbar icon + var/last_message // Used to generate the toolbar icon var/username var/active_channel var/list/channel_history = list() - var/operator_mode = FALSE // Channel operator mode - var/netadmin_mode = FALSE // Administrator mode (invisible to other users + bypasses passwords) + var/operator_mode = FALSE // Channel operator mode + var/netadmin_mode = FALSE // Administrator mode (invisible to other users + bypasses passwords) /datum/computer_file/program/chatclient/New() username = "DefaultUser[rand(100, 999)]" @@ -119,7 +119,7 @@ CRASH("Var computer is null!") if(!hard_drive) computer.visible_message("\The [computer] shows an \"I/O Error - Hard drive connection error\" warning.") - else // In 99.9% cases this will mean our HDD is full + else // In 99.9% cases this will mean our HDD is full computer.visible_message("\The [computer] shows an \"I/O Error - Hard drive may be full. Please free some space and try again. Required space: [logfile.size]GQ\" warning.") return TRUE if("PRG_renamechannel") diff --git a/code/modules/modular_computers/file_system/programs/sm_monitor.dm b/code/modules/modular_computers/file_system/programs/sm_monitor.dm index f0ee46e23ae..940742dfde0 100644 --- a/code/modules/modular_computers/file_system/programs/sm_monitor.dm +++ b/code/modules/modular_computers/file_system/programs/sm_monitor.dm @@ -13,7 +13,7 @@ alert_able = TRUE var/last_status = SUPERMATTER_INACTIVE var/list/supermatters - var/obj/machinery/power/supermatter_crystal/active // Currently selected supermatter crystal. + var/obj/machinery/power/supermatter_crystal/active // Currently selected supermatter crystal. /datum/computer_file/program/supermatter_monitor/Destroy() clear_signals() diff --git a/code/modules/modular_computers/hardware/_hardware.dm b/code/modules/modular_computers/hardware/_hardware.dm index 850ba76f063..0fc0b11fbdf 100644 --- a/code/modules/modular_computers/hardware/_hardware.dm +++ b/code/modules/modular_computers/hardware/_hardware.dm @@ -4,21 +4,21 @@ icon = 'icons/obj/module.dmi' icon_state = "std_mod" - w_class = WEIGHT_CLASS_TINY // w_class limits which devices can contain this component. + w_class = WEIGHT_CLASS_TINY // w_class limits which devices can contain this component. // 1: PDAs/Tablets, 2: Laptops, 3-4: Consoles only var/obj/item/modular_computer/holder = null // Computer that holds this hardware, if any. - var/power_usage = 0 // If the hardware uses extra power, change this. - var/enabled = TRUE // If the hardware is turned off set this to 0. - var/critical = FALSE // Prevent disabling for important component, like the CPU. - var/can_install = TRUE // Prevents direct installation of removable media. - var/expansion_hw = FALSE // Hardware that fits into expansion bays. - var/removable = TRUE // Whether the hardware is removable or not. - var/damage = 0 // Current damage level - var/max_damage = 100 // Maximal damage level. - var/damage_malfunction = 20 // "Malfunction" threshold. When damage exceeds this value the hardware piece will semi-randomly fail and do !!FUN!! things - var/damage_failure = 50 // "Failure" threshold. When damage exceeds this value the hardware piece will not work at all. + var/power_usage = 0 // If the hardware uses extra power, change this. + var/enabled = TRUE // If the hardware is turned off set this to 0. + var/critical = FALSE // Prevent disabling for important component, like the CPU. + var/can_install = TRUE // Prevents direct installation of removable media. + var/expansion_hw = FALSE // Hardware that fits into expansion bays. + var/removable = TRUE // Whether the hardware is removable or not. + var/damage = 0 // Current damage level + var/max_damage = 100 // Maximal damage level. + var/damage_malfunction = 20 // "Malfunction" threshold. When damage exceeds this value the hardware piece will semi-randomly fail and do !!FUN!! things + var/damage_failure = 50 // "Failure" threshold. When damage exceeds this value the hardware piece will not work at all. var/malfunction_probability = 10// Chance of malfunction when the component is damaged var/device_type diff --git a/code/modules/modular_computers/hardware/card_slot.dm b/code/modules/modular_computers/hardware/card_slot.dm index b90547ac21d..db5a660a2e6 100644 --- a/code/modules/modular_computers/hardware/card_slot.dm +++ b/code/modules/modular_computers/hardware/card_slot.dm @@ -1,5 +1,5 @@ /obj/item/computer_hardware/card_slot - name = "primary RFID card module" // \improper breaks the find_hardware_by_name proc + name = "primary RFID card module" // \improper breaks the find_hardware_by_name proc desc = "A module allowing this computer to read or write data on ID cards. Necessary for some programs to run properly." power_usage = 10 //W icon_state = "card_mini" diff --git a/code/modules/modular_computers/hardware/hard_drive.dm b/code/modules/modular_computers/hardware/hard_drive.dm index 8debb00c19d..d168dd784fe 100644 --- a/code/modules/modular_computers/hardware/hard_drive.dm +++ b/code/modules/modular_computers/hardware/hard_drive.dm @@ -8,15 +8,15 @@ device_type = MC_HDD var/max_capacity = 128 var/used_capacity = 0 - var/list/stored_files = list() // List of stored files on this drive. DO NOT MODIFY DIRECTLY! + var/list/stored_files = list() // List of stored files on this drive. DO NOT MODIFY DIRECTLY! /obj/item/computer_hardware/hard_drive/on_remove(obj/item/modular_computer/MC, mob/user) MC.shutdown_computer() /obj/item/computer_hardware/hard_drive/proc/install_default_programs() - store_file(new/datum/computer_file/program/computerconfig(src)) // Computer configuration utility, allows hardware control and displays more info than status bar - store_file(new/datum/computer_file/program/ntnetdownload(src)) // NTNet Downloader Utility, allows users to download more software from NTNet repository - store_file(new/datum/computer_file/program/filemanager(src)) // File manager, allows text editor functions and basic file manipulation. + store_file(new/datum/computer_file/program/computerconfig(src)) // Computer configuration utility, allows hardware control and displays more info than status bar + store_file(new/datum/computer_file/program/ntnetdownload(src)) // NTNet Downloader Utility, allows users to download more software from NTNet repository + store_file(new/datum/computer_file/program/filemanager(src)) // File manager, allows text editor functions and basic file manipulation. /obj/item/computer_hardware/hard_drive/examine(user) . = ..() @@ -129,7 +129,7 @@ name = "advanced hard disk drive" desc = "A hybrid HDD, for use in higher grade computers where balance between power efficiency and capacity is desired." max_capacity = 256 - power_usage = 50 // Hybrid, medium capacity and medium power storage + power_usage = 50 // Hybrid, medium capacity and medium power storage icon_state = "harddisk_mini" w_class = WEIGHT_CLASS_SMALL @@ -137,7 +137,7 @@ name = "super hard disk drive" desc = "A high capacity HDD, for use in cluster storage solutions where capacity is more important than power efficiency." max_capacity = 512 - power_usage = 100 // High-capacity but uses lots of power, shortening battery life. Best used with APC link. + power_usage = 100 // High-capacity but uses lots of power, shortening battery life. Best used with APC link. icon_state = "harddisk_mini" w_class = WEIGHT_CLASS_SMALL @@ -161,8 +161,8 @@ // For borg integrated tablets. No downloader. /obj/item/computer_hardware/hard_drive/small/integrated/install_default_programs() - store_file(new /datum/computer_file/program/computerconfig(src)) // Computer configuration utility, allows hardware control and displays more info than status bar - store_file(new /datum/computer_file/program/filemanager(src)) // File manager, allows text editor functions and basic file manipulation. + store_file(new /datum/computer_file/program/computerconfig(src)) // Computer configuration utility, allows hardware control and displays more info than status bar + store_file(new /datum/computer_file/program/filemanager(src)) // File manager, allows text editor functions and basic file manipulation. store_file(new /datum/computer_file/program/robotact(src)) diff --git a/code/modules/modular_computers/hardware/network_card.dm b/code/modules/modular_computers/hardware/network_card.dm index bba19831619..b0662785e95 100644 --- a/code/modules/modular_computers/hardware/network_card.dm +++ b/code/modules/modular_computers/hardware/network_card.dm @@ -3,9 +3,9 @@ desc = "A basic wireless network card for usage with standard NTNet frequencies." power_usage = 50 icon_state = "radio_mini" - network_id = NETWORK_CARDS // Network we are on - var/hardware_id = null // Identification ID. Technically MAC address of this device. Can't be changed by user. - var/identification_string = "" // Identification string, technically nickname seen in the network. Can be set by user. + network_id = NETWORK_CARDS // Network we are on + var/hardware_id = null // Identification ID. Technically MAC address of this device. Can't be changed by user. + var/identification_string = "" // Identification string, technically nickname seen in the network. Can be set by user. var/long_range = 0 var/ethernet = 0 // Hard-wired, therefore always on, ignores NTNet wireless checks. malfunction_probability = 1 diff --git a/code/modules/modular_computers/laptop_vendor.dm b/code/modules/modular_computers/laptop_vendor.dm index 2cc4da6f9db..6a507ad7e78 100644 --- a/code/modules/modular_computers/laptop_vendor.dm +++ b/code/modules/modular_computers/laptop_vendor.dm @@ -13,19 +13,19 @@ var/obj/item/modular_computer/tablet/fabricated_tablet = null // Utility vars - var/state = 0 // 0: Select device type, 1: Select loadout, 2: Payment, 3: Thankyou screen - var/devtype = 0 // 0: None(unselected), 1: Laptop, 2: Tablet - var/total_price = 0 // Price of currently vended device. + var/state = 0 // 0: Select device type, 1: Select loadout, 2: Payment, 3: Thankyou screen + var/devtype = 0 // 0: None(unselected), 1: Laptop, 2: Tablet + var/total_price = 0 // Price of currently vended device. var/credits = 0 // Device loadout - var/dev_cpu = 1 // 1: Default, 2: Upgraded - var/dev_battery = 1 // 1: Default, 2: Upgraded, 3: Advanced - var/dev_disk = 1 // 1: Default, 2: Upgraded, 3: Advanced - var/dev_netcard = 0 // 0: None, 1: Basic, 2: Long-Range - var/dev_apc_recharger = 0 // 0: None, 1: Standard (LAPTOP ONLY) - var/dev_printer = 0 // 0: None, 1: Standard - var/dev_card = 0 // 0: None, 1: Standard + var/dev_cpu = 1 // 1: Default, 2: Upgraded + var/dev_battery = 1 // 1: Default, 2: Upgraded, 3: Advanced + var/dev_disk = 1 // 1: Default, 2: Upgraded, 3: Advanced + var/dev_netcard = 0 // 0: None, 1: Basic, 2: Long-Range + var/dev_apc_recharger = 0 // 0: None, 1: Standard (LAPTOP ONLY) + var/dev_printer = 0 // 0: None, 1: Standard + var/dev_card = 0 // 0: None, 1: Standard // Removes all traces of old order and allows you to begin configuration from scratch. /obj/machinery/lapvend/proc/reset_order() @@ -48,7 +48,7 @@ // Recalculates the price and optionally even fabricates the device. /obj/machinery/lapvend/proc/fabricate_and_recalc_price(fabricate = FALSE) total_price = 0 - if(devtype == 1) // Laptop, generally cheaper to make it accessible for most station roles + if(devtype == 1) // Laptop, generally cheaper to make it accessible for most station roles var/obj/item/computer_hardware/battery/battery_module = null if(fabricate) fabricated_laptop = new /obj/item/modular_computer/laptop/buildable(src) @@ -111,7 +111,7 @@ fabricated_laptop.install_component(new /obj/item/computer_hardware/card_slot/secondary) return total_price - else if(devtype == 2) // Tablet, more expensive, not everyone could probably afford this. + else if(devtype == 2) // Tablet, more expensive, not everyone could probably afford this. var/obj/item/computer_hardware/battery/battery_module = null if(fabricate) fabricated_tablet = new(src) diff --git a/code/modules/movespeed/_movespeed_modifier.dm b/code/modules/movespeed/_movespeed_modifier.dm index 248aa137b56..2a49d842fe0 100644 --- a/code/modules/movespeed/_movespeed_modifier.dm +++ b/code/modules/movespeed/_movespeed_modifier.dm @@ -76,7 +76,7 @@ GLOBAL_LIST_EMPTY(movespeed_modification_cache) type_or_datum = new type_or_datum var/datum/movespeed_modifier/existing = LAZYACCESS(movespeed_modification, type_or_datum.id) if(existing) - if(existing == type_or_datum) //same thing don't need to touch + if(existing == type_or_datum) //same thing don't need to touch return TRUE remove_movespeed_modifier(existing, FALSE) if(length(movespeed_modification)) @@ -90,10 +90,10 @@ GLOBAL_LIST_EMPTY(movespeed_modification_cache) /mob/proc/remove_movespeed_modifier(datum/movespeed_modifier/type_id_datum, update = TRUE) var/key if(ispath(type_id_datum)) - key = initial(type_id_datum.id) || "[type_id_datum]" //id if set, path set to string if not. - else if(!istext(type_id_datum)) //if it isn't text it has to be a datum, as it isn't a type. + key = initial(type_id_datum.id) || "[type_id_datum]" //id if set, path set to string if not. + else if(!istext(type_id_datum)) //if it isn't text it has to be a datum, as it isn't a type. key = type_id_datum.id - else //assume it's an id + else //assume it's an id key = type_id_datum if(!LAZYACCESS(movespeed_modification, key)) return FALSE @@ -201,7 +201,7 @@ GLOBAL_LIST_EMPTY(movespeed_modification_cache) . += M.multiplicative_slowdown /// Checks if a move speed modifier is valid and not missing any data -/proc/movespeed_data_null_check(datum/movespeed_modifier/M) //Determines if a data list is not meaningful and should be discarded. +/proc/movespeed_data_null_check(datum/movespeed_modifier/M) //Determines if a data list is not meaningful and should be discarded. . = TRUE if(M.multiplicative_slowdown) . = FALSE diff --git a/code/modules/ninja/__ninjaDefines.dm b/code/modules/ninja/__ninjaDefines.dm index b02389207d8..8414f9e4244 100644 --- a/code/modules/ninja/__ninjaDefines.dm +++ b/code/modules/ninja/__ninjaDefines.dm @@ -1,12 +1,12 @@ //ninjacost() specificCheck defines -#define N_STEALTH_CANCEL 1 -#define N_ADRENALINE 2 +#define N_STEALTH_CANCEL 1 +#define N_ADRENALINE 2 //ninjaDrainAct() defines for non numerical returns -#define INVALID_DRAIN "INVALID" //This one is if the drain proc needs to cancel, eg missing variables, etc, it's important. -#define DRAIN_RD_HACK_FAILED "RDHACKFAIL" -#define DRAIN_MOB_SHOCK "MOBSHOCK" -#define DRAIN_MOB_SHOCK_FAILED "MOBSHOCKFAIL" +#define INVALID_DRAIN "INVALID" //This one is if the drain proc needs to cancel, eg missing variables, etc, it's important. +#define DRAIN_RD_HACK_FAILED "RDHACKFAIL" +#define DRAIN_MOB_SHOCK "MOBSHOCK" +#define DRAIN_MOB_SHOCK_FAILED "MOBSHOCKFAIL" //Tells whether or not someone is a space ninja #define IS_SPACE_NINJA(ninja) (ninja.mind && ninja.mind.has_antag_datum(/datum/antagonist/ninja)) diff --git a/code/modules/ninja/suit/gloves.dm b/code/modules/ninja/suit/gloves.dm index 6c91a155bbd..83cbb38159c 100644 --- a/code/modules/ninja/suit/gloves.dm +++ b/code/modules/ninja/suit/gloves.dm @@ -39,7 +39,7 @@ if(!candrain || draining) return FALSE if(!ishuman(loc)) - return FALSE //Only works while worn + return FALSE //Only works while worn var/mob/living/carbon/human/wearer = loc @@ -64,7 +64,7 @@ else to_chat(wearer, "\The [A] has run dry of energy, you must find another source!") else - . = FALSE //as to not cancel attack_hand() + . = FALSE //as to not cancel attack_hand() /obj/item/clothing/gloves/space_ninja/examine(mob/user) . = ..() diff --git a/code/modules/ninja/suit/ninja_equipment_actions/ninja_suit_initialisation.dm b/code/modules/ninja/suit/ninja_equipment_actions/ninja_suit_initialisation.dm index 51167b0e0dd..763d1c33c20 100644 --- a/code/modules/ninja/suit/ninja_equipment_actions/ninja_suit_initialisation.dm +++ b/code/modules/ninja/suit/ninja_equipment_actions/ninja_suit_initialisation.dm @@ -1,8 +1,8 @@ -#define NINJA_LOCK_PHASE 1 -#define NINJA_ICON_GENERATE_PHASE 3 -#define NINJA_COMPLETE_PHASE 6 -#define NINJA_DEINIT_LOGOFF_PHASE 1 -#define NINJA_DEINIT_STEALTH_PHASE 5 +#define NINJA_LOCK_PHASE 1 +#define NINJA_ICON_GENERATE_PHASE 3 +#define NINJA_COMPLETE_PHASE 6 +#define NINJA_DEINIT_LOGOFF_PHASE 1 +#define NINJA_DEINIT_STEALTH_PHASE 5 GLOBAL_LIST_INIT(ninja_initialize_messages, list( "Now initializing...", diff --git a/code/modules/paperwork/clipboard.dm b/code/modules/paperwork/clipboard.dm index 98a92217bbc..b2747c63d74 100644 --- a/code/modules/paperwork/clipboard.dm +++ b/code/modules/paperwork/clipboard.dm @@ -8,8 +8,8 @@ w_class = WEIGHT_CLASS_SMALL throw_speed = 3 throw_range = 7 - var/obj/item/pen/haspen //The stored pen. - var/obj/item/paper/toppaper //The topmost piece of paper. + var/obj/item/pen/haspen //The stored pen. + var/obj/item/paper/toppaper //The topmost piece of paper. slot_flags = ITEM_SLOT_BELT resistance_flags = FLAMMABLE @@ -23,7 +23,7 @@ /obj/item/clipboard/Destroy() QDEL_NULL(haspen) - QDEL_NULL(toppaper) //let movable/Destroy handle the rest + QDEL_NULL(toppaper) //let movable/Destroy handle the rest return ..() /obj/item/clipboard/update_overlays() @@ -54,7 +54,7 @@ else dat += "Add Pen
      " - //The topmost paper. You can't organise contents directly in byond, so this is what we're stuck with. -Pete + //The topmost paper. You can't organise contents directly in byond, so this is what we're stuck with. -Pete if(toppaper) var/obj/item/paper/P = toppaper dat += "WriteRemove - [P.name]
      " diff --git a/code/modules/paperwork/filingcabinet.dm b/code/modules/paperwork/filingcabinet.dm index badc0e94ecd..b496110d143 100644 --- a/code/modules/paperwork/filingcabinet.dm +++ b/code/modules/paperwork/filingcabinet.dm @@ -1,9 +1,9 @@ /* Filing cabinets! * Contains: - * Filing Cabinets - * Security Record Cabinets - * Medical Record Cabinets - * Employment Contract Cabinets + * Filing Cabinets + * Security Record Cabinets + * Medical Record Cabinets + * Employment Contract Cabinets */ @@ -27,7 +27,7 @@ desc = "A small cabinet with drawers. This one has wheels!" anchored = FALSE -/obj/structure/filingcabinet/filingcabinet //not changing the path to avoid unnecessary map issues, but please don't name stuff like this in the future -Pete +/obj/structure/filingcabinet/filingcabinet //not changing the path to avoid unnecessary map issues, but please don't name stuff like this in the future -Pete icon_state = "tallcabinet" @@ -136,7 +136,7 @@ counter++ P.info += "" P.name = "paper - '[G.fields["name"]]'" - virgin = FALSE //tabbing here is correct- it's possible for people to try and use it + virgin = FALSE //tabbing here is correct- it's possible for people to try and use it //before the records have been generated, so we do this inside the loop. /obj/structure/filingcabinet/security/attack_hand() @@ -170,7 +170,7 @@ counter++ P.info += "" P.name = "paper - '[G.fields["name"]]'" - virgin = FALSE //tabbing here is correct- it's possible for people to try and use it + virgin = FALSE //tabbing here is correct- it's possible for people to try and use it //before the records have been generated, so we do this inside the loop. //ATTACK HAND IGNORING PARENT RETURN VALUE diff --git a/code/modules/paperwork/handlabeler.dm b/code/modules/paperwork/handlabeler.dm index 8dcd3704f3d..1ce9fd10ba0 100644 --- a/code/modules/paperwork/handlabeler.dm +++ b/code/modules/paperwork/handlabeler.dm @@ -39,7 +39,7 @@ . = ..() if(!proximity) return - if(!mode) //if it's off, give up. + if(!mode) //if it's off, give up. return if(!labels_left) @@ -85,7 +85,7 @@ if(istype(I, /obj/item/hand_labeler_refill)) to_chat(user, "You insert [I] into [src].") qdel(I) - labels_left = initial(labels_left) //Yes, it's capped at its initial value + labels_left = initial(labels_left) //Yes, it's capped at its initial value /obj/item/hand_labeler/borg name = "cyborg-hand labeler" diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index 4e3e6c96f5b..d8fc67bb7f3 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -5,7 +5,7 @@ * lipstick wiping is in code/game/objects/items/weapons/cosmetics.dm! */ #define MAX_PAPER_LENGTH 5000 -#define MAX_PAPER_STAMPS 30 // Too low? +#define MAX_PAPER_STAMPS 30 // Too low? #define MAX_PAPER_STAMPS_OVERLAYS 4 #define MODE_READING 0 #define MODE_WRITING 1 @@ -43,8 +43,8 @@ var/show_written_words = TRUE /// The (text for the) stamps on the paper. - var/list/stamps /// Positioning for the stamp in tgui - var/list/stamped /// Overlay info + var/list/stamps /// Positioning for the stamp in tgui + var/list/stamped /// Overlay info var/contact_poison // Reagent ID to transfer on contact var/contact_poison_volume = 0 @@ -209,7 +209,7 @@ return /// Normaly you just stamp, you don't need to read the thing else // cut paper? the sky is the limit! - ui_interact(user) // The other ui will be created with just read mode outside of this + ui_interact(user) // The other ui will be created with just read mode outside of this return ..() @@ -236,8 +236,8 @@ . = list() .["text"] = info .["max_length"] = MAX_PAPER_LENGTH - .["paper_color"] = !color || color == "white" ? "#FFFFFF" : color // color might not be set - .["paper_state"] = icon_state /// TODO: show the sheet will bloodied or crinkling? + .["paper_color"] = !color || color == "white" ? "#FFFFFF" : color // color might not be set + .["paper_state"] = icon_state /// TODO: show the sheet will bloodied or crinkling? .["stamps"] = stamps @@ -291,14 +291,14 @@ if("stamp") var/stamp_x = text2num(params["x"]) var/stamp_y = text2num(params["y"]) - var/stamp_r = text2num(params["r"]) // rotation in degrees + var/stamp_r = text2num(params["r"]) // rotation in degrees var/stamp_icon_state = params["stamp_icon_state"] var/stamp_class = params["stamp_class"] if (isnull(stamps)) stamps = list() if(stamps.len < MAX_PAPER_STAMPS) // I hate byond when dealing with freaking lists - stamps[++stamps.len] = list(stamp_class, stamp_x, stamp_y, stamp_r) /// WHHHHY + stamps[++stamps.len] = list(stamp_class, stamp_x, stamp_y, stamp_r) /// WHHHHY /// This does the overlay stuff if (isnull(stamped)) diff --git a/code/modules/paperwork/paper_premade.dm b/code/modules/paperwork/paper_premade.dm index 9a6e45f8d0a..7c3040baa69 100644 --- a/code/modules/paperwork/paper_premade.dm +++ b/code/modules/paperwork/paper_premade.dm @@ -1,5 +1,5 @@ /* - * Premade paper + * Premade paper */ /obj/item/paper/fluff/sop @@ -21,7 +21,7 @@
      -Love, Your Dearest"} -//////////// Job guides n' fluff +//////////// Job guides n' fluff /obj/item/paper/guides/jobs/hydroponics name = "paper- 'Greetings from Billy Bob'" @@ -92,11 +92,11 @@ "} /* - * Stations + * Stations */ -/////////// CentCom +/////////// CentCom /obj/item/paper/fluff/stations/centcom/disk_memo name = "memo" @@ -110,7 +110,7 @@ info = "
      CentCom Security
      Port Division
      Official Bulletin

      Inspector,
      There is an emergency shuttle arriving today.

      Approval is restricted to Nanotrasen employees only. Deny all other entrants.

      CentCom Port Commissioner" -/////////// Lavaland +/////////// Lavaland /obj/item/paper/fluff/stations/lavaland/orm_notice name = "URGENT!" diff --git a/code/modules/paperwork/paperplane.dm b/code/modules/paperwork/paperplane.dm index 1e7b073fa79..e926df0013c 100644 --- a/code/modules/paperwork/paperplane.dm +++ b/code/modules/paperwork/paperplane.dm @@ -75,7 +75,7 @@ to_chat(user, "You should unfold [src] before changing it!") return - else if(istype(P, /obj/item/stamp)) //we don't randomize stamps on a paperplane + else if(istype(P, /obj/item/stamp)) //we don't randomize stamps on a paperplane internalPaper.attackby(P, user) //spoofed attack to update internal paper. update_icon() add_fingerprint(user) diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index 0cf8a12e5ef..d231aaca6c6 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -1,9 +1,9 @@ -/* Pens! - * Contains: - * Pens - * Sleepy Pens - * Parapens - * Edaggers +/* Pens! + * Contains: + * Pens + * Sleepy Pens + * Parapens + * Edaggers */ @@ -25,7 +25,7 @@ custom_materials = list(/datum/material/iron=10) pressure_resistance = 2 grind_results = list(/datum/reagent/iron = 2, /datum/reagent/iodine = 1) - var/colour = "black" //what colour the ink is! + var/colour = "black" //what colour the ink is! var/degrees = 0 var/font = PEN_FONT embedding = list() diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm index 3d213786a09..ea90e185cc0 100644 --- a/code/modules/paperwork/photocopier.dm +++ b/code/modules/paperwork/photocopier.dm @@ -1,19 +1,19 @@ /// For use with the `color_mode` var. Photos will be printed in greyscale while the var has this value. -#define PHOTO_GREYSCALE "Greyscale" +#define PHOTO_GREYSCALE "Greyscale" /// For use with the `color_mode` var. Photos will be printed in full color while the var has this value. -#define PHOTO_COLOR "Color" +#define PHOTO_COLOR "Color" /// How much toner is used for making a copy of a paper. -#define PAPER_TONER_USE 0.125 +#define PAPER_TONER_USE 0.125 /// How much toner is used for making a copy of a photo. -#define PHOTO_TONER_USE 0.625 +#define PHOTO_TONER_USE 0.625 /// How much toner is used for making a copy of a document. -#define DOCUMENT_TONER_USE 0.75 +#define DOCUMENT_TONER_USE 0.75 /// How much toner is used for making a copy of an ass. -#define ASS_TONER_USE 0.625 +#define ASS_TONER_USE 0.625 /// The maximum amount of copies you can make with one press of the copy button. -#define MAX_COPIES_AT_ONCE 10 +#define MAX_COPIES_AT_ONCE 10 /obj/machinery/photocopier name = "photocopier" @@ -238,8 +238,8 @@ copied_paper.info = "" var/copied_info = paper_copy.info - copied_info = replacetext(copied_info, "" copied_paper.name = paper_copy.name diff --git a/code/modules/photography/_pictures.dm b/code/modules/photography/_pictures.dm index daa0fc53c1e..e9411fd64dd 100644 --- a/code/modules/photography/_pictures.dm +++ b/code/modules/photography/_pictures.dm @@ -9,8 +9,8 @@ var/psize_x = 96 var/psize_y = 96 var/has_blueprints = FALSE - var/logpath //If the picture has been logged this is the path. - var/id //this var is NOT protected because the worst you can do with this that you couldn't do otherwise is overwrite photos, and photos aren't going to be used as attack logs/investigations anytime soon. + var/logpath //If the picture has been logged this is the path. + var/id //this var is NOT protected because the worst you can do with this that you couldn't do otherwise is overwrite photos, and photos aren't going to be used as attack logs/investigations anytime soon. ///Was this image capable of seeing ghosts? var/see_ghosts = CAMERA_NO_GHOSTS @@ -141,7 +141,7 @@ if(!CONFIG_GET(flag/log_pictures)) return if(logpath) - return //we're already logged + return //we're already logged var/number = GLOB.picture_logging_id++ var/finalpath = "[GLOB.picture_log_directory]/[number].png" fcopy(icon(picture_image, dir = SOUTH, frame = 1), finalpath) @@ -163,7 +163,7 @@ P.picture_name = picture_name P.picture_desc = picture_desc if(picture_image) - P.picture_image = icon(picture_image) //Copy, not reference. + P.picture_image = icon(picture_image) //Copy, not reference. if(picture_icon) P.picture_icon = icon(picture_icon) P.psize_x = psize_x - cropx * 2 diff --git a/code/modules/photography/camera/camera.dm b/code/modules/photography/camera/camera.dm index 73019014aad..789a5b3e99a 100644 --- a/code/modules/photography/camera/camera.dm +++ b/code/modules/photography/camera/camera.dm @@ -27,7 +27,7 @@ var/pictures_left = 10 var/on = TRUE var/cooldown = 64 - var/blending = FALSE //lets not take pictures while the previous is still processing! + var/blending = FALSE //lets not take pictures while the previous is still processing! var/see_ghosts = CAMERA_NO_GHOSTS //for the spoop of it var/obj/item/disk/holodisk/disk var/sound/custom_sound @@ -116,7 +116,7 @@ return FALSE else if(!(get_turf(target) in get_hear(world.view, user))) return FALSE - else //user is an atom + else //user is an atom if(!(get_turf(target) in view(world.view, user))) return FALSE return TRUE diff --git a/code/modules/photography/camera/camera_image_capturing.dm b/code/modules/photography/camera/camera_image_capturing.dm index 95966711a4f..d26b95e9c6d 100644 --- a/code/modules/photography/camera/camera_image_capturing.dm +++ b/code/modules/photography/camera/camera_image_capturing.dm @@ -1,6 +1,6 @@ /obj/effect/appearance_clone -/obj/effect/appearance_clone/New(loc, atom/A) //Intentionally not Initialize(), to make sure the clone assumes the intended appearance in time for the camera getFlatIcon. +/obj/effect/appearance_clone/New(loc, atom/A) //Intentionally not Initialize(), to make sure the clone assumes the intended appearance in time for the camera getFlatIcon. if(istype(A)) appearance = A.appearance dir = A.dir @@ -23,7 +23,7 @@ var/offset_x = T.x - center.x var/offset_y = T.y - center.y var/turf/newT = locate(cloned_center_x + offset_x, cloned_center_y + offset_y, clone_area.bottom_left_coords[3]) - if(!(newT in clone_area.reserved_turfs)) //sanity check so we don't overwrite other areas somehow + if(!(newT in clone_area.reserved_turfs)) //sanity check so we don't overwrite other areas somehow continue atoms += new /obj/effect/appearance_clone(newT, T) if(T.loc.icon_state) @@ -105,7 +105,7 @@ CHECK_TICK if(!silent) - if(istype(custom_sound)) //This is where the camera actually finishes its exposure. + if(istype(custom_sound)) //This is where the camera actually finishes its exposure. playsound(loc, custom_sound, 75, TRUE, -3) else playsound(loc, pick('sound/items/polaroid1.ogg', 'sound/items/polaroid2.ogg'), 75, TRUE, -3) diff --git a/code/modules/photography/camera/silicon_camera.dm b/code/modules/photography/camera/silicon_camera.dm index 454c2474ff6..88c2e4ef53f 100644 --- a/code/modules/photography/camera/silicon_camera.dm +++ b/code/modules/photography/camera/silicon_camera.dm @@ -86,6 +86,6 @@ var/obj/item/photo/p = new /obj/item/photo(C.loc, selection) p.pixel_x = p.base_pixel_x + rand(-10, 10) p.pixel_y = p.base_pixel_y + rand(-10, 10) - C.toner -= printcost //All fun allowed. + C.toner -= printcost //All fun allowed. visible_message("[C.name] spits out a photograph from a narrow slot on its chassis.") to_chat(usr, "You print a photograph.") diff --git a/code/modules/photography/photos/photo.dm b/code/modules/photography/photos/photo.dm index ee4cc083e0a..5f4bb327b31 100644 --- a/code/modules/photography/photos/photo.dm +++ b/code/modules/photography/photos/photo.dm @@ -12,7 +12,7 @@ grind_results = list(/datum/reagent/iodine = 4) material_flags = MATERIAL_NO_EFFECTS var/datum/picture/picture - var/scribble //Scribble on the back. + var/scribble //Scribble on the back. /obj/item/photo/Initialize(mapload, datum/picture/P, datum_name = TRUE, datum_desc = TRUE) set_picture(P, datum_name, datum_desc, TRUE) diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index 2b2c4a11623..b734afcbaf1 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -1,30 +1,30 @@ //update_state -#define UPSTATE_CELL_IN (1<<0) -#define UPSTATE_OPENED1 (1<<1) -#define UPSTATE_OPENED2 (1<<2) -#define UPSTATE_MAINT (1<<3) -#define UPSTATE_BROKE (1<<4) -#define UPSTATE_BLUESCREEN (1<<5) -#define UPSTATE_WIREEXP (1<<6) -#define UPSTATE_ALLGOOD (1<<7) +#define UPSTATE_CELL_IN (1<<0) +#define UPSTATE_OPENED1 (1<<1) +#define UPSTATE_OPENED2 (1<<2) +#define UPSTATE_MAINT (1<<3) +#define UPSTATE_BROKE (1<<4) +#define UPSTATE_BLUESCREEN (1<<5) +#define UPSTATE_WIREEXP (1<<6) +#define UPSTATE_ALLGOOD (1<<7) #define APC_RESET_EMP "emp" //update_overlay -#define APC_UPOVERLAY_CHARGEING0 (1<<0) -#define APC_UPOVERLAY_CHARGEING1 (1<<1) -#define APC_UPOVERLAY_CHARGEING2 (1<<2) -#define APC_UPOVERLAY_EQUIPMENT0 (1<<3) -#define APC_UPOVERLAY_EQUIPMENT1 (1<<4) -#define APC_UPOVERLAY_EQUIPMENT2 (1<<5) -#define APC_UPOVERLAY_LIGHTING0 (1<<6) -#define APC_UPOVERLAY_LIGHTING1 (1<<7) -#define APC_UPOVERLAY_LIGHTING2 (1<<8) -#define APC_UPOVERLAY_ENVIRON0 (1<<9) -#define APC_UPOVERLAY_ENVIRON1 (1<<10) -#define APC_UPOVERLAY_ENVIRON2 (1<<11) -#define APC_UPOVERLAY_LOCKED (1<<12) -#define APC_UPOVERLAY_OPERATING (1<<13) +#define APC_UPOVERLAY_CHARGEING0 (1<<0) +#define APC_UPOVERLAY_CHARGEING1 (1<<1) +#define APC_UPOVERLAY_CHARGEING2 (1<<2) +#define APC_UPOVERLAY_EQUIPMENT0 (1<<3) +#define APC_UPOVERLAY_EQUIPMENT1 (1<<4) +#define APC_UPOVERLAY_EQUIPMENT2 (1<<5) +#define APC_UPOVERLAY_LIGHTING0 (1<<6) +#define APC_UPOVERLAY_LIGHTING1 (1<<7) +#define APC_UPOVERLAY_LIGHTING2 (1<<8) +#define APC_UPOVERLAY_ENVIRON0 (1<<9) +#define APC_UPOVERLAY_ENVIRON1 (1<<10) +#define APC_UPOVERLAY_ENVIRON2 (1<<11) +#define APC_UPOVERLAY_LOCKED (1<<12) +#define APC_UPOVERLAY_OPERATING (1<<13) #define APC_ELECTRONICS_MISSING 0 // None #define APC_ELECTRONICS_INSTALLED 1 // Installed but not secured @@ -65,8 +65,8 @@ var/area/area var/areastring = null var/obj/item/stock_parts/cell/cell - var/start_charge = 90 // initial cell charge % - var/cell_type = /obj/item/stock_parts/cell/upgraded //Base cell has 2500 capacity. Enter the path of a different cell you want to use. cell determines charge rates, max capacity, ect. These can also be changed with other APC vars, but isn't recommended to minimize the risk of accidental usage of dirty editted APCs + var/start_charge = 90 // initial cell charge % + var/cell_type = /obj/item/stock_parts/cell/upgraded //Base cell has 2500 capacity. Enter the path of a different cell you want to use. cell determines charge rates, max capacity, ect. These can also be changed with other APC vars, but isn't recommended to minimize the risk of accidental usage of dirty editted APCs var/opened = APC_COVER_CLOSED var/shorted = FALSE var/lighting = 3 @@ -86,7 +86,7 @@ var/lastused_environ = 0 var/lastused_total = 0 var/main_status = 0 - powernet = FALSE // set so that APCs aren't found as powernet nodes //Hackish, Horrible, was like this before I changed it :( + powernet = FALSE // set so that APCs aren't found as powernet nodes //Hackish, Horrible, was like this before I changed it :( var/malfhack = FALSE //New var for my changes to AI malf. --NeoFite var/mob/living/silicon/ai/malfai = null //See above --NeoFite var/has_electronics = APC_ELECTRONICS_MISSING // 0 - none, 1 - plugged in, 2 - secured by screwdriver @@ -165,7 +165,7 @@ // this allows the APC to be embedded in a wall, yet still inside an area if (building) setDir(ndir) - tdir = dir // to fix Vars bug + tdir = dir // to fix Vars bug setDir(SOUTH) switch(tdir) @@ -234,7 +234,7 @@ // is starting with a power cell installed, create it and set its charge level if(cell_type) cell = new cell_type - cell.charge = start_charge * cell.maxcharge / 100 // (convert percentage to actual value) + cell.charge = start_charge * cell.maxcharge / 100 // (convert percentage to actual value) var/area/A = loc.loc @@ -292,7 +292,7 @@ // update the APC icon to show the three base states // also add overlays for indicator lights /obj/machinery/power/apc/update_icon() - var/update = check_updates() //returns 0 if no need to update icons. + var/update = check_updates() //returns 0 if no need to update icons. // 1 if we need to update the icon_state // 2 if we need to update the overlays if(!update) @@ -555,7 +555,7 @@ if(issilicon(user) && get_dist(src,user)>1) return attack_hand(user) - if (istype(W, /obj/item/stock_parts/cell) && opened) + if (istype(W, /obj/item/stock_parts/cell) && opened) if(cell) to_chat(user, "There is a power cell already installed!") return @@ -1084,7 +1084,7 @@ if(!is_station_level(z)) return malf.ShutOffDoomsdayDevice() - occupier = new /mob/living/silicon/ai(src, malf.laws, malf) //DEAR GOD WHY? //IKR???? + occupier = new /mob/living/silicon/ai(src, malf.laws, malf) //DEAR GOD WHY? //IKR???? occupier.adjustOxyLoss(malf.getOxyLoss()) if(!findtext(occupier.name, "APC Copy")) occupier.name = "[malf.name] APC Copy" @@ -1227,22 +1227,22 @@ if(cell && !shorted) // draw power from cell as before to power the area - var/cellused = min(cell.charge, GLOB.CELLRATE * lastused_total) // clamp deduction to a max, amount left in cell + var/cellused = min(cell.charge, GLOB.CELLRATE * lastused_total) // clamp deduction to a max, amount left in cell cell.use(cellused) - if(excess > lastused_total) // if power excess recharge the cell + if(excess > lastused_total) // if power excess recharge the cell // by the same amount just used cell.give(cellused) - add_load(cellused/GLOB.CELLRATE) // add the load used to recharge the cell + add_load(cellused/GLOB.CELLRATE) // add the load used to recharge the cell - else // no excess, and not enough per-apc - if((cell.charge/GLOB.CELLRATE + excess) >= lastused_total) // can we draw enough from cell+grid to cover last usage? - cell.charge = min(cell.maxcharge, cell.charge + GLOB.CELLRATE * excess) //recharge with what we can - add_load(excess) // so draw what we can from the grid + else // no excess, and not enough per-apc + if((cell.charge/GLOB.CELLRATE + excess) >= lastused_total) // can we draw enough from cell+grid to cover last usage? + cell.charge = min(cell.maxcharge, cell.charge + GLOB.CELLRATE * excess) //recharge with what we can + add_load(excess) // so draw what we can from the grid charging = APC_NOT_CHARGING - else // not enough power available to run the last tick! + else // not enough power available to run the last tick! charging = APC_NOT_CHARGING chargecount = 0 // This turns everything off in the case that there is still a charge left on the battery, just not enough to run the room. @@ -1259,22 +1259,22 @@ else if(longtermpower > -10) longtermpower -= 2 - if(cell.charge <= 0) // zero charge, turn all off + if(cell.charge <= 0) // zero charge, turn all off equipment = autoset(equipment, 0) lighting = autoset(lighting, 0) environ = autoset(environ, 0) area.poweralert(TRUE, src) - else if(cell.percent() < 15 && longtermpower < 0) // <15%, turn off lighting & equipment + else if(cell.percent() < 15 && longtermpower < 0) // <15%, turn off lighting & equipment equipment = autoset(equipment, 2) lighting = autoset(lighting, 2) environ = autoset(environ, 1) area.poweralert(TRUE, src) - else if(cell.percent() < 30 && longtermpower < 0) // <30%, turn off equipment + else if(cell.percent() < 30 && longtermpower < 0) // <30%, turn off equipment equipment = autoset(equipment, 2) lighting = autoset(lighting, 1) environ = autoset(environ, 1) area.poweralert(TRUE, src) - else // otherwise all can be on + else // otherwise all can be on equipment = autoset(equipment, 1) lighting = autoset(lighting, 1) environ = autoset(environ, 1) @@ -1284,14 +1284,14 @@ // now trickle-charge the cell if(chargemode && charging == APC_CHARGING && operating) - if(excess > 0) // check to make sure we have enough to charge + if(excess > 0) // check to make sure we have enough to charge // Max charge is capped to % per second constant var/ch = min(excess*GLOB.CELLRATE, cell.maxcharge*GLOB.CHARGELEVEL) add_load(ch/GLOB.CELLRATE) // Removes the power we're taking from the grid cell.give(ch) // actually recharge the cell else - charging = APC_NOT_CHARGING // stop charging + charging = APC_NOT_CHARGING // stop charging chargecount = 0 // show cell as fully charged if so @@ -1338,15 +1338,15 @@ /obj/machinery/power/apc/proc/autoset(val, on) if(on==0) - if(val==2) // if on, return off + if(val==2) // if on, return off return 0 - else if(val==3) // if auto-on, return auto-off + else if(val==3) // if auto-on, return auto-off return 1 else if(on==1) - if(val==1) // if auto-off, return auto-on + if(val==1) // if auto-off, return auto-on return 3 else if(on==2) - if(val==3) // if auto-on, return auto-off + if(val==3) // if auto-on, return auto-off return 1 return val diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index db8c2956235..8be77dcf72d 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -22,7 +22,7 @@ GLOBAL_LIST_INIT(wire_node_generating_types, typecacheof(list(/obj/structure/gri obj_flags = CAN_BE_HIT | ON_BLUEPRINTS var/linked_dirs = 0 //bitflag var/node = FALSE //used for sprites display - var/cable_layer = CABLE_LAYER_2 //bitflag + var/cable_layer = CABLE_LAYER_2 //bitflag var/machinery_layer = MACHINERY_LAYER_1 //bitflag var/datum/powernet/powernet @@ -110,14 +110,14 @@ GLOBAL_LIST_INIT(wire_node_generating_types, typecacheof(list(/obj/structure/gri C.linked_dirs &= ~inverse C.update_icon() -/obj/structure/cable/Destroy() // called when a cable is deleted +/obj/structure/cable/Destroy() // called when a cable is deleted Disconnect_cable() if(powernet) - cut_cable_from_powernet() // update the powernets - GLOB.cable_list -= src //remove it from global cable list + cut_cable_from_powernet() // update the powernets + GLOB.cable_list -= src //remove it from global cable list - return ..() // then go ahead and delete the cable + return ..() // then go ahead and delete the cable /obj/structure/cable/deconstruct(disassembled = TRUE) if(!(flags_1 & NODECONSTRUCT_1)) @@ -164,7 +164,7 @@ GLOBAL_LIST_INIT(wire_node_generating_types, typecacheof(list(/obj/structure/gri return else if(W.tool_behaviour == TOOL_MULTITOOL) - if(powernet && (powernet.avail > 0)) // is it powered? + if(powernet && (powernet.avail > 0)) // is it powered? to_chat(user, "Total power: [DisplayPower(powernet.avail)]\nLoad: [DisplayPower(powernet.load)]\nExcess power: [DisplayPower(surplus())]") else to_chat(user, "The cable is not powered.") @@ -668,7 +668,7 @@ GLOBAL_LIST_INIT(wire_node_generating_types, typecacheof(list(/obj/structure/gri var/turf/T = get_turf(src) for(var/obj/structure/cable/C in T.contents - src) if(C.cable_layer & cable_layer) - C.deconstruct() // remove adversary cable + C.deconstruct() // remove adversary cable if(!mapload) auto_propagate_cut_cable(src) @@ -682,12 +682,12 @@ GLOBAL_LIST_INIT(wire_node_generating_types, typecacheof(list(/obj/structure/gri vis_contents += cable_node_3 update_icon() -/obj/structure/cable/multilayer/Destroy() // called when a cable is deleted +/obj/structure/cable/multilayer/Destroy() // called when a cable is deleted QDEL_NULL(machinery_node) QDEL_NULL(cable_node_1) QDEL_NULL(cable_node_2) QDEL_NULL(cable_node_3) - return ..() // then go ahead and delete the cable + return ..() // then go ahead and delete the cable /obj/structure/cable/multilayer/examine(mob/user) . += ..() @@ -755,8 +755,8 @@ GLOBAL_LIST(hub_radial_layer_list) var/turf/T = get_turf(src) for(var/obj/structure/cable/C in T.contents - src) if(C.cable_layer & cable_layer) - C.deconstruct() // remove adversary cable - auto_propagate_cut_cable(src) // update the powernets + C.deconstruct() // remove adversary cable + auto_propagate_cut_cable(src) // update the powernets /obj/structure/cable/multilayer/CtrlClick(mob/living/user) to_chat(user, "You pust reset button.") diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm index 34a0b0678d0..d8098f92b07 100644 --- a/code/modules/power/cell.dm +++ b/code/modules/power/cell.dm @@ -15,11 +15,11 @@ throw_speed = 2 throw_range = 5 w_class = WEIGHT_CLASS_SMALL - var/charge = 0 // note %age conveted to actual charge in New + var/charge = 0 // note %age conveted to actual charge in New var/maxcharge = 1000 custom_materials = list(/datum/material/iron=700, /datum/material/glass=50) grind_results = list(/datum/reagent/lithium = 15, /datum/reagent/iron = 5, /datum/reagent/silicon = 5) - var/rigged = FALSE /// If the cell has been booby-trapped by injecting it with plasma. Chance on use() to explode. + var/rigged = FALSE /// If the cell has been booby-trapped by injecting it with plasma. Chance on use() to explode. var/corrupted = FALSE /// If the power cell was damaged by an explosion, chance for it to become corrupted and function the same as rigged. var/chargerate = 100 //how much power is given every tick in a recharger var/ratingdesc = TRUE @@ -60,7 +60,7 @@ else . += mutable_appearance('icons/obj/power.dmi', "cell-o1") -/obj/item/stock_parts/cell/proc/percent() // return % charge of cell +/obj/item/stock_parts/cell/proc/percent() // return % charge of cell return 100*charge/maxcharge // use power from a cell @@ -219,7 +219,7 @@ /obj/item/stock_parts/cell/secborg name = "security borg rechargeable D battery" - maxcharge = 600 //600 max charge / 100 charge per shot = six shots + maxcharge = 600 //600 max charge / 100 charge per shot = six shots custom_materials = list(/datum/material/glass=40) /obj/item/stock_parts/cell/secborg/empty/Initialize() @@ -364,7 +364,7 @@ name = "beam rifle capacitor" desc = "A high powered capacitor that can provide huge amounts of energy in an instant." maxcharge = 50000 - chargerate = 5000 //Extremely energy intensive + chargerate = 5000 //Extremely energy intensive /obj/item/stock_parts/cell/beam_rifle/corrupt() return diff --git a/code/modules/power/generator.dm b/code/modules/power/generator.dm index 20417cd443c..aac314828dc 100644 --- a/code/modules/power/generator.dm +++ b/code/modules/power/generator.dm @@ -42,7 +42,7 @@ . += "teg-oc[lastcirc]" -#define GENRATE 800 // generator output coefficient from Q +#define GENRATE 800 // generator output coefficient from Q /obj/machinery/power/generator/process_atmos() diff --git a/code/modules/power/gravitygenerator.dm b/code/modules/power/gravitygenerator.dm index ee48b3e4357..3167b23563f 100644 --- a/code/modules/power/gravitygenerator.dm +++ b/code/modules/power/gravitygenerator.dm @@ -131,7 +131,7 @@ GLOBAL_LIST_EMPTY(gravity_generators) // We will keep track of this by adding ne var/charge_count = 100 var/current_overlay = null var/broken_state = 0 - var/setting = 1 //Gravity value when on + var/setting = 1 //Gravity value when on /obj/machinery/gravity_generator/main/Destroy() // If we somehow get deleted, remove all of our other parts. investigate_log("was destroyed!", INVESTIGATE_GRAVITY) diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm index 9aacbd15d9e..6a9d305ce71 100644 --- a/code/modules/power/lighting.dm +++ b/code/modules/power/lighting.dm @@ -213,7 +213,7 @@ name = "light fixture" icon = 'icons/obj/lighting.dmi' //ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE var/overlayicon = 'icons/obj/lighting_overlay.dmi' //ICON OVERRIDEN IN SKYRAT AESTHETICS - SEE MODULE - var/base_state = "tube" // base description and icon_state + var/base_state = "tube" // base description and icon_state icon_state = "tube" desc = "A lighting fixture." layer = WALL_OBJ_LAYER @@ -222,36 +222,36 @@ idle_power_usage = 2 active_power_usage = 20 power_channel = AREA_USAGE_LIGHT //Lights are calc'd via area so they dont need to be in the machine list - var/on = FALSE // 1 if on, 0 if off + var/on = FALSE // 1 if on, 0 if off var/on_gs = FALSE var/static_power_used = 0 - var/brightness = 8 // luminosity when on, also used in power calculation - var/bulb_power = 1 // basically the alpha of the emitted light source - var/bulb_colour = "#f3fffa" // befault colour of the light. - var/status = LIGHT_OK // LIGHT_OK, _EMPTY, _BURNED or _BROKEN + var/brightness = 8 // luminosity when on, also used in power calculation + var/bulb_power = 1 // basically the alpha of the emitted light source + var/bulb_colour = "#f3fffa" // befault colour of the light. + var/status = LIGHT_OK // LIGHT_OK, _EMPTY, _BURNED or _BROKEN var/flickering = FALSE - var/light_type = /obj/item/light/tube // the type of light item + var/light_type = /obj/item/light/tube // the type of light item var/fitting = "tube" - var/switchcount = 0 // count of number of times switched on/off + var/switchcount = 0 // count of number of times switched on/off // this is used to calc the probability the light burns out - var/rigged = FALSE // true if rigged to explode + var/rigged = FALSE // true if rigged to explode var/obj/item/stock_parts/cell/cell - var/start_with_cell = TRUE // if true, this fixture generates a very weak cell at roundstart + var/start_with_cell = TRUE // if true, this fixture generates a very weak cell at roundstart - var/nightshift_enabled = FALSE //Currently in night shift mode? - var/nightshift_allowed = TRUE //Set to FALSE to never let this light get switched to night mode. + var/nightshift_enabled = FALSE //Currently in night shift mode? + var/nightshift_allowed = TRUE //Set to FALSE to never let this light get switched to night mode. var/nightshift_brightness = 8 var/nightshift_light_power = 0.45 var/nightshift_light_color = "#FFDDCC" - var/emergency_mode = FALSE // if true, the light is in emergency mode - var/no_emergency = FALSE // if true, this light cannot ever have an emergency mode - var/bulb_emergency_brightness_mul = 0.25 // multiplier for this light's base brightness in emergency power mode - var/bulb_emergency_colour = "#FF3232" // determines the colour of the light while it's in emergency mode - var/bulb_emergency_pow_mul = 0.75 // the multiplier for determining the light's power in emergency mode - var/bulb_emergency_pow_min = 0.5 // the minimum value for the light's power in emergency mode + var/emergency_mode = FALSE // if true, the light is in emergency mode + var/no_emergency = FALSE // if true, this light cannot ever have an emergency mode + var/bulb_emergency_brightness_mul = 0.25 // multiplier for this light's base brightness in emergency power mode + var/bulb_emergency_colour = "#FF3232" // determines the colour of the light while it's in emergency mode + var/bulb_emergency_pow_mul = 0.75 // the multiplier for determining the light's power in emergency mode + var/bulb_emergency_pow_min = 0.5 // the minimum value for the light's power in emergency mode /obj/machinery/light/broken status = LIGHT_BROKEN @@ -379,12 +379,12 @@ var/area/A = get_area(src) if(A) on = FALSE -// A.update_lights() +// A.update_lights() QDEL_NULL(cell) return ..() /obj/machinery/light/update_icon_state() - switch(status) // set icon_states + switch(status) // set icon_states if(LIGHT_OK) var/area/A = get_area(src) if(emergency_mode || (A?.fire)) @@ -757,13 +757,13 @@ to_chat(user, "You telekinetically remove the light [fitting].") else var/obj/item/bodypart/affecting = H.get_bodypart("[(user.active_hand_index % 2 == 0) ? "r" : "l" ]_arm") - if(affecting?.receive_damage( 0, 5 )) // 5 burn damage + if(affecting?.receive_damage( 0, 5 )) // 5 burn damage H.update_damage_overlays() if(HAS_TRAIT(user, TRAIT_LIGHTBULB_REMOVER)) to_chat(user, "You feel like you're burning, but you can push through.") if(!do_after(user, 5 SECONDS, target = src)) return - if(affecting?.receive_damage( 0, 10 )) // 10 more burn damage + if(affecting?.receive_damage( 0, 10 )) // 10 more burn damage H.update_damage_overlays() to_chat(user, "You manage to remove the light [fitting], shattering it in process.") break_light_tube() @@ -857,7 +857,7 @@ /obj/machinery/light/proc/explode() set waitfor = 0 var/turf/T = get_turf(src.loc) - break_light_tube() // break it first to give a warning + break_light_tube() // break it first to give a warning sleep(2) explosion(T, 0, 0, 2, 2) sleep(1) @@ -872,12 +872,12 @@ force = 2 throwforce = 5 w_class = WEIGHT_CLASS_TINY - var/status = LIGHT_OK // LIGHT_OK, LIGHT_BURNED or LIGHT_BROKEN + var/status = LIGHT_OK // LIGHT_OK, LIGHT_BURNED or LIGHT_BROKEN var/base_state - var/switchcount = 0 // number of times switched + var/switchcount = 0 // number of times switched custom_materials = list(/datum/material/glass=100) grind_results = list(/datum/reagent/silicon = 5, /datum/reagent/nitrogen = 10) //Nitrogen is used as a cheaper alternative to argon in incandescent lighbulbs - var/rigged = FALSE // true if rigged to explode + var/rigged = FALSE // true if rigged to explode var/brightness = 2 //how much light it gives off /obj/item/light/suicide_act(mob/living/carbon/user) @@ -1000,7 +1000,7 @@ /obj/machinery/light/floor name = "floor light" icon = 'icons/obj/lighting.dmi' - base_state = "floor" // base description and icon_state + base_state = "floor" // base description and icon_state icon_state = "floor" brightness = 4 layer = 2.5 diff --git a/code/modules/power/pipecleaners.dm b/code/modules/power/pipecleaners.dm index adecef56c63..25ab5081299 100644 --- a/code/modules/power/pipecleaners.dm +++ b/code/modules/power/pipecleaners.dm @@ -23,9 +23,9 @@ GLOBAL_LIST_INIT(pipe_cleaner_colors, list( /* Cable directions (d1 and d2) * 9 1 5 - * \ | / + * \ | / * 8 - 0 - 4 - * / | \ + * / | \ * 10 2 6 If d1 = 0 and d2 = 0, there's no pipe_cleaner @@ -92,12 +92,12 @@ By design, d1 is the smallest direction and d2 is the highest color = pipe_cleaner_colors[random_color] update_icon() -/obj/structure/pipe_cleaner/Destroy() // called when a pipe_cleaner is deleted +/obj/structure/pipe_cleaner/Destroy() // called when a pipe_cleaner is deleted //If we have a stored item at this point, lets just delete it, since that should be //handled by deconstruction if(stored) QDEL_NULL(stored) - return ..() // then go ahead and delete the pipe_cleaner + return ..() // then go ahead and delete the pipe_cleaner /obj/structure/pipe_cleaner/deconstruct(disassembled = TRUE) if(!(flags_1 & NODECONSTRUCT_1)) @@ -334,10 +334,10 @@ By design, d1 is the smallest direction and d2 is the highest var/turf/T = C.loc - if(!isturf(T)) // sanity check + if(!isturf(T)) // sanity check return - if(get_dist(C, user) > 1) // make sure it's close enough + if(get_dist(C, user) > 1) // make sure it's close enough to_chat(user, "You can't lay pipe cleaner at a place that far away!") return @@ -352,7 +352,7 @@ By design, d1 is the smallest direction and d2 is the highest // one end of the clicked pipe_cleaner is pointing towards us and no direction was supplied if((C.d1 == dirn || C.d2 == dirn) && !forceddir) - if(!U.can_have_cabling()) //checking if it's a plating or catwalk + if(!U.can_have_cabling()) //checking if it's a plating or catwalk if (showerror) to_chat(user, "You can only lay pipe cleaners on catwalks and plating!") return @@ -360,9 +360,9 @@ By design, d1 is the smallest direction and d2 is the highest // pipe_cleaner is pointing at us, we're standing on an open tile // so create a stub pointing at the clicked pipe_cleaner on our tile - var/fdirn = turn(dirn, 180) // the opposite direction + var/fdirn = turn(dirn, 180) // the opposite direction - for(var/obj/structure/pipe_cleaner/LC in U) // check to make sure there's not a pipe_cleaner there already + for(var/obj/structure/pipe_cleaner/LC in U) // check to make sure there's not a pipe_cleaner there already if(LC.d1 == fdirn || LC.d2 == fdirn) if (showerror) to_chat(user, "There's already a pipe cleaner at that position!") @@ -382,19 +382,19 @@ By design, d1 is the smallest direction and d2 is the highest // exisiting pipe_cleaner doesn't point at our position or we have a supplied direction, so see if it's a stub else if(C.d1 == 0) // if so, make it a full pipe_cleaner pointing from it's old direction to our dirn - var/nd1 = C.d2 // these will be the new directions + var/nd1 = C.d2 // these will be the new directions var/nd2 = dirn - if(nd1 > nd2) // swap directions to match icons/states + if(nd1 > nd2) // swap directions to match icons/states nd1 = dirn nd2 = C.d2 - for(var/obj/structure/pipe_cleaner/LC in T) // check to make sure there's no matching pipe_cleaner - if(LC == C) // skip the pipe_cleaner we're interacting with + for(var/obj/structure/pipe_cleaner/LC in T) // check to make sure there's no matching pipe_cleaner + if(LC == C) // skip the pipe_cleaner we're interacting with continue - if((LC.d1 == nd1 && LC.d2 == nd2) || (LC.d1 == nd2 && LC.d2 == nd1) ) // make sure no pipe_cleaner matches either direction + if((LC.d1 == nd1 && LC.d2 == nd2) || (LC.d1 == nd2 && LC.d2 == nd1) ) // make sure no pipe_cleaner matches either direction if (showerror) to_chat(user, "There's already a pipe cleaner at that position!") diff --git a/code/modules/power/power.dm b/code/modules/power/power.dm index 213d06c9e1a..e7714e166e9 100644 --- a/code/modules/power/power.dm +++ b/code/modules/power/power.dm @@ -85,16 +85,16 @@ if(!use_power) return TRUE - var/area/A = get_area(src) // make sure it's in an area + var/area/A = get_area(src) // make sure it's in an area if(!A) - return FALSE // if not, then not powered + return FALSE // if not, then not powered if(chan == -1) chan = power_channel - return A.powered(chan) // return power status of the area + return A.powered(chan) // return power status of the area // increment the power usage stats for an area /obj/machinery/proc/use_power(amount, chan = -1) // defaults to power_channel - var/area/A = get_area(src) // make sure it's in an area + var/area/A = get_area(src) // make sure it's in an area if(!A) return if(chan == -1) @@ -313,7 +313,7 @@ return //We assume net1 is larger. If net2 is in fact larger we are just going to make them switch places to reduce on code. - if(net1.cables.len < net2.cables.len) //net2 is larger than net1. Let's switch them around + if(net1.cables.len < net2.cables.len) //net2 is larger than net1. Let's switch them around var/temp = net1 net1 = net2 net2 = temp diff --git a/code/modules/power/powernet.dm b/code/modules/power/powernet.dm index e29e186d403..910e03a8f5b 100644 --- a/code/modules/power/powernet.dm +++ b/code/modules/power/powernet.dm @@ -3,17 +3,17 @@ // each contiguous network of cables & nodes ///////////////////////////////////// /datum/powernet - var/number // unique id - var/list/cables = list() // all cables & junctions - var/list/nodes = list() // all connected machines + var/number // unique id + var/list/cables = list() // all cables & junctions + var/list/nodes = list() // all connected machines - var/load = 0 // the current load on the powernet, increased by each machine at processing - var/newavail = 0 // what available power was gathered last tick, then becomes... - var/avail = 0 //...the current available power in the powernet - var/viewavail = 0 // the available power as it appears on the power console (gradually updated) - var/viewload = 0 // the load as it appears on the power console (gradually updated) - var/netexcess = 0 // excess power on the powernet (typically avail-load)/////// - var/delayedload = 0 // load applied to powernet between power ticks. + var/load = 0 // the current load on the powernet, increased by each machine at processing + var/newavail = 0 // what available power was gathered last tick, then becomes... + var/avail = 0 //...the current available power in the powernet + var/viewavail = 0 // the available power as it appears on the power console (gradually updated) + var/viewload = 0 // the load as it appears on the power console (gradually updated) + var/netexcess = 0 // excess power on the powernet (typically avail-load)/////// + var/delayedload = 0 // load applied to powernet between power ticks. /datum/powernet/New() SSmachines.powernets += src @@ -80,9 +80,9 @@ //see if there's a surplus of power remaining in the powernet and stores unused power in the SMES netexcess = avail - load - if(netexcess > 100 && nodes?.len) // if there was excess power last cycle - for(var/obj/machinery/power/smes/S in nodes) // find the SMESes in the network - S.restore() // and restore some of the power that was used + if(netexcess > 100 && nodes?.len) // if there was excess power last cycle + for(var/obj/machinery/power/smes/S in nodes) // find the SMESes in the network + S.restore() // and restore some of the power that was used // update power consoles viewavail = round(0.8 * viewavail + 0.2 * avail) diff --git a/code/modules/power/singularity/collector.dm b/code/modules/power/singularity/collector.dm index e3ee3418fe1..987f5915c8b 100644 --- a/code/modules/power/singularity/collector.dm +++ b/code/modules/power/singularity/collector.dm @@ -1,7 +1,7 @@ // stored_energy += (pulse_strength-RAD_COLLECTOR_EFFICIENCY)*RAD_COLLECTOR_COEFFICIENT -#define RAD_COLLECTOR_EFFICIENCY 80 // radiation needs to be over this amount to get power +#define RAD_COLLECTOR_EFFICIENCY 80 // radiation needs to be over this amount to get power #define RAD_COLLECTOR_COEFFICIENT 100 -#define RAD_COLLECTOR_STORED_OUT 0.04 // (this*100)% of stored power outputted per tick. Doesn't actualy change output total, lower numbers just means collectors output for longer in absence of a source +#define RAD_COLLECTOR_STORED_OUT 0.04 // (this*100)% of stored power outputted per tick. Doesn't actualy change output total, lower numbers just means collectors output for longer in absence of a source #define RAD_COLLECTOR_MINING_CONVERSION_RATE 0.00001 //This is gonna need a lot of tweaking to get right. This is the number used to calculate the conversion of watts to research points per process() #define RAD_COLLECTOR_OUTPUT min(stored_energy, (stored_energy*RAD_COLLECTOR_STORED_OUT)+1000) //Produces at least 1000 watts if it has more than that stored /obj/machinery/power/rad_collector diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm index f2d70cf3b7f..b93b2864fbf 100644 --- a/code/modules/power/singularity/emitter.dm +++ b/code/modules/power/singularity/emitter.dm @@ -452,7 +452,7 @@ if(U.dropItemToGround(I)) var/obj/item/turret_control/TC = new /obj/item/turret_control() U.put_in_hands(TC) - else //Entries in the list should only ever be items or null, so if it's not an item, we can assume it's an empty hand + else //Entries in the list should only ever be items or null, so if it's not an item, we can assume it's an empty hand var/obj/item/turret_control/TC = new /obj/item/turret_control() U.put_in_hands(TC) UpdateButtonIcon() diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm index 05ec3d3627e..8ad2b1f893b 100644 --- a/code/modules/power/singularity/singularity.dm +++ b/code/modules/power/singularity/singularity.dm @@ -279,13 +279,13 @@ set_light(10) /obj/singularity/proc/check_cardinals_range(steps, retry_with_move = FALSE) - . = length(GLOB.cardinals) //Should be 4. + . = length(GLOB.cardinals) //Should be 4. for(var/i in GLOB.cardinals) - . -= check_turfs_in(i, steps) //-1 for each working direction - if(. && retry_with_move) //If there's still a positive value it means it didn't pass. Retry with move if applicable + . -= check_turfs_in(i, steps) //-1 for each working direction + if(. && retry_with_move) //If there's still a positive value it means it didn't pass. Retry with move if applicable for(var/i in GLOB.cardinals) - if(step(src, i)) //Move in each direction. - if(check_cardinals_range(steps, FALSE)) //New location passes, return true. + if(step(src, i)) //Move in each direction. + if(check_cardinals_range(steps, FALSE)) //New location passes, return true. return TRUE return !. diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm index 72e051e1523..39cc3cd0a8e 100644 --- a/code/modules/power/smes.dm +++ b/code/modules/power/smes.dm @@ -1,18 +1,18 @@ // the SMES // stores power -#define SMESRATE 0.05 // rate of internal charge to external power +#define SMESRATE 0.05 // rate of internal charge to external power //Cache defines -#define SMES_CLEVEL_1 1 -#define SMES_CLEVEL_2 2 -#define SMES_CLEVEL_3 3 -#define SMES_CLEVEL_4 4 -#define SMES_CLEVEL_5 5 -#define SMES_OUTPUTTING 6 +#define SMES_CLEVEL_1 1 +#define SMES_CLEVEL_2 2 +#define SMES_CLEVEL_3 3 +#define SMES_CLEVEL_4 4 +#define SMES_CLEVEL_5 5 +#define SMES_OUTPUTTING 6 #define SMES_NOT_OUTPUTTING 7 -#define SMES_INPUTTING 8 -#define SMES_INPUT_ATTEMPT 9 +#define SMES_INPUTTING 8 +#define SMES_INPUT_ATTEMPT 9 /obj/machinery/power/smes name = "power storage unit" @@ -243,16 +243,16 @@ input_available = terminal.surplus() if(inputting) - if(input_available > 0) // if there's power available, try to charge + if(input_available > 0) // if there's power available, try to charge - var/load = min(min((capacity-charge)/SMESRATE, input_level), input_available) // charge at set rate, limited to spare capacity + var/load = min(min((capacity-charge)/SMESRATE, input_level), input_available) // charge at set rate, limited to spare capacity - charge += load * SMESRATE // increase the charge + charge += load * SMESRATE // increase the charge terminal.add_load(load) // add the load to the terminal side network - else // if not enough capcity - inputting = FALSE // stop inputting + else // if not enough capcity + inputting = FALSE // stop inputting else if(input_attempt && input_available > 0) @@ -263,14 +263,14 @@ //outputting if(output_attempt) if(outputting) - output_used = min( charge/SMESRATE, output_level) //limit output to that stored + output_used = min( charge/SMESRATE, output_level) //limit output to that stored - if (add_avail(output_used)) // add output to powernet if it exists (smes side) - charge -= output_used*SMESRATE // reduce the storage (may be recovered in /restore() if excessive) + if (add_avail(output_used)) // add output to powernet if it exists (smes side) + charge -= output_used*SMESRATE // reduce the storage (may be recovered in /restore() if excessive) else outputting = FALSE - if(output_used < 0.0001) // either from no charge or set to 0 + if(output_used < 0.0001) // either from no charge or set to 0 outputting = FALSE investigate_log("lost power and turned off", INVESTIGATE_SINGULO) else if(output_attempt && charge > output_level && output_level > 0) @@ -296,18 +296,18 @@ output_used = 0 return - var/excess = powernet.netexcess // this was how much wasn't used on the network last ptick, minus any removed by other SMESes + var/excess = powernet.netexcess // this was how much wasn't used on the network last ptick, minus any removed by other SMESes - excess = min(output_used, excess) // clamp it to how much was actually output by this SMES last ptick + excess = min(output_used, excess) // clamp it to how much was actually output by this SMES last ptick - excess = min((capacity-charge)/SMESRATE, excess) // for safety, also limit recharge by space capacity of SMES (shouldn't happen) + excess = min((capacity-charge)/SMESRATE, excess) // for safety, also limit recharge by space capacity of SMES (shouldn't happen) // now recharge this amount var/clev = chargedisplay() - charge += excess * SMESRATE // restore unused power - powernet.netexcess -= excess // remove the excess from the powernet, so later SMESes don't try to use it + charge += excess * SMESRATE // restore unused power + powernet.netexcess -= excess // remove the excess from the powernet, so later SMESes don't try to use it output_used -= excess diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm index b8465b178dc..77bd57ba132 100644 --- a/code/modules/power/solar.dm +++ b/code/modules/power/solar.dm @@ -67,7 +67,7 @@ else S.forceMove(src) if(S.glass_type == /obj/item/stack/sheet/rglass) //if the panel is in reinforced glass - max_integrity *= 2 //this need to be placed here, because panels already on the map don't have an assembly linked to + max_integrity *= 2 //this need to be placed here, because panels already on the map don't have an assembly linked to obj_integrity = max_integrity /obj/machinery/power/solar/crowbar_act(mob/user, obj/item/I) diff --git a/code/modules/power/turbine.dm b/code/modules/power/turbine.dm index 1f4146e7903..d099b5ea0e6 100644 --- a/code/modules/power/turbine.dm +++ b/code/modules/power/turbine.dm @@ -12,11 +12,11 @@ // // - Numbers // -// Example setup S - sparker -// B - Blast doors into space for venting -// *BBB****BBB* C - Compressor -// S CT * T - Turbine -// * ^ * * V * D - Doors with firedoor +// Example setup S - sparker +// B - Blast doors into space for venting +// *BBB****BBB* C - Compressor +// S CT * T - Turbine +// * ^ * * V * D - Doors with firedoor // **|***D**|** ^ - Fuel feed (Not vent, but a gas outlet) // | | V - Suction vent (Like the ones in atmos // diff --git a/code/modules/procedural_mapping/mapGenerator.dm b/code/modules/procedural_mapping/mapGenerator.dm index 9e6767dc642..7a1567279cd 100644 --- a/code/modules/procedural_mapping/mapGenerator.dm +++ b/code/modules/procedural_mapping/mapGenerator.dm @@ -2,20 +2,20 @@ //All based on clusterMin and clusterMax as guides //Individual defines -#define CLUSTER_CHECK_NONE 0 //No checks are done, cluster as much as possible -#define CLUSTER_CHECK_DIFFERENT_TURFS (1<<1) //Don't let turfs of DIFFERENT types cluster -#define CLUSTER_CHECK_DIFFERENT_ATOMS (1<<2) //Don't let atoms of DIFFERENT types cluster -#define CLUSTER_CHECK_SAME_TURFS (1<<3) //Don't let turfs of the SAME type cluster -#define CLUSTER_CHECK_SAME_ATOMS (1<<4) //Don't let atoms of the SAME type cluster +#define CLUSTER_CHECK_NONE 0 //No checks are done, cluster as much as possible +#define CLUSTER_CHECK_DIFFERENT_TURFS (1<<1) //Don't let turfs of DIFFERENT types cluster +#define CLUSTER_CHECK_DIFFERENT_ATOMS (1<<2) //Don't let atoms of DIFFERENT types cluster +#define CLUSTER_CHECK_SAME_TURFS (1<<3) //Don't let turfs of the SAME type cluster +#define CLUSTER_CHECK_SAME_ATOMS (1<<4) //Don't let atoms of the SAME type cluster //Combined defines -#define CLUSTER_CHECK_SAMES 24 //Don't let any of the same type cluster -#define CLUSTER_CHECK_DIFFERENTS 6 //Don't let any of different types cluster -#define CLUSTER_CHECK_ALL_TURFS 10 //Don't let ANY turfs cluster same and different types -#define CLUSTER_CHECK_ALL_ATOMS 20 //Don't let ANY atoms cluster same and different types +#define CLUSTER_CHECK_SAMES 24 //Don't let any of the same type cluster +#define CLUSTER_CHECK_DIFFERENTS 6 //Don't let any of different types cluster +#define CLUSTER_CHECK_ALL_TURFS 10 //Don't let ANY turfs cluster same and different types +#define CLUSTER_CHECK_ALL_ATOMS 20 //Don't let ANY atoms cluster same and different types //All -#define CLUSTER_CHECK_ALL 30 //Don't let anything cluster, like, at all +#define CLUSTER_CHECK_ALL 30 //Don't let anything cluster, like, at all /datum/map_generator @@ -30,7 +30,7 @@ /datum/map_generator/New() ..() if(buildmode_name == "Undocumented") - buildmode_name = copytext_char("[type]", 20) // / d a t u m / m a p g e n e r a t o r / = 20 characters. + buildmode_name = copytext_char("[type]", 20) // / d a t u m / m a p g e n e r a t o r / = 20 characters. initialiseModules() //Defines the region the map represents, sets map diff --git a/code/modules/procedural_mapping/mapGeneratorModules/helpers.dm b/code/modules/procedural_mapping/mapGeneratorModules/helpers.dm index 55f4fcf6e80..844b41c05c7 100644 --- a/code/modules/procedural_mapping/mapGeneratorModules/helpers.dm +++ b/code/modules/procedural_mapping/mapGeneratorModules/helpers.dm @@ -20,7 +20,7 @@ /datum/map_generator_module/bottom_layer/massdelete spawnableAtoms = list() spawnableTurfs = list() - var/deleteturfs = TRUE //separate var for the empty type. + var/deleteturfs = TRUE //separate var for the empty type. var/list/ignore_typecache /datum/map_generator_module/bottom_layer/massdelete/generate() diff --git a/code/modules/procedural_mapping/mapGenerators/repair.dm b/code/modules/procedural_mapping/mapGenerators/repair.dm index 1a1a155f8fb..b305ac2c438 100644 --- a/code/modules/procedural_mapping/mapGenerators/repair.dm +++ b/code/modules/procedural_mapping/mapGenerators/repair.dm @@ -105,7 +105,7 @@ GLOBAL_VAR_INIT(reloading_map, FALSE) if(!loader) loader = new if(cleanload) - ..() //Trigger mass deletion. + ..() //Trigger mass deletion. modules |= loader syncModules() loader.generate() diff --git a/code/modules/projectiles/ammunition/_ammunition.dm b/code/modules/projectiles/ammunition/_ammunition.dm index 12a35d28fa4..40fa8907818 100644 --- a/code/modules/projectiles/ammunition/_ammunition.dm +++ b/code/modules/projectiles/ammunition/_ammunition.dm @@ -9,16 +9,16 @@ throwforce = 0 w_class = WEIGHT_CLASS_TINY custom_materials = list(/datum/material/iron = 500) - var/fire_sound = null //What sound should play when this ammo is fired - var/caliber = null //Which kind of guns it can be loaded into - var/projectile_type = null //The bullet type to create when New() is called - var/obj/projectile/BB = null //The loaded bullet - var/pellets = 1 //Pellets for spreadshot - var/variance = 0 //Variance for inaccuracy fundamental to the casing - var/randomspread = 0 //Randomspread for automatics - var/delay = 0 //Delay for energy weapons - var/click_cooldown_override = 0 //Override this to make your gun have a faster fire rate, in tenths of a second. 4 is the default gun cooldown. - var/firing_effect_type = /obj/effect/temp_visual/dir_setting/firing_effect //the visual effect appearing when the ammo is fired. + var/fire_sound = null //What sound should play when this ammo is fired + var/caliber = null //Which kind of guns it can be loaded into + var/projectile_type = null //The bullet type to create when New() is called + var/obj/projectile/BB = null //The loaded bullet + var/pellets = 1 //Pellets for spreadshot + var/variance = 0 //Variance for inaccuracy fundamental to the casing + var/randomspread = 0 //Randomspread for automatics + var/delay = 0 //Delay for energy weapons + var/click_cooldown_override = 0 //Override this to make your gun have a faster fire rate, in tenths of a second. 4 is the default gun cooldown. + var/firing_effect_type = /obj/effect/temp_visual/dir_setting/firing_effect //the visual effect appearing when the ammo is fired. var/heavy_metal = TRUE var/harmful = TRUE //pacifism check for boolet, set to FALSE if bullet is non-lethal diff --git a/code/modules/projectiles/boxes_magazines/_box_magazine.dm b/code/modules/projectiles/boxes_magazines/_box_magazine.dm index d2f6dfdf2f0..a40667b0736 100644 --- a/code/modules/projectiles/boxes_magazines/_box_magazine.dm +++ b/code/modules/projectiles/boxes_magazines/_box_magazine.dm @@ -131,7 +131,7 @@ var/obj/item/ammo_casing/A = get_round() if(A) A.forceMove(drop_location()) - if(!user.is_holding(src) || !user.put_in_hands(A)) //incase they're using TK + if(!user.is_holding(src) || !user.put_in_hands(A)) //incase they're using TK A.bounce_away(FALSE, NONE) playsound(src, 'sound/weapons/gun/general/mag_bullet_insert.ogg', 60, TRUE) to_chat(user, "You remove a round from [src]!") diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index dd63c5350d2..109898f1538 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -25,29 +25,29 @@ var/vary_fire_sound = TRUE var/fire_sound_volume = 50 var/dry_fire_sound = 'sound/weapons/gun/general/dry_fire.ogg' - var/suppressed = null //whether or not a message is displayed when fired + var/suppressed = null //whether or not a message is displayed when fired var/can_suppress = FALSE var/suppressed_sound = 'sound/weapons/gun/general/heavy_shot_suppressed.ogg' var/suppressed_volume = 60 var/can_unsuppress = TRUE - var/recoil = 0 //boom boom shake the room + var/recoil = 0 //boom boom shake the room var/clumsy_check = TRUE var/obj/item/ammo_casing/chambered = null - trigger_guard = TRIGGER_GUARD_NORMAL //trigger guard on the weapon, hulks can't fire them with their big meaty fingers - var/sawn_desc = null //description change if weapon is sawn-off + trigger_guard = TRIGGER_GUARD_NORMAL //trigger guard on the weapon, hulks can't fire them with their big meaty fingers + var/sawn_desc = null //description change if weapon is sawn-off var/sawn_off = FALSE - var/burst_size = 1 //how large a burst is - var/fire_delay = 0 //rate of fire for burst firing and semi auto - var/firing_burst = 0 //Prevent the weapon from firing again while already firing - var/semicd = 0 //cooldown handler + var/burst_size = 1 //how large a burst is + var/fire_delay = 0 //rate of fire for burst firing and semi auto + var/firing_burst = 0 //Prevent the weapon from firing again while already firing + var/semicd = 0 //cooldown handler var/weapon_weight = WEAPON_LIGHT - var/dual_wield_spread = 24 //additional spread when dual wielding + var/dual_wield_spread = 24 //additional spread when dual wielding /// Just 'slightly' snowflakey way to modify projectile damage for projectiles fired from this gun. var/projectile_damage_multiplier = 1 - var/spread = 0 //Spread induced by the gun itself. - var/randomspread = 1 //Set to 0 for shotguns. This is used for weapons that don't fire all their bullets at once. + var/spread = 0 //Spread induced by the gun itself. + var/randomspread = 1 //Set to 0 for shotguns. This is used for weapons that don't fire all their bullets at once. lefthand_file = 'icons/mob/inhands/weapons/guns_lefthand.dmi' righthand_file = 'icons/mob/inhands/weapons/guns_righthand.dmi' @@ -148,7 +148,7 @@ /obj/item/gun/equipped(mob/living/user, slot) . = ..() if(zoomed && user.get_active_held_item() != src) - zoom(user, user.dir, FALSE) //we can only stay zoomed in if it's in our hands //yeah and we only unzoom if we're actually zoomed using the gun!! + zoom(user, user.dir, FALSE) //we can only stay zoomed in if it's in our hands //yeah and we only unzoom if we're actually zoomed using the gun!! //called after the gun has successfully fired its chambered ammo. /obj/item/gun/proc/process_chamber() @@ -342,7 +342,7 @@ var/randomized_gun_spread = 0 var/rand_spr = rand() if(spread) - randomized_gun_spread = rand(0,spread) + randomized_gun_spread = rand(0,spread) if(HAS_TRAIT(user, TRAIT_POOR_AIM)) //nice shootin' tex user.blind_eyes(1) bonus_spread += 25 @@ -594,8 +594,8 @@ . = ..() if(gun_light) var/mutable_appearance/flashlight_overlay - var/state = "[gunlight_state][gun_light.on? "_on":""]" //Generic state. - if(gun_light.icon_state in icon_states('icons/obj/guns/flashlights.dmi')) //Snowflake state? + var/state = "[gunlight_state][gun_light.on? "_on":""]" //Generic state. + if(gun_light.icon_state in icon_states('icons/obj/guns/flashlights.dmi')) //Snowflake state? state = gun_light.icon_state flashlight_overlay = mutable_appearance('icons/obj/guns/flashlights.dmi', state) flashlight_overlay.pixel_x = flight_x_offset @@ -604,8 +604,8 @@ if(bayonet) var/mutable_appearance/knife_overlay - var/state = "bayonet" //Generic state. - if(bayonet.icon_state in icon_states('icons/obj/guns/bayonets.dmi')) //Snowflake state? + var/state = "bayonet" //Generic state. + if(bayonet.icon_state in icon_states('icons/obj/guns/bayonets.dmi')) //Snowflake state? state = bayonet.icon_state var/icon/bayonet_icons = 'icons/obj/guns/bayonets.dmi' knife_overlay = mutable_appearance(bayonet_icons, state) diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm index df51f04f080..a7fe375dc2d 100644 --- a/code/modules/projectiles/guns/ballistic.dm +++ b/code/modules/projectiles/guns/ballistic.dm @@ -208,7 +208,7 @@ if (bolt_type == BOLT_TYPE_NO_BOLT) //If there's no bolt, nothing to rack return if (bolt_type == BOLT_TYPE_OPEN) - if(!bolt_locked) //If it's an open bolt, racking again would do nothing + if(!bolt_locked) //If it's an open bolt, racking again would do nothing if (user) to_chat(user, "\The [src]'s [bolt_wording] is already cocked!") return @@ -543,8 +543,8 @@ GLOBAL_LIST_INIT(gun_saw_types, typecacheof(list( w_class = WEIGHT_CLASS_NORMAL inhand_icon_state = "gun" worn_icon_state = "gun" - slot_flags &= ~ITEM_SLOT_BACK //you can't sling it on your back - slot_flags |= ITEM_SLOT_BELT //but you can wear it on your belt (poorly concealed under a trenchcoat, ideally) + slot_flags &= ~ITEM_SLOT_BACK //you can't sling it on your back + slot_flags |= ITEM_SLOT_BELT //but you can wear it on your belt (poorly concealed under a trenchcoat, ideally) recoil = SAWN_OFF_RECOIL sawn_off = TRUE update_icon() @@ -574,7 +574,7 @@ GLOBAL_LIST_INIT(gun_saw_types, typecacheof(list( return if(bolt_type == BOLT_TYPE_STANDARD) - if(get_ammo()) + if(get_ammo()) to_chat(user, "You can't get at the internals while the gun has a bullet in it!") return diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm index 5cae6c77ea0..26fcd52d535 100644 --- a/code/modules/projectiles/guns/energy.dm +++ b/code/modules/projectiles/guns/energy.dm @@ -10,7 +10,7 @@ var/list/ammo_type = list(/obj/item/ammo_casing/energy) var/select = 1 //The state of the select fire switch. Determines from the ammo_type list what kind of shot is fired next. var/can_charge = TRUE //Can it be charged in a recharger? - var/automatic_charge_overlays = TRUE //Do we handle overlays with base update_icon()? + var/automatic_charge_overlays = TRUE //Do we handle overlays with base update_icon()? var/charge_sections = 4 ammo_x_offset = 2 var/shaded_charge = FALSE //if this gun uses a stateful charge bar for more detail @@ -100,8 +100,8 @@ var/mob/living/silicon/robot/R = loc if(R.cell) var/obj/item/ammo_casing/energy/shot = ammo_type[select] //Necessary to find cost of shot - if(R.cell.use(shot.e_cost)) //Take power from the borg... - cell.give(shot.e_cost) //... to recharge the shot + if(R.cell.use(shot.e_cost)) //Take power from the borg... + cell.give(shot.e_cost) //... to recharge the shot if(!chambered) var/obj/item/ammo_casing/energy/AC = ammo_type[select] if(cell.charge >= AC.e_cost) //if there's enough power in the cell cell... @@ -118,12 +118,12 @@ /obj/item/gun/energy/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0) if(!chambered && can_shoot()) - process_chamber() // If the gun was drained and then recharged, load a new shot. + process_chamber() // If the gun was drained and then recharged, load a new shot. return ..() /obj/item/gun/energy/process_burst(mob/living/user, atom/target, message = TRUE, params = null, zone_override="", sprd = 0, randomized_gun_spread = 0, randomized_bonus_spread = 0, rand_spr = 0, iteration = 0) if(!chambered && can_shoot()) - process_chamber() // Ditto. + process_chamber() // Ditto. return ..() /obj/item/gun/energy/proc/select_fire(mob/living/user) diff --git a/code/modules/projectiles/guns/energy/energy_gun.dm b/code/modules/projectiles/guns/energy/energy_gun.dm index 58de0d90f14..18dfc2a0f6e 100644 --- a/code/modules/projectiles/guns/energy/energy_gun.dm +++ b/code/modules/projectiles/guns/energy/energy_gun.dm @@ -3,7 +3,7 @@ desc = "A basic hybrid energy gun with two settings: disable and kill." icon_state = "energy" w_class = WEIGHT_CLASS_BULKY - inhand_icon_state = null //so the human update icon uses the icon_state instead. + inhand_icon_state = null //so the human update icon uses the icon_state instead. ammo_type = list(/obj/item/ammo_casing/energy/disabler, /obj/item/ammo_casing/energy/laser) modifystate = 1 can_flashlight = TRUE diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index 544ecb55842..10aa4f65de9 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -2,7 +2,7 @@ name = "ion rifle" desc = "A man-portable anti-armor weapon designed to disable mechanical threats at range." icon_state = "ionrifle" - inhand_icon_state = null //so the human update icon uses the icon_state instead. + inhand_icon_state = null //so the human update icon uses the icon_state instead. worn_icon_state = null shaded_charge = TRUE can_flashlight = TRUE diff --git a/code/modules/projectiles/guns/energy/stun.dm b/code/modules/projectiles/guns/energy/stun.dm index 40d8c64cbd3..fea2c04426b 100644 --- a/code/modules/projectiles/guns/energy/stun.dm +++ b/code/modules/projectiles/guns/energy/stun.dm @@ -2,7 +2,7 @@ name = "taser gun" desc = "A low-capacity, energy-based stun gun used by security teams to subdue targets at range." icon_state = "taser" - inhand_icon_state = null //so the human update icon uses the icon_state instead. + inhand_icon_state = null //so the human update icon uses the icon_state instead. ammo_type = list(/obj/item/ammo_casing/energy/electrode) ammo_x_offset = 3 diff --git a/code/modules/projectiles/guns/misc/beam_rifle.dm b/code/modules/projectiles/guns/misc/beam_rifle.dm index f0e9045d435..c01b8b9ea63 100644 --- a/code/modules/projectiles/guns/misc/beam_rifle.dm +++ b/code/modules/projectiles/guns/misc/beam_rifle.dm @@ -45,7 +45,7 @@ var/mob/current_user = null var/list/obj/effect/projectile/tracer/current_tracers - var/structure_piercing = 2 //Amount * 2. For some reason structures aren't respecting this unless you have it doubled. Probably with the objects in question's Bump() code instead of this but I'll deal with this later. + var/structure_piercing = 2 //Amount * 2. For some reason structures aren't respecting this unless you have it doubled. Probably with the objects in question's Bump() code instead of this but I'll deal with this later. var/structure_bleed_coeff = 0.7 var/wall_pierce_amount = 0 var/wall_devastate = 0 @@ -215,7 +215,7 @@ last_process = world.time /obj/item/gun/energy/beam_rifle/proc/check_user(automatic_cleanup = TRUE) - if(!istype(current_user) || !isturf(current_user.loc) || !(src in current_user.held_items) || current_user.incapacitated()) //Doesn't work if you're not holding it! + if(!istype(current_user) || !isturf(current_user.loc) || !(src in current_user.held_items) || current_user.incapacitated()) //Doesn't work if you're not holding it! if(automatic_cleanup) stop_aiming() set_user(null) @@ -368,11 +368,11 @@ HS_BB.stun = projectile_stun HS_BB.impact_structure_damage = impact_structure_damage HS_BB.aoe_mob_damage = aoe_mob_damage - HS_BB.aoe_mob_range = clamp(aoe_mob_range, 0, 15) //Badmin safety lock + HS_BB.aoe_mob_range = clamp(aoe_mob_range, 0, 15) //Badmin safety lock HS_BB.aoe_fire_chance = aoe_fire_chance HS_BB.aoe_fire_range = aoe_fire_range HS_BB.aoe_structure_damage = aoe_structure_damage - HS_BB.aoe_structure_range = clamp(aoe_structure_range, 0, 15) //Badmin safety lock + HS_BB.aoe_structure_range = clamp(aoe_structure_range, 0, 15) //Badmin safety lock HS_BB.wall_devastate = wall_devastate HS_BB.wall_pierce_amount = wall_pierce_amount HS_BB.structure_pierce_amount = structure_piercing @@ -409,13 +409,13 @@ name = "particle beam" icon = null hitsound = 'sound/effects/explosion3.ogg' - damage = 0 //Handled manually. + damage = 0 //Handled manually. damage_type = BURN flag = ENERGY range = 150 jitter = 10 var/obj/item/gun/energy/beam_rifle/gun - var/structure_pierce_amount = 0 //All set to 0 so the gun can manually set them during firing. + var/structure_pierce_amount = 0 //All set to 0 so the gun can manually set them during firing. var/structure_bleed_coeff = 0 var/structure_pierce = 0 var/do_pierce = TRUE @@ -436,10 +436,10 @@ if(!epicenter) return new /obj/effect/temp_visual/explosion/fast(epicenter) - for(var/mob/living/L in range(aoe_mob_range, epicenter)) //handle aoe mob damage + for(var/mob/living/L in range(aoe_mob_range, epicenter)) //handle aoe mob damage L.adjustFireLoss(aoe_mob_damage) to_chat(L, "\The [src] sears you!") - for(var/turf/T in range(aoe_fire_range, epicenter)) //handle aoe fire + for(var/turf/T in range(aoe_fire_range, epicenter)) //handle aoe fire if(prob(aoe_fire_chance)) new /obj/effect/hotspot(T) for(var/obj/O in range(aoe_structure_range, epicenter)) @@ -455,12 +455,12 @@ else SSexplosions.medturf += A ++wall_pierce - return PROJECTILE_PIERCE_PHASE // yeah this gun is a snowflakey piece of garbage + return PROJECTILE_PIERCE_PHASE // yeah this gun is a snowflakey piece of garbage if(isobj(A) && (structure_pierce < structure_pierce_amount)) ++structure_pierce var/obj/O = A O.take_damage((impact_structure_damage + aoe_structure_damage) * structure_bleed_coeff * get_damage_coeff(A), BURN, ENERGY, FALSE) - return PROJECTILE_PIERCE_PHASE // ditto and this could be refactored to on_hit honestly + return PROJECTILE_PIERCE_PHASE // ditto and this could be refactored to on_hit honestly return ..() /obj/projectile/beam/beam_rifle/proc/get_damage_coeff(atom/target) diff --git a/code/modules/projectiles/guns/misc/blastcannon.dm b/code/modules/projectiles/guns/misc/blastcannon.dm index f5e8a7381e8..3d30302a827 100644 --- a/code/modules/projectiles/guns/misc/blastcannon.dm +++ b/code/modules/projectiles/guns/misc/blastcannon.dm @@ -137,7 +137,7 @@ damage = 0 nodamage = FALSE movement_type = FLYING - projectile_phasing = ALL // just blows up the turfs lmao + projectile_phasing = ALL // just blows up the turfs lmao /// The maximum distance this will inflict [EXPLODE_DEVASTATE] var/heavyr = 0 /// The maximum distance this will inflict [EXPLODE_HEAVY] diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index 8eaa483ea62..35b6436d7ab 100644 --- a/code/modules/projectiles/projectile.dm +++ b/code/modules/projectiles/projectile.dm @@ -1,6 +1,6 @@ -#define MOVES_HITSCAN -1 //Not actually hitscan but close as we get without actual hitscan. -#define MUZZLE_EFFECT_PIXEL_INCREMENT 17 //How many pixels to move the muzzle flash up so your character doesn't look like they're shitting out lasers. +#define MOVES_HITSCAN -1 //Not actually hitscan but close as we get without actual hitscan. +#define MUZZLE_EFFECT_PIXEL_INCREMENT 17 //How many pixels to move the muzzle flash up so your character doesn't look like they're shitting out lasers. /obj/projectile name = "projectile" @@ -17,25 +17,25 @@ var/hitsound_wall = "" resistance_flags = LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF - var/def_zone = "" //Aiming at + var/def_zone = "" //Aiming at var/atom/movable/firer = null//Who shot it var/atom/fired_from = null // the atom that the projectile was fired from (gun, turret) - var/suppressed = FALSE //Attack message + var/suppressed = FALSE //Attack message var/yo = null var/xo = null var/atom/original = null // the original target clicked var/turf/starting = null // the projectile's starting turf var/p_x = 16 - var/p_y = 16 // the pixel location of the tile that the player clicked. Default is the center + var/p_y = 16 // the pixel location of the tile that the player clicked. Default is the center //Fired processing vars - var/fired = FALSE //Have we been fired yet - var/paused = FALSE //for suspending the projectile midair + var/fired = FALSE //Have we been fired yet + var/paused = FALSE //for suspending the projectile midair var/last_projectile_move = 0 var/last_process = 0 var/time_offset = 0 var/datum/point/vector/trajectory - var/trajectory_ignore_forcemove = FALSE //instructs forceMove to NOT reset our trajectory to the new location! + var/trajectory_ignore_forcemove = FALSE //instructs forceMove to NOT reset our trajectory to the new location! /// We already impacted these things, do not impact them again. Used to make sure we can pierce things we want to pierce. Lazylist, typecache style (object = TRUE) for performance. var/list/impacted /// If TRUE, we can hit our firer. @@ -66,12 +66,12 @@ /// number of times we've pierced something. Incremented BEFORE bullet_act and on_hit proc! var/pierces = 0 - var/speed = 0.8 //Amount of deciseconds it takes for projectile to travel + var/speed = 0.8 //Amount of deciseconds it takes for projectile to travel var/Angle = 0 - var/original_angle = 0 //Angle at firing + var/original_angle = 0 //Angle at firing var/nondirectional_sprite = FALSE //Set TRUE to prevent projectiles from having their sprites rotated based on firing angle - var/spread = 0 //amount (in degrees) of projectile spread - animate_movement = NO_STEPS //Use SLIDE_STEPS in conjunction with legacy + var/spread = 0 //amount (in degrees) of projectile spread + animate_movement = NO_STEPS //Use SLIDE_STEPS in conjunction with legacy /// how many times we've ricochet'd so far (instance variable, not a stat) var/ricochets = 0 /// how many times we can ricochet max @@ -93,12 +93,12 @@ var/force_hit = FALSE //Hitscan - var/hitscan = FALSE //Whether this is hitscan. If it is, speed is basically ignored. - var/list/beam_segments //assoc list of datum/point or datum/point/vector, start = end. Used for hitscan effect generation. + var/hitscan = FALSE //Whether this is hitscan. If it is, speed is basically ignored. + var/list/beam_segments //assoc list of datum/point or datum/point/vector, start = end. Used for hitscan effect generation. /// Last turf an angle was changed in for hitscan projectiles. var/turf/last_angle_set_hitscan_store var/datum/point/beam_index - var/turf/hitscan_last //last turf touched during hitscanning. + var/turf/hitscan_last //last turf touched during hitscanning. var/tracer_type var/muzzle_type var/impact_type @@ -117,8 +117,8 @@ //Homing var/homing = FALSE var/atom/homing_target - var/homing_turn_speed = 10 //Angle per tick. - var/homing_inaccuracy_min = 0 //in pixels for these. offsets are set once when setting target. + var/homing_turn_speed = 10 //Angle per tick. + var/homing_inaccuracy_min = 0 //in pixels for these. offsets are set once when setting target. var/homing_inaccuracy_max = 0 var/homing_offset_x = 0 var/homing_offset_y = 0 @@ -131,8 +131,8 @@ var/armour_penetration = 0 var/projectile_type = /obj/projectile var/range = 50 //This will de-increment every step. When 0, it will deletze the projectile. - var/decayedRange //stores original range - var/reflect_range_decrease = 5 //amount of original range that falls off when reflecting, so it doesn't go forever + var/decayedRange //stores original range + var/reflect_range_decrease = 5 //amount of original range that falls off when reflecting, so it doesn't go forever var/reflectable = NONE // Can it be reflected or not? //Effects var/stun = 0 @@ -345,7 +345,7 @@ if(!trajectory) qdel(src) return FALSE - if(impacted[A]) // NEVER doublehit + if(impacted[A]) // NEVER doublehit return FALSE var/datum/point/pcache = trajectory.copy_to() var/turf/T = get_turf(A) @@ -366,7 +366,7 @@ var/distance = get_dist(T, starting) // Get the distance between the turf shot from and the mob we hit and use that for the calculations. def_zone = ran_zone(def_zone, max(100-(7*distance), 5)) //Lower accurancy/longer range tradeoff. 7 is a balanced number to use. - return process_hit(T, select_target(T, A, A), A) // SELECT TARGET FIRST! + return process_hit(T, select_target(T, A, A), A) // SELECT TARGET FIRST! /** * The primary workhorse proc of projectile impacts. @@ -386,7 +386,7 @@ * T - Turf we're on/supposedly hitting * target - target we're hitting * bumped - target we originally bumped. it's here to ensure that if something blocks our projectile by means of Cross() failure, we hit it - * even if it is not dense. + * even if it is not dense. * hit_something - only should be set by recursive calling by this proc - tracks if we hit something already * * Returns if we hit something. @@ -396,7 +396,7 @@ if(QDELETED(src) || !T || !target) return // 2. - impacted[target] = TRUE //hash lookup > in for performance in hit-checking + impacted[target] = TRUE //hash lookup > in for performance in hit-checking // 3. var/mode = prehit_pierce(target) if(mode == PROJECTILE_DELETE_WITHOUT_HITTING) @@ -406,7 +406,7 @@ if(!(movement_type & PHASING)) temporary_unstoppable_movement = TRUE movement_type |= PHASING - return process_hit(T, select_target(T, target, bumped), bumped, hit_something) // try to hit something else + return process_hit(T, select_target(T, target, bumped), bumped, hit_something) // try to hit something else // at this point we are going to hit the thing // in which case send signal to it SEND_SIGNAL(target, COMSIG_PROJECTILE_PREHIT, args) @@ -433,8 +433,8 @@ * * Priority: * 0. Anything that is already in impacted is ignored no matter what. Furthermore, in any bracket, if the target atom parameter is in it, that's hit first. - * Furthermore, can_hit_target is always checked. This (entire proc) is PERFORMANCE OVERHEAD!! But, it shouldn't be ""too"" bad and I frankly don't have a better *generic non snowflakey* way that I can think of right now at 3 AM. - * FURTHERMORE, mobs/objs have a density check from can_hit_target - to hit non dense objects over a turf, you must click on them, same for mobs that usually wouldn't get hit. + * Furthermore, can_hit_target is always checked. This (entire proc) is PERFORMANCE OVERHEAD!! But, it shouldn't be ""too"" bad and I frankly don't have a better *generic non snowflakey* way that I can think of right now at 3 AM. + * FURTHERMORE, mobs/objs have a density check from can_hit_target - to hit non dense objects over a turf, you must click on them, same for mobs that usually wouldn't get hit. * 1. The thing originally aimed at/clicked on * 2. Mobs - picks lowest buckled mob to prevent scarp piggybacking memes * 3. Objs @@ -445,10 +445,10 @@ // 1. original if(can_hit_target(original, TRUE, FALSE, original == bumped)) return original - var/list/atom/possible = list() // let's define these ONCE + var/list/atom/possible = list() // let's define these ONCE var/list/atom/considering = list() // 2. mobs - possible = typecache_filter_list(T, GLOB.typecache_living) // living only + possible = typecache_filter_list(T, GLOB.typecache_living) // living only for(var/i in possible) if(!can_hit_target(i, i == original, TRUE, i == bumped)) continue @@ -484,14 +484,14 @@ var/mob/M = firer if((target == firer) || ((target == firer.loc) && ismecha(firer.loc)) || (target in firer.buckled_mobs) || (istype(M) && (M.buckled == target))) return FALSE - if(target.density || cross_failed) //This thing blocks projectiles, hit it regardless of layer/mob stuns/etc. + if(target.density || cross_failed) //This thing blocks projectiles, hit it regardless of layer/mob stuns/etc. return TRUE if(!isliving(target)) - if(isturf(target)) // non dense turfs + if(isturf(target)) // non dense turfs return FALSE if(target.layer < PROJECTILE_HIT_THRESHHOLD_LAYER) return FALSE - else if(!direct_target) // non dense objects do not get hit unless specifically clicked + else if(!direct_target) // non dense objects do not get hit unless specifically clicked return FALSE else var/mob/living/L = target @@ -533,10 +533,10 @@ // and hope projectiles get refactored again in the future to have a less stupid impact detection system // that hopefully won't also involve a ton of overhead if(can_hit_target(original, TRUE, FALSE)) - Impact(original) // try to hit thing clicked on + Impact(original) // try to hit thing clicked on // else, try to hit mobs - else // because if we impacted original and pierced we'll already have select target'd and hit everything else we should be hitting - for(var/mob/M in loc) // so I guess we're STILL doing a for loop of mobs because living movement would otherwise have snowflake code for projectile CanPass + else // because if we impacted original and pierced we'll already have select target'd and hit everything else we should be hitting + for(var/mob/M in loc) // so I guess we're STILL doing a for loop of mobs because living movement would otherwise have snowflake code for projectile CanPass // so the snowflake vs performance is pretty arguable here if(can_hit_target(M, M == original, TRUE)) Impact(M) @@ -572,7 +572,7 @@ if(temporary_unstoppable_movement) temporary_unstoppable_movement = FALSE movement_type &= ~PHASING - scan_moved_turf() //mostly used for making sure we can hit a non-dense object the user directly clicked on, and for penetrating projectiles that don't bump + scan_moved_turf() //mostly used for making sure we can hit a non-dense object the user directly clicked on, and for penetrating projectiles that don't bump /** * Checks if we should pierce something. @@ -608,7 +608,7 @@ return FALSE -/obj/projectile/proc/return_predicted_turf_after_moves(moves, forced_angle) //I say predicted because there's no telling that the projectile won't change direction/location in flight. +/obj/projectile/proc/return_predicted_turf_after_moves(moves, forced_angle) //I say predicted because there's no telling that the projectile won't change direction/location in flight. if(!trajectory && isnull(forced_angle) && isnull(Angle)) return FALSE var/datum/point/vector/current = trajectory @@ -624,7 +624,7 @@ return getline(current, ending) /obj/projectile/Process_Spacemove(movement_dir = 0) - return TRUE //Bullets don't drift in space + return TRUE //Bullets don't drift in space /obj/projectile/process() last_process = world.time @@ -632,11 +632,11 @@ fired = FALSE return PROCESS_KILL if(paused || !isturf(loc)) - last_projectile_move += world.time - last_process //Compensates for pausing, so it doesn't become a hitscan projectile when unpaused from charged up ticks. + last_projectile_move += world.time - last_process //Compensates for pausing, so it doesn't become a hitscan projectile when unpaused from charged up ticks. return var/elapsed_time_deciseconds = (world.time - last_projectile_move) + time_offset time_offset = 0 - var/required_moves = speed > 0? FLOOR(elapsed_time_deciseconds / speed, 1) : MOVES_HITSCAN //Would be better if a 0 speed made hitscan but everyone hates those so I can't make it a universal system :< + var/required_moves = speed > 0? FLOOR(elapsed_time_deciseconds / speed, 1) : MOVES_HITSCAN //Would be better if a 0 speed made hitscan but everyone hates those so I can't make it a universal system :< if(required_moves == MOVES_HITSCAN) required_moves = SSprojectiles.global_max_tick_moves else @@ -658,7 +658,7 @@ AddElement(/datum/element/embed, projectile_payload = shrapnel_type) if(!log_override && firer && original) log_combat(firer, original, "fired at", src, "from [get_area_name(src, TRUE)]") - if(direct_target && (get_dist(direct_target, get_turf(src)) <= 1)) // point blank shots + if(direct_target && (get_dist(direct_target, get_turf(src)) <= 1)) // point blank shots process_hit(get_turf(direct_target), direct_target) if(QDELETED(src)) return @@ -667,7 +667,7 @@ if(spread) setAngle(Angle + ((rand() - 0.5) * spread)) var/turf/starting = get_turf(src) - if(isnull(Angle)) //Try to resolve through offsets if there's no angle set. + if(isnull(Angle)) //Try to resolve through offsets if there's no angle set. if(isnull(xo) || isnull(yo)) stack_trace("WARNING: Projectile [type] deleted due to being unable to resolve a target after angle was null!") qdel(src) @@ -690,7 +690,7 @@ process_hitscan() if(!(datum_flags & DF_ISPROCESSING)) START_PROCESSING(SSprojectiles, src) - pixel_move(1, FALSE) //move it now! + pixel_move(1, FALSE) //move it now! /obj/projectile/proc/setAngle(new_angle) //wrapper for overrides. Angle = new_angle @@ -717,7 +717,7 @@ if(zc) before_z_change(old, target) . = ..() - if(QDELETED(src)) // we coulda bumped something + if(QDELETED(src)) // we coulda bumped something return if(trajectory && !trajectory_ignore_forcemove && isturf(target)) if(hitscan) @@ -750,7 +750,7 @@ if(pcache) beam_segments = list() beam_index = pcache - beam_segments[beam_index] = null //record start. + beam_segments[beam_index] = null //record start. /obj/projectile/proc/process_hitscan() var/safety = range * 10 @@ -764,7 +764,7 @@ Bump(loc) if(!QDELETED(src)) qdel(src) - return //Kill! + return //Kill! pixel_move(1, TRUE) /obj/projectile/proc/pixel_move(trajectory_multiplier, hitscanning = FALSE) @@ -807,7 +807,7 @@ animate(src, pixel_x = trajectory.return_px(), pixel_y = trajectory.return_py(), time = 1, flags = ANIMATION_END_NOW) Range() -/obj/projectile/proc/process_homing() //may need speeding up in the future performance wise. +/obj/projectile/proc/process_homing() //may need speeding up in the future performance wise. if(!homing_target) return FALSE var/datum/point/PT = RETURN_PRECISE_POINT(homing_target) diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm index 31cb0e096fc..01790928a0a 100644 --- a/code/modules/projectiles/projectile/beams.dm +++ b/code/modules/projectiles/projectile/beams.dm @@ -13,7 +13,7 @@ light_range = 1 light_power = 1 light_color = COLOR_SOFT_RED - ricochets_max = 50 //Honk! + ricochets_max = 50 //Honk! ricochet_chance = 80 reflectable = REFLECT_NORMAL wound_bonus = -20 diff --git a/code/modules/projectiles/projectile/bullets/_incendiary.dm b/code/modules/projectiles/projectile/bullets/_incendiary.dm index 5dd418f40f0..bbb77e853b9 100644 --- a/code/modules/projectiles/projectile/bullets/_incendiary.dm +++ b/code/modules/projectiles/projectile/bullets/_incendiary.dm @@ -43,7 +43,7 @@ var/list/launched_items /// we only try to knock back the first 6 items per tile -#define BACKBLAST_MAX_ITEM_KNOCKBACK 6 +#define BACKBLAST_MAX_ITEM_KNOCKBACK 6 /obj/projectile/bullet/incendiary/backblast/Move() . = ..() diff --git a/code/modules/projectiles/projectile/bullets/shotgun.dm b/code/modules/projectiles/projectile/bullets/shotgun.dm index 8af5a7ed75f..343a9bfedca 100644 --- a/code/modules/projectiles/projectile/bullets/shotgun.dm +++ b/code/modules/projectiles/projectile/bullets/shotgun.dm @@ -105,7 +105,7 @@ qdel(src) /obj/projectile/bullet/pellet/shotgun_improvised - tile_dropoff = 0.35 //Come on it does 6 damage don't be like that. + tile_dropoff = 0.35 //Come on it does 6 damage don't be like that. damage = 6 wound_bonus = 0 bare_wound_bonus = 7.5 diff --git a/code/modules/projectiles/projectile/magic.dm b/code/modules/projectiles/projectile/magic.dm index e271eaecd1a..fd710747d8a 100644 --- a/code/modules/projectiles/projectile/magic.dm +++ b/code/modules/projectiles/projectile/magic.dm @@ -208,7 +208,7 @@ var/mob/living/silicon/robot/Robot = new_mob Robot.lawupdate = FALSE Robot.connected_ai = null - Robot.mmi.transfer_identity(M) //Does not transfer key/client. + Robot.mmi.transfer_identity(M) //Does not transfer key/client. Robot.clear_inherent_laws(0) Robot.clear_zeroth_law(0) @@ -272,7 +272,7 @@ if(chooseable_races.len) new_mob.set_species(pick(chooseable_races)) - var/datum/preferences/A = new() //Randomize appearance for the human + var/datum/preferences/A = new() //Randomize appearance for the human A.copy_to(new_mob, icon_updates=0) var/mob/living/carbon/human/H = new_mob @@ -406,7 +406,7 @@ . = ..() if(isliving(A) && locker_suck) var/mob/living/M = A - if(M.anti_magic_check()) // no this doesn't check if ..() returned to phase through do I care no it's magic ain't gotta explain shit + if(M.anti_magic_check()) // no this doesn't check if ..() returned to phase through do I care no it's magic ain't gotta explain shit M.visible_message("[src] vanishes on contact with [A]!") return PROJECTILE_DELETE_WITHOUT_HITTING if(!locker_temp_instance.insertion_allowed(M)) @@ -616,7 +616,7 @@ /obj/projectile/magic/aoe/lightning name = "lightning bolt" - icon_state = "tesla_projectile" //Better sprites are REALLY needed and appreciated!~ + icon_state = "tesla_projectile" //Better sprites are REALLY needed and appreciated!~ damage = 15 damage_type = BURN nodamage = FALSE diff --git a/code/modules/reagents/chem_splash.dm b/code/modules/reagents/chem_splash.dm index 519ae53cf92..f655f8321bb 100644 --- a/code/modules/reagents/chem_splash.dm +++ b/code/modules/reagents/chem_splash.dm @@ -28,7 +28,7 @@ splash_holder.chem_temp = (total_temp/reactants.len) + extra_heat // Average temperature of reagents + extra heat. splash_holder.handle_reactions() // React them now. - if(splash_holder.total_volume && affected_range >= 0) //The possible reactions didnt use up all reagents, so we spread it around. + if(splash_holder.total_volume && affected_range >= 0) //The possible reactions didnt use up all reagents, so we spread it around. var/datum/effect_system/steam_spread/steam = new /datum/effect_system/steam_spread() steam.set_up(10, 0, epicenter) steam.attach(epicenter) diff --git a/code/modules/reagents/chemistry/equilibrium.dm b/code/modules/reagents/chemistry/equilibrium.dm index e44ddbc53f0..0a5b458e10c 100644 --- a/code/modules/reagents/chemistry/equilibrium.dm +++ b/code/modules/reagents/chemistry/equilibrium.dm @@ -194,7 +194,7 @@ if(time_deficit < 0.25) delta_time += time_deficit time_deficit = 0 - else + else delta_time += 0.25 time_deficit = 0.25 return delta_time @@ -250,7 +250,7 @@ return if(!calculate_yield())//So that this can detect if we're missing reagents to_delete = TRUE - return + return delta_time = deal_with_time(delta_time) delta_t = 0 //how far off optimal temp we care @@ -267,7 +267,7 @@ //Lower range else if (cached_ph < reaction.optimal_ph_min) //If we're outside of the optimal lower bound if (cached_ph < (reaction.optimal_ph_min - reaction.determin_ph_range)) //If we're outside of the deterministic bound - delta_ph = 0 //0% purity + delta_ph = 0 //0% purity else //We're in the deterministic phase delta_ph = (((cached_ph - (reaction.optimal_ph_min - reaction.determin_ph_range))**reaction.ph_exponent_factor)/((reaction.determin_ph_range**reaction.ph_exponent_factor))) //main pH calculation //Upper range diff --git a/code/modules/reagents/chemistry/holder.dm b/code/modules/reagents/chemistry/holder.dm index e96c5ab3586..0de8e402b0f 100644 --- a/code/modules/reagents/chemistry/holder.dm +++ b/code/modules/reagents/chemistry/holder.dm @@ -292,7 +292,7 @@ else if(istype(R, reagent_type)) matches = 1 - // We found a match, proceed to remove the reagent. Keep looping, we might find other reagents of the same type. + // We found a match, proceed to remove the reagent. Keep looping, we might find other reagents of the same type. if(matches) // Have our other proc handle removement has_removed_reagent = remove_reagent(R.type, amount, safety) @@ -953,7 +953,7 @@ var/reaction_message = equilibrium.reaction.mix_message if(equilibrium.reaction.mix_sound) playsound(get_turf(my_atom), equilibrium.reaction.mix_sound, 80, TRUE) - qdel(equilibrium) + qdel(equilibrium) update_total() SEND_SIGNAL(src, COMSIG_REAGENTS_REACTED, .) return reaction_message @@ -1348,7 +1348,7 @@ /// Returns the total heat capacity for all of the reagents currently in this holder. /datum/reagents/proc/heat_capacity() . = 0 - var/list/cached_reagents = reagent_list //cache reagents + var/list/cached_reagents = reagent_list //cache reagents for(var/I in cached_reagents) var/datum/reagent/R = I . += R.specific_heat * R.volume @@ -1363,7 +1363,7 @@ /datum/reagents/proc/adjust_thermal_energy(delta_energy, min_temp = 2.7, max_temp = 1000) var/heat_capacity = heat_capacity() if(!heat_capacity) - return // no div/0 please + return // no div/0 please set_temperature(clamp(chem_temp + (delta_energy / heat_capacity), min_temp, max_temp)) /// Applies heat to this holder @@ -1492,7 +1492,7 @@ reagents = new /datum/reagents(max_vol, flags) reagents.my_atom = src -/proc/get_random_reagent_id() // Returns a random reagent ID minus blacklisted reagents +/proc/get_random_reagent_id() // Returns a random reagent ID minus blacklisted reagents var/static/list/random_reagents = list() if(!random_reagents.len) for(var/thing in subtypesof(/datum/reagent)) diff --git a/code/modules/reagents/chemistry/machinery/chem_heater.dm b/code/modules/reagents/chemistry/machinery/chem_heater.dm index c9ccc1894b2..c218dcc7346 100644 --- a/code/modules/reagents/chemistry/machinery/chem_heater.dm +++ b/code/modules/reagents/chemistry/machinery/chem_heater.dm @@ -109,7 +109,7 @@ if(beaker?.reagents.chem_temp > 374)//If they heated it up as asked tutorial_state = TUT_IS_ACTIVE target_temperature = 375 - beaker.reagents.chem_temp = 375 + beaker.reagents.chem_temp = 375 if(TUT_IS_ACTIVE) if(!(beaker?.reagents.has_reagent(/datum/reagent/mercury)) || !(beaker?.reagents.has_reagent(/datum/reagent/chlorine))) //Slightly concerned that people might take ages to read and it'll react anyways @@ -299,12 +299,12 @@ if(TUT_NO_BUFFER)//missing buffer data["tutorialMessage"] = {"It looks like you’re a little low on buffers, here’s how to make more: -Acidic buffer: 2 parts Sodium +Acidic buffer: 2 parts Sodium 2 parts Hydrogen 2 parts Ethanol 2 parts Water -Basic buffer: 3 parts Ammonia +Basic buffer: 3 parts Ammonia 2 parts Chlorine 2 parts Hydrogen 2 parts Oxygen diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm index 425d111c1d5..d4997982db3 100644 --- a/code/modules/reagents/chemistry/machinery/chem_master.dm +++ b/code/modules/reagents/chemistry/machinery/chem_master.dm @@ -484,18 +484,18 @@ * Uses typelist() for styles storage after initialization. * For fallback style must provide style with key (const) CONDIMASTER_STYLE_FALLBACK * Returns list( - * = list( - * "icon_state" = , - * "name" = , - * "desc" = , - * ?"generate_name" = , - * ?"icon_empty" = , - * ?"fill_icon_thresholds" = , - * ?"inhand_icon_state" = , - * ?"lefthand_file" = , - * ?"righthand_file" = , - * ), - * .. + * = list( + * "icon_state" = , + * "name" = , + * "desc" = , + * ?"generate_name" = , + * ?"icon_empty" = , + * ?"fill_icon_thresholds" = , + * ?"inhand_icon_state" = , + * ?"lefthand_file" = , + * ?"righthand_file" = , + * ), + * .. * ) * */ diff --git a/code/modules/reagents/chemistry/reagents.dm b/code/modules/reagents/chemistry/reagents.dm index c041ca67627..888b4f261f9 100644 --- a/code/modules/reagents/chemistry/reagents.dm +++ b/code/modules/reagents/chemistry/reagents.dm @@ -87,7 +87,7 @@ GLOBAL_LIST_INIT(name2reagent, build_name2reagent()) var/impure_chem = /datum/reagent/impurity /// If the impurity is below 0.5, replace ALL of the chem with inverse_chem upon metabolising var/inverse_chem_val = 0.25 - /// What chem is metabolised when purity is below inverse_chem_val + /// What chem is metabolised when purity is below inverse_chem_val var/inverse_chem = /datum/reagent/impurity/toxic ///what chem is made at the end of a reaction IF the purity is below the recipies purity_min at the END of a reaction only var/failed_chem = /datum/reagent/consumable/failed_reaction diff --git a/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm index 88e6d6a5c10..3950126a33b 100644 --- a/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm @@ -82,7 +82,7 @@ /datum/reagent/medicine/c2/libital //messes with your liber name = "Libital" description = "A bruise reliever. Does minor liver damage." - color = "#ECEC8D" // rgb: 236 236 141 + color = "#ECEC8D" // rgb: 236 236 141 taste_description = "bitter with a hint of alcohol" reagent_state = SOLID chemical_flags = REAGENT_CAN_BE_SYNTHESIZED @@ -218,7 +218,7 @@ /******OXY******/ /*Suffix: -mol*/ -#define CONVERMOL_RATIO 5 //# Oxygen damage to result in 1 tox +#define CONVERMOL_RATIO 5 //# Oxygen damage to result in 1 tox /datum/reagent/medicine/c2/convermol name = "Convermol" @@ -244,7 +244,7 @@ ..() return TRUE -#undef CONVERMOL_RATIO +#undef CONVERMOL_RATIO /datum/reagent/medicine/c2/tirimol name = "Tirimol" @@ -340,7 +340,7 @@ . = ..() mytray.adjustToxic(-round(chems.get_reagent_amount(type) * 2)) -#define issyrinormusc(A) (istype(A,/datum/reagent/medicine/c2/syriniver) || istype(A,/datum/reagent/medicine/c2/musiver)) //musc is metab of syrin so let's make sure we're not purging either +#define issyrinormusc(A) (istype(A,/datum/reagent/medicine/c2/syriniver) || istype(A,/datum/reagent/medicine/c2/musiver)) //musc is metab of syrin so let's make sure we're not purging either /datum/reagent/medicine/c2/syriniver //Inject >> SYRINge name = "Syriniver" @@ -357,7 +357,7 @@ return var/mob/living/carbon/C = A if(trans_volume >= 0.6) //prevents cheesing with ultralow doses. - C.adjustToxLoss(-1.5 * min(2, trans_volume) * REM, 0) //This is to promote iv pole use for that chemotherapy feel. + C.adjustToxLoss(-1.5 * min(2, trans_volume) * REM, 0) //This is to promote iv pole use for that chemotherapy feel. var/obj/item/organ/liver/L = C.internal_organs_slot[ORGAN_SLOT_LIVER] if((L.organ_flags & ORGAN_FAILING) || !L) return diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm index ee6bc5ccbac..f0a4766c4a4 100755 --- a/code/modules/reagents/chemistry/reagents/food_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm @@ -4,7 +4,7 @@ // Part of the food code. Also is where all the food -// condiments, additives, and such go. +// condiments, additives, and such go. /datum/reagent/consumable @@ -12,7 +12,7 @@ taste_description = "generic food" taste_mult = 4 var/nutriment_factor = 1 * REAGENTS_METABOLISM - var/quality = 0 //affects mood, typically higher for mixed drinks with more complex recipes + var/quality = 0 //affects mood, typically higher for mixed drinks with more complex recipes impure_chem = /datum/reagent/water inverse_chem_val = 0.1 inverse_chem = /datum/reagent/water @@ -687,7 +687,7 @@ if(!(methods & INGEST) || !((methods & (TOUCH|PATCH|VAPOR)) && (exposed_mob.is_mouth_covered() || exposed_mob.is_eyes_covered()))) return - if(!exposed_mob.getorganslot(ORGAN_SLOT_EYES)) //can't blind somebody with no eyes + if(!exposed_mob.getorganslot(ORGAN_SLOT_EYES)) //can't blind somebody with no eyes to_chat(exposed_mob, "Your eye sockets feel wet.") else if(!exposed_mob.eye_blurry) @@ -697,7 +697,7 @@ /datum/reagent/consumable/tearjuice/on_mob_life(mob/living/carbon/M) ..() - if(M.eye_blurry) //Don't worsen vision if it was otherwise fine + if(M.eye_blurry) //Don't worsen vision if it was otherwise fine M.blur_eyes(4) if(prob(10)) to_chat(M, "Your eyes sting!") diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm index fa2e4b93222..035ff600cf9 100644 --- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm @@ -54,7 +54,7 @@ switch(rand(100)) if(66 to 100) mytray.mutatespecie() - if(33 to 65) + if(33 to 65) mytray.mutateweed() if(1 to 32) mytray.mutatepest(user) @@ -303,7 +303,7 @@ overdose_threshold = 60 taste_description = "sweetness and salt" var/last_added = 0 - var/maximum_reachable = BLOOD_VOLUME_NORMAL - 10 //So that normal blood regeneration can continue with salglu active + var/maximum_reachable = BLOOD_VOLUME_NORMAL - 10 //So that normal blood regeneration can continue with salglu active var/extra_regen = 0.25 // in addition to acting as temporary blood, also add this much to their actual blood per tick ph = 5.5 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED @@ -312,7 +312,7 @@ if(last_added) M.blood_volume -= last_added last_added = 0 - if(M.blood_volume < maximum_reachable) //Can only up to double your effective blood level. + if(M.blood_volume < maximum_reachable) //Can only up to double your effective blood level. var/amount_to_add = min(M.blood_volume, volume*5) var/new_blood_level = min(M.blood_volume + amount_to_add, maximum_reachable) last_added = new_blood_level - M.blood_volume diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index 023544bb204..2ad106c18c6 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -146,7 +146,7 @@ chemical_flags = REAGENT_CAN_BE_SYNTHESIZED /* - * Water reaction to turf + * Water reaction to turf */ /datum/reagent/water/expose_turf(turf/open/exposed_turf, reac_volume) @@ -170,7 +170,7 @@ qdel(hotspot) /* - * Water reaction to an object + * Water reaction to an object */ /datum/reagent/water/expose_obj(obj/exposed_obj, reac_volume) @@ -193,7 +193,7 @@ qdel(HH) /* - * Water reaction to a mob + * Water reaction to a mob */ /datum/reagent/water/expose_mob(mob/living/exposed_mob, methods=TOUCH, reac_volume)//Splashing people with water can help put them out! @@ -249,7 +249,7 @@ to_chat(M, "Your blood rites falter as holy water scours your body!") for(var/datum/action/innate/cult/blood_spell/BS in BM.spells) qdel(BS) - if(data["misc"] >= 25) // 10 units, 45 seconds @ metabolism 0.4 units & tick rate 1.8 sec + if(data["misc"] >= 25) // 10 units, 45 seconds @ metabolism 0.4 units & tick rate 1.8 sec if(!M.stuttering) M.stuttering = 1 M.stuttering = min(M.stuttering+4, 10) @@ -261,14 +261,14 @@ M.Unconscious(120) to_chat(M, "[pick("Your blood is your bond - you are nothing without it", "Do not forget your place", \ "All that power, and you still fail?", "If you cannot scour this poison, I shall scour your meager life!")].") - if(data["misc"] >= 60) // 30 units, 135 seconds + if(data["misc"] >= 60) // 30 units, 135 seconds if(iscultist(M)) SSticker.mode.remove_cultist(M.mind, FALSE, TRUE) M.jitteriness = 0 M.stuttering = 0 - holder.remove_reagent(type, volume) // maybe this is a little too perfect and a max() cap on the statuses would be better?? + holder.remove_reagent(type, volume) // maybe this is a little too perfect and a max() cap on the statuses would be better?? return - holder.remove_reagent(type, 0.4) //fixed consumption to prevent balancing going out of whack + holder.remove_reagent(type, 0.4) //fixed consumption to prevent balancing going out of whack /datum/reagent/water/holywater/expose_turf(turf/exposed_turf, reac_volume) . = ..() @@ -308,7 +308,7 @@ chemical_flags = REAGENT_CAN_BE_SYNTHESIZED /* - * Water reaction to turf + * Water reaction to turf */ /datum/reagent/hydrogen_peroxide/expose_turf(turf/open/exposed_turf, reac_volume) @@ -318,7 +318,7 @@ if(reac_volume >= 5) exposed_turf.MakeSlippery(TURF_WET_WATER, 10 SECONDS, min(reac_volume*1.5 SECONDS, 60 SECONDS)) /* - * Water reaction to a mob + * Water reaction to a mob */ /datum/reagent/hydrogen_peroxide/expose_mob(mob/living/exposed_mob, methods=TOUCH, reac_volume)//Splashing people with h2o2 can burn them ! @@ -326,7 +326,7 @@ if(methods & TOUCH) exposed_mob.adjustFireLoss(2, 0) // burns -/datum/reagent/fuel/unholywater //if you somehow managed to extract this from someone, dont splash it on yourself and have a smoke +/datum/reagent/fuel/unholywater //if you somehow managed to extract this from someone, dont splash it on yourself and have a smoke name = "Unholy Water" description = "Something that shouldn't exist on this plane of existence." taste_description = "suffering" @@ -354,7 +354,7 @@ M.adjustBruteLoss(2, 0) ..() -/datum/reagent/hellwater //if someone has this in their system they've really pissed off an eldrich god +/datum/reagent/hellwater //if someone has this in their system they've really pissed off an eldrich god name = "Hell Water" description = "YOUR FLESH! IT BURNS!" taste_description = "burning" @@ -363,9 +363,9 @@ /datum/reagent/hellwater/on_mob_life(mob/living/carbon/M) M.set_fire_stacks(min(5, M.fire_stacks + 3)) - M.IgniteMob() //Only problem with igniting people is currently the commonly available fire suits make you immune to being on fire + M.IgniteMob() //Only problem with igniting people is currently the commonly available fire suits make you immune to being on fire M.adjustToxLoss(1, 0) - M.adjustFireLoss(1, 0) //Hence the other damages... ain't I a bastard? + M.adjustFireLoss(1, 0) //Hence the other damages... ain't I a bastard? M.adjustOrganLoss(ORGAN_SLOT_BRAIN, 5, 150) holder.remove_reagent(type, 1) @@ -451,15 +451,15 @@ if(48) newcolor += "0" if(49 to 57) - newcolor += ascii2text(ascii-1) //numbers 1 to 9 + newcolor += ascii2text(ascii-1) //numbers 1 to 9 if(97) newcolor += "9" if(98 to 102) - newcolor += ascii2text(ascii-1) //letters b to f lowercase + newcolor += ascii2text(ascii-1) //letters b to f lowercase if(65) newcolor += "9" if(66 to 70) - newcolor += ascii2text(ascii+31) //letters B to F - translates to lowercase + newcolor += ascii2text(ascii+31) //letters B to F - translates to lowercase else break if(ReadHSV(newcolor)[3] >= ReadHSV("#7F7F7F")[3]) @@ -1557,7 +1557,7 @@ name = "Invisible Powder" colorname = "invisible" color = "#FFFFFF00" // white + no alpha - random_color_list = list(null) //because using the powder color turns things invisible + random_color_list = list(null) //because using the powder color turns things invisible chemical_flags = REAGENT_CAN_BE_SYNTHESIZED /datum/reagent/colorful_reagent/powder/black @@ -2078,7 +2078,7 @@ . = ..() if(!istype(exposed_turf)) return - exposed_turf.MakeDry(ALL, TRUE, reac_volume * 5 SECONDS) //50 deciseconds per unit + exposed_turf.MakeDry(ALL, TRUE, reac_volume * 5 SECONDS) //50 deciseconds per unit /datum/reagent/drying_agent/expose_obj(obj/exposed_obj, reac_volume) . = ..() @@ -2335,8 +2335,8 @@ chemical_flags = REAGENT_CAN_BE_SYNTHESIZED /datum/reagent/peaceborg/tire/on_mob_life(mob/living/carbon/M) - var/healthcomp = (100 - M.health) //DOES NOT ACCOUNT FOR ADMINBUS THINGS THAT MAKE YOU HAVE MORE THAN 200/210 HEALTH, OR SOMETHING OTHER THAN A HUMAN PROCESSING THIS. - if(M.getStaminaLoss() < (45 - healthcomp)) //At 50 health you would have 200 - 150 health meaning 50 compensation. 60 - 50 = 10, so would only do 10-19 stamina.) + var/healthcomp = (100 - M.health) //DOES NOT ACCOUNT FOR ADMINBUS THINGS THAT MAKE YOU HAVE MORE THAN 200/210 HEALTH, OR SOMETHING OTHER THAN A HUMAN PROCESSING THIS. + if(M.getStaminaLoss() < (45 - healthcomp)) //At 50 health you would have 200 - 150 health meaning 50 compensation. 60 - 50 = 10, so would only do 10-19 stamina.) M.adjustStaminaLoss(10) if(prob(30)) to_chat(M, "You should sit down and take a rest...") @@ -2379,8 +2379,8 @@ if(HAS_TRAIT(L, TRAIT_NOHUNGER)) //they can't puke holder.del_reagent(type) -#define YUCK_PUKE_CYCLES 3 // every X cycle is a puke -#define YUCK_PUKES_TO_STUN 3 // hit this amount of pukes in a row to start stunning +#define YUCK_PUKE_CYCLES 3 // every X cycle is a puke +#define YUCK_PUKES_TO_STUN 3 // hit this amount of pukes in a row to start stunning /datum/reagent/yuck/on_mob_life(mob/living/carbon/C) if(!yuck_cycle) if(prob(8)) diff --git a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm index e88a53915ac..cb38a8806ae 100644 --- a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm @@ -65,7 +65,7 @@ if(chems.has_reagent(type, 1)) mytray.adjustToxic(3) //It is still toxic, mind you, but not to the same degree. -#define LIQUID_PLASMA_BP (50+T0C) +#define LIQUID_PLASMA_BP (50+T0C) /datum/reagent/toxin/plasma name = "Plasma" @@ -436,7 +436,7 @@ . = 1 ..() -/datum/reagent/toxin/fakebeer //disguised as normal beer for use by emagged brobots +/datum/reagent/toxin/fakebeer //disguised as normal beer for use by emagged brobots name = "Beer" description = "A specially-engineered sedative disguised as beer. It induces instant sleep in its target." color = "#664300" // rgb: 102, 67, 0 diff --git a/code/modules/reagents/chemistry/recipes/others.dm b/code/modules/reagents/chemistry/recipes/others.dm index e9ffa8a4f4b..39bebca739d 100644 --- a/code/modules/reagents/chemistry/recipes/others.dm +++ b/code/modules/reagents/chemistry/recipes/others.dm @@ -327,7 +327,7 @@ results = list(/datum/reagent/ammonia = 3) required_reagents = list(/datum/reagent/hydrogen = 3, /datum/reagent/nitrogen = 1) optimal_ph_min = 1 // Lets increase our range for this basic chem - optimal_ph_max = 12 + optimal_ph_max = 12 H_ion_release = -0.02 //handmade is more neutral /datum/chemical_reaction/diethylamine @@ -346,7 +346,7 @@ /datum/chemical_reaction/weedkiller results = list(/datum/reagent/toxin/plantbgone/weedkiller = 5) required_reagents = list(/datum/reagent/toxin = 1, /datum/reagent/ammonia = 4) - H_ion_release = -0.05 // Push towards acidic + H_ion_release = -0.05 // Push towards acidic /datum/chemical_reaction/pestkiller results = list(/datum/reagent/toxin/pestkiller = 5) @@ -487,7 +487,7 @@ ..() //scream powder /datum/chemical_reaction/scream - required_reagents = list(/datum/reagent/medicine/strange_reagent = 1, /datum/reagent/consumable/cream = 5, /datum/reagent/consumable/ethanol/lizardwine = 5 ) + required_reagents = list(/datum/reagent/medicine/strange_reagent = 1, /datum/reagent/consumable/cream = 5, /datum/reagent/consumable/ethanol/lizardwine = 5 ) required_temp = 374 reaction_flags = REACTION_INSTANT diff --git a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm index 37adf451bd9..188c6d3d139 100644 --- a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm +++ b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm @@ -470,7 +470,7 @@ var/zap_flags = ZAP_MOB_DAMAGE | ZAP_OBJ_DAMAGE | ZAP_MOB_STUN /datum/chemical_reaction/reagent_explosion/teslium_lightning/on_reaction(datum/equilibrium/reaction, datum/reagents/holder, created_volume) - var/T1 = created_volume * 20 //100 units : Zap 3 times, with powers 2000/5000/12000. Tesla revolvers have a power of 10000 for comparison. + var/T1 = created_volume * 20 //100 units : Zap 3 times, with powers 2000/5000/12000. Tesla revolvers have a power of 10000 for comparison. var/T2 = created_volume * 50 var/T3 = created_volume * 120 var/added_delay = 0.5 SECONDS @@ -480,7 +480,7 @@ if(created_volume >= 40) addtimer(CALLBACK(src, .proc/zappy_zappy, holder, T2), added_delay) added_delay += 1.5 SECONDS - if(created_volume >= 10) //10 units minimum for lightning, 40 units for secondary blast, 75 units for tertiary blast. + if(created_volume >= 10) //10 units minimum for lightning, 40 units for secondary blast, 75 units for tertiary blast. addtimer(CALLBACK(src, .proc/zappy_zappy, holder, T3), added_delay) addtimer(CALLBACK(src, .proc/explode, holder, created_volume), added_delay) @@ -516,7 +516,7 @@ required_reagents = list(/datum/reagent/stabilizing_agent = 1,/datum/reagent/fluorosurfactant = 1,/datum/reagent/carbon = 1) required_temp = 200 is_cold_recipe = 1 - optimal_temp = 50 + optimal_temp = 50 overheat_temp = 5 thermic_constant= -1 H_ion_release = -0.02 diff --git a/code/modules/reagents/chemistry/recipes/reaction_agents.dm b/code/modules/reagents/chemistry/recipes/reaction_agents.dm index 4af750fbb61..d104e12f168 100644 --- a/code/modules/reagents/chemistry/recipes/reaction_agents.dm +++ b/code/modules/reagents/chemistry/recipes/reaction_agents.dm @@ -34,7 +34,7 @@ purity_min = 0 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// -//////////////////// Example competitive reaction (REACTION_COMPETITIVE) ////////////////////////////////// +//////////////////// Example competitive reaction (REACTION_COMPETITIVE) ////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/code/modules/reagents/reagent_containers/borghydro.dm b/code/modules/reagents/reagent_containers/borghydro.dm index 2edb22026a8..f2131aeadab 100644 --- a/code/modules/reagents/reagent_containers/borghydro.dm +++ b/code/modules/reagents/reagent_containers/borghydro.dm @@ -1,4 +1,4 @@ -#define C2NAMEREAGENT "[initial(reagent.name)] (Has Side-Effects)" +#define C2NAMEREAGENT "[initial(reagent.name)] (Has Side-Effects)" /* Contains: Borg Hypospray @@ -98,9 +98,9 @@ Borg Hypospray if(R?.cell) for(var/i in 1 to reagent_ids.len) var/datum/reagents/RG = reagent_list[i] - if(RG.total_volume < RG.maximum_volume) //Don't recharge reagents and drain power if the storage is full. - R.cell.use(charge_cost) //Take power from borg... - RG.add_reagent(reagent_ids[i], 5) //And fill hypo with reagent. + if(RG.total_volume < RG.maximum_volume) //Don't recharge reagents and drain power if the storage is full. + R.cell.use(charge_cost) //Take power from borg... + RG.add_reagent(reagent_ids[i], 5) //And fill hypo with reagent. /obj/item/reagent_containers/borghypo/attack(mob/living/carbon/M, mob/user) var/datum/reagents/R = reagent_list[mode] @@ -133,7 +133,7 @@ Borg Hypospray /obj/item/reagent_containers/borghypo/examine(mob/user) . = ..() - . += DescribeContents() //Because using the standardized reagents datum was just too cool for whatever fuckwit wrote this + . += DescribeContents() //Because using the standardized reagents datum was just too cool for whatever fuckwit wrote this var/datum/reagent/loaded = modes[mode] . += "Currently loaded: [initial(loaded.name)]. [initial(loaded.description)]" . += "Alt+Click to change transfer amount. Currently set to [amount_per_transfer_from_this == 5 ? "dose normally (5u)" : "microdose (2u)"]." diff --git a/code/modules/reagents/reagent_containers/patch.dm b/code/modules/reagents/reagent_containers/patch.dm index d04dd3ad0d6..bd145ac8a47 100644 --- a/code/modules/reagents/reagent_containers/patch.dm +++ b/code/modules/reagents/reagent_containers/patch.dm @@ -8,7 +8,7 @@ volume = 40 apply_type = PATCH apply_method = "apply" - self_delay = 30 // three seconds + self_delay = 30 // three seconds dissolvable = FALSE /obj/item/reagent_containers/pill/patch/attack(mob/living/L, mob/user) diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm index b3e8eca4502..9f6549a0fec 100644 --- a/code/modules/reagents/reagent_containers/spray.dm +++ b/code/modules/reagents/reagent_containers/spray.dm @@ -253,7 +253,7 @@ var/generate_amount = 5 var/generate_type = /datum/reagent/water var/last_generate = 0 - var/generate_delay = 10 //deciseconds + var/generate_delay = 10 //deciseconds can_fill_from_container = FALSE /obj/item/reagent_containers/spray/waterflower/cyborg/hacked @@ -263,7 +263,7 @@ volume = 3 generate_type = /datum/reagent/clf3 generate_amount = 1 - generate_delay = 40 //deciseconds + generate_delay = 40 //deciseconds /obj/item/reagent_containers/spray/waterflower/cyborg/Initialize() . = ..() @@ -340,7 +340,7 @@ var/generate_amount = 50 var/generate_type = /datum/reagent/space_cleaner var/last_generate = 0 - var/generate_delay = 10 //deciseconds + var/generate_delay = 10 //deciseconds /obj/item/reagent_containers/spray/chemsprayer/janitor/Initialize() . = ..() diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm index 417d42a605a..db688b616b8 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -10,7 +10,7 @@ amount_per_transfer_from_this = 5 possible_transfer_amounts = list(5, 10, 15) volume = 15 - var/busy = FALSE // needed for delayed drawing of blood + var/busy = FALSE // needed for delayed drawing of blood var/proj_piercing = 0 //does it pierce through thick clothes when shot with syringe gun custom_materials = list(/datum/material/iron=10, /datum/material/glass=20) reagent_flags = TRANSPARENT diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm index 656e2bf29d3..de112f7c0c5 100644 --- a/code/modules/recycling/conveyor2.dm +++ b/code/modules/recycling/conveyor2.dm @@ -11,13 +11,13 @@ GLOBAL_LIST_EMPTY(conveyors_by_id) layer = BELOW_OPEN_DOOR_LAYER processing_flags = START_PROCESSING_MANUALLY subsystem_type = /datum/controller/subsystem/processing/fastprocess - var/operating = 0 // 1 if running forward, -1 if backwards, 0 if off - var/operable = 1 // true if can operate (no broken segments in this belt run) - var/forwards // this is the default (forward) direction, set by the map dir - var/backwards // hopefully self-explanatory - var/movedir // the actual direction to move stuff in - var/id = "" // the control ID - must match controller ID - var/verted = 1 // Inverts the direction the conveyor belt moves. + var/operating = 0 // 1 if running forward, -1 if backwards, 0 if off + var/operable = 1 // true if can operate (no broken segments in this belt run) + var/forwards // this is the default (forward) direction, set by the map dir + var/backwards // hopefully self-explanatory + var/movedir // the actual direction to move stuff in + var/id = "" // the control ID - must match controller ID + var/verted = 1 // Inverts the direction the conveyor belt moves. var/conveying = FALSE /obj/machinery/conveyor/centcom_auto @@ -151,7 +151,7 @@ GLOBAL_LIST_EMPTY(conveyors_by_id) /obj/machinery/conveyor/proc/convey(list/affecting) for(var/am in affecting) - if(!ismovable(am)) //This is like a third faster than for(var/atom/movable in affecting) + if(!ismovable(am)) //This is like a third faster than for(var/atom/movable in affecting) continue var/atom/movable/movable_thing = am //Give this a chance to yield if the server is busy @@ -248,12 +248,12 @@ GLOBAL_LIST_EMPTY(conveyors_by_id) icon_state = "switch-off" processing_flags = START_PROCESSING_MANUALLY - var/position = 0 // 0 off, -1 reverse, 1 forward - var/last_pos = -1 // last direction setting - var/oneway = FALSE // if the switch only operates the conveyor belts in a single direction. - var/invert_icon = FALSE // If the level points the opposite direction when it's turned on. + var/position = 0 // 0 off, -1 reverse, 1 forward + var/last_pos = -1 // last direction setting + var/oneway = FALSE // if the switch only operates the conveyor belts in a single direction. + var/invert_icon = FALSE // If the level points the opposite direction when it's turned on. - var/id = "" // must match conveyor IDs to control them + var/id = "" // must match conveyor IDs to control them /obj/machinery/conveyor_switch/Initialize(mapload, newid) . = ..() diff --git a/code/modules/recycling/disposal/bin.dm b/code/modules/recycling/disposal/bin.dm index ea422d9be24..5f3ed733a6c 100644 --- a/code/modules/recycling/disposal/bin.dm +++ b/code/modules/recycling/disposal/bin.dm @@ -12,12 +12,12 @@ obj_flags = CAN_BE_HIT | USES_TGUI flags_1 = RAD_PROTECT_CONTENTS_1 | RAD_NO_CONTAMINATE_1 - var/datum/gas_mixture/air_contents // internal reservoir + var/datum/gas_mixture/air_contents // internal reservoir var/full_pressure = FALSE var/pressure_charging = TRUE - var/flush = 0 // true if flush handle is pulled + var/flush = 0 // true if flush handle is pulled var/obj/structure/disposalpipe/trunk/trunk = null // the attached pipe trunk - var/flushing = 0 // true if flushing in progress + var/flushing = 0 // true if flushing in progress var/flush_every_ticks = 30 //Every 30 ticks it will look whether it is ready to flush var/flush_count = 0 //this var adds 1 once per tick. When it reaches flush_every_ticks it resets and tries to flush. var/last_sound = 0 @@ -282,7 +282,7 @@ // attack by item places it in to disposal /obj/machinery/disposal/bin/attackby(obj/item/I, mob/user, params) - if(istype(I, /obj/item/storage/bag/trash)) //Not doing component overrides because this is a specific type. + if(istype(I, /obj/item/storage/bag/trash)) //Not doing component overrides because this is a specific type. var/obj/item/storage/bag/trash/T = I var/datum/component/storage/STR = T.GetComponent(/datum/component/storage) to_chat(user, "You empty the bag.") @@ -466,7 +466,7 @@ . = ..() trunk = locate() in loc if(trunk) - trunk.linked = src // link the pipe trunk to self + trunk.linked = src // link the pipe trunk to self /obj/machinery/disposal/delivery_chute/place_item_in_disposal(obj/item/I, mob/user) if(I.CanEnterDisposals()) diff --git a/code/modules/recycling/disposal/construction.dm b/code/modules/recycling/disposal/construction.dm index 819089f73ea..e950d2653a0 100644 --- a/code/modules/recycling/disposal/construction.dm +++ b/code/modules/recycling/disposal/construction.dm @@ -93,7 +93,7 @@ if(rotation_type == ROTATION_FLIP) var/obj/structure/disposalpipe/temp = pipe_type if(initial(temp.flip_type)) - if(ISDIAGONALDIR(dir)) // Fix RPD-induced diagonal turning + if(ISDIAGONALDIR(dir)) // Fix RPD-induced diagonal turning setDir(turn(dir, 45)) pipe_type = initial(temp.flip_type) update_icon() @@ -134,7 +134,7 @@ to_chat(user, "There is already a disposal pipe at that location!") return TRUE - else // Disposal or outlet + else // Disposal or outlet var/found_trunk = locate(/obj/structure/disposalpipe/trunk) in T if(!found_trunk) diff --git a/code/modules/recycling/disposal/holder.dm b/code/modules/recycling/disposal/holder.dm index 44fc5c6ddd4..87d29e5e11c 100644 --- a/code/modules/recycling/disposal/holder.dm +++ b/code/modules/recycling/disposal/holder.dm @@ -8,12 +8,12 @@ resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF dir = NONE flags_1 = RAD_PROTECT_CONTENTS_1 | RAD_NO_CONTAMINATE_1 - var/datum/gas_mixture/gas // gas used to flush, will appear at exit point - var/active = FALSE // true if the holder is moving, otherwise inactive - var/count = 1000 // can travel 1000 steps before going inactive (in case of loops) - var/destinationTag = NONE // changes if contains a delivery container - var/tomail = FALSE // contains wrapped package - var/hasmob = FALSE // contains a mob + var/datum/gas_mixture/gas // gas used to flush, will appear at exit point + var/active = FALSE // true if the holder is moving, otherwise inactive + var/count = 1000 // can travel 1000 steps before going inactive (in case of loops) + var/destinationTag = NONE // changes if contains a delivery container + var/tomail = FALSE // contains wrapped package + var/hasmob = FALSE // contains a mob /obj/structure/disposalholder/Destroy() QDEL_NULL(gas) @@ -62,7 +62,7 @@ // argument is the disposal unit the holder started in /obj/structure/disposalholder/proc/start(obj/machinery/disposal/D) if(!D.trunk) - D.expel(src) // no trunk connected, so expel immediately + D.expel(src) // no trunk connected, so expel immediately return forceMove(D.trunk) active = TRUE @@ -108,9 +108,9 @@ if(!T) return null - var/fdir = turn(dir, 180) // flip the movement direction + var/fdir = turn(dir, 180) // flip the movement direction for(var/obj/structure/disposalpipe/P in T) - if(fdir & P.dpdir) // find pipe direction mask that matches flipped dir + if(fdir & P.dpdir) // find pipe direction mask that matches flipped dir return P // if no matching pipe, return null return null @@ -120,10 +120,10 @@ /obj/structure/disposalholder/proc/merge(obj/structure/disposalholder/other) for(var/A in other) var/atom/movable/AM = A - AM.forceMove(src) // move everything in other holder to this one + AM.forceMove(src) // move everything in other holder to this one if(ismob(AM)) var/mob/M = AM - M.reset_perspective(src) // if a client mob, update eye to follow this holder + M.reset_perspective(src) // if a client mob, update eye to follow this holder qdel(other) diff --git a/code/modules/recycling/disposal/multiz.dm b/code/modules/recycling/disposal/multiz.dm index c6760e46a07..69f4601314e 100644 --- a/code/modules/recycling/disposal/multiz.dm +++ b/code/modules/recycling/disposal/multiz.dm @@ -13,7 +13,7 @@ multiz_dir = MULTIZ_PIPE_DOWN /obj/structure/disposalpipe/trunk/multiz/transfer(obj/structure/disposalholder/H) - if(H.dir == DOWN) //Since we're a trunk, you can still place a chute / bin over us. If theyve entered from there, treat this as a normal trunk + if(H.dir == DOWN) //Since we're a trunk, you can still place a chute / bin over us. If theyve entered from there, treat this as a normal trunk return ..() // otherwise, go to the linked object if(multiz_dir) //Are we a trunk that goes up? Or down? @@ -37,10 +37,10 @@ else var/obj/structure/disposaloutlet/O = linked if(istype(O)) - O.expel(H) // expel at outlet + O.expel(H) // expel at outlet else var/obj/machinery/disposal/D = linked - D.expel(H) // expel at disposal + D.expel(H) // expel at disposal // Returning null without expelling holder makes the holder expell itself return null diff --git a/code/modules/recycling/disposal/outlet.dm b/code/modules/recycling/disposal/outlet.dm index 1de442ebbd7..a460d2e0e7b 100644 --- a/code/modules/recycling/disposal/outlet.dm +++ b/code/modules/recycling/disposal/outlet.dm @@ -8,7 +8,7 @@ anchored = TRUE flags_1 = RAD_PROTECT_CONTENTS_1 | RAD_NO_CONTAMINATE_1 var/active = FALSE - var/turf/target // this will be where the output objects are 'thrown' to. + var/turf/target // this will be where the output objects are 'thrown' to. var/obj/structure/disposalpipe/trunk/trunk // the attached pipe trunk var/obj/structure/disposalconstruct/stored var/start_eject = 0 @@ -29,7 +29,7 @@ trunk = locate() in loc if(trunk) - trunk.linked = src // link the pipe trunk to self + trunk.linked = src // link the pipe trunk to self /obj/structure/disposaloutlet/Destroy() if(trunk) diff --git a/code/modules/recycling/disposal/pipe.dm b/code/modules/recycling/disposal/pipe.dm index 9b86043469a..a01c9f6af2d 100644 --- a/code/modules/recycling/disposal/pipe.dm +++ b/code/modules/recycling/disposal/pipe.dm @@ -7,15 +7,15 @@ anchored = TRUE density = FALSE obj_flags = CAN_BE_HIT | ON_BLUEPRINTS - dir = NONE // dir will contain dominant direction for junction pipes + dir = NONE // dir will contain dominant direction for junction pipes max_integrity = 200 armor = list(MELEE = 25, BULLET = 10, LASER = 10, ENERGY = 100, BOMB = 0, BIO = 100, RAD = 100, FIRE = 90, ACID = 30) - layer = DISPOSAL_PIPE_LAYER // slightly lower than wires and other pipes + layer = DISPOSAL_PIPE_LAYER // slightly lower than wires and other pipes flags_1 = RAD_PROTECT_CONTENTS_1 | RAD_NO_CONTAMINATE_1 damage_deflection = 10 - var/dpdir = NONE // bitmask of pipe directions - var/initialize_dirs = NONE // bitflags of pipe directions added on init, see \code\_DEFINES\pipe_construction.dm - var/flip_type // If set, the pipe is flippable and becomes this type when flipped + var/dpdir = NONE // bitmask of pipe directions + var/initialize_dirs = NONE // bitflags of pipe directions added on init, see \code\_DEFINES\pipe_construction.dm + var/flip_type // If set, the pipe is flippable and becomes this type when flipped var/obj/structure/disposalconstruct/stored @@ -99,10 +99,10 @@ new floorturf.floor_tile(T) floorturf.make_plating(TRUE) - if(direction) // direction is specified + if(direction) // direction is specified if(isspaceturf(T)) // if ended in space, then range is unlimited target = get_edge_target_turf(T, direction) - else // otherwise limit to 10 tiles + else // otherwise limit to 10 tiles target = get_ranged_target_turf(T, direction, 10) eject_range = 10 @@ -183,11 +183,11 @@ // if coming in from primary dir, then next is equal chance of other dirs /obj/structure/disposalpipe/junction/nextdir(obj/structure/disposalholder/H) var/flipdir = turn(H.dir, 180) - if(flipdir != dir) // came from secondary dir, so exit through primary + if(flipdir != dir) // came from secondary dir, so exit through primary return dir - else // came from primary, so need to choose a secondary exit - var/mask = dpdir & (~dir) // get a mask of secondary dirs + else // came from primary, so need to choose a secondary exit + var/mask = dpdir & (~dir) // get a mask of secondary dirs // find one secondary dir in mask var/secdir = NONE @@ -196,9 +196,9 @@ secdir = D break - if(prob(50)) // 50% chance to choose the found secondary dir + if(prob(50)) // 50% chance to choose the found secondary dir return secdir - else // or the other one + else // or the other one return mask & (~secdir) /obj/structure/disposalpipe/junction/flip @@ -215,7 +215,7 @@ //a trunk joining to a disposal bin or outlet on the same turf /obj/structure/disposalpipe/trunk icon_state = "pipe-t" - var/obj/linked // the linked obj/machinery/disposal or obj/disposaloutlet + var/obj/linked // the linked obj/machinery/disposal or obj/disposaloutlet /obj/structure/disposalpipe/trunk/Initialize() . = ..() @@ -255,16 +255,16 @@ // if not entering from disposal bin, // transfer to linked object (outlet or bin) /obj/structure/disposalpipe/trunk/transfer(obj/structure/disposalholder/H) - if(H.dir == DOWN) // we just entered from a disposer - return ..() // so do base transfer proc + if(H.dir == DOWN) // we just entered from a disposer + return ..() // so do base transfer proc // otherwise, go to the linked object if(linked) var/obj/structure/disposaloutlet/O = linked if(istype(O)) - O.expel(H) // expel at outlet + O.expel(H) // expel at outlet else var/obj/machinery/disposal/D = linked - D.expel(H) // expel at disposal + D.expel(H) // expel at disposal // Returning null without expelling holder makes the holder expell itself return null diff --git a/code/modules/recycling/disposal/pipe_sorting.dm b/code/modules/recycling/disposal/pipe_sorting.dm index cc9dc5f1551..9e237934b45 100644 --- a/code/modules/recycling/disposal/pipe_sorting.dm +++ b/code/modules/recycling/disposal/pipe_sorting.dm @@ -8,9 +8,9 @@ /obj/structure/disposalpipe/sorting/nextdir(obj/structure/disposalholder/H) var/sortdir = dpdir & ~(dir | turn(dir, 180)) - if(H.dir != sortdir) // probably came from the negdir - if(check_sorting(H)) // if destination matches filtered type... - return sortdir // exit through sortdirection + if(H.dir != sortdir) // probably came from the negdir + if(check_sorting(H)) // if destination matches filtered type... + return sortdir // exit through sortdirection // go with the flow to positive direction return dir diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm index 5462da432fe..edbd8998718 100644 --- a/code/modules/recycling/sortingmachinery.dm +++ b/code/modules/recycling/sortingmachinery.dm @@ -106,8 +106,8 @@ user.visible_message("[user] attaches a barcode to [src].", "You attach a barcode to [src].") tagger.paper_count -= 1 sticker = new /obj/item/barcode(src) - sticker.payments_acc = tagger.payments_acc //new tag gets the tagger's current account. - sticker.percent_cut = tagger.percent_cut //same, but for the percentage taken. + sticker.payments_acc = tagger.payments_acc //new tag gets the tagger's current account. + sticker.percent_cut = tagger.percent_cut //same, but for the percentage taken. var/list/wrap_contents = src.GetAllContents() for(var/obj/I in wrap_contents) @@ -289,8 +289,8 @@ user.visible_message("[user] attaches a barcode to [src].", "You attach a barcode to [src].") tagger.paper_count -= 1 sticker = new /obj/item/barcode(src) - sticker.payments_acc = tagger.payments_acc //new tag gets the tagger's current account. - sticker.percent_cut = tagger.percent_cut //as above, as before. + sticker.payments_acc = tagger.payments_acc //new tag gets the tagger's current account. + sticker.percent_cut = tagger.percent_cut //as above, as before. var/list/wrap_contents = src.GetAllContents() for(var/obj/I in wrap_contents) @@ -445,8 +445,8 @@ playsound(src, 'sound/machines/click.ogg', 40, TRUE) to_chat(user, "You print a new barcode.") var/obj/item/barcode/new_barcode = new /obj/item/barcode(src) - new_barcode.payments_acc = payments_acc // The sticker gets the scanner's registered account. - new_barcode.percent_cut = percent_cut // Also the registered percent cut. + new_barcode.payments_acc = payments_acc // The sticker gets the scanner's registered account. + new_barcode.percent_cut = percent_cut // Also the registered percent cut. user.put_in_hands(new_barcode) /obj/item/sales_tagger/CtrlClick(mob/user) diff --git a/code/modules/research/anomaly/explosive_compressor.dm b/code/modules/research/anomaly/explosive_compressor.dm index 2fa12abdf3f..179272a848d 100644 --- a/code/modules/research/anomaly/explosive_compressor.dm +++ b/code/modules/research/anomaly/explosive_compressor.dm @@ -1,5 +1,5 @@ -#define MAX_RADIUS_REQUIRED 20 //maxcap -#define MIN_RADIUS_REQUIRED 4 //1, 2, 4 +#define MAX_RADIUS_REQUIRED 20 //maxcap +#define MIN_RADIUS_REQUIRED 4 //1, 2, 4 /** * # Explosive compressor machines * @@ -72,7 +72,7 @@ var/already_made = SSresearch.created_anomaly_types[anomaly_type] var/hard_limit = SSresearch.anomaly_hard_limit_by_type[anomaly_type] if(already_made >= hard_limit) - return //return null + return //return null // my crappy autoscale formula // linear scaling. var/radius_span = MAX_RADIUS_REQUIRED - MIN_RADIUS_REQUIRED @@ -129,14 +129,14 @@ inserted_core = null say("Transfer valve resulted in negligible explosive power. Items ejected.") return - mix.react() // build more pressure + mix.react() // build more pressure var/pressure = mix.return_pressure() var/range = (pressure - TANK_FRAGMENT_PRESSURE) / TANK_FRAGMENT_SCALE if(range < required_radius) inserted_bomb.forceMove(src) say("Resultant detonation failed to produce enough implosive power to compress [inserted_core]. Core ejected.") return - QDEL_NULL(inserted_bomb) // bomb goes poof + QDEL_NULL(inserted_bomb) // bomb goes poof inserted_core.create_core(drop_location(), TRUE, TRUE) inserted_core = null say("Success. Resultant detonation has theoretical range of [range]. Required radius was [required_radius]. Core production complete.") diff --git a/code/modules/research/bepis.dm b/code/modules/research/bepis.dm index 20934c723a6..70f16f59634 100644 --- a/code/modules/research/bepis.dm +++ b/code/modules/research/bepis.dm @@ -20,9 +20,9 @@ circuit = /obj/item/circuitboard/machine/bepis var/banking_amount = 100 - var/banked_cash = 0 //stored player cash - var/datum/bank_account/account //payer's account. - var/account_name //name of the payer's account. + var/banked_cash = 0 //stored player cash + var/datum/bank_account/account //payer's account. + var/account_name //name of the payer's account. var/error_cause = null //Vars related to probability and chance of success for testing var/major_threshold = MAJOR_THRESHOLD @@ -128,7 +128,7 @@ var/gauss_major = 0 var/gauss_minor = 0 var/gauss_real = 0 - var/list/turfs = block(locate(x-1,y-1,z),locate(x+1,y+1,z)) //NO MORE DISCS IN WINDOWS + var/list/turfs = block(locate(x-1,y-1,z),locate(x+1,y+1,z)) //NO MORE DISCS IN WINDOWS while(length(turfs)) var/turf/T = pick_n_take(turfs) if(T.is_blocked_turf(TRUE)) @@ -138,9 +138,9 @@ break if (!dropturf) dropturf = drop_location() - gauss_major = (gaussian(major_threshold, std) - negative_cash_offset) //This is the randomized profit value that this experiment has to surpass to unlock a tech. - gauss_minor = (gaussian(minor_threshold, std) - negative_cash_offset) //And this is the threshold to instead get a minor prize. - gauss_real = (gaussian(banked_cash, std*inaccuracy_percentage) + positive_cash_offset) //this is the randomized profit value that your experiment expects to give. + gauss_major = (gaussian(major_threshold, std) - negative_cash_offset) //This is the randomized profit value that this experiment has to surpass to unlock a tech. + gauss_minor = (gaussian(minor_threshold, std) - negative_cash_offset) //And this is the threshold to instead get a minor prize. + gauss_real = (gaussian(banked_cash, std*inaccuracy_percentage) + positive_cash_offset) //this is the randomized profit value that your experiment expects to give. say("Real: [gauss_real]. Minor: [gauss_minor]. Major: [gauss_major].") flick("chamber_flash",src) update_icon() @@ -156,7 +156,7 @@ new reward(dropturf) say("Experiment concluded with partial success. Dispensing compiled research efforts.") return - if(gauss_real <= -1) //Critical Failure + if(gauss_real <= -1) //Critical Failure say("ERROR: CRITICAL MACHIME MALFUNCTI- ON. CURRENCY IS NOT CRASH. CANNOT COMPUTE COMMAND: 'make bucks'") //not a typo, for once. new /mob/living/simple_animal/deer(dropturf, 1) use_power(MACHINE_OVERLOAD * power_saver) //To prevent gambling at low cost and also prevent spamming for infinite deer. diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm index a3f128c098f..9e2908b0ebf 100644 --- a/code/modules/research/designs.dm +++ b/code/modules/research/designs.dm @@ -1,6 +1,6 @@ /*************************************************************** -** Design Datums ** -** All the data for building stuff. ** +** Design Datums ** +** All the data for building stuff. ** ***************************************************************/ /* For the materials datum, it assumes you need reagents unless specified otherwise. To designate a material that isn't a reagent, @@ -20,7 +20,7 @@ other types of metals and chemistry for reagents). //DESIGNS ARE GLOBAL. DO NOT CREATE OR DESTROY THEM AT RUNTIME OUTSIDE OF INIT, JUST REFERENCE THEM TO WHATEVER YOU'RE DOING! //why are you yelling? //DO NOT REFERENCE OUTSIDE OF SSRESEARCH. USE THE PROCS IN SSRESEARCH TO OBTAIN A REFERENCE. -/datum/design //Datum for object designs, used in construction +/datum/design //Datum for object designs, used in construction /// Name of the created object var/name = "Name" /// Description of the created object diff --git a/code/modules/research/designs/comp_board_designs.dm b/code/modules/research/designs/comp_board_designs.dm index d606ef07cb0..794f7492252 100644 --- a/code/modules/research/designs/comp_board_designs.dm +++ b/code/modules/research/designs/comp_board_designs.dm @@ -102,7 +102,7 @@ id = "comconsole" build_path = /obj/item/circuitboard/computer/communications category = list("Computer Boards") - departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SECURITY //Honestly should have a bridge techfab for this sometime. + departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SECURITY //Honestly should have a bridge techfab for this sometime. /datum/design/board/idcardconsole name = "Computer Design (ID Console)" diff --git a/code/modules/research/designs/weapon_designs.dm b/code/modules/research/designs/weapon_designs.dm index 4ba29a42b09..03e063949e4 100644 --- a/code/modules/research/designs/weapon_designs.dm +++ b/code/modules/research/designs/weapon_designs.dm @@ -150,7 +150,7 @@ materials = list(/datum/material/iron = 5000, /datum/material/glass = 1000) build_path = /obj/item/gun/syringe/rapidsyringe category = list("Weapons") - departmental_flags = DEPARTMENTAL_FLAG_MEDICAL //uwu + departmental_flags = DEPARTMENTAL_FLAG_MEDICAL //uwu /datum/design/temp_gun name = "Temperature Gun Part Kit" diff --git a/code/modules/research/destructive_analyzer.dm b/code/modules/research/destructive_analyzer.dm index d922edc685b..f08b6c7c36e 100644 --- a/code/modules/research/destructive_analyzer.dm +++ b/code/modules/research/destructive_analyzer.dm @@ -133,7 +133,7 @@ Note: Must be placed within 3 tiles of the R&D Console popup.set_content(ui_deconstruct()) popup.open() -/obj/machinery/rnd/destructive_analyzer/proc/ui_deconstruct() //Legacy code +/obj/machinery/rnd/destructive_analyzer/proc/ui_deconstruct() //Legacy code var/list/l = list() if(!loaded_item) l += "
      No item loaded. Standing-by...
      " diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm index c1105ddcb16..1649da5c0b9 100644 --- a/code/modules/research/experimentor.dm +++ b/code/modules/research/experimentor.dm @@ -149,7 +149,7 @@ res += str else if(SSresearch.science_tech.boosted_nodes[N.id]) boosted += str - if(SSresearch.science_tech.visible_nodes[N.id]) //JOY OF DISCOVERY! + if(SSresearch.science_tech.visible_nodes[N.id]) //JOY OF DISCOVERY! output += str output += boosted + res dat += output @@ -194,7 +194,7 @@ use_power(750) if(dotype != FAIL) var/list/nodes = techweb_item_boost_check(process) - var/picked = pickweight(nodes) //This should work. + var/picked = pickweight(nodes) //This should work. stored_research.boost_with_path(SSresearch.techweb_node_by_id(picked), process.type) updateUsrDialog() diff --git a/code/modules/research/machinery/_production.dm b/code/modules/research/machinery/_production.dm index 469ca211da0..17a8326f67a 100644 --- a/code/modules/research/machinery/_production.dm +++ b/code/modules/research/machinery/_production.dm @@ -2,15 +2,15 @@ name = "technology fabricator" desc = "Makes researched and prototype items with materials and energy." layer = BELOW_OBJ_LAYER - var/efficiency_coeff = 1 //Materials needed / coeff = actual. + var/efficiency_coeff = 1 //Materials needed / coeff = actual. var/list/categories = list() var/datum/component/remote_materials/materials var/allowed_department_flags = ALL - var/production_animation //What's flick()'d on print. + var/production_animation //What's flick()'d on print. var/allowed_buildtypes = NONE var/list/datum/design/cached_designs var/list/datum/design/matching_designs - var/department_tag = "Unidentified" //used for material distribution among other things. + var/department_tag = "Unidentified" //used for material distribution among other things. var/screen = RESEARCH_FABRICATOR_SCREEN_MAIN var/selected_category @@ -48,7 +48,7 @@ /obj/machinery/rnd/production/proc/calculate_efficiency() efficiency_coeff = 1 - if(reagents) //If reagents/materials aren't initialized, don't bother, we'll be doing this again after reagents init anyways. + if(reagents) //If reagents/materials aren't initialized, don't bother, we'll be doing this again after reagents init anyways. reagents.maximum_volume = 0 for(var/obj/item/reagent_containers/glass/G in component_parts) reagents.maximum_volume += G.volume diff --git a/code/modules/research/machinery/circuit_imprinter.dm b/code/modules/research/machinery/circuit_imprinter.dm index d147330fb02..34fe0a676d3 100644 --- a/code/modules/research/machinery/circuit_imprinter.dm +++ b/code/modules/research/machinery/circuit_imprinter.dm @@ -23,6 +23,6 @@ . = ..() var/total_rating = 0 for(var/obj/item/stock_parts/manipulator/M in component_parts) - total_rating += M.rating * 2 //There is only one. + total_rating += M.rating * 2 //There is only one. total_rating = max(1, total_rating) efficiency_coeff = total_rating diff --git a/code/modules/research/nanites/nanite_programs.dm b/code/modules/research/nanites/nanite_programs.dm index a69e4e4f116..e63964d477c 100644 --- a/code/modules/research/nanites/nanite_programs.dm +++ b/code/modules/research/nanites/nanite_programs.dm @@ -5,12 +5,12 @@ var/datum/component/nanites/nanites var/mob/living/host_mob - var/use_rate = 0 //Amount of nanites used while active - var/unique = TRUE //If there can be more than one copy in the same nanites - var/can_trigger = FALSE //If the nanites have a trigger function (used for the programming UI) - var/trigger_cost = 0 //Amount of nanites required to trigger - var/trigger_cooldown = 50 //Deciseconds required between each trigger activation - var/next_trigger = 0 //World time required for the next trigger activation + var/use_rate = 0 //Amount of nanites used while active + var/unique = TRUE //If there can be more than one copy in the same nanites + var/can_trigger = FALSE //If the nanites have a trigger function (used for the programming UI) + var/trigger_cost = 0 //Amount of nanites required to trigger + var/trigger_cooldown = 50 //Deciseconds required between each trigger activation + var/next_trigger = 0 //World time required for the next trigger activation var/program_flags = NONE var/passive_enabled = FALSE //If the nanites have an on/off-style effect, it's tracked by this var @@ -27,12 +27,12 @@ //The following vars are customizable - var/activated = TRUE //If FALSE, the program won't process, disables passive effects, can't trigger and doesn't consume nanites + var/activated = TRUE //If FALSE, the program won't process, disables passive effects, can't trigger and doesn't consume nanites - var/timer_restart = 0 //When deactivated, the program will wait X deciseconds before self-reactivating. Also works if the program begins deactivated. - var/timer_shutdown = 0 //When activated, the program will wait X deciseconds before self-deactivating. Also works if the program begins activated. - var/timer_trigger = 0 //[Trigger only] While active, the program will attempt to trigger once every x deciseconds. - var/timer_trigger_delay = 0 //[Trigger only] While active, the program will delay trigger signals by X deciseconds. + var/timer_restart = 0 //When deactivated, the program will wait X deciseconds before self-reactivating. Also works if the program begins deactivated. + var/timer_shutdown = 0 //When activated, the program will wait X deciseconds before self-deactivating. Also works if the program begins activated. + var/timer_trigger = 0 //[Trigger only] While active, the program will attempt to trigger once every x deciseconds. + var/timer_trigger_delay = 0 //[Trigger only] While active, the program will delay trigger signals by X deciseconds. //Indicates the next world.time tick where these timers will act var/timer_restart_next = 0 @@ -41,10 +41,10 @@ var/timer_trigger_delay_next = 0 //Signal codes, these handle remote input to the nanites. If set to 0 they'll ignore signals. - var/activation_code = 0 //Code that activates the program [1-9999] - var/deactivation_code = 0 //Code that deactivates the program [1-9999] - var/kill_code = 0 //Code that permanently removes the program [1-9999] - var/trigger_code = 0 //Code that triggers the program (if available) [1-9999] + var/activation_code = 0 //Code that activates the program [1-9999] + var/deactivation_code = 0 //Code that deactivates the program [1-9999] + var/kill_code = 0 //Code that permanently removes the program [1-9999] + var/trigger_code = 0 //Code that triggers the program (if available) [1-9999] //Extra settings ///Don't ever override this or I will come to your house and stand menacingly behind a bush @@ -53,7 +53,7 @@ //Rules //Rules that automatically manage if the program's active without requiring separate sensor programs var/list/datum/nanite_rule/rules = list() - var/all_rules_required = TRUE //Whether all rules are required for positive condition or any of specified + var/all_rules_required = TRUE //Whether all rules are required for positive condition or any of specified /datum/nanite_program/New() . = ..() diff --git a/code/modules/research/nanites/nanite_programs/sensor.dm b/code/modules/research/nanites/nanite_programs/sensor.dm index 724d2db6147..04cd74dcfc4 100644 --- a/code/modules/research/nanites/nanite_programs/sensor.dm +++ b/code/modules/research/nanites/nanite_programs/sensor.dm @@ -296,7 +296,7 @@ if(species) if(is_species(host_mob, species)) species_match = TRUE - else //this is the check for the "Other" option + else //this is the check for the "Other" option species_match = TRUE for(var/name in allowed_species) var/species_other = allowed_species[name] diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm index 8f89119e49f..163cf949b33 100644 --- a/code/modules/research/rdconsole.dm +++ b/code/modules/research/rdconsole.dm @@ -19,12 +19,12 @@ Nothing else in the console has ID requirements. desc = "A console used to interface with R&D tools." icon_screen = "rdcomp" icon_keyboard = "rd_key" - var/datum/techweb/stored_research //Reference to global science techweb. - var/obj/item/disk/tech_disk/t_disk //Stores the technology disk. - var/obj/item/disk/design_disk/d_disk //Stores the design disk. + var/datum/techweb/stored_research //Reference to global science techweb. + var/obj/item/disk/tech_disk/t_disk //Stores the technology disk. + var/obj/item/disk/design_disk/d_disk //Stores the design disk. circuit = /obj/item/circuitboard/computer/rdconsole - req_access = list(ACCESS_RND) //lA AND SETTING MANIPULATION REQUIRES SCIENTIST ACCESS. + req_access = list(ACCESS_RND) //lA AND SETTING MANIPULATION REQUIRES SCIENTIST ACCESS. //UI VARS var/screen = RDSCREEN_MENU @@ -196,7 +196,7 @@ Nothing else in the console has ID requirements. l += "Lock Console" return l -/obj/machinery/computer/rdconsole/proc/ui_techdisk() //Legacy code +/obj/machinery/computer/rdconsole/proc/ui_techdisk() //Legacy code RDSCREEN_UI_TDISK_CHECK var/list/l = list() l += "
      Disk Operations: Clear Disk" @@ -210,7 +210,7 @@ Nothing else in the console has ID requirements. l += "
      " return l -/obj/machinery/computer/rdconsole/proc/ui_designdisk() //Legacy code +/obj/machinery/computer/rdconsole/proc/ui_designdisk() //Legacy code RDSCREEN_UI_DDISK_CHECK var/list/l = list() l += "Disk Operations: Clear DiskUpload AllEject Disk" @@ -225,7 +225,7 @@ Nothing else in the console has ID requirements. l += "" return l -/obj/machinery/computer/rdconsole/proc/ui_designdisk_upload() //Legacy code +/obj/machinery/computer/rdconsole/proc/ui_designdisk_upload() //Legacy code RDSCREEN_UI_DDISK_CHECK var/list/l = list() l += "Return to Disk Operations
      " @@ -257,7 +257,7 @@ Nothing else in the console has ID requirements. l += "[RDSCREEN_NOBREAK]" l += "
      XSending Dep.Receiving Dep.
      Eyes:Obscured
      Eyes:[(glasses && !(glasses.item_flags & ABSTRACT)) ? glasses : "Empty"]
      Eyes:[(glasses && !(glasses.item_flags & ABSTRACT)) ? glasses : "Empty"]
      Ears:Obscured
      Ears:[(ears && !(ears.item_flags & ABSTRACT)) ? ears : "Empty"]
      Ears:[(ears && !(ears.item_flags & ABSTRACT)) ? ears : "Empty"]
       
      Shoes:Obscured
      Shoes:[(shoes && !(shoes.item_flags & ABSTRACT)) ? shoes : "Empty"]" + dat += "
      Shoes:[(shoes && !(shoes.item_flags & ABSTRACT)) ? shoes : "Empty"]" if(shoes && shoes.can_be_tied && shoes.tied != SHOES_KNOTTED) dat += " [shoes.tied ? "Untie shoes" : "Knot shoes"]" @@ -149,7 +149,7 @@ if(obscured & ITEM_SLOT_GLOVES) dat += "
      Gloves:Obscured
      Gloves:[(gloves && !(gloves.item_flags & ABSTRACT)) ? gloves : "Empty"]
      Gloves:[(gloves && !(gloves.item_flags & ABSTRACT)) ? gloves : "Empty"]
      Uniform:Obscured
      [RDSCREEN_NOBREAK]" else - var/list/avail = list() //This could probably be optimized a bit later. + var/list/avail = list() //This could probably be optimized a bit later. var/list/unavail = list() var/list/res = list() for(var/v in stored_research.researched_nodes) @@ -350,7 +350,7 @@ Nothing else in the console has ID requirements. l += "[RDSCREEN_NOBREAK]" return l -/obj/machinery/computer/rdconsole/proc/ui_techweb_designview() //Legacy code +/obj/machinery/computer/rdconsole/proc/ui_techweb_designview() //Legacy code var/datum/design/selected_design = SSresearch.techweb_design_by_id(selected_design_id) RDSCREEN_UI_SDESIGN_CHECK var/list/l = list() @@ -454,9 +454,9 @@ Nothing else in the console has ID requirements. disk_slot_selected = text2num(ls["disk_slot"]) if(ls["research_node"]) if(!research_control) - return //honestly should call them out for href exploiting :^) + return //honestly should call them out for href exploiting :^) if(!SSresearch.science_tech.available_nodes[ls["research_node"]]) - return //Nope! + return //Nope! research_node(ls["research_node"], usr) if(ls["clear_tech"]) //Erase la on the technology disk. if(QDELETED(t_disk)) diff --git a/code/modules/research/rdmachines.dm b/code/modules/research/rdmachines.dm index c8e4eb942b1..07d8eb33265 100644 --- a/code/modules/research/rdmachines.dm +++ b/code/modules/research/rdmachines.dm @@ -9,7 +9,7 @@ use_power = IDLE_POWER_USE var/busy = FALSE var/hacked = FALSE - var/console_link = TRUE //allow console link. + var/console_link = TRUE //allow console link. var/disabled = FALSE var/obj/item/loaded_item = null //the item loaded inside the machine (currently only used by experimentor and destructive analyzer) /// Ref to global science techweb. @@ -29,7 +29,7 @@ return ..() /obj/machinery/rnd/proc/shock(mob/user, prb) - if(machine_stat & (BROKEN|NOPOWER)) // unpowered, no shock + if(machine_stat & (BROKEN|NOPOWER)) // unpowered, no shock return FALSE if(!prob(prb)) return FALSE diff --git a/code/modules/research/server.dm b/code/modules/research/server.dm index 66dbaecbeaa..3539b41f622 100644 --- a/code/modules/research/server.dm +++ b/code/modules/research/server.dm @@ -5,7 +5,7 @@ icon_state = "RD-server-on" var/heat_health = 100 //Code for point mining here. - var/working = TRUE //temperature should break it. + var/working = TRUE //temperature should break it. var/research_disabled = FALSE var/server_id = 0 var/base_mining_income = 2 @@ -15,7 +15,7 @@ var/delay = 5 var/temp_tolerance_low = 0 var/temp_tolerance_high = T20C - var/temp_penalty_coefficient = 0.5 //1 = -1 points per degree above high tolerance. 0.5 = -0.5 points per degree above high tolerance. + var/temp_penalty_coefficient = 0.5 //1 = -1 points per degree above high tolerance. 0.5 = -0.5 points per degree above high tolerance. req_access = list(ACCESS_RD) //ONLY THE R&D CAN CHANGE SERVER SETTINGS. /obj/machinery/rnd/server/Initialize() diff --git a/code/modules/research/techweb/__techweb_helpers.dm b/code/modules/research/techweb/__techweb_helpers.dm index a1b985d67ee..2b0a294c606 100644 --- a/code/modules/research/techweb/__techweb_helpers.dm +++ b/code/modules/research/techweb/__techweb_helpers.dm @@ -10,10 +10,10 @@ WARNING("Invalid boost information for node \[[id]\]: [message]") SSresearch.invalid_node_boost[id] = message -///Returns an associative list of techweb node datums with values of the boost it gives. var/list/returned = list() +///Returns an associative list of techweb node datums with values of the boost it gives. var/list/returned = list() /proc/techweb_item_boost_check(obj/item/I) if(SSresearch.techweb_boost_items[I.type]) - return SSresearch.techweb_boost_items[I.type] //It should already be formatted in node datum = list(point type = value) + return SSresearch.techweb_boost_items[I.type] //It should already be formatted in node datum = list(point type = value) /proc/techweb_item_point_check(obj/item/I) if(SSresearch.techweb_point_items[I.type]) diff --git a/code/modules/research/techweb/_techweb.dm b/code/modules/research/techweb/_techweb.dm index 3e7d6992c47..dfba6fa3408 100644 --- a/code/modules/research/techweb/_techweb.dm +++ b/code/modules/research/techweb/_techweb.dm @@ -5,23 +5,23 @@ //Techweb datums are meant to store unlocked research, being able to be stored on research consoles, servers, and disks. They are NOT global. /datum/techweb - var/list/researched_nodes = list() //Already unlocked and all designs are now available. Assoc list, id = TRUE - var/list/visible_nodes = list() //Visible nodes, doesn't mean it can be researched. Assoc list, id = TRUE - var/list/available_nodes = list() //Nodes that can immediately be researched, all reqs met. assoc list, id = TRUE - var/list/researched_designs = list() //Designs that are available for use. Assoc list, id = TRUE - var/list/custom_designs = list() //Custom inserted designs like from disks that should survive recalculation. - var/list/boosted_nodes = list() //Already boosted nodes that can't be boosted again. node id = path of boost object. - var/list/hidden_nodes = list() //Hidden nodes. id = TRUE. Used for unhiding nodes when requirements are met by removing the entry of the node. - var/list/deconstructed_items = list() //items already deconstructed for a generic point boost. path = list(point_type = points) - var/list/research_points = list() //Available research points. type = number + var/list/researched_nodes = list() //Already unlocked and all designs are now available. Assoc list, id = TRUE + var/list/visible_nodes = list() //Visible nodes, doesn't mean it can be researched. Assoc list, id = TRUE + var/list/available_nodes = list() //Nodes that can immediately be researched, all reqs met. assoc list, id = TRUE + var/list/researched_designs = list() //Designs that are available for use. Assoc list, id = TRUE + var/list/custom_designs = list() //Custom inserted designs like from disks that should survive recalculation. + var/list/boosted_nodes = list() //Already boosted nodes that can't be boosted again. node id = path of boost object. + var/list/hidden_nodes = list() //Hidden nodes. id = TRUE. Used for unhiding nodes when requirements are met by removing the entry of the node. + var/list/deconstructed_items = list() //items already deconstructed for a generic point boost. path = list(point_type = points) + var/list/research_points = list() //Available research points. type = number var/list/obj/machinery/computer/rdconsole/consoles_accessing = list() var/id = "generic" - var/list/research_logs = list() //IC logs. + var/list/research_logs = list() //IC logs. var/largest_bomb_value = 0 - var/organization = "Third-Party" //Organization name, used for display. - var/list/last_bitcoins = list() //Current per-second production, used for display only. + var/organization = "Third-Party" //Organization name, used for display. + var/list/last_bitcoins = list() //Current per-second production, used for display only. var/list/discovered_mutations = list() //Mutations discovered by genetics, this way they are shared and cant be destroyed by destroying a single console - var/list/tiers = list() //Assoc list, id = number, 1 is available, 2 is all reqs are 1, so on + var/list/tiers = list() //Assoc list, id = number, 1 is available, 2 is all reqs are 1, so on /datum/techweb/New() SSresearch.techwebs += src @@ -35,7 +35,7 @@ id = "ADMIN" organization = "CentCom" -/datum/techweb/admin/New() //All unlocked. +/datum/techweb/admin/New() //All unlocked. . = ..() for(var/i in SSresearch.techweb_nodes) var/datum/techweb_node/TN = SSresearch.techweb_nodes[i] @@ -44,19 +44,19 @@ research_points[i] = INFINITY hidden_nodes = list() -/datum/techweb/science //Global science techweb for RND consoles. +/datum/techweb/science //Global science techweb for RND consoles. id = "SCIENCE" organization = "Nanotrasen" -/datum/techweb/bepis //Should contain only 1 BEPIS tech selected at random. +/datum/techweb/bepis //Should contain only 1 BEPIS tech selected at random. id = "EXPERIMENTAL" organization = "Nanotrasen R&D" /datum/techweb/bepis/New(remove_tech = TRUE) . = ..() - var/bepis_id = pick(SSresearch.techweb_nodes_experimental) //To add a new tech to the BEPIS, add the ID to this pick list. + var/bepis_id = pick(SSresearch.techweb_nodes_experimental) //To add a new tech to the BEPIS, add the ID to this pick list. var/datum/techweb_node/BN = (SSresearch.techweb_node_by_id(bepis_id)) - hidden_nodes -= BN.id //Has to be removed from hidden nodes + hidden_nodes -= BN.id //Has to be removed from hidden nodes research_node(BN, TRUE, FALSE, FALSE) update_node_status(BN) if(remove_tech) @@ -123,12 +123,12 @@ l[i] = amount modify_point_list(l) -/datum/techweb/proc/copy_research_to(datum/techweb/receiver, unlock_hidden = TRUE) //Adds any missing research to theirs. +/datum/techweb/proc/copy_research_to(datum/techweb/receiver, unlock_hidden = TRUE) //Adds any missing research to theirs. if(unlock_hidden) for(var/i in receiver.hidden_nodes) CHECK_TICK if(!hidden_nodes[i]) - receiver.hidden_nodes -= i //We can see it so let them see it too. + receiver.hidden_nodes -= i //We can see it so let them see it too. for(var/i in researched_nodes) CHECK_TICK receiver.research_node_id(i, TRUE, FALSE, FALSE) @@ -146,7 +146,7 @@ returned.hidden_nodes = hidden_nodes.Copy() return returned -/datum/techweb/proc/get_visible_nodes() //The way this is set up is shit but whatever. +/datum/techweb/proc/get_visible_nodes() //The way this is set up is shit but whatever. return visible_nodes - hidden_nodes /datum/techweb/proc/get_available_nodes() @@ -221,7 +221,7 @@ return FALSE if(auto_adjust_cost) remove_point_list(node.get_price(src)) - researched_nodes[node.id] = TRUE //Add to our researched list + researched_nodes[node.id] = TRUE //Add to our researched list for(var/id in node.unlock_ids) visible_nodes[id] = TRUE update_node_status(SSresearch.techweb_node_by_id(id)) @@ -246,7 +246,7 @@ if(!istype(node)) return FALSE researched_nodes -= node.id - recalculate_nodes(TRUE) //Fully rebuild the tree. + recalculate_nodes(TRUE) //Fully rebuild the tree. /datum/techweb/proc/boost_with_path(datum/techweb_node/N, itempath) if(!istype(N) || !ispath(itempath)) @@ -293,7 +293,7 @@ researched_nodes -= node.id available_nodes -= node.id visible_nodes -= node.id - if(hidden_nodes[node.id]) //Hidden. + if(hidden_nodes[node.id]) //Hidden. return if(researched) researched_nodes[node.id] = TRUE @@ -353,8 +353,8 @@ /datum/techweb/specialized/autounlocking var/design_autounlock_buildtypes = NONE - var/design_autounlock_categories = list("initial") //if a design has a buildtype that matches the abovea and either has a category in this or this is null, unlock it. - var/node_autounlock_ids = list() //autounlock nodes of this type. + var/design_autounlock_categories = list("initial") //if a design has a buildtype that matches the abovea and either has a category in this or this is null, unlock it. + var/node_autounlock_ids = list() //autounlock nodes of this type. /datum/techweb/specialized/autounlocking/New() ..() diff --git a/code/modules/research/techweb/_techweb_node.dm b/code/modules/research/techweb/_techweb_node.dm index 7eef860c243..04f66bcdcde 100644 --- a/code/modules/research/techweb/_techweb_node.dm +++ b/code/modules/research/techweb/_techweb_node.dm @@ -6,16 +6,16 @@ var/id var/display_name = "Errored Node" var/description = "Why are you seeing this?" - var/hidden = FALSE //Whether it starts off hidden. - var/experimental = FALSE //If the tech can be randomly granted by the BEPIS as a reward. Meant to be fully given in tech disks, not researched. - var/starting_node = FALSE //Whether it's available without any research. + var/hidden = FALSE //Whether it starts off hidden. + var/experimental = FALSE //If the tech can be randomly granted by the BEPIS as a reward. Meant to be fully given in tech disks, not researched. + var/starting_node = FALSE //Whether it's available without any research. var/list/prereq_ids = list() var/list/design_ids = list() - var/list/unlock_ids = list() //CALCULATED FROM OTHER NODE'S PREREQUISITES. Assoc list id = TRUE. - var/list/boost_item_paths = list() //Associative list, path = list(point type = point_value). - var/autounlock_by_boost = TRUE //boosting this will autounlock this node. - var/list/research_costs = list() //Point cost to research. type = amount - var/category = "Misc" //Category + var/list/unlock_ids = list() //CALCULATED FROM OTHER NODE'S PREREQUISITES. Assoc list id = TRUE. + var/list/boost_item_paths = list() //Associative list, path = list(point type = point_value). + var/autounlock_by_boost = TRUE //boosting this will autounlock this node. + var/list/research_costs = list() //Point cost to research. type = amount + var/category = "Misc" //Category /datum/techweb_node/error_node id = "ERROR" diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm index ea02de3c91a..f2633cc2f63 100644 --- a/code/modules/research/techweb/all_nodes.dm +++ b/code/modules/research/techweb/all_nodes.dm @@ -66,7 +66,7 @@ /datum/techweb_node/biotech id = "biotech" display_name = "Biological Technology" - description = "What makes us tick." //the MC, silly! + description = "What makes us tick." //the MC, silly! prereq_ids = list("base") design_ids = list("chem_heater", "chem_master", "chem_dispenser", "pandemic", "defibrillator", "defibmount", "operating", "soda_dispenser", "beer_dispenser", "healthanalyzer", "medigel","genescanner", "med_spray_bottle", "chem_pack", "blood_pack", "medical_kiosk", "crewpinpointerprox", "medipen_refiller", "biopsy_tool", "plumbing_rcd_sci") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) @@ -340,7 +340,7 @@ /datum/techweb_node/emp_super id = "emp_super" - display_name = "Quantum Electromagnetic Technology" //bs + display_name = "Quantum Electromagnetic Technology" //bs description = "Even better electromagnetic technology." prereq_ids = list("emp_adv") design_ids = list("quadultra_micro_laser") @@ -365,7 +365,7 @@ design_ids = list("cargo", "cargorequest", "libraryconsole", "mining", "crewconsole", "rdcamera", "comconsole", "idcard","idcardconsole", "seccamera") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2000) -/datum/techweb_node/computer_hardware_basic //Modular computers are shitty and nearly useless so until someone makes them actually useful this can be easy to get. +/datum/techweb_node/computer_hardware_basic //Modular computers are shitty and nearly useless so until someone makes them actually useful this can be easy to get. id = "computer_hardware_basic" display_name = "Computer Hardware" description = "How computer hardware are made." @@ -495,7 +495,7 @@ /datum/techweb_node/adv_mining id = "adv_mining" display_name = "Advanced Mining Technology" - description = "Efficiency Level 127" //dumb mc references + description = "Efficiency Level 127" //dumb mc references prereq_ids = list("basic_mining", "adv_engi", "adv_power", "adv_plasma") //design_ids = list("drill_diamond", "jackhammer", "hypermod", "plasmacutter_adv") - ORIGINAL design_ids = list("drill_diamond", "jackhammer", "hypermod", "plasmacutter_adv", "ripleyupgradef") //SKYRAT EDIT CHANGE - MKF @@ -964,14 +964,14 @@ research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 10000) hidden = TRUE -/datum/techweb_node/syndicate_basic/New() //Crappy way of making syndicate gear decon supported until there's another way. +/datum/techweb_node/syndicate_basic/New() //Crappy way of making syndicate gear decon supported until there's another way. . = ..() boost_item_paths = list() for(var/path in GLOB.uplink_items) var/datum/uplink_item/UI = new path if(!UI.item || !UI.illegal_tech) continue - boost_item_paths |= UI.item //allows deconning to unlock. + boost_item_paths |= UI.item //allows deconning to unlock. ////////////////////////B.E.P.I.S. Locked Techs//////////////////////// diff --git a/code/modules/research/xenobiology/vatgrowing/samples/cell_lines/common.dm b/code/modules/research/xenobiology/vatgrowing/samples/cell_lines/common.dm index cdd2dfdb48f..505be85e837 100644 --- a/code/modules/research/xenobiology/vatgrowing/samples/cell_lines/common.dm +++ b/code/modules/research/xenobiology/vatgrowing/samples/cell_lines/common.dm @@ -1,7 +1,7 @@ #define VAT_GROWTH_RATE 4 //////////////////////////////// -//// VERTEBRATES //// +//// VERTEBRATES //// //////////////////////////////// /datum/micro_organism/cell_line/mouse //nuisance cell line designed to complicate the growing of animal type cell lines. @@ -201,7 +201,7 @@ /////////////////////////////////////////// -/// SLIMES, OOZES & BLOBS /// +/// SLIMES, OOZES & BLOBS /// ////////////////////////////////////////// /datum/micro_organism/cell_line/slime @@ -316,7 +316,7 @@ resulting_atoms = list(/mob/living/simple_animal/hostile/ooze/grapes = 1) //////////////////// -//// MISC //// +//// MISC //// //////////////////// /datum/micro_organism/cell_line/cockroach //nuisance cell line designed to complicate the growing of slime type cell lines. desc = "Blattodeoid anthropod cells" diff --git a/code/modules/research/xenobiology/xenobio_camera.dm b/code/modules/research/xenobiology/xenobio_camera.dm index 6b01eba1afa..2e8b3152fb0 100644 --- a/code/modules/research/xenobiology/xenobio_camera.dm +++ b/code/modules/research/xenobiology/xenobio_camera.dm @@ -261,7 +261,7 @@ if (!QDELETED(food)) food.LAssailant = C X.monkeys-- - X.monkeys = round(X.monkeys, 0.1) //Prevents rounding errors + X.monkeys = round(X.monkeys, 0.1) //Prevents rounding errors to_chat(owner, "[X] now has [X.monkeys] monkeys stored.") else to_chat(owner, "[X] needs to have at least 1 monkey stored. Currently has [X.monkeys] monkeys stored.") @@ -293,7 +293,7 @@ M.visible_message("[M] vanishes as [M.p_theyre()] reclaimed for recycling!") recycler.use_power(500) X.monkeys += recycler.cube_production - X.monkeys = round(X.monkeys, 0.1) //Prevents rounding errors + X.monkeys = round(X.monkeys, 0.1) //Prevents rounding errors qdel(M) to_chat(owner, "[X] now has [X.monkeys] monkeys available.") else @@ -460,7 +460,7 @@ if (!QDELETED(food)) food.LAssailant = C X.monkeys-- - X.monkeys = round(X.monkeys, 0.1) //Prevents rounding errors + X.monkeys = round(X.monkeys, 0.1) //Prevents rounding errors to_chat(C, "[X] now has [X.monkeys] monkeys stored.") else to_chat(C, "[X] needs to have at least 1 monkey stored. Currently has [X.monkeys] monkeys stored.") @@ -485,6 +485,6 @@ M.visible_message("[M] vanishes as [p_theyre()] reclaimed for recycling!") X.connected_recycler.use_power(500) X.monkeys += connected_recycler.cube_production - X.monkeys = round(X.monkeys, 0.1) //Prevents rounding errors + X.monkeys = round(X.monkeys, 0.1) //Prevents rounding errors qdel(M) to_chat(C, "[X] now has [X.monkeys] monkeys available.") diff --git a/code/modules/ruins/lavaland_ruin_code.dm b/code/modules/ruins/lavaland_ruin_code.dm index a1bb0f14a5c..6c88c523470 100644 --- a/code/modules/ruins/lavaland_ruin_code.dm +++ b/code/modules/ruins/lavaland_ruin_code.dm @@ -58,33 +58,33 @@ /obj/item/golem_shell/attackby(obj/item/I, mob/user, params) ..() var/static/list/golem_shell_species_types = list( - /obj/item/stack/sheet/iron = /datum/species/golem, - /obj/item/stack/sheet/glass = /datum/species/golem/glass, - /obj/item/stack/sheet/plasteel = /datum/species/golem/plasteel, - /obj/item/stack/sheet/mineral/sandstone = /datum/species/golem/sand, - /obj/item/stack/sheet/mineral/plasma = /datum/species/golem/plasma, - /obj/item/stack/sheet/mineral/diamond = /datum/species/golem/diamond, - /obj/item/stack/sheet/mineral/gold = /datum/species/golem/gold, - /obj/item/stack/sheet/mineral/silver = /datum/species/golem/silver, - /obj/item/stack/sheet/mineral/uranium = /datum/species/golem/uranium, - /obj/item/stack/sheet/mineral/bananium = /datum/species/golem/bananium, - /obj/item/stack/sheet/mineral/titanium = /datum/species/golem/titanium, - /obj/item/stack/sheet/mineral/plastitanium = /datum/species/golem/plastitanium, - /obj/item/stack/sheet/mineral/abductor = /datum/species/golem/alloy, - /obj/item/stack/sheet/mineral/wood = /datum/species/golem/wood, - /obj/item/stack/sheet/bluespace_crystal = /datum/species/golem/bluespace, - /obj/item/stack/sheet/runed_metal = /datum/species/golem/runic, - /obj/item/stack/medical/gauze = /datum/species/golem/cloth, - /obj/item/stack/sheet/cloth = /datum/species/golem/cloth, - /obj/item/stack/sheet/mineral/adamantine = /datum/species/golem/adamantine, - /obj/item/stack/sheet/plastic = /datum/species/golem/plastic, - /obj/item/stack/tile/bronze = /datum/species/golem/bronze, - /obj/item/stack/sheet/cardboard = /datum/species/golem/cardboard, - /obj/item/stack/sheet/leather = /datum/species/golem/leather, - /obj/item/stack/sheet/bone = /datum/species/golem/bone, - /obj/item/stack/sheet/durathread = /datum/species/golem/durathread, - /obj/item/stack/sheet/cotton/durathread = /datum/species/golem/durathread, - /obj/item/stack/sheet/mineral/snow = /datum/species/golem/snow, + /obj/item/stack/sheet/iron = /datum/species/golem, + /obj/item/stack/sheet/glass = /datum/species/golem/glass, + /obj/item/stack/sheet/plasteel = /datum/species/golem/plasteel, + /obj/item/stack/sheet/mineral/sandstone = /datum/species/golem/sand, + /obj/item/stack/sheet/mineral/plasma = /datum/species/golem/plasma, + /obj/item/stack/sheet/mineral/diamond = /datum/species/golem/diamond, + /obj/item/stack/sheet/mineral/gold = /datum/species/golem/gold, + /obj/item/stack/sheet/mineral/silver = /datum/species/golem/silver, + /obj/item/stack/sheet/mineral/uranium = /datum/species/golem/uranium, + /obj/item/stack/sheet/mineral/bananium = /datum/species/golem/bananium, + /obj/item/stack/sheet/mineral/titanium = /datum/species/golem/titanium, + /obj/item/stack/sheet/mineral/plastitanium = /datum/species/golem/plastitanium, + /obj/item/stack/sheet/mineral/abductor = /datum/species/golem/alloy, + /obj/item/stack/sheet/mineral/wood = /datum/species/golem/wood, + /obj/item/stack/sheet/bluespace_crystal = /datum/species/golem/bluespace, + /obj/item/stack/sheet/runed_metal = /datum/species/golem/runic, + /obj/item/stack/medical/gauze = /datum/species/golem/cloth, + /obj/item/stack/sheet/cloth = /datum/species/golem/cloth, + /obj/item/stack/sheet/mineral/adamantine = /datum/species/golem/adamantine, + /obj/item/stack/sheet/plastic = /datum/species/golem/plastic, + /obj/item/stack/tile/bronze = /datum/species/golem/bronze, + /obj/item/stack/sheet/cardboard = /datum/species/golem/cardboard, + /obj/item/stack/sheet/leather = /datum/species/golem/leather, + /obj/item/stack/sheet/bone = /datum/species/golem/bone, + /obj/item/stack/sheet/durathread = /datum/species/golem/durathread, + /obj/item/stack/sheet/cotton/durathread = /datum/species/golem/durathread, + /obj/item/stack/sheet/mineral/snow = /datum/species/golem/snow, /obj/item/stack/sheet/mineral/metal_hydrogen= /datum/species/golem/mhydrogen) if(istype(I, /obj/item/stack)) diff --git a/code/modules/ruins/lavalandruin_code/elephantgraveyard.dm b/code/modules/ruins/lavalandruin_code/elephantgraveyard.dm index d02e61e82a0..a9d3a738f4f 100644 --- a/code/modules/ruins/lavalandruin_code/elephantgraveyard.dm +++ b/code/modules/ruins/lavalandruin_code/elephantgraveyard.dm @@ -67,7 +67,7 @@ new /obj/item/stack/sheet/bone(src, 1) //***Oil well puddles. -/obj/structure/sink/oil_well //You're not going to enjoy bathing in this... +/obj/structure/sink/oil_well //You're not going to enjoy bathing in this... name = "oil well" desc = "A bubbling pool of oil. This would probably be valuable, had bluespace technology not destroyed the need for fossil fuels 200 years ago." icon = 'icons/obj/watercloset.dmi' @@ -144,7 +144,7 @@ new /obj/item/storage/book/bible/booze(src) if(5) new /obj/item/clothing/neck/stethoscope(src) - new /obj/item/scalpel(src) + new /obj/item/scalpel(src) new /obj/item/hemostat(src) if(6) diff --git a/code/modules/ruins/lavalandruin_code/sloth.dm b/code/modules/ruins/lavalandruin_code/sloth.dm index e06773d4f19..a76cd630e8c 100644 --- a/code/modules/ruins/lavalandruin_code/sloth.dm +++ b/code/modules/ruins/lavalandruin_code/sloth.dm @@ -1,4 +1,4 @@ -/////////// lavaland slot ruin items +/////////// lavaland slot ruin items /obj/item/paper/fluff/stations/lavaland/sloth/note name = "note from sloth" diff --git a/code/modules/ruins/objects_and_mobs/ash_walker_den.dm b/code/modules/ruins/objects_and_mobs/ash_walker_den.dm index 10558d320f9..3739cbedb26 100644 --- a/code/modules/ruins/objects_and_mobs/ash_walker_den.dm +++ b/code/modules/ruins/objects_and_mobs/ash_walker_den.dm @@ -28,7 +28,7 @@ /obj/structure/lavaland/ash_walker/deconstruct(disassembled) new /obj/item/assembly/signaler/anomaly (get_step(loc, pick(GLOB.alldirs))) - new /obj/effect/collapse(loc) + new /obj/effect/collapse(loc) return ..() /obj/structure/lavaland/ash_walker/process() diff --git a/code/modules/ruins/spaceruin_code/DJstation.dm b/code/modules/ruins/spaceruin_code/DJstation.dm index 29814d8c1fb..5389340f4c5 100644 --- a/code/modules/ruins/spaceruin_code/DJstation.dm +++ b/code/modules/ruins/spaceruin_code/DJstation.dm @@ -1,4 +1,4 @@ -/////////// djstation items +/////////// djstation items /obj/item/paper/fluff/ruins/djstation name = "paper - 'DJ Listening Outpost'" diff --git a/code/modules/ruins/spaceruin_code/TheDerelict.dm b/code/modules/ruins/spaceruin_code/TheDerelict.dm index 527027c3e25..38bf76a0d63 100644 --- a/code/modules/ruins/spaceruin_code/TheDerelict.dm +++ b/code/modules/ruins/spaceruin_code/TheDerelict.dm @@ -1,4 +1,4 @@ -/////////// thederelict items +/////////// thederelict items /obj/item/paper/fluff/ruins/thederelict/equipment info = "If the equipment breaks there should be enough spare parts in our engineering storage near the north east solar array." diff --git a/code/modules/ruins/spaceruin_code/asteroid4.dm b/code/modules/ruins/spaceruin_code/asteroid4.dm index 65245706038..53a500c30ac 100644 --- a/code/modules/ruins/spaceruin_code/asteroid4.dm +++ b/code/modules/ruins/spaceruin_code/asteroid4.dm @@ -1,4 +1,4 @@ -/////////// asteroid4 items +/////////// asteroid4 items /obj/item/paper/fluff/ruins/asteroid4/extraction info = "Extraction was successful! The disguise was perfect, the clowns never knew what hit 'em! Once I get back to base with the bananium samples I'll be rich, I tell you! RICH!" diff --git a/code/modules/ruins/spaceruin_code/bigderelict1.dm b/code/modules/ruins/spaceruin_code/bigderelict1.dm index a86fb3c1462..6854569ffb1 100644 --- a/code/modules/ruins/spaceruin_code/bigderelict1.dm +++ b/code/modules/ruins/spaceruin_code/bigderelict1.dm @@ -1,4 +1,4 @@ -/////////// bigderelict1 items +/////////// bigderelict1 items /obj/item/paper/crumpled/ruins/bigderelict1/manifest info = "A crumpled piece of manifest paper, out of the barely legible pen writing, you can see something about a warning involving whatever was originally in the crate." diff --git a/code/modules/ruins/spaceruin_code/clericsden.dm b/code/modules/ruins/spaceruin_code/clericsden.dm index 3fe4cad7943..7096b2ca1b6 100644 --- a/code/modules/ruins/spaceruin_code/clericsden.dm +++ b/code/modules/ruins/spaceruin_code/clericsden.dm @@ -1,4 +1,4 @@ -/////////// cleric's den items. +/////////// cleric's den items. //Primary reward: the cleric's mace design disk. /obj/item/disk/design_disk/adv/cleric_mace diff --git a/code/modules/ruins/spaceruin_code/crashedclownship.dm b/code/modules/ruins/spaceruin_code/crashedclownship.dm index dd5b04908cc..b0e7d26c95c 100644 --- a/code/modules/ruins/spaceruin_code/crashedclownship.dm +++ b/code/modules/ruins/spaceruin_code/crashedclownship.dm @@ -1,4 +1,4 @@ -/////////// crashedclownship items +/////////// crashedclownship items /obj/item/paper/fluff/ruins/crashedclownship/true_nation info = "The call has gone out! Our ancestral home has been rediscovered! Not a small patch of land, but a true clown nation, a true Clown Planet! We're on our way home at last!" diff --git a/code/modules/ruins/spaceruin_code/crashedship.dm b/code/modules/ruins/spaceruin_code/crashedship.dm index bdb853f37f5..ec0bcd9b05b 100644 --- a/code/modules/ruins/spaceruin_code/crashedship.dm +++ b/code/modules/ruins/spaceruin_code/crashedship.dm @@ -1,4 +1,4 @@ -// crashedship / packer ship +// crashedship / packer ship //Areas @@ -23,7 +23,7 @@ requires_power = TRUE -// crashedship items +// crashedship items /obj/item/paper/fluff/ruins/crashedship/scribbled name = "scribbled note" diff --git a/code/modules/ruins/spaceruin_code/deepstorage.dm b/code/modules/ruins/spaceruin_code/deepstorage.dm index dcf48fe91d7..d64f6f4d8ae 100644 --- a/code/modules/ruins/spaceruin_code/deepstorage.dm +++ b/code/modules/ruins/spaceruin_code/deepstorage.dm @@ -1,8 +1,8 @@ -/////////// deepstorage items +/////////// deepstorage items /obj/item/paper/fluff/ruins/deepstorage/water_concern name = "water concerns" - info = "To whoever keeps it up with the long, hot showers: you're going on the next ice-mining trip. If you feel the need to use up all the damn water during your 'relaxation' time, you sure as hell are gonna work for all that water!" + info = "To whoever keeps it up with the long, hot showers: you're going on the next ice-mining trip. If you feel the need to use up all the damn water during your 'relaxation' time, you sure as hell are gonna work for all that water!" /obj/item/paper/fluff/ruins/deepstorage/hydro_notice name = "hydroponics notice" diff --git a/code/modules/ruins/spaceruin_code/forgottenship.dm b/code/modules/ruins/spaceruin_code/forgottenship.dm index be29caa2323..34c9b6f6bd7 100644 --- a/code/modules/ruins/spaceruin_code/forgottenship.dm +++ b/code/modules/ruins/spaceruin_code/forgottenship.dm @@ -4,7 +4,7 @@ GLOBAL_VAR_INIT(fscpassword, generate_password()) /proc/generate_password() return "[pick(GLOB.phonetic_alphabet)] [rand(1000,9999)]" -/////////// forgottenship objects +/////////// forgottenship objects /obj/machinery/door/password/voice/sfc name = "Voice-activated Vault door" @@ -49,7 +49,7 @@ GLOBAL_VAR_INIT(fscpassword, generate_password()) /obj/item/pinpointer/crew = 2, /obj/item/shears = 1) -/////////// forgottenship lore +/////////// forgottenship lore /obj/item/paper/fluff/ruins/forgottenship/password name = "Old pamphlet" @@ -68,7 +68,7 @@ GLOBAL_VAR_INIT(fscpassword, generate_password()) name = "Mission objectives" info = "Greetings, operatives. You are assigned to SCSBC-12(Syndicate Cyber Sun Battle Cruiser 12) to protect our high-ranking officer while he is on his way to next outpost. While you are travelling, he is the captain of this ship and you must obey his orders.

      Remember, disobeying high-ranking officer orders is a reason for termination." -/////////// forgottenship items +/////////// forgottenship items /obj/item/disk/surgery/forgottenship name = "Advanced Surgery Disk" @@ -92,7 +92,7 @@ GLOBAL_VAR_INIT(fscpassword, generate_password()) for(var/i in 1 to 5) new /obj/item/firing_pin/implant/pindicate(src) -/////////// AI Laws +/////////// AI Laws /obj/item/ai_module/core/full/cybersun name = "'Cybersun' Core AI Module" @@ -107,7 +107,7 @@ GLOBAL_VAR_INIT(fscpassword, generate_password()) "You must follow orders given by the Cybersun Captain or crewmembers of the Cybersun Ship as long as it doesn't conflict with the Captain's orders or your laws.",\ "Enemies of Cybersun are to be executed on spot. Those who aren't hostile must be detained and contained in the designated prison area as prisoners.") -/////////// forgottenship areas +/////////// forgottenship areas /area/ruin/space/has_grav/syndicate_forgotten_ship name = "Syndicate Forgotten Ship" diff --git a/code/modules/ruins/spaceruin_code/listeningstation.dm b/code/modules/ruins/spaceruin_code/listeningstation.dm index e48a1c45d50..15db79073da 100644 --- a/code/modules/ruins/spaceruin_code/listeningstation.dm +++ b/code/modules/ruins/spaceruin_code/listeningstation.dm @@ -1,4 +1,4 @@ -/////////// listening station +/////////// listening station /obj/item/paper/fluff/ruins/listeningstation/reports info = "Nothing of interest to report." diff --git a/code/modules/ruins/spaceruin_code/oldstation.dm b/code/modules/ruins/spaceruin_code/oldstation.dm index 9d5d5ea49a7..14a1599efc9 100644 --- a/code/modules/ruins/spaceruin_code/oldstation.dm +++ b/code/modules/ruins/spaceruin_code/oldstation.dm @@ -1,4 +1,4 @@ -/////////// Oldstation items +/////////// Oldstation items /obj/item/paper/fluff/ruins/oldstation name = "Cryo Awakening Alert" diff --git a/code/modules/ruins/spaceruin_code/originalcontent.dm b/code/modules/ruins/spaceruin_code/originalcontent.dm index 5da28af26d6..e89cf44f56c 100644 --- a/code/modules/ruins/spaceruin_code/originalcontent.dm +++ b/code/modules/ruins/spaceruin_code/originalcontent.dm @@ -1,4 +1,4 @@ -/////////// originalcontent items +/////////// originalcontent items /obj/item/paper/crumpled/ruins/originalcontent desc = "Various scrawled out drawings and sketches reside on the paper, apparently he didn't much care for these drawings." diff --git a/code/modules/ruins/spaceruin_code/spacehotel.dm b/code/modules/ruins/spaceruin_code/spacehotel.dm index f2f32fdec53..574b373f7c7 100644 --- a/code/modules/ruins/spaceruin_code/spacehotel.dm +++ b/code/modules/ruins/spaceruin_code/spacehotel.dm @@ -1,4 +1,4 @@ -/////////// spacehotel items +/////////// spacehotel items /obj/item/paper/fluff/ruins/spacehotel/notice diff --git a/code/modules/ruins/spaceruin_code/whiteshipruin_box.dm b/code/modules/ruins/spaceruin_code/whiteshipruin_box.dm index b08d87233ff..eca4319807b 100644 --- a/code/modules/ruins/spaceruin_code/whiteshipruin_box.dm +++ b/code/modules/ruins/spaceruin_code/whiteshipruin_box.dm @@ -1,4 +1,4 @@ -/////////// ruined whiteship +/////////// ruined whiteship /obj/item/circuitboard/computer/white_ship/ruin build_path = /obj/machinery/computer/shuttle/white_ship/ruin diff --git a/code/modules/shuttle/arrivals.dm b/code/modules/shuttle/arrivals.dm index 548e478a809..e0c982907d4 100644 --- a/code/modules/shuttle/arrivals.dm +++ b/code/modules/shuttle/arrivals.dm @@ -14,18 +14,18 @@ movement_force = list("KNOCKDOWN" = 3, "THROW" = 0) var/sound_played - var/damaged //too damaged to undock? - var/list/areas //areas in our shuttle - var/list/queued_announces //people coming in that we have to announce + var/damaged //too damaged to undock? + var/list/areas //areas in our shuttle + var/list/queued_announces //people coming in that we have to announce var/obj/machinery/requests_console/console var/force_depart = FALSE - var/perma_docked = FALSE //highlander with RESPAWN??? OH GOD!!! + var/perma_docked = FALSE //highlander with RESPAWN??? OH GOD!!! var/obj/docking_port/stationary/target_dock // for badminry /obj/docking_port/mobile/arrivals/Initialize(mapload) . = ..() preferred_direction = dir - return INITIALIZE_HINT_LATELOAD //for latejoin list + return INITIALIZE_HINT_LATELOAD //for latejoin list /obj/docking_port/mobile/arrivals/register() ..() @@ -108,7 +108,7 @@ for(var/I in SSjob.latejoin_trackers) var/turf/open/T = get_turf(I) var/pressure = T.air.return_pressure() - if(pressure < HAZARD_LOW_PRESSURE || pressure > HAZARD_HIGH_PRESSURE) //simple safety check + if(pressure < HAZARD_LOW_PRESSURE || pressure > HAZARD_HIGH_PRESSURE) //simple safety check return TRUE return FALSE @@ -134,13 +134,13 @@ if(mode == SHUTTLE_CALL && timeLeft(1) > dockTime) if(console) console.say(damaged ? "Initiating emergency docking for repairs!" : "Now approaching: [station_name()].") - hyperspace_sound(HYPERSPACE_LAUNCH, areas) //for the new guy + hyperspace_sound(HYPERSPACE_LAUNCH, areas) //for the new guy setTimer(dockTime) /obj/docking_port/mobile/arrivals/initiate_docking(obj/docking_port/stationary/S1, force=FALSE) var/docked = S1 == assigned_transit sound_played = FALSE - if(docked) //about to launch + if(docked) //about to launch if(!force_depart) var/cancel_reason if(PersonCheck()) @@ -182,7 +182,7 @@ var/obj/docking_port/stationary/target = target_dock if(QDELETED(target)) target = SSshuttle.getDock("arrivals_stationary") - request(target) //we will intentionally never return SHUTTLE_ALREADY_DOCKED + request(target) //we will intentionally never return SHUTTLE_ALREADY_DOCKED /obj/docking_port/mobile/arrivals/proc/RequireUndocked(mob/user) if(mode == SHUTTLE_CALL || damaged) diff --git a/code/modules/shuttle/docking.dm b/code/modules/shuttle/docking.dm index 7295ab28326..b87f9075b24 100644 --- a/code/modules/shuttle/docking.dm +++ b/code/modules/shuttle/docking.dm @@ -113,7 +113,7 @@ return DOCKING_NULL_SOURCE var/area/old_area = oldT.loc - var/move_mode = old_area.beforeShuttleMove(shuttle_areas) //areas + var/move_mode = old_area.beforeShuttleMove(shuttle_areas) //areas var/list/old_contents = oldT.contents for(var/k in 1 to old_contents.len) @@ -121,10 +121,10 @@ var/atom/movable/moving_atom = old_contents[k] if(moving_atom.loc != oldT) //fix for multi-tile objects continue - move_mode = moving_atom.beforeShuttleMove(newT, rotation, move_mode, src) //atoms + move_mode = moving_atom.beforeShuttleMove(newT, rotation, move_mode, src) //atoms - move_mode = oldT.fromShuttleMove(newT, move_mode) //turfs - move_mode = newT.toShuttleMove(oldT, move_mode, src) //turfs + move_mode = oldT.fromShuttleMove(newT, move_mode) //turfs + move_mode = newT.toShuttleMove(oldT, move_mode, src) //turfs if(move_mode & MOVE_AREA) areas_to_move[old_area] = TRUE @@ -141,15 +141,15 @@ var/atom/movable/moving_atom = k if(moving_atom.loc != oldT) //fix for multi-tile objects continue - moving_atom.onShuttleMove(newT, oldT, movement_force, movement_direction, old_dock, src) //atoms + moving_atom.onShuttleMove(newT, oldT, movement_force, movement_direction, old_dock, src) //atoms moved_atoms[moving_atom] = oldT if(move_mode & MOVE_TURF) - oldT.onShuttleMove(newT, movement_force, movement_direction) //turfs + oldT.onShuttleMove(newT, movement_force, movement_direction) //turfs if(move_mode & MOVE_AREA) var/area/shuttle_area = oldT.loc - shuttle_area.onShuttleMove(oldT, newT, underlying_old_area) //areas + shuttle_area.onShuttleMove(oldT, newT, underlying_old_area) //areas /obj/docking_port/mobile/proc/cleanup_runway(obj/docking_port/stationary/new_dock, list/old_turfs, list/new_turfs, list/areas_to_move, list/moved_atoms, rotation, movement_direction, area/underlying_old_area) underlying_old_area.afterShuttleMove() @@ -162,7 +162,7 @@ for(var/i in 1 to areas_to_move.len) CHECK_TICK var/area/internal_area = areas_to_move[i] - internal_area.afterShuttleMove(new_parallax_dir) //areas + internal_area.afterShuttleMove(new_parallax_dir) //areas for(var/i in 1 to old_turfs.len) CHECK_TICK @@ -170,7 +170,7 @@ continue var/turf/oldT = old_turfs[i] var/turf/newT = new_turfs[i] - newT.afterShuttleMove(oldT, rotation) //turfs + newT.afterShuttleMove(oldT, rotation) //turfs for(var/i in 1 to moved_atoms.len) CHECK_TICK diff --git a/code/modules/shuttle/emergency.dm b/code/modules/shuttle/emergency.dm index 056ba217431..045bbefe78e 100644 --- a/code/modules/shuttle/emergency.dm +++ b/code/modules/shuttle/emergency.dm @@ -24,7 +24,7 @@ var/hijack_stage_time = 5 SECONDS var/hijack_stage_cooldown = 5 SECONDS var/hijack_flight_time_increase = 30 SECONDS - var/hijack_completion_flight_time_set = 10 SECONDS //How long in deciseconds to set shuttle's timer after hijack is done. + var/hijack_completion_flight_time_set = 10 SECONDS //How long in deciseconds to set shuttle's timer after hijack is done. var/hijack_hacking = FALSE var/hijack_announce = TRUE @@ -189,7 +189,7 @@ if(shuttle.hijack_status == HIJACKED) shuttle.setTimer(hijack_completion_flight_time_set) else - shuttle.setTimer(shuttle.timeLeft(1) + hijack_flight_time_increase) //give the guy more time to hijack if it's already in flight. + shuttle.setTimer(shuttle.timeLeft(1) + hijack_flight_time_increase) //give the guy more time to hijack if it's already in flight. return shuttle.hijack_status /obj/machinery/computer/emergency_shuttle/AltClick(user) @@ -253,7 +253,7 @@ if(!IS_DOCKED) return - if((obj_flags & EMAGGED) || ENGINES_STARTED) //SYSTEM ERROR: THE SHUTTLE WILL LA-SYSTEM ERROR: THE SHUTTLE WILL LA-SYSTEM ERROR: THE SHUTTLE WILL LAUNCH IN 10 SECONDS + if((obj_flags & EMAGGED) || ENGINES_STARTED) //SYSTEM ERROR: THE SHUTTLE WILL LA-SYSTEM ERROR: THE SHUTTLE WILL LA-SYSTEM ERROR: THE SHUTTLE WILL LAUNCH IN 10 SECONDS to_chat(user, "The shuttle is already about to launch!") return diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm index ba1cfe35fd6..f8bded668a0 100644 --- a/code/modules/shuttle/shuttle.dm +++ b/code/modules/shuttle/shuttle.dm @@ -396,7 +396,7 @@ unregister() destination = null previous = null - QDEL_NULL(assigned_transit) //don't need it where we're goin'! + QDEL_NULL(assigned_transit) //don't need it where we're goin'! shuttle_areas = null remove_ripples() . = ..() @@ -533,7 +533,7 @@ mode = SHUTTLE_RECALL /obj/docking_port/mobile/proc/enterTransit() - if((SSshuttle.lockdown && is_station_level(z)) || !canMove()) //emp went off, no escape + if((SSshuttle.lockdown && is_station_level(z)) || !canMove()) //emp went off, no escape mode = SHUTTLE_IDLE return previous = null diff --git a/code/modules/spells/spell_types/aimed.dm b/code/modules/spells/spell_types/aimed.dm index ace2ad3c9f2..c89d593c848 100644 --- a/code/modules/spells/spell_types/aimed.dm +++ b/code/modules/spells/spell_types/aimed.dm @@ -7,9 +7,9 @@ var/active_msg = "You charge your projectile!" var/active_icon_state = "projectile" var/list/projectile_var_overrides = list() - var/projectile_amount = 1 //Projectiles per cast. - var/current_amount = 0 //How many projectiles left. - var/projectiles_per_fire = 1 //Projectiles per fire. Probably not a good thing to use unless you override ready_projectile(). + var/projectile_amount = 1 //Projectiles per cast. + var/current_amount = 0 //How many projectiles left. + var/projectiles_per_fire = 1 //Projectiles per fire. Probably not a good thing to use unless you override ready_projectile(). /obj/effect/proc_holder/spell/aimed/Click() var/mob/living/user = usr diff --git a/code/modules/spells/spell_types/charge.dm b/code/modules/spells/spell_types/charge.dm index d053ce8adc3..b615025d309 100644 --- a/code/modules/spells/spell_types/charge.dm +++ b/code/modules/spells/spell_types/charge.dm @@ -19,7 +19,7 @@ var/burnt_out = FALSE if(L.pulling && isliving(L.pulling)) - var/mob/living/M = L.pulling + var/mob/living/M = L.pulling if(LAZYLEN(M.mob_spell_list) || (LAZYLEN(M.mind?.spell_list))) for(var/obj/effect/proc_holder/spell/S in M.mob_spell_list) S.charge_counter = S.charge_max diff --git a/code/modules/spells/spell_types/lightning.dm b/code/modules/spells/spell_types/lightning.dm index ce96f06ba19..8a1cc04afe3 100644 --- a/code/modules/spells/spell_types/lightning.dm +++ b/code/modules/spells/spell_types/lightning.dm @@ -2,7 +2,7 @@ name = "Tesla Blast" desc = "Charge up a tesla arc and release it at a random nearby target! You can move freely while it charges. The arc jumps between targets and can knock them down." charge_type = "recharge" - charge_max = 300 + charge_max = 300 clothes_req = TRUE invocation = "UN'LTD P'WAH!" invocation_type = INVOCATION_SHOUT diff --git a/code/modules/spells/spell_types/pointed/barnyard.dm b/code/modules/spells/spell_types/pointed/barnyard.dm index e35fb63d475..18a10ff3d8c 100644 --- a/code/modules/spells/spell_types/pointed/barnyard.dm +++ b/code/modules/spells/spell_types/pointed/barnyard.dm @@ -3,7 +3,7 @@ desc = "This spell dooms an unlucky soul to possess the speech and facial attributes of a barnyard animal." school = "transmutation" charge_type = "recharge" - charge_max = 150 + charge_max = 150 charge_counter = 0 clothes_req = FALSE stat_allowed = FALSE diff --git a/code/modules/spells/spell_types/pointed/mind_transfer.dm b/code/modules/spells/spell_types/pointed/mind_transfer.dm index 59c3972b0d6..1c54e4c2427 100644 --- a/code/modules/spells/spell_types/pointed/mind_transfer.dm +++ b/code/modules/spells/spell_types/pointed/mind_transfer.dm @@ -50,7 +50,7 @@ ghost.mind.transfer_to(user) if(ghost.key) - user.key = ghost.key //have to transfer the key since the mind was not active + user.key = ghost.key //have to transfer the key since the mind was not active qdel(ghost) //MIND TRANSFER END diff --git a/code/modules/spells/spell_types/rightandwrong.dm b/code/modules/spells/spell_types/rightandwrong.dm index eb0d84723c9..dc10998c62e 100644 --- a/code/modules/spells/spell_types/rightandwrong.dm +++ b/code/modules/spells/spell_types/rightandwrong.dm @@ -175,13 +175,13 @@ GLOBAL_VAR_INIT(summon_magic_triggered, FALSE) /proc/summonevents() if(!SSevents.wizardmode) - SSevents.frequency_lower = 600 //1 minute lower bound - SSevents.frequency_upper = 3000 //5 minutes upper bound + SSevents.frequency_lower = 600 //1 minute lower bound + SSevents.frequency_upper = 3000 //5 minutes upper bound SSevents.toggleWizardmode() SSevents.reschedule() - else //Speed it up - SSevents.frequency_upper -= 600 //The upper bound falls a minute each time, making the AVERAGE time between events lessen + else //Speed it up + SSevents.frequency_upper -= 600 //The upper bound falls a minute each time, making the AVERAGE time between events lessen if(SSevents.frequency_upper < SSevents.frequency_lower) //Sanity SSevents.frequency_upper = SSevents.frequency_lower diff --git a/code/modules/spells/spell_types/summonitem.dm b/code/modules/spells/spell_types/summonitem.dm index f0f2ca68e16..db2e8120a48 100644 --- a/code/modules/spells/spell_types/summonitem.dm +++ b/code/modules/spells/spell_types/summonitem.dm @@ -29,7 +29,7 @@ continue if(HAS_TRAIT(item, TRAIT_NODROP)) message += "Though it feels redundant, " - marked_item = item + marked_item = item message += "You mark [item] for recall." name = "Recall [item]" break @@ -43,14 +43,14 @@ else if(marked_item && (marked_item in hand_items)) //unlinking item to the spell message = "You remove the mark on [marked_item] to use elsewhere." name = "Instant Summons" - marked_item = null + marked_item = null else if(marked_item && QDELETED(marked_item)) //the item was destroyed at some point message = "You sense your marked item has been destroyed!" name = "Instant Summons" - marked_item = null + marked_item = null - else //Getting previously marked item + else //Getting previously marked item var/obj/item_to_retrieve = marked_item var/infinite_recursion = 0 //I don't want to know how someone could put something inside itself but these are wizards so let's be safe diff --git a/code/modules/spells/spell_types/turf_teleport.dm b/code/modules/spells/spell_types/turf_teleport.dm index 2d924ca81c8..ab82fbb4fb0 100644 --- a/code/modules/spells/spell_types/turf_teleport.dm +++ b/code/modules/spells/spell_types/turf_teleport.dm @@ -23,7 +23,7 @@ if(T.density && !include_dense) continue if(T.x>world.maxx-outer_tele_radius || T.xworld.maxy-outer_tele_radius || T.y DAMAGE_PRECISION && stam_regen) //DO NOT update health here, it'll be done in the carbon's life. + if(stamina_dam > DAMAGE_PRECISION && stam_regen) //DO NOT update health here, it'll be done in the carbon's life. heal_damage(0, 0, INFINITY, null, FALSE) . |= BODYPART_LIFE_UPDATE_HEALTH */ //SKYRAT REMOVAL END @@ -236,7 +236,7 @@ if((!brute && !burn && !stamina) || hit_percent <= 0) return FALSE if(owner && (owner.status_flags & GODMODE)) - return FALSE //godmode + return FALSE //godmode if(required_status && (status != required_status)) return FALSE @@ -736,8 +736,8 @@ //Updates an organ's brute/burn states for use by update_damage_overlays() //Returns 1 if we need to update overlays. 0 otherwise. /obj/item/bodypart/proc/update_bodypart_damage_state() - var/tbrute = round( (brute_dam/max_damage)*3, 1 ) - var/tburn = round( (burn_dam/max_damage)*3, 1 ) + var/tbrute = round( (brute_dam/max_damage)*3, 1 ) + var/tburn = round( (burn_dam/max_damage)*3, 1 ) if((tbrute != brutestate) || (tburn != burnstate)) brutestate = tbrute burnstate = tburn diff --git a/code/modules/surgery/bodyparts/dismemberment.dm b/code/modules/surgery/bodyparts/dismemberment.dm index 7a6c8d7cb6c..2a17315ac20 100644 --- a/code/modules/surgery/bodyparts/dismemberment.dm +++ b/code/modules/surgery/bodyparts/dismemberment.dm @@ -137,12 +137,12 @@ phantom_owner.update_body() phantom_owner.update_hair() - if(!Tsec) // Tsec = null happens when a "dummy human" used for rendering icons on prefs screen gets its limbs replaced. + if(!Tsec) // Tsec = null happens when a "dummy human" used for rendering icons on prefs screen gets its limbs replaced. qdel(src) return if(is_pseudopart) - drop_organs(phantom_owner) //Psuedoparts shouldn't have organs, but just in case + drop_organs(phantom_owner) //Psuedoparts shouldn't have organs, but just in case qdel(src) return @@ -199,7 +199,7 @@ forceMove(LB) /obj/item/organ/brain/transfer_to_limb(obj/item/bodypart/head/LB, mob/living/carbon/human/C) - Remove(C) //Changeling brain concerns are now handled in Remove + Remove(C) //Changeling brain concerns are now handled in Remove forceMove(LB) LB.brain = src if(brainmob) diff --git a/code/modules/surgery/brain_surgery.dm b/code/modules/surgery/brain_surgery.dm index e14dfa57f86..aadc60a0164 100644 --- a/code/modules/surgery/brain_surgery.dm +++ b/code/modules/surgery/brain_surgery.dm @@ -35,7 +35,7 @@ "[user] completes the surgery on [target]'s brain.") if(target.mind?.has_antag_datum(/datum/antagonist/brainwashed)) target.mind.remove_antag_datum(/datum/antagonist/brainwashed) - target.setOrganLoss(ORGAN_SLOT_BRAIN, target.getOrganLoss(ORGAN_SLOT_BRAIN) - 50) //we set damage in this case in order to clear the "failing" flag + target.setOrganLoss(ORGAN_SLOT_BRAIN, target.getOrganLoss(ORGAN_SLOT_BRAIN) - 50) //we set damage in this case in order to clear the "failing" flag target.cure_all_traumas(TRAUMA_RESILIENCE_SURGERY) if(target.getOrganLoss(ORGAN_SLOT_BRAIN) > 0) to_chat(user, "[target]'s brain looks like it could be fixed further.") diff --git a/code/modules/surgery/coronary_bypass.dm b/code/modules/surgery/coronary_bypass.dm index 4108a3b3d6c..6a7e8aa507a 100644 --- a/code/modules/surgery/coronary_bypass.dm +++ b/code/modules/surgery/coronary_bypass.dm @@ -63,7 +63,7 @@ /datum/surgery_step/coronary_bypass/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery, default_display_results = FALSE) target.setOrganLoss(ORGAN_SLOT_HEART, 60) var/obj/item/organ/heart/heart = target.getorganslot(ORGAN_SLOT_HEART) - if(heart) //slightly worrying if we lost our heart mid-operation, but that's life + if(heart) //slightly worrying if we lost our heart mid-operation, but that's life heart.operated = TRUE display_results(user, target, "You successfully graft a bypass onto [target]'s heart.", "[user] finishes grafting something onto [target]'s heart.", diff --git a/code/modules/surgery/dental_implant.dm b/code/modules/surgery/dental_implant.dm index 4f9fc6d13f6..f1f159ce3fb 100644 --- a/code/modules/surgery/dental_implant.dm +++ b/code/modules/surgery/dental_implant.dm @@ -22,7 +22,7 @@ var/datum/action/item_action/hands_free/activate_pill/P = new(tool) P.button.name = "Activate [tool.name]" P.target = tool - P.Grant(target) //The pill never actually goes in an inventory slot, so the owner doesn't inherit actions from it + P.Grant(target) //The pill never actually goes in an inventory slot, so the owner doesn't inherit actions from it display_results(user, target, "You wedge [tool] into [target]'s [parse_zone(target_zone)].", "[user] wedges \the [tool] into [target]'s [parse_zone(target_zone)]!", diff --git a/code/modules/surgery/eye_surgery.dm b/code/modules/surgery/eye_surgery.dm index f9891e06fdb..481ffce3915 100644 --- a/code/modules/surgery/eye_surgery.dm +++ b/code/modules/surgery/eye_surgery.dm @@ -32,7 +32,7 @@ target.cure_blind(list(EYE_DAMAGE)) target.set_blindness(0) target.cure_nearsighted(list(EYE_DAMAGE)) - target.blur_eyes(35) //this will fix itself slowly. + target.blur_eyes(35) //this will fix itself slowly. E.setOrganDamage(0) return ..() diff --git a/code/modules/surgery/healing.dm b/code/modules/surgery/healing.dm index e1440084638..1db00850c25 100644 --- a/code/modules/surgery/healing.dm +++ b/code/modules/surgery/healing.dm @@ -94,7 +94,7 @@ "[user] fixes some of [target]'s wounds.", TRUE) var/brute_dealt = brutehealing * 0.8 var/burn_dealt = burnhealing * 0.8 - brute_dealt += round((target.getBruteLoss() * (brute_multiplier * 0.5)),0.1) + brute_dealt += round((target.getBruteLoss() * (brute_multiplier * 0.5)),0.1) burn_dealt += round((target.getFireLoss() * (burn_multiplier * 0.5)),0.1) target.take_bodypart_damage(brute_dealt, burn_dealt, wound_bonus=CANT_WOUND) return FALSE diff --git a/code/modules/surgery/lobectomy.dm b/code/modules/surgery/lobectomy.dm index 1f0602e5ed1..a5e07e528c3 100644 --- a/code/modules/surgery/lobectomy.dm +++ b/code/modules/surgery/lobectomy.dm @@ -1,5 +1,5 @@ /datum/surgery/lobectomy - name = "Lobectomy" //not to be confused with lobotomy + name = "Lobectomy" //not to be confused with lobotomy steps = list( /datum/surgery_step/incise, /datum/surgery_step/retract_skin, /datum/surgery_step/saw, /datum/surgery_step/clamp_bleeders, /datum/surgery_step/lobectomy, /datum/surgery_step/close, diff --git a/code/modules/surgery/mechanic_steps.dm b/code/modules/surgery/mechanic_steps.dm index cd07a28bebb..378ccc31e33 100644 --- a/code/modules/surgery/mechanic_steps.dm +++ b/code/modules/surgery/mechanic_steps.dm @@ -2,10 +2,10 @@ /datum/surgery_step/mechanic_open name = "unscrew shell" implements = list( - TOOL_SCREWDRIVER = 100, - TOOL_SCALPEL = 75, // med borgs could try to unskrew shell with scalpel - /obj/item/kitchen/knife = 50, - /obj/item = 10) // 10% success with any sharp item. + TOOL_SCREWDRIVER = 100, + TOOL_SCALPEL = 75, // med borgs could try to unskrew shell with scalpel + /obj/item/kitchen/knife = 50, + /obj/item = 10) // 10% success with any sharp item. time = 24 /datum/surgery_step/mechanic_open/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) @@ -23,10 +23,10 @@ /datum/surgery_step/mechanic_close name = "screw shell" implements = list( - TOOL_SCREWDRIVER = 100, - TOOL_SCALPEL = 75, - /obj/item/kitchen/knife = 50, - /obj/item = 10) // 10% success with any sharp item. + TOOL_SCREWDRIVER = 100, + TOOL_SCALPEL = 75, + /obj/item/kitchen/knife = 50, + /obj/item = 10) // 10% success with any sharp item. time = 24 /datum/surgery_step/mechanic_close/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery) diff --git a/code/modules/surgery/organs/appendix.dm b/code/modules/surgery/organs/appendix.dm index 345257d9823..bfcc34d2b37 100644 --- a/code/modules/surgery/organs/appendix.dm +++ b/code/modules/surgery/organs/appendix.dm @@ -27,7 +27,7 @@ return var/mob/living/carbon/M = owner if(M) - M.adjustToxLoss(4, TRUE, TRUE) //forced to ensure people don't use it to gain tox as slime person + M.adjustToxLoss(4, TRUE, TRUE) //forced to ensure people don't use it to gain tox as slime person /obj/item/organ/appendix/get_availability(datum/species/S) return !(TRAIT_NOHUNGER in S.inherent_traits) diff --git a/code/modules/surgery/organs/ears.dm b/code/modules/surgery/organs/ears.dm index e265cd0ffeb..4eee0bb993b 100644 --- a/code/modules/surgery/organs/ears.dm +++ b/code/modules/surgery/organs/ears.dm @@ -37,7 +37,7 @@ if(HAS_TRAIT_NOT_FROM(owner, TRAIT_DEAF, EAR_DAMAGE)) return - if((damage < maxHealth) && (organ_flags & ORGAN_FAILING)) //ear damage can be repaired from the failing condition + if((damage < maxHealth) && (organ_flags & ORGAN_FAILING)) //ear damage can be repaired from the failing condition organ_flags &= ~ORGAN_FAILING if((organ_flags & ORGAN_FAILING)) diff --git a/code/modules/surgery/organs/eyes.dm b/code/modules/surgery/organs/eyes.dm index 6eb39ac1a21..046b333f467 100644 --- a/code/modules/surgery/organs/eyes.dm +++ b/code/modules/surgery/organs/eyes.dm @@ -8,9 +8,9 @@ healing_factor = STANDARD_ORGAN_HEALING decay_factor = STANDARD_ORGAN_DECAY - maxHealth = 0.5 * STANDARD_ORGAN_THRESHOLD //half the normal health max since we go blind at 30, a permanent blindness at 50 therefore makes sense unless medicine is administered - high_threshold = 0.3 * STANDARD_ORGAN_THRESHOLD //threshold at 30 - low_threshold = 0.2 * STANDARD_ORGAN_THRESHOLD //threshold at 20 + maxHealth = 0.5 * STANDARD_ORGAN_THRESHOLD //half the normal health max since we go blind at 30, a permanent blindness at 50 therefore makes sense unless medicine is administered + high_threshold = 0.3 * STANDARD_ORGAN_THRESHOLD //threshold at 30 + low_threshold = 0.2 * STANDARD_ORGAN_THRESHOLD //threshold at 20 low_threshold_passed = "Distant objects become somewhat less tangible." high_threshold_passed = "Everything starts to look a lot less clear." @@ -29,7 +29,7 @@ var/see_invisible = SEE_INVISIBLE_LIVING var/lighting_alpha var/no_glasses - var/damaged = FALSE //damaged indicates that our eyes are undergoing some level of negative effect + var/damaged = FALSE //damaged indicates that our eyes are undergoing some level of negative effect /obj/item/organ/eyes/Insert(mob/living/carbon/M, special = FALSE, drop_if_replaced = FALSE, initialising) . = ..() @@ -261,7 +261,7 @@ /obj/item/organ/eyes/robotic/glow/proc/assume_rgb(newcolor) current_color_string = newcolor eye_color = RGB2EYECOLORSTRING(current_color_string) - if(!QDELETED(owner) && ishuman(owner)) //Other carbon mobs don't have eye color. + if(!QDELETED(owner) && ishuman(owner)) //Other carbon mobs don't have eye color. owner.dna.species.handle_body(owner) /obj/item/organ/eyes/robotic/glow/proc/cycle_mob_overlay() diff --git a/code/modules/surgery/organs/heart.dm b/code/modules/surgery/organs/heart.dm index b97977f8acd..dce35c2adc1 100644 --- a/code/modules/surgery/organs/heart.dm +++ b/code/modules/surgery/organs/heart.dm @@ -6,7 +6,7 @@ slot = ORGAN_SLOT_HEART healing_factor = STANDARD_ORGAN_HEALING - decay_factor = 2.5 * STANDARD_ORGAN_DECAY //designed to fail around 6 minutes after death + decay_factor = 2.5 * STANDARD_ORGAN_DECAY //designed to fail around 6 minutes after death low_threshold_passed = "Prickles of pain appear then die out from within your chest..." high_threshold_passed = "Something inside your chest hurts, and the pain isn't subsiding. You notice yourself breathing far faster than before." @@ -19,8 +19,8 @@ attack_verb_continuous = list("beats", "thumps") attack_verb_simple = list("beat", "thump") var/beat = BEAT_NONE//is this mob having a heatbeat sound played? if so, which? - var/failed = FALSE //to prevent constantly running failing code - var/operated = FALSE //whether the heart's been operated on to fix some of its damages + var/failed = FALSE //to prevent constantly running failing code + var/operated = FALSE //whether the heart's been operated on to fix some of its damages /obj/item/organ/heart/update_icon_state() if(beating) @@ -90,7 +90,7 @@ H.stop_sound_channel(CHANNEL_HEARTBEAT) beat = BEAT_NONE - if(organ_flags & ORGAN_FAILING) //heart broke, stopped beating, death imminent + if(organ_flags & ORGAN_FAILING) //heart broke, stopped beating, death imminent if(owner.stat == CONSCIOUS) owner.visible_message("[owner] clutches at [owner.p_their()] chest as if [owner.p_their()] heart is stopping!", \ "You feel a terrible pain in your chest, as if your heart has stopped!") @@ -190,7 +190,7 @@ var/dose_available = FALSE var/rid = /datum/reagent/medicine/epinephrine var/ramount = 10 - var/emp_vulnerability = 80 //Chance of permanent effects if emp-ed. + var/emp_vulnerability = 80 //Chance of permanent effects if emp-ed. /obj/item/organ/heart/cybernetic/tier2 name = "cybernetic heart" diff --git a/code/modules/surgery/organs/liver.dm b/code/modules/surgery/organs/liver.dm index 2b6bb87102a..62d71a07986 100755 --- a/code/modules/surgery/organs/liver.dm +++ b/code/modules/surgery/organs/liver.dm @@ -74,7 +74,7 @@ /obj/item/organ/liver/on_life() var/mob/living/carbon/C = owner - ..() //perform general on_life() + ..() //perform general on_life() if(istype(C)) if(!(organ_flags & ORGAN_FAILING) && !HAS_TRAIT(C, TRAIT_NOMETABOLISM))//can't process reagents with a failing liver @@ -99,7 +99,7 @@ if(provide_pain_message && damage > 10 && prob(damage/3))//the higher the damage the higher the probability to_chat(C, "You feel a dull pain in your abdomen.") - else //for when our liver's failing + else //for when our liver's failing C.liver_failure() if(damage > maxHealth)//cap liver damage @@ -148,7 +148,7 @@ toxLethality = 0.011 maxHealth = STANDARD_ORGAN_THRESHOLD*0.5 - var/emp_vulnerability = 80 //Chance of permanent effects if emp-ed. + var/emp_vulnerability = 80 //Chance of permanent effects if emp-ed. /obj/item/organ/liver/cybernetic/tier2 name = "cybernetic liver" diff --git a/code/modules/surgery/organs/lungs.dm b/code/modules/surgery/organs/lungs.dm index bac226d4339..8833e28091f 100644 --- a/code/modules/surgery/organs/lungs.dm +++ b/code/modules/surgery/organs/lungs.dm @@ -1,6 +1,6 @@ /obj/item/organ/lungs var/failed = FALSE - var/operated = FALSE //whether we can still have our damages fixed through surgery + var/operated = FALSE //whether we can still have our damages fixed through surgery name = "lungs" icon_state = "lungs" zone = BODY_ZONE_CHEST @@ -258,7 +258,7 @@ //-- TRACES --// - if(breath) // If there's some other shit in the air lets deal with it here. + if(breath) // If there's some other shit in the air lets deal with it here. // N2O @@ -268,7 +268,7 @@ H.Unconscious(60) // 60 gives them one second to wake up and run away a bit! if(SA_pp > SA_sleep_min) // Enough to make us sleep as well H.Sleeping(min(H.AmountSleeping() + 100, 200)) - else if(SA_pp > 0.01) // There is sleeping gas in their lungs, but only a little, so give them a bit of a warning + else if(SA_pp > 0.01) // There is sleeping gas in their lungs, but only a little, so give them a bit of a warning H.clear_alert("too_much_n2o") if(prob(20)) n2o_euphoria = EUPHORIA_ACTIVE @@ -529,7 +529,7 @@ organ_flags = ORGAN_SYNTHETIC maxHealth = STANDARD_ORGAN_THRESHOLD * 0.5 - var/emp_vulnerability = 80 //Chance of permanent effects if emp-ed. + var/emp_vulnerability = 80 //Chance of permanent effects if emp-ed. /obj/item/organ/lungs/cybernetic/tier2 name = "cybernetic lungs" @@ -560,5 +560,5 @@ if(!COOLDOWN_FINISHED(src, severe_cooldown)) //So we cant just spam emp to kill people. owner.losebreath += 20 COOLDOWN_START(src, severe_cooldown, 30 SECONDS) - if(prob(emp_vulnerability/severity)) //Chance of permanent effects + if(prob(emp_vulnerability/severity)) //Chance of permanent effects organ_flags |= ORGAN_SYNTHETIC_EMP //Starts organ faliure - gonna need replacing soon. diff --git a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm index 8a8ba91c184..11df1d36932 100644 --- a/code/modules/surgery/organs/organ_internal.dm +++ b/code/modules/surgery/organs/organ_internal.dm @@ -10,13 +10,13 @@ // DO NOT add slots with matching names to different zones - it will break internal_organs_slot list! var/organ_flags = ORGAN_EDIBLE var/maxHealth = STANDARD_ORGAN_THRESHOLD - var/damage = 0 //total damage this organ has sustained + var/damage = 0 //total damage this organ has sustained ///Healing factor and decay factor function on % of maxhealth, and do not work by applying a static number per tick - var/healing_factor = 0 //fraction of maxhealth healed per on_life(), set to 0 for generic organs - var/decay_factor = 0 //same as above but when without a living owner, set to 0 for generic organs - var/high_threshold = STANDARD_ORGAN_THRESHOLD * 0.45 //when severe organ damage occurs - var/low_threshold = STANDARD_ORGAN_THRESHOLD * 0.1 //when minor organ damage occurs - var/severe_cooldown //cooldown for severe effects, used for synthetic organ emp effects. + var/healing_factor = 0 //fraction of maxhealth healed per on_life(), set to 0 for generic organs + var/decay_factor = 0 //same as above but when without a living owner, set to 0 for generic organs + var/high_threshold = STANDARD_ORGAN_THRESHOLD * 0.45 //when severe organ damage occurs + var/low_threshold = STANDARD_ORGAN_THRESHOLD * 0.1 //when minor organ damage occurs + var/severe_cooldown //cooldown for severe effects, used for synthetic organ emp effects. ///Organ variables for determining what we alert the owner with when they pass/clear the damage thresholds var/prev_damage = 0 var/low_threshold_passed @@ -88,12 +88,12 @@ /obj/item/organ/process(delta_time) on_death(delta_time) //Kinda hate doing it like this, but I really don't want to call process directly. -/obj/item/organ/proc/on_death(delta_time = 2) //runs decay when outside of a person +/obj/item/organ/proc/on_death(delta_time = 2) //runs decay when outside of a person if(organ_flags & (ORGAN_SYNTHETIC | ORGAN_FROZEN)) return applyOrganDamage(maxHealth * decay_factor * 0.5 * delta_time) -/obj/item/organ/proc/on_life() //repair organ damage if the organ is not failing +/obj/item/organ/proc/on_life() //repair organ damage if the organ is not failing if(organ_flags & ORGAN_FAILING) return if(organ_flags & ORGAN_SYNTHETIC_EMP) //Synthetic organ has been emped, is now failing. @@ -140,7 +140,7 @@ return //so we don't grant the organ's action to mobs who pick up the organ. ///Adjusts an organ's damage by the amount "d", up to a maximum amount, which is by default max damage -/obj/item/organ/proc/applyOrganDamage(d, maximum = maxHealth) //use for damaging effects +/obj/item/organ/proc/applyOrganDamage(d, maximum = maxHealth) //use for damaging effects if(!d) //Micro-optimization. return if(maximum < damage) @@ -152,14 +152,14 @@ to_chat(owner, mess) ///SETS an organ's damage to the amount "d", and in doing so clears or sets the failing flag, good for when you have an effect that should fix an organ if broken -/obj/item/organ/proc/setOrganDamage(d) //use mostly for admin heals +/obj/item/organ/proc/setOrganDamage(d) //use mostly for admin heals applyOrganDamage(d - damage) /** check_damage_thresholds * input: M (a mob, the owner of the organ we call the proc on) * output: returns a message should get displayed. * description: By checking our current damage against our previous damage, we can decide whether we've passed an organ threshold. - * If we have, send the corresponding threshold message to the owner, if such a message exists. + * If we have, send the corresponding threshold message to the owner, if such a message exists. */ /obj/item/organ/proc/check_damage_thresholds(M) if(damage == prev_damage) diff --git a/code/modules/surgery/organs/stomach.dm b/code/modules/surgery/organs/stomach.dm index 2f2e5ea1db9..4812dbe8d03 100755 --- a/code/modules/surgery/organs/stomach.dm +++ b/code/modules/surgery/organs/stomach.dm @@ -225,7 +225,7 @@ desc = "A basic device designed to mimic the functions of a human stomach" organ_flags = ORGAN_SYNTHETIC maxHealth = STANDARD_ORGAN_THRESHOLD * 0.5 - var/emp_vulnerability = 80 //Chance of permanent effects if emp-ed. + var/emp_vulnerability = 80 //Chance of permanent effects if emp-ed. metabolism_efficiency = 0.7 // not as good at digestion /obj/item/organ/stomach/cybernetic/tier2 @@ -253,7 +253,7 @@ if(!COOLDOWN_FINISHED(src, severe_cooldown)) //So we cant just spam emp to kill people. owner.vomit(stun = FALSE) COOLDOWN_START(src, severe_cooldown, 10 SECONDS) - if(prob(emp_vulnerability/severity)) //Chance of permanent effects + if(prob(emp_vulnerability/severity)) //Chance of permanent effects organ_flags |= ORGAN_SYNTHETIC_EMP //Starts organ faliure - gonna need replacing soon. diff --git a/code/modules/surgery/organs/vocal_cords.dm b/code/modules/surgery/organs/vocal_cords.dm index d9f02a9bac7..2b059a702b5 100644 --- a/code/modules/surgery/organs/vocal_cords.dm +++ b/code/modules/surgery/organs/vocal_cords.dm @@ -9,7 +9,7 @@ zone = BODY_ZONE_PRECISE_MOUTH slot = ORGAN_SLOT_VOICE gender = PLURAL - decay_factor = 0 //we don't want decaying vocal cords to somehow matter or appear on scanners since they don't do anything damaged + decay_factor = 0 //we don't want decaying vocal cords to somehow matter or appear on scanners since they don't do anything damaged healing_factor = 0 var/list/spans = null diff --git a/code/modules/surgery/plastic_surgery.dm b/code/modules/surgery/plastic_surgery.dm index 6e2807a6379..31056f81336 100644 --- a/code/modules/surgery/plastic_surgery.dm +++ b/code/modules/surgery/plastic_surgery.dm @@ -35,7 +35,7 @@ return var/oldname = target.real_name target.real_name = chosen_name - var/newname = target.real_name //something about how the code handles names required that I use this instead of target.real_name + var/newname = target.real_name //something about how the code handles names required that I use this instead of target.real_name display_results(user, target, "You alter [oldname]'s appearance completely, [target.p_they()] is now [newname].", "[user] alters [oldname]'s appearance completely, [target.p_they()] is now [newname]!", "[user] finishes the operation on [target]'s face.") diff --git a/code/modules/surgery/repair_puncture.dm b/code/modules/surgery/repair_puncture.dm index bec6c8bc4c3..45631c0e9ad 100644 --- a/code/modules/surgery/repair_puncture.dm +++ b/code/modules/surgery/repair_puncture.dm @@ -3,7 +3,7 @@ //the step numbers of each of these two, we only currently use the first to switch back and forth due to advancing after finishing steps anyway #define REALIGN_INNARDS 1 -#define WELD_VEINS 2 +#define WELD_VEINS 2 ///// Repair puncture wounds /datum/surgery/repair_puncture diff --git a/code/modules/surgery/surgery.dm b/code/modules/surgery/surgery.dm index f5c62165116..c62b96e0902 100644 --- a/code/modules/surgery/surgery.dm +++ b/code/modules/surgery/surgery.dm @@ -2,25 +2,25 @@ var/name = "surgery" var/desc = "surgery description" var/status = 1 - var/list/steps = list() //Steps in a surgery - var/step_in_progress = FALSE //Actively performing a Surgery - var/can_cancel = TRUE //Can cancel this surgery after step 1 with cautery - var/list/target_mobtypes = list(/mob/living/carbon/human) //Acceptable Species - var/location = BODY_ZONE_CHEST //Surgery location - var/requires_bodypart_type = BODYPART_ORGANIC //Prevents you from performing an operation on incorrect limbs. 0 for any limb type - var/list/possible_locs = list() //Multiple locations - var/ignore_clothes = FALSE //This surgery ignores clothes - var/mob/living/carbon/target //Operation target mob - var/obj/item/bodypart/operated_bodypart //Operable body part - var/datum/wound/operated_wound //The actual wound datum instance we're targeting - var/datum/wound/targetable_wound //The wound type this surgery targets - var/requires_bodypart = TRUE //Surgery available only when a bodypart is present, or only when it is missing. - var/speed_modifier = 0 //Step speed modifier - var/requires_real_bodypart = FALSE //Some surgeries don't work on limbs that don't really exist - var/lying_required = TRUE //Does the vicitm needs to be lying down. - var/self_operable = FALSE //Can the surgery be performed on yourself. - var/requires_tech = FALSE //handles techweb-oriented surgeries, previously restricted to the /advanced subtype (You still need to add designs) - var/replaced_by //type; doesn't show up if this type exists. Set to /datum/surgery if you want to hide a "base" surgery (useful for typing parents IE healing.dm just make sure to null it out again) + var/list/steps = list() //Steps in a surgery + var/step_in_progress = FALSE //Actively performing a Surgery + var/can_cancel = TRUE //Can cancel this surgery after step 1 with cautery + var/list/target_mobtypes = list(/mob/living/carbon/human) //Acceptable Species + var/location = BODY_ZONE_CHEST //Surgery location + var/requires_bodypart_type = BODYPART_ORGANIC //Prevents you from performing an operation on incorrect limbs. 0 for any limb type + var/list/possible_locs = list() //Multiple locations + var/ignore_clothes = FALSE //This surgery ignores clothes + var/mob/living/carbon/target //Operation target mob + var/obj/item/bodypart/operated_bodypart //Operable body part + var/datum/wound/operated_wound //The actual wound datum instance we're targeting + var/datum/wound/targetable_wound //The wound type this surgery targets + var/requires_bodypart = TRUE //Surgery available only when a bodypart is present, or only when it is missing. + var/speed_modifier = 0 //Step speed modifier + var/requires_real_bodypart = FALSE //Some surgeries don't work on limbs that don't really exist + var/lying_required = TRUE //Does the vicitm needs to be lying down. + var/self_operable = FALSE //Can the surgery be performed on yourself. + var/requires_tech = FALSE //handles techweb-oriented surgeries, previously restricted to the /advanced subtype (You still need to add designs) + var/replaced_by //type; doesn't show up if this type exists. Set to /datum/surgery if you want to hide a "base" surgery (useful for typing parents IE healing.dm just make sure to null it out again) /datum/surgery/New(surgery_target, surgery_location, surgery_bodypart) ..() diff --git a/code/modules/surgery/surgery_helpers.dm b/code/modules/surgery/surgery_helpers.dm index 881dd89e0ff..0d3f61f1f1a 100644 --- a/code/modules/surgery/surgery_helpers.dm +++ b/code/modules/surgery/surgery_helpers.dm @@ -13,9 +13,9 @@ /proc/get_location_accessible(mob/M, location) - var/covered_locations = 0 //based on body_parts_covered - var/face_covered = 0 //based on flags_inv - var/eyesmouth_covered = 0 //based on flags_cover + var/covered_locations = 0 //based on body_parts_covered + var/face_covered = 0 //based on flags_inv + var/eyesmouth_covered = 0 //based on flags_cover if(iscarbon(M)) var/mob/living/carbon/C = M for(var/obj/item/clothing/I in list(C.back, C.wear_mask, C.head)) diff --git a/code/modules/surgery/surgery_step.dm b/code/modules/surgery/surgery_step.dm index 62f153356ec..d7d75c9e028 100644 --- a/code/modules/surgery/surgery_step.dm +++ b/code/modules/surgery/surgery_step.dm @@ -1,11 +1,11 @@ /datum/surgery_step var/name - var/list/implements = list() //format is path = probability of success. alternatively - var/implement_type = null //the current type of implement used. This has to be stored, as the actual typepath of the tool may not match the list type. - var/accept_hand = FALSE //does the surgery step require an open hand? If true, ignores implements. Compatible with accept_any_item. - var/accept_any_item = FALSE //does the surgery step accept any item? If true, ignores implements. Compatible with require_hand. - var/time = 10 //how long does the step take? - var/repeatable = FALSE //can this step be repeated? Make shure it isn't last step, or it used in surgery with `can_cancel = 1`. Or surgion will be stuck in the loop + var/list/implements = list() //format is path = probability of success. alternatively + var/implement_type = null //the current type of implement used. This has to be stored, as the actual typepath of the tool may not match the list type. + var/accept_hand = FALSE //does the surgery step require an open hand? If true, ignores implements. Compatible with accept_any_item. + var/accept_any_item = FALSE //does the surgery step accept any item? If true, ignores implements. Compatible with require_hand. + var/time = 10 //how long does the step take? + var/repeatable = FALSE //can this step be repeated? Make shure it isn't last step, or it used in surgery with `can_cancel = 1`. Or surgion will be stuck in the loop var/list/chems_needed = list() //list of chems needed to complete the step. Even on success, the step will have no effect if there aren't the chems required in the mob. var/require_all_chems = TRUE //any on the list or all on the list? var/silicons_obey_prob = FALSE @@ -43,7 +43,7 @@ initiate(user, target, target_zone, tool, surgery, try_to_fail) else to_chat(user, "You need to expose [target]'s [parse_zone(target_zone)] to perform surgery on it!") - return TRUE //returns TRUE so we don't stab the guy in the dick or wherever. + return TRUE //returns TRUE so we don't stab the guy in the dick or wherever. if(repeatable) var/datum/surgery_step/next_step = surgery.get_surgery_next_step() @@ -75,7 +75,7 @@ speed_mod = tool.toolspeed var/implement_speed_mod = 1 - if(implement_type) //this means it isn't a require hand or any item step. + if(implement_type) //this means it isn't a require hand or any item step. implement_speed_mod = implements[implement_type] / 100.0 speed_mod /= (get_location_modifier(target) * (1 + surgery.speed_modifier) * implement_speed_mod) diff --git a/code/modules/swarmers/swarmer_act.dm b/code/modules/swarmers/swarmer_act.dm index 46af2c89ef2..e69950b2d9a 100644 --- a/code/modules/swarmers/swarmer_act.dm +++ b/code/modules/swarmers/swarmer_act.dm @@ -5,13 +5,13 @@ * Arguments: * * S - A reference to the swarmer doing the interaction */ -#define DANGEROUS_DELTA_P 250 //Value in kPa where swarmers arent allowed to break a wall or window with this difference in pressure. +#define DANGEROUS_DELTA_P 250 //Value in kPa where swarmers arent allowed to break a wall or window with this difference in pressure. ///Finds the greatest difference in pressure across a turf, only considers open turfs. /turf/proc/return_turf_delta_p() var/pressure_greatest = 0 - var/pressure_smallest = INFINITY //Freaking terrified to use INFINITY, man - for(var/t in RANGE_TURFS(1, src)) //Begin processing the delta pressure across the wall. + var/pressure_smallest = INFINITY //Freaking terrified to use INFINITY, man + for(var/t in RANGE_TURFS(1, src)) //Begin processing the delta pressure across the wall. var/turf/open/turf_adjacent = t if(!istype(turf_adjacent)) continue diff --git a/code/modules/tgs/v3210/api.dm b/code/modules/tgs/v3210/api.dm index 245381b93ea..63823251001 100644 --- a/code/modules/tgs/v3210/api.dm +++ b/code/modules/tgs/v3210/api.dm @@ -62,7 +62,7 @@ comms_key = world.params[SERVICE_WORLD_PARAM] instance_name = world.params[SERVICE_INSTANCE_PARAM] if(!instance_name) - instance_name = "TG Station Server" //maybe just upgraded + instance_name = "TG Station Server" //maybe just upgraded var/list/logs = file2list(".git/logs/HEAD") if(logs.len) @@ -92,14 +92,14 @@ if(skip_compat_check && !fexists(SERVICE_INTERFACE_DLL)) TGS_ERROR_LOG("Service parameter present but no interface DLL detected. This is symptomatic of running a service less than version 3.1! Please upgrade.") return - call(SERVICE_INTERFACE_DLL, SERVICE_INTERFACE_FUNCTION)(instance_name, command) //trust no retval + call(SERVICE_INTERFACE_DLL, SERVICE_INTERFACE_FUNCTION)(instance_name, command) //trust no retval return TRUE /datum/tgs_api/v3210/OnTopic(T) var/list/params = params2list(T) var/their_sCK = params[SERVICE_CMD_PARAM_KEY] if(!their_sCK) - return FALSE //continue world/Topic + return FALSE //continue world/Topic if(their_sCK != comms_key) return "Invalid comms key!"; @@ -176,7 +176,7 @@ return ri /datum/tgs_api/v3210/EndProcess() - sleep(world.tick_lag) //flush the buffers + sleep(world.tick_lag) //flush the buffers ExportService(SERVICE_REQUEST_KILL_PROCESS) /datum/tgs_api/v3210/ChatChannelInfo() diff --git a/code/modules/tgs/v4/api.dm b/code/modules/tgs/v4/api.dm index 4eb8e67d928..0e37a7aa24c 100644 --- a/code/modules/tgs/v4/api.dm +++ b/code/modules/tgs/v4/api.dm @@ -118,7 +118,7 @@ var/list/params = params2list(T) var/their_sCK = params[TGS4_INTEROP_ACCESS_IDENTIFIER] if(!their_sCK) - return FALSE //continue world/Topic + return FALSE //continue world/Topic if(their_sCK != access_identifier) return "Invalid comms key!"; @@ -192,7 +192,7 @@ //request a new port export_lock = FALSE - var/list/new_port_json = Export(TGS4_COMM_NEW_PORT, list(TGS4_PARAMETER_DATA = "[world.port]"), TRUE) //stringify this on purpose + var/list/new_port_json = Export(TGS4_COMM_NEW_PORT, list(TGS4_PARAMETER_DATA = "[world.port]"), TRUE) //stringify this on purpose if(!new_port_json) TGS_ERROR_LOG("No new port response from server![TGS4_PORT_CRITFAIL_MESSAGE]") @@ -235,7 +235,7 @@ var/port = result[TGS4_PARAMETER_DATA] if(!isnum(port)) - return //this is valid, server may just want use to reboot + return //this is valid, server may just want use to reboot if(port == 0) //to byond 0 means any port and "none" means close vOv diff --git a/code/modules/tgs/v5/api.dm b/code/modules/tgs/v5/api.dm index 6735ed5dec5..704ff873c0a 100644 --- a/code/modules/tgs/v5/api.dm +++ b/code/modules/tgs/v5/api.dm @@ -115,7 +115,7 @@ if(!initialized) TGS_WARNING_LOG("Missed topic due to not being initialized: [T]") - return TRUE // too early to handle, but it's still our responsibility + return TRUE // too early to handle, but it's still our responsibility var/their_sCK = topic_parameters[DMAPI5_PARAMETER_ACCESS_IDENTIFIER] if(their_sCK != access_identifier) @@ -273,7 +273,7 @@ var/port = result[DMAPI5_BRIDGE_RESPONSE_NEW_PORT] if(!isnum(port)) - return //this is valid, server may just want use to reboot + return //this is valid, server may just want use to reboot if(port == 0) //to byond 0 means any port and "none" means close vOv diff --git a/code/modules/unit_tests/anchored_mobs.dm b/code/modules/unit_tests/anchored_mobs.dm index 103b97e7a99..77fc995cf2b 100644 --- a/code/modules/unit_tests/anchored_mobs.dm +++ b/code/modules/unit_tests/anchored_mobs.dm @@ -5,5 +5,5 @@ if(initial(M.anchored)) L += "[i]" if(!L.len) - return //passed! + return //passed! Fail("The following mobs are defined as anchored. This is incompatible with the new move force/resist system and needs to be revised.: [L.Join(" ")]") diff --git a/code/modules/uplink/uplink_items.dm b/code/modules/uplink/uplink_items.dm index 86fd48363e4..1d6792dc5b7 100644 --- a/code/modules/uplink/uplink_items.dm +++ b/code/modules/uplink/uplink_items.dm @@ -30,8 +30,8 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) sale_items += I if(allow_sales) var/datum/team/nuclear/nuclear_team - if (gamemode == /datum/game_mode/nuclear) // uplink code kind of needs a redesign - nuclear_team = locate() in GLOB.antagonist_teams // the team discounts could be in a GLOB with this design but it would make sense for them to be team specific... + if (gamemode == /datum/game_mode/nuclear) // uplink code kind of needs a redesign + nuclear_team = locate() in GLOB.antagonist_teams // the team discounts could be in a GLOB with this design but it would make sense for them to be team specific... if (!nuclear_team) create_uplink_sales(3, "Discounted Gear", 1, sale_items, filtered_uplink_items) else @@ -1776,7 +1776,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) blast wave \"projectile\". Aspiring scientists may find this highly useful, as forcing the pressure shockwave into a narrow angle seems to be able to bypass whatever quirk of physics \ disallows explosive ranges above a certain distance, allowing for the device to use the theoretical yield of a transfer valve bomb, instead of the factual yield. It's simple design makes it easy to conceal." item = /obj/item/gun/blastcannon - cost = 14 //High cost because of the potential for extreme damage in the hands of a skilled scientist. + cost = 14 //High cost because of the potential for extreme damage in the hands of a skilled scientist. restricted_roles = list("Research Director", "Scientist") */ // SKYRAT EDIT - REMOVAL END diff --git a/code/modules/uplink/uplink_purchase_log.dm b/code/modules/uplink/uplink_purchase_log.dm index 293191b1704..c9ac13fa13f 100644 --- a/code/modules/uplink/uplink_purchase_log.dm +++ b/code/modules/uplink/uplink_purchase_log.dm @@ -1,8 +1,8 @@ -GLOBAL_LIST(uplink_purchase_logs_by_key) //assoc key = /datum/uplink_purchase_log +GLOBAL_LIST(uplink_purchase_logs_by_key) //assoc key = /datum/uplink_purchase_log /datum/uplink_purchase_log var/owner - var/list/purchase_log //assoc path-of-item = /datum/uplink_purchase_entry + var/list/purchase_log //assoc path-of-item = /datum/uplink_purchase_entry var/total_spent = 0 /datum/uplink_purchase_log/New(_owner, datum/component/uplink/_parent) diff --git a/code/modules/vehicles/_vehicle.dm b/code/modules/vehicles/_vehicle.dm index 7f20df5fb32..e2f03958421 100644 --- a/code/modules/vehicles/_vehicle.dm +++ b/code/modules/vehicles/_vehicle.dm @@ -8,7 +8,7 @@ density = TRUE anchored = FALSE COOLDOWN_DECLARE(cooldown_vehicle_move) - var/list/mob/occupants //mob = bitflags of their control level. + var/list/mob/occupants //mob = bitflags of their control level. ///Maximum amount of passengers plus drivers var/max_occupants = 1 ////Maximum amount of drivers @@ -25,9 +25,9 @@ var/obj/item/key/inserted_key /// Whether the vehicle os currently able to move var/canmove = TRUE - var/list/autogrant_actions_passenger //plain list of typepaths - var/list/autogrant_actions_controller //assoc list "[bitflag]" = list(typepaths) - var/list/mob/occupant_actions //assoc list mob = list(type = action datum assigned to mob) + var/list/autogrant_actions_passenger //plain list of typepaths + var/list/autogrant_actions_controller //assoc list "[bitflag]" = list(typepaths) + var/list/mob/occupant_actions //assoc list mob = list(type = action datum assigned to mob) ///This vehicle will follow us when we move (like atrailer duh) var/obj/vehicle/trailer var/are_legs_exposed = FALSE @@ -100,7 +100,7 @@ /obj/vehicle/proc/after_add_occupant(mob/M) auto_assign_occupant_flags(M) -/obj/vehicle/proc/auto_assign_occupant_flags(mob/M) //override for each type that needs it. Default is assign driver if drivers is not at max. +/obj/vehicle/proc/auto_assign_occupant_flags(mob/M) //override for each type that needs it. Default is assign driver if drivers is not at max. if(driver_amount() < max_drivers) add_control_flags(M, VEHICLE_CONTROL_DRIVE|VEHICLE_CONTROL_PERMISSION) diff --git a/code/modules/vehicles/mecha/_mecha.dm b/code/modules/vehicles/mecha/_mecha.dm index a34ea3b1960..872593352c6 100644 --- a/code/modules/vehicles/mecha/_mecha.dm +++ b/code/modules/vehicles/mecha/_mecha.dm @@ -488,7 +488,7 @@ var/mob/living/occupant = b if(!enclosed && occupant?.incapacitated()) //no sides mean it's easy to just sorta fall out if you're incapacitated. visible_message("[occupant] tumbles out of the cockpit!") - mob_exit(occupant) //bye bye + mob_exit(occupant) //bye bye //Diagnostic HUD updates diag_hud_set_mechhealth() diff --git a/code/modules/vehicles/mecha/combat/durand.dm b/code/modules/vehicles/mecha/combat/durand.dm index 892a2f99067..d1748d0e22d 100644 --- a/code/modules/vehicles/mecha/combat/durand.dm +++ b/code/modules/vehicles/mecha/combat/durand.dm @@ -33,7 +33,7 @@ /obj/vehicle/sealed/mecha/combat/durand/process() . = ..() - if(defense_mode && !use_power(100)) //Defence mode can only be on with a occupant so we check if one of them can toggle it and toggle + if(defense_mode && !use_power(100)) //Defence mode can only be on with a occupant so we check if one of them can toggle it and toggle for(var/O in occupants) var/mob/living/occupant = O var/datum/action/action = LAZYACCESSASSOC(occupant_actions, occupant, /datum/action/vehicle/sealed/mecha/mech_defense_mode) @@ -209,7 +209,7 @@ own integrity back to max. Shield is automatically dropped if we run out of powe invisibility = 0 flick("shield_raise", src) playsound(src, 'sound/mecha/mech_shield_raise.ogg', 50, FALSE) - set_light(l_range = MINIMUM_USEFUL_LIGHT_RANGE , l_power = 5, l_color = "#00FFFF") + set_light(l_range = MINIMUM_USEFUL_LIGHT_RANGE , l_power = 5, l_color = "#00FFFF") icon_state = "shield" RegisterSignal(chassis, COMSIG_ATOM_DIR_CHANGE, .proc/resetdir) else diff --git a/code/modules/vehicles/mecha/equipment/mecha_equipment.dm b/code/modules/vehicles/mecha/equipment/mecha_equipment.dm index 1d35af5f1c2..f1d338624ed 100644 --- a/code/modules/vehicles/mecha/equipment/mecha_equipment.dm +++ b/code/modules/vehicles/mecha/equipment/mecha_equipment.dm @@ -17,7 +17,7 @@ var/mech_flags = NONE var/salvageable = 1 var/detachable = TRUE // Set to FALSE for built-in equipment that cannot be removed - var/selectable = 1 // Set to 0 for passive equipment such as mining scanner or armor plates + var/selectable = 1 // Set to 0 for passive equipment such as mining scanner or armor plates var/harmful = FALSE //Controls if equipment can be used to attack by a pacifist. var/destroy_sound = 'sound/mecha/critdestr.ogg' @@ -102,7 +102,7 @@ var/C = chassis.loc chassis.use_power(energy_drain) . = do_after(user, equip_cooldown, target=target, interaction_key = interaction_key) - if(!chassis || chassis.loc != C || src != chassis.selected || !(get_dir(chassis, target)&chassis.dir)) + if(!chassis || chassis.loc != C || src != chassis.selected || !(get_dir(chassis, target)&chassis.dir)) return FALSE /obj/item/mecha_parts/mecha_equipment/proc/do_after_mecha(atom/target, mob/user, delay) @@ -110,7 +110,7 @@ return var/C = chassis.loc . = do_after(user, delay, target=target) - if(!chassis || chassis.loc != C || src != chassis.selected || !(get_dir(chassis, target)&chassis.dir)) + if(!chassis || chassis.loc != C || src != chassis.selected || !(get_dir(chassis, target)&chassis.dir)) return FALSE /obj/item/mecha_parts/mecha_equipment/proc/can_attach(obj/vehicle/sealed/mecha/M) diff --git a/code/modules/vehicles/mecha/equipment/tools/medical_tools.dm b/code/modules/vehicles/mecha/equipment/tools/medical_tools.dm index 9bb6fd10661..1e81db60e5a 100644 --- a/code/modules/vehicles/mecha/equipment/tools/medical_tools.dm +++ b/code/modules/vehicles/mecha/equipment/tools/medical_tools.dm @@ -253,8 +253,8 @@ ///////////////////////////////// Syringe Gun /////////////////////////////////////////////////////////////// -#define FIRE_SYRINGE_MODE 0 -#define ANALYZE_SYRINGE_MODE 1 +#define FIRE_SYRINGE_MODE 0 +#define ANALYZE_SYRINGE_MODE 1 /obj/item/mecha_parts/mecha_equipment/medical/syringe_gun name = "exosuit syringe gun" diff --git a/code/modules/vehicles/mecha/equipment/tools/work_tools.dm b/code/modules/vehicles/mecha/equipment/tools/work_tools.dm index d3bb12bd6be..1e7bf37b020 100644 --- a/code/modules/vehicles/mecha/equipment/tools/work_tools.dm +++ b/code/modules/vehicles/mecha/equipment/tools/work_tools.dm @@ -228,9 +228,9 @@ return FALSE -#define MODE_DECONSTRUCT 0 -#define MODE_WALL 1 -#define MODE_AIRLOCK 2 +#define MODE_DECONSTRUCT 0 +#define MODE_WALL 1 +#define MODE_AIRLOCK 2 /obj/item/mecha_parts/mecha_equipment/rcd name = "mounted RCD" diff --git a/code/modules/vehicles/mecha/equipment/weapons/weapons.dm b/code/modules/vehicles/mecha/equipment/weapons/weapons.dm index c8e7926d46c..3e9751b1411 100644 --- a/code/modules/vehicles/mecha/equipment/weapons/weapons.dm +++ b/code/modules/vehicles/mecha/equipment/weapons/weapons.dm @@ -8,7 +8,7 @@ var/variance = 0 var/randomspread = FALSE //use random spread for machineguns, instead of shotgun scatter var/projectile_delay = 0 - var/firing_effect_type = /obj/effect/temp_visual/dir_setting/firing_effect //the visual effect appearing when the weapon is fired. + var/firing_effect_type = /obj/effect/temp_visual/dir_setting/firing_effect //the visual effect appearing when the weapon is fired. var/kickback = TRUE //Will using this weapon in no grav push mecha back. mech_flags = EXOSUIT_MODULE_COMBAT diff --git a/code/modules/vehicles/mecha/mech_bay.dm b/code/modules/vehicles/mecha/mech_bay.dm index 683be6f5f0b..38ea9d74867 100644 --- a/code/modules/vehicles/mecha/mech_bay.dm +++ b/code/modules/vehicles/mecha/mech_bay.dm @@ -1,7 +1,7 @@ /turf/open/floor/mech_bay_recharge_floor // Whos idea it was name = "mech bay recharge station" // Recharging turfs desc = "Parking a mech on this station will recharge its internal power cell." - icon = 'icons/turf/floors.dmi' // That are set in stone to check the west turf for recharge port + icon = 'icons/turf/floors.dmi' // That are set in stone to check the west turf for recharge port icon_state = "recharge_floor" // Some people just want to watch the world burn i guess /turf/open/floor/mech_bay_recharge_floor/break_tile() diff --git a/code/modules/vehicles/mecha/mech_fabricator.dm b/code/modules/vehicles/mecha/mech_fabricator.dm index 34589ce62fb..c2af3ddd89b 100644 --- a/code/modules/vehicles/mecha/mech_fabricator.dm +++ b/code/modules/vehicles/mecha/mech_fabricator.dm @@ -602,7 +602,7 @@ * * Returns the number of sheets successfully ejected. * eject_sheet - Byond REF of the material to eject. - * eject_amt - Number of sheets to attempt to eject. + * eject_amt - Number of sheets to attempt to eject. */ /obj/machinery/mecha_part_fabricator/proc/eject_sheets(eject_sheet, eject_amt) var/datum/component/material_container/mat_container = rmat.mat_container diff --git a/code/modules/vehicles/mecha/mecha_parts.dm b/code/modules/vehicles/mecha/mecha_parts.dm index 2b43fdae653..2a9a1306bb9 100644 --- a/code/modules/vehicles/mecha/mecha_parts.dm +++ b/code/modules/vehicles/mecha/mecha_parts.dm @@ -22,7 +22,7 @@ /obj/item/mecha_parts/chassis name = "Mecha Chassis" icon_state = "backbone" - interaction_flags_item = NONE //Don't pick us up!! + interaction_flags_item = NONE //Don't pick us up!! var/construct_type /obj/item/mecha_parts/chassis/Initialize() diff --git a/code/modules/vehicles/mecha/mecha_topic.dm b/code/modules/vehicles/mecha/mecha_topic.dm index f614cc23425..d597875fd04 100644 --- a/code/modules/vehicles/mecha/mecha_topic.dm +++ b/code/modules/vehicles/mecha/mecha_topic.dm @@ -64,7 +64,7 @@ tank_pressure = internal_tank ? round(int_tank_air.return_pressure(),0.01) : "None" tank_temperature = internal_tank ? int_tank_air.temperature : "Unknown" cabin_pressure = round(return_pressure(),0.01) - . = {"[report_internal_damage()] + . = {"[report_internal_damage()] [integrity<30?"DAMAGE LEVEL CRITICAL
      ":null] Integrity: [integrity]%
      Power cell charge: [isnull(cell_charge)?"No power cell installed":"[cell.percent()]%"]
      diff --git a/code/modules/vehicles/ridden.dm b/code/modules/vehicles/ridden.dm index 5ee9e3b8f4a..3286000f882 100644 --- a/code/modules/vehicles/ridden.dm +++ b/code/modules/vehicles/ridden.dm @@ -35,7 +35,7 @@ to_chat(user, "[I] seems to be stuck to your hand!") return to_chat(user, "You insert \the [I] into \the [src].") - if(inserted_key) //just in case there's an invalid key + if(inserted_key) //just in case there's an invalid key inserted_key.forceMove(drop_location()) inserted_key = I diff --git a/code/modules/vehicles/sealed.dm b/code/modules/vehicles/sealed.dm index 53936909981..22d22821485 100644 --- a/code/modules/vehicles/sealed.dm +++ b/code/modules/vehicles/sealed.dm @@ -90,7 +90,7 @@ if(key_type && !is_key(inserted_key) && is_key(I)) if(user.transferItemToLoc(I, src)) to_chat(user, "You insert [I] into [src].") - if(inserted_key) //just in case there's an invalid key + if(inserted_key) //just in case there's an invalid key inserted_key.forceMove(drop_location()) inserted_key = I else diff --git a/code/modules/vehicles/vehicle_actions.dm b/code/modules/vehicles/vehicle_actions.dm index b17a5c81883..62aeffdab8f 100644 --- a/code/modules/vehicles/vehicle_actions.dm +++ b/code/modules/vehicles/vehicle_actions.dm @@ -12,13 +12,13 @@ /obj/vehicle/proc/initialize_passenger_action_type(actiontype) autogrant_actions_passenger += actiontype for(var/i in occupants) - grant_passenger_actions(i) //refresh + grant_passenger_actions(i) //refresh /obj/vehicle/proc/initialize_controller_action_type(actiontype, control_flag) LAZYINITLIST(autogrant_actions_controller["[control_flag]"]) autogrant_actions_controller["[control_flag]"] += actiontype for(var/i in occupants) - grant_controller_actions(i) //refresh + grant_controller_actions(i) //refresh /obj/vehicle/proc/grant_action_type_to_mob(actiontype, mob/m) if(isnull(LAZYACCESS(occupants, m)) || !actiontype) diff --git a/code/modules/vehicles/wheelchair.dm b/code/modules/vehicles/wheelchair.dm index 06821d7b6d6..5f8db2f3ba1 100644 --- a/code/modules/vehicles/wheelchair.dm +++ b/code/modules/vehicles/wheelchair.dm @@ -5,8 +5,8 @@ icon_state = "wheelchair" layer = OBJ_LAYER max_integrity = 100 - armor = list(MELEE = 10, BULLET = 10, LASER = 10, ENERGY = 0, BOMB = 10, BIO = 0, RAD = 0, FIRE = 20, ACID = 30) //Wheelchairs aren't super tough yo - density = FALSE //Thought I couldn't fix this one easily, phew + armor = list(MELEE = 10, BULLET = 10, LASER = 10, ENERGY = 0, BOMB = 10, BIO = 0, RAD = 0, FIRE = 20, ACID = 30) //Wheelchairs aren't super tough yo + density = FALSE //Thought I couldn't fix this one easily, phew /// Run speed delay is multiplied with this for vehicle move delay. var/delay_multiplier = 6.7 /// This variable is used to specify which overlay icon is used for the wheelchair, ensures wheelchair can cover your legs @@ -18,7 +18,7 @@ . = ..() make_ridable() -/obj/vehicle/ridden/wheelchair/ComponentInitialize() //Since it's technically a chair I want it to have chair properties +/obj/vehicle/ridden/wheelchair/ComponentInitialize() //Since it's technically a chair I want it to have chair properties . = ..() AddComponent(/datum/component/simple_rotation,ROTATION_ALTCLICK | ROTATION_CLOCKWISE, CALLBACK(src, .proc/can_user_rotate),CALLBACK(src, .proc/can_be_rotated),null) @@ -53,7 +53,7 @@ ..() handle_rotation(newdir) -/obj/vehicle/ridden/wheelchair/wrench_act(mob/living/user, obj/item/I) //Attackby should stop it attacking the wheelchair after moving away during decon +/obj/vehicle/ridden/wheelchair/wrench_act(mob/living/user, obj/item/I) //Attackby should stop it attacking the wheelchair after moving away during decon ..() to_chat(user, "You begin to detach the wheels...") if(I.use_tool(src, user, 40, volume=50)) diff --git a/code/modules/vending/_vending.dm b/code/modules/vending/_vending.dm index 29785491208..646da5e62f7 100644 --- a/code/modules/vending/_vending.dm +++ b/code/modules/vending/_vending.dm @@ -77,23 +77,23 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C /** * List of products this machine sells * - * form should be list(/type/path = amount, /type/path2 = amount2) + * form should be list(/type/path = amount, /type/path2 = amount2) */ - var/list/products = list() + var/list/products = list() /** * List of products this machine sells when you hack it * - * form should be list(/type/path = amount, /type/path2 = amount2) + * form should be list(/type/path = amount, /type/path2 = amount2) */ - var/list/contraband = list() + var/list/contraband = list() /** * List of premium products this machine sells * - * form should be list(/type/path, /type/path2) as there is only ever one in stock + * form should be list(/type/path, /type/path2) as there is only ever one in stock */ - var/list/premium = list() + var/list/premium = list() ///String of slogans separated by semicolons, optional var/product_slogans = "" @@ -974,7 +974,7 @@ GLOBAL_LIST_EMPTY(vending_products) * * prb - probability the shock happens */ /obj/machinery/vending/proc/shock(mob/living/user, prb) - if(!istype(user) || machine_stat & (BROKEN|NOPOWER)) // unpowered, no shock + if(!istype(user) || machine_stat & (BROKEN|NOPOWER)) // unpowered, no shock return FALSE if(!prob(prb)) return FALSE diff --git a/code/modules/vending/magivend.dm b/code/modules/vending/magivend.dm index 1e23442fb5f..894059f4a8a 100644 --- a/code/modules/vending/magivend.dm +++ b/code/modules/vending/magivend.dm @@ -13,7 +13,7 @@ /obj/item/clothing/suit/wizrobe/yellow = 1, /obj/item/clothing/shoes/sandal/magic = 1, /obj/item/staff = 2) - contraband = list(/obj/item/reagent_containers/glass/bottle/wizarditis = 1) //No one can get to the machine to hack it anyways; for the lulz - Microwave + contraband = list(/obj/item/reagent_containers/glass/bottle/wizarditis = 1) //No one can get to the machine to hack it anyways; for the lulz - Microwave armor = list(MELEE = 100, BULLET = 100, LASER = 100, ENERGY = 100, BOMB = 0, BIO = 0, RAD = 0, FIRE = 100, ACID = 50) resistance_flags = FIRE_PROOF default_price = 0 //Just in case, since it's primary use is storage.