From d2c780604747dfcfda21793e6c26c2466b2015e6 Mon Sep 17 00:00:00 2001 From: klorpa <30924131+klorpa@users.noreply.github.com> Date: Wed, 21 Aug 2024 00:07:02 -0500 Subject: [PATCH] Spelling and Grammar Fixes (#85992) ## About The Pull Request Fixes several errors to spelling, grammar, and punctuation. ## Why It's Good For The Game ## Changelog :cl: spellcheck: fixed a few typos /:cl: --- code/__DEFINES/admin_verb.dm | 2 +- code/__DEFINES/ai/ai_blackboard.dm | 4 ++-- code/__DEFINES/bodyparts.dm | 2 +- code/__DEFINES/dcs/flags.dm | 2 +- code/__DEFINES/dcs/helpers.dm | 2 +- code/__DEFINES/layers.dm | 2 +- code/__DEFINES/lighting.dm | 10 +++++----- code/__DEFINES/machines.dm | 2 +- code/__DEFINES/reactions.dm | 2 +- code/__DEFINES/shuttles.dm | 2 +- code/__DEFINES/sight.dm | 4 ++-- code/__HELPERS/_planes.dm | 4 ++-- code/__HELPERS/maths.dm | 4 ++-- code/__HELPERS/text.dm | 6 +++--- code/_onclick/item_attack.dm | 2 +- .../configuration/configuration.dm | 2 +- code/controllers/failsafe.dm | 2 +- code/controllers/subsystem/air.dm | 4 ++-- code/controllers/subsystem/ambience.dm | 2 +- code/controllers/subsystem/events.dm | 2 +- code/controllers/subsystem/input.dm | 6 +++--- .../subsystem/modular_computers.dm | 4 ++-- code/controllers/subsystem/time_track.dm | 2 +- code/datums/achievements/_awards.dm | 2 +- code/datums/ai/movement/_ai_movement.dm | 2 +- .../robot_customer_behaviors.dm | 6 +++--- code/datums/armor/_armor.dm | 6 +++--- .../bodypart_overlays/bodypart_overlay.dm | 4 ++-- code/datums/browser.dm | 2 +- code/datums/chatmessage.dm | 2 +- code/datums/components/acid.dm | 2 +- code/datums/components/pinata.dm | 4 ++-- code/datums/components/squeak.dm | 4 ++-- code/datums/datum.dm | 4 ++-- code/datums/datumvars.dm | 6 +++--- code/datums/diseases/adrenal_crisis.dm | 2 +- .../diseases/advance/symptoms/choking.dm | 2 +- code/datums/dna.dm | 6 +++--- code/datums/ductnet.dm | 6 +++--- code/datums/elements/bane.dm | 4 ++-- code/datums/mood.dm | 2 +- code/datums/mutations/touch.dm | 6 +++--- code/datums/view.dm | 8 ++++---- code/game/atoms_movable.dm | 12 +++++------ code/game/machinery/autolathe.dm | 2 +- code/game/machinery/barsigns.dm | 2 +- .../computer/atmos_computers/__identifiers.dm | 2 +- code/game/machinery/limbgrower.dm | 2 +- code/game/machinery/machine_frame.dm | 2 +- code/game/machinery/modular_shield.dm | 20 +++++++++---------- .../machinery/newscaster/newscaster_data.dm | 10 +++++----- code/game/objects/items/devices/multitool.dm | 4 ++-- .../game/objects/items/devices/radio/radio.dm | 10 +++++----- code/game/objects/items/dice.dm | 2 +- code/game/objects/items/food/lizard.dm | 2 +- code/game/objects/items/food/martian.dm | 4 ++-- code/game/objects/items/food/meatdish.dm | 6 +++--- code/game/objects/items/food/meatslab.dm | 2 +- code/game/objects/items/food/pie.dm | 2 +- code/game/objects/items/food/pizza.dm | 2 +- code/game/objects/items/food/snacks.dm | 2 +- code/game/objects/items/grenades/_grenade.dm | 6 +++--- code/game/objects/objs.dm | 6 +++--- code/modules/vending/_vending.dm | 2 +- code/modules/vending/games.dm | 2 +- code/world.dm | 2 +- 66 files changed, 130 insertions(+), 130 deletions(-) diff --git a/code/__DEFINES/admin_verb.dm b/code/__DEFINES/admin_verb.dm index 04806e098b2..71e0475e5c3 100644 --- a/code/__DEFINES/admin_verb.dm +++ b/code/__DEFINES/admin_verb.dm @@ -81,7 +81,7 @@ _ADMIN_VERB(verb_path_name, verb_permissions, verb_name, verb_desc, verb_categor #define ADMIN_CATEGORY_FUN "Admin.Fun" #define ADMIN_CATEGORY_GAME "Admin.Game" -// Special categories that are seperated +// Special categories that are separated #define ADMIN_CATEGORY_DEBUG "Debug" #define ADMIN_CATEGORY_SERVER "Server" #define ADMIN_CATEGORY_OBJECT "Object" diff --git a/code/__DEFINES/ai/ai_blackboard.dm b/code/__DEFINES/ai/ai_blackboard.dm index 4374288b07c..baf166d2a7a 100644 --- a/code/__DEFINES/ai/ai_blackboard.dm +++ b/code/__DEFINES/ai/ai_blackboard.dm @@ -8,7 +8,7 @@ #define BB_FOOD_TARGET "bb_food_target" ///How close a mob must be for us to select it as a target, if that is less than how far we can maintain it as a target #define BB_AGGRO_RANGE "BB_aggro_range" -///are we hungry? determined by the udder compnent +///are we hungry? determined by the udder component #define BB_CHECK_HUNGRY "BB_check_hungry" ///are we ready to breed? #define BB_BREED_READY "BB_breed_ready" @@ -47,7 +47,7 @@ ///bane ai used by example script #define BB_BANE_BATMAN "BB_bane_batman" -//yep thats it +//yep that's it ///Hunting BB keys #define BB_CURRENT_HUNTING_TARGET "BB_current_hunting_target" diff --git a/code/__DEFINES/bodyparts.dm b/code/__DEFINES/bodyparts.dm index 8afda278a41..18d0a3c7cb8 100644 --- a/code/__DEFINES/bodyparts.dm +++ b/code/__DEFINES/bodyparts.dm @@ -16,7 +16,7 @@ #define LIMB_MAX_HP_ALIEN_CORE 500 //Used by xenomorph chests and heads /// Limb Body Damage Coefficient -/// A mutiplication of the burn and brute damage that the limb's stored damage contributes to its attached mob's overall wellbeing. +/// A multiplication of the burn and brute damage that the limb's stored damage contributes to its attached mob's overall wellbeing. /// For instance, if a limb has 50 damage, and has a coefficient of 50%, the human is considered to have suffered 25 damage to their total health. #define LIMB_BODY_DAMAGE_COEFFICIENT_ADVANCED 0.5 //Used by advanced robotic limbs. diff --git a/code/__DEFINES/dcs/flags.dm b/code/__DEFINES/dcs/flags.dm index 9b181e226a9..950a37d3c43 100644 --- a/code/__DEFINES/dcs/flags.dm +++ b/code/__DEFINES/dcs/flags.dm @@ -30,7 +30,7 @@ #define ELEMENT_DONT_SORT_LIST_ARGS (1<<3) /** * Elements with this flag will be ignored by the dcs_check_list_arguments test. - * A good example is connect_loc, for which it's pratically undoable unless we force every signal proc to have a different name. + * A good example is connect_loc, for which it's practically undoable unless we force every signal proc to have a different name. */ #define ELEMENT_NO_LIST_UNIT_TEST (1<<4) diff --git a/code/__DEFINES/dcs/helpers.dm b/code/__DEFINES/dcs/helpers.dm index df6acffd761..01abfac80d4 100644 --- a/code/__DEFINES/dcs/helpers.dm +++ b/code/__DEFINES/dcs/helpers.dm @@ -1,5 +1,5 @@ /// Used to trigger signals and call procs registered for that signal -/// The datum hosting the signal is automaticaly added as the first argument +/// The datum hosting the signal is automatically added as the first argument /// Returns a bitfield gathered from all registered procs /// Arguments given here are packaged in a list and given to _SendSignal #define SEND_SIGNAL(target, sigtype, arguments...) ( !target._listen_lookup?[sigtype] ? NONE : target._SendSignal(sigtype, list(target, ##arguments)) ) diff --git a/code/__DEFINES/layers.dm b/code/__DEFINES/layers.dm index c6c66d6922a..e3d20fa1051 100644 --- a/code/__DEFINES/layers.dm +++ b/code/__DEFINES/layers.dm @@ -290,7 +290,7 @@ //---------- EMISSIVES ------------- //Layering order of these is not particularly meaningful. -//Important part is the seperation of the planes for control via plane_master +//Important part is the separation of the planes for control via plane_master /// The layer you should use if you _really_ don't want an emissive overlay to be blocked. #define EMISSIVE_LAYER_UNBLOCKABLE 9999 diff --git a/code/__DEFINES/lighting.dm b/code/__DEFINES/lighting.dm index 1a4b7a15e47..71a13d63820 100644 --- a/code/__DEFINES/lighting.dm +++ b/code/__DEFINES/lighting.dm @@ -77,21 +77,21 @@ #define _EMISSIVE_COLOR(val) list(0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,1, val,val,val,0) /// The color matrix applied to all emissive overlays. Should be solely dependent on alpha and not have RGB overlap with [EM_BLOCK_COLOR]. #define EMISSIVE_COLOR _EMISSIVE_COLOR(1) -/// A globaly cached version of [EMISSIVE_COLOR] for quick access. +/// A globally cached version of [EMISSIVE_COLOR] for quick access. GLOBAL_LIST_INIT(emissive_color, EMISSIVE_COLOR) #define _EM_BLOCK_COLOR(val) list(0,0,0,0, 0,0,0,0, 0,0,0,0, 0,0,0,val, 0,0,0,0) /// The color matrix applied to all emissive blockers. Should be solely dependent on alpha and not have RGB overlap with [EMISSIVE_COLOR]. #define EM_BLOCK_COLOR _EM_BLOCK_COLOR(1) -/// A globaly cached version of [EM_BLOCK_COLOR] for quick access. +/// A globally cached version of [EM_BLOCK_COLOR] for quick access. GLOBAL_LIST_INIT(em_block_color, EM_BLOCK_COLOR) /// A set of appearance flags applied to all emissive and emissive blocker overlays. -/// KEEP_APART to prevent parent hooking, KEEP_TOGETHER for children, and we reset the color and alpha of our parent so nothing gets overriden +/// KEEP_APART to prevent parent hooking, KEEP_TOGETHER for children, and we reset the color and alpha of our parent so nothing gets overridden #define EMISSIVE_APPEARANCE_FLAGS (KEEP_APART|KEEP_TOGETHER|RESET_COLOR|RESET_ALPHA) -/// The color matrix used to mask out emissive blockers on the emissive plane. Alpha should default to zero, be solely dependent on the RGB value of [EMISSIVE_COLOR], and be independant of the RGB value of [EM_BLOCK_COLOR]. +/// The color matrix used to mask out emissive blockers on the emissive plane. Alpha should default to zero, be solely dependent on the RGB value of [EMISSIVE_COLOR], and be independent of the RGB value of [EM_BLOCK_COLOR]. #define EM_MASK_MATRIX list(0,0,0,1/3, 0,0,0,1/3, 0,0,0,1/3, 0,0,0,0, 1,1,1,0) -/// A globaly cached version of [EM_MASK_MATRIX] for quick access. +/// A globally cached version of [EM_MASK_MATRIX] for quick access. GLOBAL_LIST_INIT(em_mask_matrix, EM_MASK_MATRIX) /// Parse the hexadecimal color into lumcounts of each perspective. diff --git a/code/__DEFINES/machines.dm b/code/__DEFINES/machines.dm index d7245d8b6f3..9d2cf451c62 100644 --- a/code/__DEFINES/machines.dm +++ b/code/__DEFINES/machines.dm @@ -52,7 +52,7 @@ #define BYPASS_DOOR_CHECKS 2 //used in design to specify which machine can build it -//Note: More than one of these can be added to a design but imprinter and lathe designs are incompatable. +//Note: More than one of these can be added to a design but imprinter and lathe designs are incompatible. #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 diff --git a/code/__DEFINES/reactions.dm b/code/__DEFINES/reactions.dm index 98f8d4a1827..a8c111c5164 100644 --- a/code/__DEFINES/reactions.dm +++ b/code/__DEFINES/reactions.dm @@ -89,7 +89,7 @@ #define FREON_MAXIMUM_BURN_TEMPERATURE 283 ///Minimum temperature allowed for the burn to go at max speed, we would have negative pressure otherwise #define FREON_LOWER_TEMPERATURE 60 -///Terminal temperature after wich we stop the reaction +///Terminal temperature after which we stop the reaction #define FREON_TERMINAL_TEMPERATURE 20 /// Multiplier for freonfire with O2 moles * FREON_OXYGEN_FULLBURN for the maximum fuel consumption #define FREON_OXYGEN_FULLBURN 10 diff --git a/code/__DEFINES/shuttles.dm b/code/__DEFINES/shuttles.dm index 6f15ea65216..759121e3b8d 100644 --- a/code/__DEFINES/shuttles.dm +++ b/code/__DEFINES/shuttles.dm @@ -36,7 +36,7 @@ /// These shuttles leave when the main emergency shuttle does but don't dock anywhere (to save space), so this counts as "escaped". #define ENDGAME_TRANSIT 3 -//positive value = cannot puchase +//positive value = cannot purchase #define SHUTTLEPURCHASE_PURCHASABLE 0 //station can buy a shuttle #define SHUTTLEPURCHASE_PURCHASED 1 //station has already bought a shuttle, so cannot #define SHUTTLEPURCHASE_FORCED 2 //station was given a new shuttle through events or other shenanigans diff --git a/code/__DEFINES/sight.dm b/code/__DEFINES/sight.dm index 05050185214..ae47267790f 100644 --- a/code/__DEFINES/sight.dm +++ b/code/__DEFINES/sight.dm @@ -63,7 +63,7 @@ /// We've gotta alpha it down if we get this, cause otherwise the sight flag won't work #define BLACKNESS_CUTTING (SEE_MOBS|SEE_OBJS|SEE_TURFS|SEE_TURFS|SEE_TURFS) -/// Range at which blindness effects treat nearsightness as blind and play +/// Range at which blindness effects treat nearsightedness as blind and play #define NEARSIGHTNESS_BLINDNESS 2 /// Range in tiles that a mob can see in the dark (used to determine if a mob has night_vision) @@ -84,7 +84,7 @@ //------------------------ // INVISIBILITY SOURCE IDS // Though don't feel the need to add one here if you have a simple effect that -// gets added and/or removed in only one place near eachother in the code. +// gets added and/or removed in only one place near each other in the code. #define INVISIBILITY_SOURCE_INVISIMIN "invisimin" #define INVISIBILITY_SOURCE_STEALTHMODE "stealthmode" diff --git a/code/__HELPERS/_planes.dm b/code/__HELPERS/_planes.dm index 9b4f2bf7ab6..c5066c66062 100644 --- a/code/__HELPERS/_planes.dm +++ b/code/__HELPERS/_planes.dm @@ -29,8 +29,8 @@ // Now for the more niche things -/// Takes an object, new plane, and multipler, and offsets the plane -/// This is for cases where you have a multipler precalculated, and just want to use it +/// Takes an object, new plane, and multiplier, and offsets the plane +/// This is for cases where you have a multiplier precalculated, and just want to use it /// Often an optimization, sometimes a necessity #define SET_PLANE_W_SCALAR(thing, new_value, multiplier) (thing.plane = GET_NEW_PLANE(new_value, multiplier)) diff --git a/code/__HELPERS/maths.dm b/code/__HELPERS/maths.dm index 0271b2e4601..5a55fd46fd2 100644 --- a/code/__HELPERS/maths.dm +++ b/code/__HELPERS/maths.dm @@ -60,7 +60,7 @@ var/y_distance_sign = SIGN(y_distance) var/x = abs_x_distance >> 1 //Counters for steps taken, setting to distance/2 - var/y = abs_y_distance >> 1 //Bit-shifting makes me l33t. It also makes get_line() unnessecarrily fast. + var/y = abs_y_distance >> 1 //Bit-shifting makes me l33t. It also makes get_line() unnecessarily fast. if(abs_x_distance >= abs_y_distance) //x distance is greater than y for(var/distance_counter in 0 to (abs_x_distance - 1))//It'll take abs_x_distance steps to get there @@ -86,7 +86,7 @@ /** * Get a list of turfs in a perimeter given the `center_atom` and `radius`. - * Automatically rounds down decimals and does not accept values less than positive 1 as they dont play well with it. + * Automatically rounds down decimals and does not accept values less than positive 1 as they don't play well with it. * Is efficient on large circles but ugly on small ones * Uses [Jesko`s method to the midpoint circle Algorithm](https://en.wikipedia.org/wiki/Midpoint_circle_algorithm). */ diff --git a/code/__HELPERS/text.dm b/code/__HELPERS/text.dm index f46d32996b7..f1fa482f506 100644 --- a/code/__HELPERS/text.dm +++ b/code/__HELPERS/text.dm @@ -71,7 +71,7 @@ return t t = matchMiddle.group[1] - // Replace any non-space whitespace characters with spaces, and also multiple occurences with just one space + // Replace any non-space whitespace characters with spaces, and also multiple occurrences with just one space var/static/regex/matchSpacing = new(@"\s+", "g") t = replacetext(t, matchSpacing, " ") @@ -153,7 +153,7 @@ /** * Filters out undesirable characters from names. * - * * strict - return null immidiately instead of filtering out + * * strict - return null immediately instead of filtering out * * allow_numbers - allows numbers and common special characters - used for silicon/other weird things names * * cap_after_symbols - words like Bob's will be capitalized to Bob'S by default. False is good for titles. */ @@ -169,7 +169,7 @@ var/char = "" // This is a sanity short circuit, if the users name is three times the maximum allowable length of name - // We bail out on trying to process the name at all, as it could be a bug or malicious input and we dont + // We bail out on trying to process the name at all, as it could be a bug or malicious input and we don't // Want to iterate all of it. if(t_len > 3 * MAX_NAME_LEN) return diff --git a/code/_onclick/item_attack.dm b/code/_onclick/item_attack.dm index aa8c3076135..5af9b7e0161 100644 --- a/code/_onclick/item_attack.dm +++ b/code/_onclick/item_attack.dm @@ -270,7 +270,7 @@ /// Called from [/obj/item/proc/attack_atom] and [/obj/item/proc/attack] if the attack succeeds /atom/proc/attacked_by(obj/item/attacking_item, mob/living/user) if(!uses_integrity) - CRASH("attacked_by() was called on an object that doesnt use integrity!") + CRASH("attacked_by() was called on an object that doesn't use integrity!") if(!attacking_item.force) return diff --git a/code/controllers/configuration/configuration.dm b/code/controllers/configuration/configuration.dm index b7f48fcab5e..6ba6cd2de09 100644 --- a/code/controllers/configuration/configuration.dm +++ b/code/controllers/configuration/configuration.dm @@ -506,7 +506,7 @@ Example config: if(!fexists(file(config_toml))) SSjob.legacy_mode = TRUE - message += "jobconfig.toml not found, falling back to legacy mode (using jobs.txt). To surpress this warning, generate a jobconfig.toml by running the verb 'Generate Job Configuration' in the Server tab.\n\ + message += "jobconfig.toml not found, falling back to legacy mode (using jobs.txt). To suppress this warning, generate a jobconfig.toml by running the verb 'Generate Job Configuration' in the Server tab.\n\ From there, you can then add it to the /config folder of your server to have it take effect for future rounds." if(!fexists(file(config_txt))) diff --git a/code/controllers/failsafe.dm b/code/controllers/failsafe.dm index f6d03eb828d..e92e30079b8 100644 --- a/code/controllers/failsafe.dm +++ b/code/controllers/failsafe.dm @@ -16,7 +16,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 *each other*) var/lasttick = 0 // Track the MC iteration to make sure its still on track. diff --git a/code/controllers/subsystem/air.dm b/code/controllers/subsystem/air.dm index 1cb3e2dec37..4557e153db1 100644 --- a/code/controllers/subsystem/air.dm +++ b/code/controllers/subsystem/air.dm @@ -559,7 +559,7 @@ SUBSYSTEM_DEF(air) // If it's already been processed, then it's already talked to us if(enemy_tile.current_cycle == -INFINITE) continue - // .air instead of .return_air() because we can guarentee that the proc won't do anything + // .air instead of .return_air() because we can guarantee that the proc won't do anything if(potential_diff.air.compare(enemy_tile.air)) //testing("Active turf found. Return value of compare(): [T.air.compare(enemy_tile.air)]") if(!potential_diff.excited) @@ -707,7 +707,7 @@ SUBSYSTEM_DEF(air) CHECK_TICK //this can't be done with setup_atmos_machinery() because -// all atmos machinery has to initalize before the first +// all atmos machinery has to initialize before the first // pipenet can be built. /datum/controller/subsystem/air/proc/setup_pipenets() for (var/obj/machinery/atmospherics/AM in atmos_machinery) diff --git a/code/controllers/subsystem/ambience.dm b/code/controllers/subsystem/ambience.dm index cae5d85246d..7258b0b16e9 100644 --- a/code/controllers/subsystem/ambience.dm +++ b/code/controllers/subsystem/ambience.dm @@ -124,7 +124,7 @@ SUBSYSTEM_DEF(ambience) client.current_ambient_sound = null return - //Station ambience is dependant on a functioning and charged APC with enviorment power enabled. + //Station ambience is dependent on a functioning and charged APC with environment power enabled. if(!is_mining_level(my_area.z) && ((!my_area.apc || !my_area.apc.operating || !my_area.apc.cell?.charge && my_area.requires_power || !my_area.power_environ))) SEND_SOUND(src, sound(null, repeat = 0, wait = 0, channel = CHANNEL_BUZZ)) client.current_ambient_sound = null diff --git a/code/controllers/subsystem/events.dm b/code/controllers/subsystem/events.dm index 897bf0c4549..38fbdaa793b 100644 --- a/code/controllers/subsystem/events.dm +++ b/code/controllers/subsystem/events.dm @@ -8,7 +8,7 @@ SUBSYSTEM_DEF(events) var/list/running = list() ///cache of currently running events, for lag checking. var/list/currentrun = list() - ///The next world.time that a naturally occuring random event can be selected. + ///The next world.time that a naturally occurring random event can be selected. var/scheduled = 0 ///The lower bound for how soon another random event can be scheduled. var/frequency_lower = 2.5 MINUTES diff --git a/code/controllers/subsystem/input.dm b/code/controllers/subsystem/input.dm index 65dc1e31a1e..e4e12418a75 100644 --- a/code/controllers/subsystem/input.dm +++ b/code/controllers/subsystem/input.dm @@ -19,7 +19,7 @@ VERB_MANAGER_SUBSYSTEM_DEF(input) ///running average of how many movement iterations from player input the server processes every second. used for the subsystem stat entry var/movements_per_second = 0 ///running average of the amount of real time clicks take to truly execute after the command is originally sent to the server. - ///if a click isnt delayed at all then it counts as 0 deciseconds. + ///if a click isn't delayed at all then it counts as 0 deciseconds. var/average_click_delay = 0 /datum/controller/subsystem/verb_manager/input/Initialize() @@ -31,7 +31,7 @@ VERB_MANAGER_SUBSYSTEM_DEF(input) return SS_INIT_SUCCESS -// This is for when macro sets are eventualy datumized +// This is for when macro sets are eventually datumized /datum/controller/subsystem/verb_manager/input/proc/setup_default_macro_sets() macro_set = list( "Any" = "\"KeyDown \[\[*\]\]\"", @@ -75,7 +75,7 @@ VERB_MANAGER_SUBSYSTEM_DEF(input) movements_per_second = MC_AVG_SECONDS(movements_per_second, moves_this_run, wait TICKS) /datum/controller/subsystem/verb_manager/input/run_verb_queue() - var/deferred_clicks_this_run = 0 //acts like current_clicks but doesnt count clicks that dont get processed by SSinput + var/deferred_clicks_this_run = 0 //acts like current_clicks but doesn't count clicks that don't get processed by SSinput for(var/datum/callback/verb_callback/queued_click as anything in verb_queue) if(!istype(queued_click)) diff --git a/code/controllers/subsystem/modular_computers.dm b/code/controllers/subsystem/modular_computers.dm index c8efa4aa4ee..0a985fc055c 100644 --- a/code/controllers/subsystem/modular_computers.dm +++ b/code/controllers/subsystem/modular_computers.dm @@ -1,4 +1,4 @@ -s///The maximum amount of logs that can be generated before they start overwriting eachother. +s///The maximum amount of logs that can be generated before they start overwriting each other. #define MAX_LOG_COUNT 300 SUBSYSTEM_DEF(modular_computers) @@ -47,7 +47,7 @@ SUBSYSTEM_DEF(modular_computers) var/static/list/discounts = list("0.10" = 7, "0.15" = 16, "0.20" = 20, "0.25" = 16, "0.50" = 8, "0.66" = 1) var/static/list/flash_discounts = list("0.30" = 3, "0.40" = 8, "0.50" = 8, "0.66" = 2, "0.75" = 1) - ///Eliminates non-alphanumeri characters, as well as the word "Single-Pack" or "Pack" or "Crate" from the coupon code + ///Eliminates non-alphanumeric characters, as well as the word "Single-Pack" or "Pack" or "Crate" from the coupon code var/static/regex/strip_pack_name = regex("\[^a-zA-Z0-9]|(Single-)?Pack|Crate", "g") var/datum/supply_pack/discounted_pack = pick(GLOB.discountable_packs[pick_weight(GLOB.pack_discount_odds)]) diff --git a/code/controllers/subsystem/time_track.dm b/code/controllers/subsystem/time_track.dm index aaaf5520e0f..b3a4fe7e869 100644 --- a/code/controllers/subsystem/time_track.dm +++ b/code/controllers/subsystem/time_track.dm @@ -108,7 +108,7 @@ SUBSYSTEM_DEF(time_track) text2file(sendmaps_json,"bad_sendmaps.json") can_fire = FALSE return - var/send_maps_sort = send_maps_data.Copy() //Doing it like this guarentees us a properly sorted list + var/send_maps_sort = send_maps_data.Copy() //Doing it like this guarantees us a properly sorted list for(var/list/packet in send_maps_data) send_maps_sort[packet["name"]] = packet diff --git a/code/datums/achievements/_awards.dm b/code/datums/achievements/_awards.dm index d99659ea780..e7d18f98124 100644 --- a/code/datums/achievements/_awards.dm +++ b/code/datums/achievements/_awards.dm @@ -67,7 +67,7 @@ /datum/award/proc/parse_value(raw_value) return default_value -///Can be overriden for achievement specific events +///Can be overridden for achievement specific events /datum/award/proc/on_unlock(mob/user) return diff --git a/code/datums/ai/movement/_ai_movement.dm b/code/datums/ai/movement/_ai_movement.dm index d48166eeb23..35492c82699 100644 --- a/code/datums/ai/movement/_ai_movement.dm +++ b/code/datums/ai/movement/_ai_movement.dm @@ -1,4 +1,4 @@ -///This datum is an abstract class that can be overriden for different types of movement +///This datum is an abstract class that can be overridden for different types of movement /datum/ai_movement ///Assoc list ist of controllers that are currently moving as key, and what they are moving to as value var/list/moving_controllers = list() diff --git a/code/datums/ai/robot_customer/robot_customer_behaviors.dm b/code/datums/ai/robot_customer/robot_customer_behaviors.dm index 7aa0f34f520..87120499013 100644 --- a/code/datums/ai/robot_customer/robot_customer_behaviors.dm +++ b/code/datums/ai/robot_customer/robot_customer_behaviors.dm @@ -63,7 +63,7 @@ return AI_BEHAVIOR_DELAY | AI_BEHAVIOR_SUCCEEDED controller.add_blackboard_key(BB_CUSTOMER_PATIENCE, seconds_per_tick * -1 SECONDS) // Convert seconds_per_tick to a SECONDS equivalent. - if(controller.blackboard[BB_CUSTOMER_PATIENCE] < 0 || controller.blackboard[BB_CUSTOMER_LEAVING]) // Check if we're leaving because sometthing mightve forced us to + if(controller.blackboard[BB_CUSTOMER_PATIENCE] < 0 || controller.blackboard[BB_CUSTOMER_LEAVING]) // Check if we're leaving because something might've forced us to return AI_BEHAVIOR_DELAY | AI_BEHAVIOR_FAILED // SPT_PROB 1.5 is about a 40% chance that the tourist will have vocalised at least once every minute. @@ -78,7 +78,7 @@ if(my_seat) controller.pawn.setDir(my_seat.dir) //Sit in your seat - ///Now check if theres a meal infront of us. + ///Now check if there's a meal infront of us. var/datum/venue/attending_venue = controller.blackboard[BB_CUSTOMER_ATTENDING_VENUE] var/turf/infront_turf = get_step(controller.pawn, controller.pawn.dir) @@ -100,7 +100,7 @@ if(greytider || QDELETED(src) || QDELETED(customer_pawn)) return controller.set_blackboard_key(BB_CUSTOMER_LEAVING, TRUE) - customer_pawn.update_icon() //They might have a special leaving accesoiry (french flag) + customer_pawn.update_icon() //They might have a special leaving accessory (French flag) if(succeeded) customer_pawn.say(pick(customer_data.leave_happy_lines)) else diff --git a/code/datums/armor/_armor.dm b/code/datums/armor/_armor.dm index 616ad00c324..961c7827b1d 100644 --- a/code/datums/armor/_armor.dm +++ b/code/datums/armor/_armor.dm @@ -139,15 +139,15 @@ GLOBAL_LIST_INIT(armor_by_type, generate_armor_type_cache()) /// Gets the rating of armor for the specified rating /datum/armor/proc/get_rating(rating) - // its not that I dont trust coders, its just that I don't trust coders + // its not that I don't trust coders, its just that I don't trust coders if(!(rating in ARMOR_LIST_ALL())) - CRASH("Attempted to get a rating '[rating]' that doesnt exist") + CRASH("Attempted to get a rating '[rating]' that doesn't exist") return vars[rating] /datum/armor/immune/get_rating(rating) return 100 -/// Converts all the ratings of the armor into a list, optionally inversed +/// Converts all the ratings of the armor into a list, optionally inverted /datum/armor/proc/get_rating_list(inverse = FALSE) var/ratings = list() for(var/rating in ARMOR_LIST_ALL()) diff --git a/code/datums/bodypart_overlays/bodypart_overlay.dm b/code/datums/bodypart_overlays/bodypart_overlay.dm index 15b1e011149..4059e7968d4 100644 --- a/code/datums/bodypart_overlays/bodypart_overlay.dm +++ b/code/datums/bodypart_overlays/bodypart_overlay.dm @@ -26,7 +26,7 @@ ) return all_images -///Generate the image. Needs to be overriden +///Generate the image. Needs to be overridden /datum/bodypart_overlay/proc/get_image(layer, obj/item/bodypart/limb) CRASH("Get image needs to be overridden") @@ -42,7 +42,7 @@ /datum/bodypart_overlay/proc/removed_from_limb(obj/item/bodypart/limb) return -///Use this to change the appearance (and yes you must overwrite hahahahahah) (or dont use this, I just dont want people directly changing the image) +///Use this to change the appearance (and yes you must overwrite hahahahahah) (or don't use this, I just don't want people directly changing the image) /datum/bodypart_overlay/proc/set_appearance() CRASH("Update appearance needs to be overridden") diff --git a/code/datums/browser.dm b/code/datums/browser.dm index f74ecf6c5a3..b9d85955238 100644 --- a/code/datums/browser.dm +++ b/code/datums/browser.dm @@ -99,7 +99,7 @@ /datum/browser/proc/open(use_onclose = TRUE) 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, span_userdanger("The [title] browser you tried to open failed a sanity check! Please report this on github!")) + to_chat(user, span_userdanger("The [title] browser you tried to open failed a sanity check! Please report this on GitHub!")) return var/window_size = "" if (width && height) diff --git a/code/datums/chatmessage.dm b/code/datums/chatmessage.dm index 998c10a3b9b..ee278cdae62 100644 --- a/code/datums/chatmessage.dm +++ b/code/datums/chatmessage.dm @@ -314,7 +314,7 @@ speaker = v.source spans |= "virtual-speaker" - // Ignore virtual speaker (most often radio messages) from ourself + // Ignore virtual speaker (most often radio messages) from ourselves if (originalSpeaker != src && speaker == src) return diff --git a/code/datums/components/acid.dm b/code/datums/components/acid.dm index fc60e0312fd..74fa1b1ae7f 100644 --- a/code/datums/components/acid.dm +++ b/code/datums/components/acid.dm @@ -148,7 +148,7 @@ GLOBAL_DATUM_INIT(acid_overlay, /mutable_appearance, mutable_appearance('icons/e var/acid_used = min(acid_volume * 0.05, 20) * seconds_per_tick var/applied_targets = 0 for(var/atom/movable/target_movable as anything in target_turf) - // Dont apply acid to things under the turf + // Don't apply acid to things under the turf if(target_turf.underfloor_accessibility < UNDERFLOOR_INTERACTABLE && HAS_TRAIT(target_movable, TRAIT_T_RAY_VISIBLE)) continue // Ignore mobs if turf_acid_ignores_mobs is TRUE diff --git a/code/datums/components/pinata.dm b/code/datums/components/pinata.dm index 064bc2de26b..62e1a8e5552 100644 --- a/code/datums/components/pinata.dm +++ b/code/datums/components/pinata.dm @@ -1,8 +1,8 @@ -///Objects or mobs with this componenet will drop items when taking damage. +///Objects or mobs with this component will drop items when taking damage. /datum/component/pinata ///How much damage does an attack need to do to have a chance to drop "candy" var/minimum_damage - ///What is the likelyhood some "candy" should drop when attacked. + ///What is the likelihood some "candy" should drop when attacked. var/drop_chance ///A list of "candy" items that can be dropped when taking damage var/candy diff --git a/code/datums/components/squeak.dm b/code/datums/components/squeak.dm index c5d42797ab4..94521486bcc 100644 --- a/code/datums/components/squeak.dm +++ b/code/datums/components/squeak.dm @@ -128,7 +128,7 @@ UnregisterSignal(user, COMSIG_QDELETING) holder = null -///just gets rid of the reference to holder in the case that theyre qdeleted +///just gets rid of the reference to holder in the case that they're qdeleted /datum/component/squeak/proc/holder_deleted(datum/source, datum/possible_holder) SIGNAL_HANDLER if(possible_holder == holder) @@ -138,7 +138,7 @@ /datum/component/squeak/proc/disposing_react(datum/source, obj/structure/disposalholder/disposal_holder, obj/machinery/disposal/disposal_source) SIGNAL_HANDLER - //We don't need to worry about unregistering this signal as it will happen for us automaticaly when the holder is qdeleted + //We don't need to worry about unregistering this signal as it will happen for us automatically when the holder is qdeleted RegisterSignal(disposal_holder, COMSIG_ATOM_DIR_CHANGE, PROC_REF(holder_dir_change)) /datum/component/squeak/proc/holder_dir_change(datum/source, old_dir, new_dir) diff --git a/code/datums/datum.dm b/code/datums/datum.dm index 59a1d54571d..3361229b92e 100644 --- a/code/datums/datum.dm +++ b/code/datums/datum.dm @@ -343,7 +343,7 @@ . = ..() update_item_action_buttons() -/** Update a filter's parameter to the new one. If the filter doesnt exist we won't do anything. +/** Update a filter's parameter to the new one. If the filter doesn't exist we won't do anything. * * Arguments: * * name - Filter name @@ -361,7 +361,7 @@ filter_data[name][thing] = new_params[thing] update_filters() -/** Update a filter's parameter and animate this change. If the filter doesnt exist we won't do anything. +/** Update a filter's parameter and animate this change. If the filter doesn't exist we won't do anything. * Basically a [datum/proc/modify_filter] call but with animations. Unmodified filter parameters are kept. * * Arguments: diff --git a/code/datums/datumvars.dm b/code/datums/datumvars.dm index aeea8b22cba..944532324af 100644 --- a/code/datums/datumvars.dm +++ b/code/datums/datumvars.dm @@ -23,8 +23,8 @@ /** * Gets all the dropdown options in the vv menu. - * When overriding, make sure to call . = ..() first and appent to the result, that way parent items are always at the top and child items are further down. - * Add seperators by doing VV_DROPDOWN_OPTION("", "---") + * When overriding, make sure to call . = ..() first and append to the result, that way parent items are always at the top and child items are further down. + * Add separators by doing VV_DROPDOWN_OPTION("", "---") */ /datum/proc/vv_get_dropdown() SHOULD_CALL_PARENT(TRUE) @@ -44,7 +44,7 @@ /** * This proc is only called if everything topic-wise is verified. The only verifications that should happen here is things like permission checks! * href_list is a reference, modifying it in these procs WILL change the rest of the proc in topic.dm of admin/view_variables! - * 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. + * 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 in case this runtimes. */ /datum/proc/vv_do_topic(list/href_list) if(!usr || !usr.client || !usr.client.holder || !check_rights(NONE)) diff --git a/code/datums/diseases/adrenal_crisis.dm b/code/datums/diseases/adrenal_crisis.dm index cd9a2dd3180..aa9587c2e1a 100644 --- a/code/datums/diseases/adrenal_crisis.dm +++ b/code/datums/diseases/adrenal_crisis.dm @@ -8,7 +8,7 @@ agent = "Shitty Adrenal Glands" viable_mobtypes = list(/mob/living/carbon/human) spreading_modifier = 1 - desc = "If left untreated the subject will suffer from lethargy, dizziness and periodic loss of conciousness." + desc = "If left untreated the subject will suffer from lethargy, dizziness and periodic loss of consciousness." severity = DISEASE_SEVERITY_MEDIUM spread_flags = DISEASE_SPREAD_NON_CONTAGIOUS spread_text = "Organ failure" diff --git a/code/datums/diseases/advance/symptoms/choking.dm b/code/datums/diseases/advance/symptoms/choking.dm index 47044068f24..6ae9fe42b6e 100644 --- a/code/datums/diseases/advance/symptoms/choking.dm +++ b/code/datums/diseases/advance/symptoms/choking.dm @@ -74,7 +74,7 @@ Asphyxiation Very very noticable. Decreases stage speed. - Decreases transmittablity. + Decreases transmittability. Bonus Inflicts large spikes of oxyloss diff --git a/code/datums/dna.dm b/code/datums/dna.dm index 4fff0104439..f16cf5bc50c 100644 --- a/code/datums/dna.dm +++ b/code/datums/dna.dm @@ -63,7 +63,7 @@ GLOBAL_LIST_INIT(total_uf_len_by_block, populate_total_uf_len_by_block()) var/list/features = list("mcolor" = COLOR_WHITE) ///Stores the hashed values of the person's non-human features var/unique_features - ///Stores the real name of the person who originally got this dna datum. Used primarely for changelings, + ///Stores the real name of the person who originally got this dna datum. Used primarily for changelings, var/real_name ///All mutations are from now on here var/list/mutations = list() @@ -77,7 +77,7 @@ GLOBAL_LIST_INIT(total_uf_len_by_block, populate_total_uf_len_by_block()) ///List of the default genes from this mutation to allow DNA Scanner highlighting var/default_mutation_genes[DNA_MUTATION_BLOCKS] var/stability = 100 - ///Did we take something like mutagen? In that case we cant get our genes scanned to instantly cheese all the powers. + ///Did we take something like mutagen? In that case we can't get our genes scanned to instantly cheese all the powers. var/scrambled = FALSE /// Weighted list of nonlethal meltdowns var/static/list/nonfatal_meltdowns = list() @@ -743,7 +743,7 @@ GLOBAL_LIST_INIT(total_uf_len_by_block, populate_total_uf_len_by_block()) if(istype(mutation, /datum/mutation/human)) var/datum/mutation/human/M = mutation mutation_type = M.type - if(!mutation_in_sequence(mutation_type)) //cant activate what we dont have, use add_mutation + if(!mutation_in_sequence(mutation_type)) //can't activate what we don't have, use add_mutation return FALSE add_mutation(mutation, MUT_NORMAL) return TRUE diff --git a/code/datums/ductnet.dm b/code/datums/ductnet.dm index e97add695d9..5cc241cce2b 100644 --- a/code/datums/ductnet.dm +++ b/code/datums/ductnet.dm @@ -35,7 +35,7 @@ demanders += P return TRUE -///remove a plumber. we dont delete ourselves because ductnets dont persist through plumbing objects +///remove a plumber. we don't delete ourselves because ductnets don't persist through plumbing objects /datum/ductnet/proc/remove_plumber(datum/component/plumbing/P) suppliers.Remove(P) //we're probably only in one of these, but Remove() is inherently sane so this is fine demanders.Remove(P) @@ -62,7 +62,7 @@ var/obj/machinery/duct/M = A M.duct = src //forget your old master - D.ducts.Cut() //clear this so the other network doesnt clear the ducts along with themselves (this took the life out of me) + D.ducts.Cut() //clear this so the other network doesn't clear the ducts along with themselves (this took the life out of me) D.destroy_network() ///destroy the network and tell all our ducts and plumbers we are gone @@ -72,5 +72,5 @@ for(var/A in ducts) var/obj/machinery/duct/D = A D.duct = null - if(delete) //I don't want code to run with qdeleted objects because that can never be good, so keep this in-case the ductnet has some business left to attend to before commiting suicide + if(delete) //I don't want code to run with qdeleted objects because that can never be good, so keep this in-case the ductnet has some business left to attend to before committing suicide qdel(src) diff --git a/code/datums/elements/bane.dm b/code/datums/elements/bane.dm index 95e21251657..110a755de23 100644 --- a/code/datums/elements/bane.dm +++ b/code/datums/elements/bane.dm @@ -1,6 +1,6 @@ /// Deals extra damage to mobs of a certain type, species, or biotype. -/// This doesn't directly modify the normal damage of the weapon, instead it applies its own damage seperatedly ON TOP of normal damage -/// ie. a sword that does 10 damage with a bane elment attacthed that has a 0.5 damage_multiplier will do: +/// This doesn't directly modify the normal damage of the weapon, instead it applies its own damage separately ON TOP of normal damage +/// ie. a sword that does 10 damage with a bane element attached that has a 0.5 damage_multiplier will do: /// 10 damage from the swords normal attack + 5 damage (50%) from the bane element /datum/element/bane element_flags = ELEMENT_BESPOKE diff --git a/code/datums/mood.dm b/code/datums/mood.dm index 8193f9c1c15..3834ea866b8 100644 --- a/code/datums/mood.dm +++ b/code/datums/mood.dm @@ -288,7 +288,7 @@ if (SANITY_LEVEL_INSANE) mood_screen_object.color = "#f15d36" - if (!conflicting_moodies.len) // theres no special icons, use the normal icon states + if (!conflicting_moodies.len) // there's no special icons, use the normal icon states mood_screen_object.icon_state = "mood[mood_level]" return diff --git a/code/datums/mutations/touch.dm b/code/datums/mutations/touch.dm index 98d3d18807f..2483ef2e0fa 100644 --- a/code/datums/mutations/touch.dm +++ b/code/datums/mutations/touch.dm @@ -51,7 +51,7 @@ /datum/action/cooldown/spell/touch/shock/cast_on_hand_hit(obj/item/melee/touch_attack/hand, atom/victim, mob/living/carbon/caster) if(iscarbon(victim)) var/mob/living/carbon/carbon_victim = victim - if(carbon_victim.electrocute_act(15, caster, 1, SHOCK_NOGLOVES | SHOCK_NOSTUN))//doesnt stun. never let this stun + if(carbon_victim.electrocute_act(15, caster, 1, SHOCK_NOGLOVES | SHOCK_NOSTUN))//doesn't stun. never let this stun carbon_victim.dropItemToGround(carbon_victim.get_active_held_item()) carbon_victim.dropItemToGround(carbon_victim.get_inactive_held_item()) carbon_victim.adjust_confusion(15 SECONDS) @@ -156,7 +156,7 @@ heal_multiplier = initial(heal_multiplier) * power_coefficient pain_multiplier = initial(pain_multiplier) * synchronizer_coefficient - // Message to show on a succesful heal if the healer has a special pacifism interaction with the mutation. + // Message to show on a successful heal if the healer has a special pacifism interaction with the mutation. var/peaceful_message = null // Heal more, hurt a bit more. @@ -340,7 +340,7 @@ /obj/item/melee/touch_attack/lay_on_hands name = "mending touch" - desc = "Unlike in your favorite tabletop games, you sadly can't cast this on yourself, so you can't use that as a Scapegoat." // mayus is reference. if you get it youre cool + desc = "Unlike in your favorite tabletop games, you sadly can't cast this on yourself, so you can't use that as a Scapegoat." // mayus is reference. if you get it you're cool icon = 'icons/obj/weapons/hand.dmi' icon_state = "greyscale" color = COLOR_VERY_PALE_LIME_GREEN diff --git a/code/datums/view.dm b/code/datums/view.dm index 19ba66c3900..90d07c66796 100644 --- a/code/datums/view.dm +++ b/code/datums/view.dm @@ -1,19 +1,19 @@ //This is intended to be a full wrapper. DO NOT directly modify its values ///Container for client viewsize /datum/view_data - /// Width offset to apply to the default view string if we're not supressed for some reason + /// Width offset to apply to the default view string if we're not suppressed for some reason var/width = 0 /// Height offset to apply to the default view string, see above var/height = 0 /// This client's current "default" view, in the format "WidthxHeight" /// We add/remove from this when we want to change their window size var/default = "" - /// This client's current zoom level, if it's not being supressed + /// This client's current zoom level, if it's not being suppressed /// If it's 0, we autoscale to the size of the window. Otherwise it's treated as the ratio between /// the pixels on the map and output pixels. Only looks proper nice in increments of whole numbers (iirc) /// Stored here so other parts of the code have a non blocking way of getting a user's functional zoom var/zoom = 0 - /// If the view is currently being supressed by some other "monitor" + /// If the view is currently being suppressed by some other "monitor" /// For when you want to own the client's eye without fucking with their viewport /// Doesn't make sense for a binocoler to effect your view in a camera console var/is_suppressed = FALSE @@ -73,7 +73,7 @@ apply() /datum/view_data/proc/setTo(toAdd) - var/list/shitcode = getviewsize(toAdd) //Backward compatability to account + var/list/shitcode = getviewsize(toAdd) //Backward compatibility 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 apply() diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index 7c2eb755a5f..e85bf1db6e1 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -66,7 +66,7 @@ /** * In case you have multiple types, you automatically use the most useful one. * IE: Skating on ice, flippers on water, flying over chasm/space, etc. - * I reccomend you use the movetype_handler system and not modify this directly, especially for living mobs. + * I recommend you use the movetype_handler system and not modify this directly, especially for living mobs. */ var/movement_type = GROUND @@ -130,7 +130,7 @@ /mutable_appearance/emissive_blocker/New() . = ..() - // Need to do this here because it's overriden by the parent call + // Need to do this here because it's overridden by the parent call color = EM_BLOCK_COLOR appearance_flags = EMISSIVE_APPEARANCE_FLAGS @@ -142,7 +142,7 @@ #endif #if EMISSIVE_BLOCK_GENERIC != 0 - #error EMISSIVE_BLOCK_GENERIC is expected to be 0 to faciliate a weird optimization hack where we rely on it being the most common. + #error EMISSIVE_BLOCK_GENERIC is expected to be 0 to facilitate a weird optimization hack where we rely on it being the most common. #error Read the comment in code/game/atoms_movable.dm for details. #endif @@ -634,7 +634,7 @@ if(!newloc || newloc == loc) return - // A mid-movement... movement... occured, resolve that first. + // A mid-movement... movement... occurred, resolve that first. RESOLVE_ACTIVE_MOVEMENT if(!direction) @@ -801,7 +801,7 @@ if (pulledby) if (pulledby.currently_z_moving) check_pulling(z_allowed = TRUE) - //dont call check_pulling() here at all if there is a pulledby that is not currently z moving + //don't call check_pulling() here at all if there is a pulledby that is not currently z moving //because it breaks stair conga lines, for some fucking reason. //it's fine because the pull will be checked when this whole proc is called by the mob doing the pulling anyways else @@ -1088,7 +1088,7 @@ for(var/atom/movable/location as anything in get_nested_locs(src) + src) LAZYREMOVEASSOC(location.important_recursive_contents, RECURSIVE_CONTENTS_ACTIVE_STORAGE, src) -///Sets the anchored var and returns if it was sucessfully changed or not. +///Sets the anchored var and returns if it was successfully changed or not. /atom/movable/proc/set_anchored(anchorvalue) SHOULD_CALL_PARENT(TRUE) if(anchored == anchorvalue) diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index 002044b2934..d83a222c108 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -101,7 +101,7 @@ /obj/machinery/autolathe/proc/AfterMaterialInsert(container, obj/item/item_inserted, last_inserted_id, mats_consumed, amount_inserted, atom/context) SIGNAL_HANDLER - //we use initial(active_power_usage) because higher tier parts will have higher active usage but we have no benifit from it + //we use initial(active_power_usage) because higher tier parts will have higher active usage but we have no benefit from it if(directly_use_energy(ROUND_UP((amount_inserted / (MAX_STACK_SIZE * SHEET_MATERIAL_AMOUNT)) * 0.4 * initial(active_power_usage)))) flick_overlay_view(mutable_appearance('icons/obj/machines/lathes.dmi', "autolathe_mat"), 1 SECONDS) diff --git a/code/game/machinery/barsigns.dm b/code/game/machinery/barsigns.dm index 8b157ff2750..1e2ed3fcf63 100644 --- a/code/game/machinery/barsigns.dm +++ b/code/game/machinery/barsigns.dm @@ -428,7 +428,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/barsign, 32) /datum/barsign/maltroach name = "Maltroach" icon_state = "maltroach" - desc = "Mothroaches politely greet you into the bar, or are they greeting eachother?" + desc = "Mothroaches politely greet you into the bar, or are they greeting each other?" neon_color = "#649e8a" /datum/barsign/rock_bottom diff --git a/code/game/machinery/computer/atmos_computers/__identifiers.dm b/code/game/machinery/computer/atmos_computers/__identifiers.dm index 653f0fbaa38..be1f01aecb5 100644 --- a/code/game/machinery/computer/atmos_computers/__identifiers.dm +++ b/code/game/machinery/computer/atmos_computers/__identifiers.dm @@ -1,7 +1,7 @@ // ATMOSIA GAS MONITOR SUITE TAGS // Things that use these include atmos control monitors, sensors, inputs, and outlets. // They last three adds _sensor, _in, and _out respectively to the id_tag variable. -// Dont put underscores here, we use them as delimiters. +// Don't put underscores here, we use them as delimiters. #define ATMOS_GAS_MONITOR_O2 GAS_O2 #define ATMOS_GAS_MONITOR_PLAS GAS_PLASMA diff --git a/code/game/machinery/limbgrower.dm b/code/game/machinery/limbgrower.dm index 8a12b129eb2..cd36dcce09a 100644 --- a/code/game/machinery/limbgrower.dm +++ b/code/game/machinery/limbgrower.dm @@ -233,7 +233,7 @@ */ /obj/machinery/limbgrower/proc/build_limb(buildpath) /// The limb we're making with our buildpath, so we can edit it. - //i need to create a body part manually using a set icon (otherwise it doesnt appear) + //i need to create a body part manually using a set icon (otherwise it doesn't appear) var/obj/item/bodypart/limb limb = new buildpath(loc) limb.name = "\improper synthetic [selected_category] [limb.plaintext_zone]" diff --git a/code/game/machinery/machine_frame.dm b/code/game/machinery/machine_frame.dm index ccdcddc8705..d39d0652324 100644 --- a/code/game/machinery/machine_frame.dm +++ b/code/game/machinery/machine_frame.dm @@ -454,7 +454,7 @@ var/obj/item/circuitboard/machine/leaving_circuit = circuit circuit = null // Assign the circuit & parts & move them all at once into the machine - // no need to seperatly move circuit board as its already part of the components list + // no need to separately move circuit board as its already part of the components list new_machine.circuit = leaving_circuit new_machine.component_parts = components for (var/obj/new_part in components) diff --git a/code/game/machinery/modular_shield.dm b/code/game/machinery/modular_shield.dm index 38e2e75b286..b4fa6bed17b 100644 --- a/code/game/machinery/modular_shield.dm +++ b/code/game/machinery/modular_shield.dm @@ -1,22 +1,22 @@ /obj/machinery/modular_shield_generator name = "modular shield generator" - desc = "A forcefield generator, it seems more stationary than its cousins. It cant handle G-force and will require frequent reboots when built on mobile craft." + desc = "A forcefield generator, it seems more stationary than its cousins. It can't handle G-force and will require frequent reboots when built on mobile craft." icon = 'icons/obj/machines/modular_shield_generator.dmi' icon_state = "gen_recovering_closed" density = TRUE circuit = /obj/item/circuitboard/machine/modular_shield_generator processing_flags = START_PROCESSING_ON_INIT - ///Doesnt actually control it, just tells us if its running or not, you can control by calling procs activate_shields and deactivate_shields + ///Doesn't actually control it, just tells us if its running or not, you can control by calling procs activate_shields and deactivate_shields var/active = FALSE ///If the generator is currently spawning the forcefield in var/initiating = FALSE - ///Determins if we can turn it on or not, no longer recovering when back to max strength + ///Determines if we can turn it on or not, no longer recovering when back to max strength var/recovering = TRUE - ///Determins max health of the shield + ///Determines max health of the shield var/max_strength = 40 ///Current health of shield @@ -28,13 +28,13 @@ ///The regeneration that the shield can support var/current_regeneration - ///Determins the max radius the shield can support + ///Determines the max radius the shield can support var/max_radius = 3 ///Current radius the shield is set to, minimum 3 var/radius = 3 - ///Determins if we only generate a shield on space turfs or not + ///Determines if we only generate a shield on space turfs or not var/exterior_only = FALSE ///The lazy list of shields that are ours @@ -286,7 +286,7 @@ return var/change_radius = max(1,(text2num(params["new_radius"]))) if(change_radius >= 10) - radius = round(change_radius)//if its over 10 we dont allow decimals + radius = round(change_radius)//if its over 10 we don't allow decimals return radius = change_radius @@ -370,7 +370,7 @@ recovering = FALSE calculate_regeneration() update_icon_state() - end_processing() //we dont care about continuing to update the alpha, we want to show history of damage to show its unstable + end_processing() //we don't care about continuing to update the alpha, we want to show history of damage to show its unstable if (active) var/random_num = rand(1,deployed_shields.len) var/obj/structure/emergency_shield/modular/random_shield = deployed_shields[random_num] @@ -383,7 +383,7 @@ /obj/machinery/modular_shield/module name = "modular shield debugger" //Filler name and sprite for testing - desc = "This is filler for testing you shouldn`t see this." + desc = "This is filler for testing you shouldn't see this." icon = 'icons/obj/machines/mech_bay.dmi' icon_state = "recharge_port" density = TRUE @@ -677,7 +677,7 @@ color = "#00ffff" density = FALSE alpha = 100 - resistance_flags = INDESTRUCTIBLE //the shield itself is indestructible or atleast should be + resistance_flags = INDESTRUCTIBLE //the shield itself is indestructible or at least should be no_damage_feedback = "weakening the generator sustaining it" ///The shield generator sustaining us diff --git a/code/game/machinery/newscaster/newscaster_data.dm b/code/game/machinery/newscaster/newscaster_data.dm index 94449808857..89e491532c4 100644 --- a/code/game/machinery/newscaster/newscaster_data.dm +++ b/code/game/machinery/newscaster/newscaster_data.dm @@ -107,17 +107,17 @@ GLOBAL_LIST_EMPTY(request_list) channel_ID = random_channel_id_setup() /** - * This proc assigns each feed_channel a random integer, from 1-999 as a unique identifer. + * This proc assigns each feed_channel a random integer, from 1-999 as a unique identifier. * Using this value, the TGUI window has a unique identifier to attach to messages that can be used to reattach them * to their parent channels back in dreammaker. - * Based on implementation, we're limiting outselves to only 998 player made channels maximum. How we'd use all of them, I don't know. + * Based on implementation, we're limiting ourselves to only 998 player made channels maximum. How we'd use all of them, I don't know. */ /datum/feed_channel/proc/random_channel_id_setup() if(!GLOB.news_network) return //Should only apply to channels made before setup is finished, use hardset_channel for these if(!GLOB.news_network.channel_IDs) GLOB.news_network.channel_IDs += rand(1,999) - return //This will almost always be the station annoucements channel here. + return //This will almost always be the station announcements channel here. var/channel_id for(var/i in 1 to 10000) channel_id = rand(1, 999) @@ -155,7 +155,7 @@ GLOBAL_LIST_EMPTY(request_list) var/active /// What is the criminal in question's name? Not a mob reference as this is a text field. var/criminal - /// Message body used to describe what crime has been comitted. + /// Message body used to describe what crime has been committed. var/body /// Who was it that created this wanted message? var/scanned_user @@ -181,7 +181,7 @@ GLOBAL_LIST_EMPTY(request_list) var/message_count = 0 /datum/feed_network/New() - create_feed_channel("Station Announcements", "SS13", "Company news, staff annoucements, and all the latest information. Have a secure shift!", locked = TRUE, hardset_channel = 1000) + create_feed_channel("Station Announcements", "SS13", "Company news, staff announcements, and all the latest information. Have a secure shift!", locked = TRUE, hardset_channel = 1000) wanted_issue = new /datum/wanted_message /datum/feed_network/proc/create_feed_channel(channel_name, author, desc, locked, adminChannel = FALSE, hardset_channel) diff --git a/code/game/objects/items/devices/multitool.dm b/code/game/objects/items/devices/multitool.dm index f8d3f43e9a6..d8b81f4a090 100644 --- a/code/game/objects/items/devices/multitool.dm +++ b/code/game/objects/items/devices/multitool.dm @@ -59,7 +59,7 @@ /obj/item/multitool/suicide_act(mob/living/carbon/user) user.visible_message(span_suicide("[user] puts the [src] to [user.p_their()] chest. It looks like [user.p_theyre()] trying to pulse [user.p_their()] heart off!")) - return OXYLOSS//theres a reason it wasn't recommended by doctors + return OXYLOSS//there's a reason it wasn't recommended by doctors /** * Sets the multitool internal object buffer @@ -142,7 +142,7 @@ if(distance < rangealert) //ai should be able to see us detect_state = PROXIMITY_ON_SCREEN break - if(distance < rangewarning) //ai cant see us but is close + if(distance < rangewarning) //ai can't see us but is close detect_state = PROXIMITY_NEAR /datum/action/item_action/toggle_multitool diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index c1a64fafe28..03bd127175e 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -19,7 +19,7 @@ w_class = WEIGHT_CLASS_SMALL custom_materials = list(/datum/material/iron=SMALL_MATERIAL_AMOUNT * 0.75, /datum/material/glass=SMALL_MATERIAL_AMOUNT * 0.25) - ///if FALSE, broadcasting and listening dont matter and this radio shouldnt do anything + ///if FALSE, broadcasting and listening don't matter and this radio shouldn't do anything VAR_PRIVATE/on = TRUE ///the "default" radio frequency this radio is set to, listens and transmits to this frequency by default. wont work if the channel is encrypted VAR_PRIVATE/frequency = FREQ_COMMON @@ -77,7 +77,7 @@ /// overlay when mic is on var/overlay_mic_idle = "m_idle" - /// overlay when speaking a message (is displayed simultaniously with speaker_active) + /// overlay when speaking a message (is displayed simultaneously with speaker_active) var/overlay_mic_active = "m_active" /// When set to FALSE, will avoid calling update_icon() in set_broadcasting and co. @@ -185,7 +185,7 @@ ..() //simple getters only because i NEED to enforce complex setter use for these vars for caching purposes but VAR_PROTECTED requires getter usage as well. -//if another decorator is made that doesnt require getters feel free to nuke these and change these vars over to that +//if another decorator is made that doesn't require getters feel free to nuke these and change these vars over to that ///simple getter for the on variable. necessary due to VAR_PROTECTED /obj/item/radio/proc/is_on() @@ -240,7 +240,7 @@ if(actual_setting) should_be_broadcasting = broadcasting - if(broadcasting && on) //we dont need hearing sensitivity if we arent broadcasting, because talk_into doesnt care about hearing + if(broadcasting && on) //we don't need hearing sensitivity if we aren't broadcasting, because talk_into doesn't care about hearing become_hearing_sensitive(INNATE_TRAIT) else if(!broadcasting) lose_hearing_sensitivity(INNATE_TRAIT) @@ -256,7 +256,7 @@ on = new_on if(on) - set_broadcasting(should_be_broadcasting)//set them to whatever theyre supposed to be + set_broadcasting(should_be_broadcasting)//set them to whatever they're supposed to be set_listening(should_be_listening) else set_broadcasting(FALSE, actual_setting = FALSE)//fake set them to off diff --git a/code/game/objects/items/dice.dm b/code/game/objects/items/dice.dm index f32b2ee30ec..b06dd737654 100644 --- a/code/game/objects/items/dice.dm +++ b/code/game/objects/items/dice.dm @@ -181,7 +181,7 @@ name = "knucklebones rules" default_raw_text = "How to play knucklebones
\