diff --git a/code/__DEFINES/ai/pets.dm b/code/__DEFINES/ai/pets.dm index 48d4f2d67d0..6af24b6cdd9 100644 --- a/code/__DEFINES/ai/pets.dm +++ b/code/__DEFINES/ai/pets.dm @@ -67,7 +67,7 @@ //virtual pet keys ///the last PDA message we must relay -#define BB_LAST_RECIEVED_MESSAGE "last_recieved_message" +#define BB_LAST_RECEIVED_MESSAGE "last_received_message" ///our current virtual pet level #define BB_VIRTUAL_PET_LEVEL "virtual_pet_level" ///the target we will play with diff --git a/code/__DEFINES/dcs/signals/signals_object.dm b/code/__DEFINES/dcs/signals/signals_object.dm index f628df0e964..bcfc32ba092 100644 --- a/code/__DEFINES/dcs/signals/signals_object.dm +++ b/code/__DEFINES/dcs/signals/signals_object.dm @@ -423,7 +423,7 @@ #define COMSIG_VIM_HEADLIGHTS_TOGGLED "vim_headlights_toggled" ///from /datum/computer_file/program/messenger/proc/receive_message -#define COMSIG_COMPUTER_RECIEVED_MESSAGE "computer_recieved_message" +#define COMSIG_COMPUTER_RECEIVED_MESSAGE "computer_received_message" ///from /datum/computer_file/program/virtual_pet/proc/handle_level_up #define COMSIG_VIRTUAL_PET_LEVEL_UP "virtual_pet_level_up" diff --git a/code/datums/components/sound_player.dm b/code/datums/components/sound_player.dm index 9bad9718a05..fc1ff34041c 100644 --- a/code/datums/components/sound_player.dm +++ b/code/datums/components/sound_player.dm @@ -1,7 +1,7 @@ /** * Sound Player component * - * Component that will play a sound upon recieving some signal + * Component that will play a sound upon receiving some signal */ /datum/component/sound_player ///Volume of the sound when played diff --git a/code/datums/mind/_mind.dm b/code/datums/mind/_mind.dm index 3aaeb093b92..f7597da54cc 100644 --- a/code/datums/mind/_mind.dm +++ b/code/datums/mind/_mind.dm @@ -553,7 +553,7 @@ /// Sets us to the passed job datum, then greets them to their new job. /// Use this one for when you're assigning this mind to a new job for the first time, -/// or for when someone's recieving a job they'd really want to be greeted to. +/// or for when someone's receiving a job they'd really want to be greeted to. /datum/mind/proc/set_assigned_role_with_greeting(datum/job/new_role, client/incoming_client) . = set_assigned_role(new_role) if(assigned_role != new_role) diff --git a/code/datums/wounds/burns.dm b/code/datums/wounds/burns.dm index dac47d4ea88..394486fef9a 100644 --- a/code/datums/wounds/burns.dm +++ b/code/datums/wounds/burns.dm @@ -290,7 +290,7 @@ flesh_damage = 5 scar_keyword = "burnmoderate" - simple_desc = "Patient's skin is burned, weakening the limb and multiplying percieved damage!" + simple_desc = "Patient's skin is burned, weakening the limb and multiplying perceived damage!" simple_treat_text = "Ointment will speed up recovery, as will regenerative mesh. Risk of infection is negligible." homemade_treat_text = "Healthy tea will speed up recovery. Salt, or preferably a salt-water mixture, will sanitize the wound, but the former will cause skin irritation, increasing the risk of infection." diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index b1720c45c51..9ada7e70a91 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -286,7 +286,7 @@ // We're gonna build a light, and mask it with the base turf's appearance // grab a 32x32 square of it // I would like to use GLOB.starbright_overlays here - // But that breaks down for... some? reason. I think recieving a render relay breaks keep_together or something + // But that breaks down for... some? reason. I think receiving a render relay breaks keep_together or something // So we're just gonna accept that this'll break with starlight color changing. hardly matters since this is really only for offset stuff, but I'd love to fix it someday var/mutable_appearance/light = new(GLOB.starlight_objects[GET_TURF_PLANE_OFFSET(generate_for) + 1]) light.render_target = "" diff --git a/code/game/machinery/computer/orders/order_computer/order_computer.dm b/code/game/machinery/computer/orders/order_computer/order_computer.dm index 718fa2bc218..770897a2fe4 100644 --- a/code/game/machinery/computer/orders/order_computer/order_computer.dm +++ b/code/game/machinery/computer/orders/order_computer/order_computer.dm @@ -208,7 +208,7 @@ GLOBAL_LIST_EMPTY(order_console_products) return TRUE /** - * Checks if an ID card is able to afford the total cost of the current console's grocieries + * Checks if an ID card is able to afford the total cost of the current console's groceries * and deducts the cost if they can. * Args: * card - The ID card we check for balance diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm index 5ba5e6937ca..504f547b5cb 100644 --- a/code/game/objects/items/devices/radio/intercom.dm +++ b/code/game/objects/items/devices/radio/intercom.dm @@ -11,7 +11,7 @@ item_flags = NO_BLOOD_ON_ITEM overlay_speaker_idle = "intercom_s" - overlay_speaker_active = "intercom_recieve" + overlay_speaker_active = "intercom_receive" overlay_mic_idle = "intercom_m" overlay_mic_active = null diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index ffb4f486cb8..ced454c3d32 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -76,7 +76,7 @@ /// overlay when speaker is on var/overlay_speaker_idle = "s_idle" - /// overlay when recieving a message + /// overlay when receiving a message var/overlay_speaker_active = "s_active" /// overlay when mic is on diff --git a/code/modules/antagonists/heretic/knowledge/side_lock_moon.dm b/code/modules/antagonists/heretic/knowledge/side_lock_moon.dm index 5ab50a8b84f..b4da4018fc1 100644 --- a/code/modules/antagonists/heretic/knowledge/side_lock_moon.dm +++ b/code/modules/antagonists/heretic/knowledge/side_lock_moon.dm @@ -5,7 +5,7 @@ desc = "Grants you Mind Gate, a spell \ which deals you 20 brain damage but the target suffers a hallucination,\ is left confused for 10 seconds, suffers oxygen loss and brain damage." - gain_text = "My mind swings open like a gate, and its insight will let me percieve the truth." + gain_text = "My mind swings open like a gate, and its insight will let me perceive the truth." next_knowledge = list( /datum/heretic_knowledge/key_ring, /datum/heretic_knowledge/spell/moon_smile, diff --git a/code/modules/events/heart_attack.dm b/code/modules/events/heart_attack.dm index 895d5a5fd99..1a1fa3ac67c 100644 --- a/code/modules/events/heart_attack.dm +++ b/code/modules/events/heart_attack.dm @@ -9,7 +9,7 @@ min_wizard_trigger_potency = 6 max_wizard_trigger_potency = 7 admin_setup = list(/datum/event_admin_setup/minimum_candidate_requirement/heart_attack, /datum/event_admin_setup/input_number/heart_attack) - ///Candidates for recieving a healthy dose of heart disease + ///Candidates for receiving a healthy dose of heart disease var/list/heart_attack_candidates = list() /datum/round_event_control/heart_attack/can_spawn_event(players_amt, allow_magic = FALSE) diff --git a/code/modules/meteors/meteor_types.dm b/code/modules/meteors/meteor_types.dm index 120352f14c5..9096ab24afe 100644 --- a/code/modules/meteors/meteor_types.dm +++ b/code/modules/meteors/meteor_types.dm @@ -150,7 +150,7 @@ * Admin spawned meteors will not grant the user an achievement. * * Arguments: - * * user - the person who will be recieving the examine award. + * * user - the person who will be receiving the examine award. */ /obj/effect/meteor/proc/check_examine_award(mob/user) diff --git a/code/modules/mob/living/basic/pets/orbie/orbie_ai.dm b/code/modules/mob/living/basic/pets/orbie/orbie_ai.dm index 92f433bd08a..1452dd18dee 100644 --- a/code/modules/mob/living/basic/pets/orbie/orbie_ai.dm +++ b/code/modules/mob/living/basic/pets/orbie/orbie_ai.dm @@ -22,12 +22,12 @@ . = ..() if(. & AI_CONTROLLER_INCOMPATIBLE) return - RegisterSignal(new_pawn, COMSIG_AI_BLACKBOARD_KEY_SET(BB_LAST_RECIEVED_MESSAGE), PROC_REF(on_set_message)) + RegisterSignal(new_pawn, COMSIG_AI_BLACKBOARD_KEY_SET(BB_LAST_RECEIVED_MESSAGE), PROC_REF(on_set_message)) /datum/ai_controller/basic_controller/orbie/proc/on_set_message(datum/source) SIGNAL_HANDLER - addtimer(CALLBACK(src, PROC_REF(clear_blackboard_key), BB_LAST_RECIEVED_MESSAGE), MESSAGE_EXPIRY_TIME) + addtimer(CALLBACK(src, PROC_REF(clear_blackboard_key), BB_LAST_RECEIVED_MESSAGE), MESSAGE_EXPIRY_TIME) ///ai behavior that lets us search for other orbies to play with /datum/ai_planning_subtree/find_playmates @@ -84,10 +84,10 @@ /datum/ai_planning_subtree/relay_pda_message /datum/ai_planning_subtree/relay_pda_message/SelectBehaviors(datum/ai_controller/controller, seconds_per_tick) - if(controller.blackboard[BB_VIRTUAL_PET_LEVEL] < 2 || isnull(controller.blackboard[BB_LAST_RECIEVED_MESSAGE])) + if(controller.blackboard[BB_VIRTUAL_PET_LEVEL] < 2 || isnull(controller.blackboard[BB_LAST_RECEIVED_MESSAGE])) return - controller.queue_behavior(/datum/ai_behavior/relay_pda_message, BB_LAST_RECIEVED_MESSAGE) + controller.queue_behavior(/datum/ai_behavior/relay_pda_message, BB_LAST_RECEIVED_MESSAGE) /datum/ai_behavior/relay_pda_message/perform(seconds_per_tick, datum/ai_controller/controller, target_key) var/mob/living/basic/living_pawn = controller.pawn diff --git a/code/modules/mob/living/carbon/human/_species.dm b/code/modules/mob/living/carbon/human/_species.dm index 82d51c173cb..778522b4d42 100644 --- a/code/modules/mob/living/carbon/human/_species.dm +++ b/code/modules/mob/living/carbon/human/_species.dm @@ -1663,7 +1663,7 @@ GLOBAL_LIST_EMPTY(features_by_species) /datum/species/proc/get_species_perks() var/list/species_perks = list() - // Let us get every perk we can concieve of in one big list. + // Let us get every perk we can conceive of in one big list. // The order these are called (kind of) matters. // Species unique perks first, as they're more important than genetic perks, // and language perk last, as it comes at the end of the perks list diff --git a/code/modules/mob/living/init_signals.dm b/code/modules/mob/living/init_signals.dm index 8415881a83a..064a0573353 100644 --- a/code/modules/mob/living/init_signals.dm +++ b/code/modules/mob/living/init_signals.dm @@ -87,7 +87,7 @@ SIGNAL_HANDLER REMOVE_TRAIT(src, TRAIT_KNOCKEDOUT, TRAIT_DEATHCOMA) -/// Updates medhud when recieving relevant signals. +/// Updates medhud when receiving relevant signals. /mob/living/proc/update_medhud_on_signal(datum/source) SIGNAL_HANDLER med_hud_set_health() diff --git a/code/modules/modular_computers/computers/item/pda.dm b/code/modules/modular_computers/computers/item/pda.dm index cbed5bef57f..e5c8c8da89c 100644 --- a/code/modules/modular_computers/computers/item/pda.dm +++ b/code/modules/modular_computers/computers/item/pda.dm @@ -376,7 +376,7 @@ return robotact qdel(robotact) robotact = null - CRASH("Cyborg [silicon_owner]'s tablet hard drive rejected recieving a new copy of the self-manage app. To fix, check the hard drive's space remaining. Please make a bug report about this.") + CRASH("Cyborg [silicon_owner]'s tablet hard drive rejected receiving a new copy of the self-manage app. To fix, check the hard drive's space remaining. Please make a bug report about this.") //Makes the light settings reflect the borg's headlamp settings /obj/item/modular_computer/pda/silicon/cyborg/ui_data(mob/user) diff --git a/code/modules/modular_computers/file_system/programs/messenger/messenger_program.dm b/code/modules/modular_computers/file_system/programs/messenger/messenger_program.dm index 4fc3730ef08..0b2f478172b 100644 --- a/code/modules/modular_computers/file_system/programs/messenger/messenger_program.dm +++ b/code/modules/modular_computers/file_system/programs/messenger/messenger_program.dm @@ -713,7 +713,7 @@ var/photo_message = signal.data["photo"] ? " (Photo Attached)" : "" to_chat(messaged_mob, span_infoplain("[icon2html(computer, messaged_mob)] PDA message from [sender_title], \"[inbound_message]\"[photo_message] [reply]")) - SEND_SIGNAL(computer, COMSIG_COMPUTER_RECIEVED_MESSAGE, sender_title, inbound_message, photo_message) + SEND_SIGNAL(computer, COMSIG_COMPUTER_RECEIVED_MESSAGE, sender_title, inbound_message, photo_message) if (alert_able && (!alert_silenced || is_rigged)) computer.ring(ringtone) diff --git a/code/modules/modular_computers/file_system/programs/virtual_pet.dm b/code/modules/modular_computers/file_system/programs/virtual_pet.dm index 1d3196789ca..1a1c69b9748 100644 --- a/code/modules/modular_computers/file_system/programs/virtual_pet.dm +++ b/code/modules/modular_computers/file_system/programs/virtual_pet.dm @@ -127,11 +127,11 @@ GLOBAL_LIST_EMPTY(virtual_pets_list) pet.forceMove(computer) -/datum/computer_file/program/virtual_pet/proc/on_message_recieve(datum/source, sender_title, inbound_message, photo_message) +/datum/computer_file/program/virtual_pet/proc/on_message_receive(datum/source, sender_title, inbound_message, photo_message) SIGNAL_HANDLER var/message_to_display = "[sender_title] has sent you a message [photo_message ? "with a photo attached" : ""]: [inbound_message]!" - pet.ai_controller?.set_blackboard_key(BB_LAST_RECIEVED_MESSAGE, message_to_display) + pet.ai_controller?.set_blackboard_key(BB_LAST_RECEIVED_MESSAGE, message_to_display) /datum/computer_file/program/virtual_pet/proc/pet_pre_clean(atom/source, mob/user) SIGNAL_HANDLER @@ -289,7 +289,7 @@ GLOBAL_LIST_EMPTY(virtual_pets_list) /datum/computer_file/program/virtual_pet/proc/grant_level_abilities() switch(level) if(2) - RegisterSignal(computer, COMSIG_COMPUTER_RECIEVED_MESSAGE, PROC_REF(on_message_recieve)) // we will now read out PDA messages + RegisterSignal(computer, COMSIG_COMPUTER_RECEIVED_MESSAGE, PROC_REF(on_message_receive)) // we will now read out PDA messages var/datum/action/cooldown/mob_cooldown/lights/lights = new(pet) lights.Grant(pet) pet.ai_controller?.set_blackboard_key(BB_LIGHTS_ABILITY, lights) diff --git a/code/modules/wiremod/core/component.dm b/code/modules/wiremod/core/component.dm index cf142d1e365..7f7bddaa572 100644 --- a/code/modules/wiremod/core/component.dm +++ b/code/modules/wiremod/core/component.dm @@ -410,7 +410,7 @@ * Called when a circuit component requests to send Ntnet data signal. * * Arguments: - * * port - The required list port needed by the Ntnet recieve + * * port - The required list port needed by the Ntnet receive * * key - The encryption key * * signal_type - The signal type used for sending this global signal (optional, default is COMSIG_GLOB_CIRCUIT_NTNET_DATA_SENT) */ diff --git a/icons/obj/machines/wallmounts.dmi b/icons/obj/machines/wallmounts.dmi index e849746eb0a..e659a0248ec 100644 Binary files a/icons/obj/machines/wallmounts.dmi and b/icons/obj/machines/wallmounts.dmi differ diff --git a/tools/ci/check_grep.sh b/tools/ci/check_grep.sh index a9e7e11117a..8436073fe97 100644 --- a/tools/ci/check_grep.sh +++ b/tools/ci/check_grep.sh @@ -92,6 +92,11 @@ if $grep -i'centcomm' $map_files; then echo -e "${RED}ERROR: Misspelling(s) of CentCom detected in maps, please remove the extra M(s).${NC}" st=1 fi; +if $grep -i'eciev' $map_files; then + echo + echo -e "${RED}ERROR: Common I-before-E typo detected in maps.${NC}" + st=1 +fi; section "whitespace issues" part "space indentation" @@ -205,6 +210,11 @@ if $grep 'NanoTrasen' $code_files; then echo -e "${RED}ERROR: Misspelling(s) of Nanotrasen detected in code, please uncapitalize the T(s).${NC}" st=1 fi; +if $grep -i'eciev' $code_files; then + echo + echo -e "${RED}ERROR: Common I-before-E typo detected in code.${NC}" + st=1 +fi; part "map json naming" if ls _maps/*.json | $grep "[A-Z]"; then echo