diff --git a/_maps/RandomRuins/IceRuins/skyrat/icemoon_underground_syndicate_base1_skyrat.dmm b/_maps/RandomRuins/IceRuins/skyrat/icemoon_underground_syndicate_base1_skyrat.dmm
index 2fd52e14425..3e6cb666ab4 100644
--- a/_maps/RandomRuins/IceRuins/skyrat/icemoon_underground_syndicate_base1_skyrat.dmm
+++ b/_maps/RandomRuins/IceRuins/skyrat/icemoon_underground_syndicate_base1_skyrat.dmm
@@ -3592,7 +3592,7 @@
},
/obj/item/paper/fluff/ruins/interdyne/note_1{
name = "Forcefield Generator Maintenance";
- default_raw_text = "To activate a deployable laboratory forcefield, open maintenance hatches of Generator itself, Relay, Well and Charger nodes with a screwdriver and upgrade them with provided parts by using rapid parts exchange device. Then close all hatches and activate every module of generator, by starting with closer to generator nodes in chain-like way. When preparations are done, set generator radius at maximum and press power button. If shield will recieve overwhelm damage, it requires some time to recharge and have to be turned back on manually."
+ default_raw_text = "To activate a deployable laboratory forcefield, open maintenance hatches of Generator itself, Relay, Well and Charger nodes with a screwdriver and upgrade them with provided parts by using rapid parts exchange device. Then close all hatches and activate every module of generator, by starting with closer to generator nodes in chain-like way. When preparations are done, set generator radius at maximum and press power button. If shield will receive overwhelm damage, it requires some time to recharge and have to be turned back on manually."
},
/obj/effect/turf_decal/trimline/dark/filled/corner{
dir = 8
diff --git a/_maps/RandomRuins/LavaRuins/skyrat/lavaland_surface_syndicate_base1_skyrat.dmm b/_maps/RandomRuins/LavaRuins/skyrat/lavaland_surface_syndicate_base1_skyrat.dmm
index 587709ac808..f1c75b50841 100644
--- a/_maps/RandomRuins/LavaRuins/skyrat/lavaland_surface_syndicate_base1_skyrat.dmm
+++ b/_maps/RandomRuins/LavaRuins/skyrat/lavaland_surface_syndicate_base1_skyrat.dmm
@@ -330,7 +330,7 @@
},
/obj/item/paper/fluff/ruins/interdyne/note_1{
name = "Forcefield Generator Maintenance";
- default_raw_text = "To activate a deployable laboratory forcefield, open maintenance hatches of Generator itself, Relay, Well and Charger nodes with a screwdriver and upgrade them with provided parts by using rapid parts exchange device. Then close all hatches and activate every module of generator, by starting with closer to generator nodes in chain-like way. When preparations are done, set generator radius at maximum and press power button. If shield will recieve overwhelm damage, it requires some time to recharge and have to be turned back on manually."
+ default_raw_text = "To activate a deployable laboratory forcefield, open maintenance hatches of Generator itself, Relay, Well and Charger nodes with a screwdriver and upgrade them with provided parts by using rapid parts exchange device. Then close all hatches and activate every module of generator, by starting with closer to generator nodes in chain-like way. When preparations are done, set generator radius at maximum and press power button. If shield will receive overwhelm damage, it requires some time to recharge and have to be turned back on manually."
},
/obj/effect/turf_decal/trimline/dark/filled/corner{
dir = 8
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/__DEFINES/~skyrat_defines/liquids.dm b/code/__DEFINES/~skyrat_defines/liquids.dm
index f31af739a87..330809be583 100644
--- a/code/__DEFINES/~skyrat_defines/liquids.dm
+++ b/code/__DEFINES/~skyrat_defines/liquids.dm
@@ -30,7 +30,7 @@
#define LIQUID_ATTRITION_TO_STOP_ACTIVITY 2
-//Percieved heat capacity for calculations with atmos sharing
+//Perceived heat capacity for calculations with atmos sharing
#define REAGENT_HEAT_CAPACITY 5
#define LIQUID_STATE_PUDDLE 1
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 f4e106c92a5..84e33874c35 100644
--- a/code/datums/mind/_mind.dm
+++ b/code/datums/mind/_mind.dm
@@ -560,7 +560,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, alt_title) // SKYRAT EDIT CHANGE - ALTERNATIVE_JOB_TITLES - ORIGINAL: /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 18d710ca0d3..6c35cedd33c 100644
--- a/code/datums/wounds/burns.dm
+++ b/code/datums/wounds/burns.dm
@@ -286,7 +286,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 538cbd14474..15f4d5e80fc 100644
--- a/code/game/atoms_movable.dm
+++ b/code/game/atoms_movable.dm
@@ -289,7 +289,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 40b6740590b..e3587b44066 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 ebcbc411592..a24cdf4fe28 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 a7a1740cbc7..c65a6358ef4 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 6daa59246e6..76523925a28 100644
--- a/code/modules/mob/living/carbon/human/_species.dm
+++ b/code/modules/mob/living/carbon/human/_species.dm
@@ -1770,7 +1770,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/file_system/programs/messenger/messenger_program.dm b/code/modules/modular_computers/file_system/programs/messenger/messenger_program.dm
index 34aaf9c8515..557a610fa75 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
@@ -717,7 +717,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/modular_skyrat/master_files/code/datums/quirks/positive_quirks/life_savings.dm b/modular_skyrat/master_files/code/datums/quirks/positive_quirks/life_savings.dm
index acc6728e455..e032278f81f 100644
--- a/modular_skyrat/master_files/code/datums/quirks/positive_quirks/life_savings.dm
+++ b/modular_skyrat/master_files/code/datums/quirks/positive_quirks/life_savings.dm
@@ -1,6 +1,6 @@
/datum/quirk/life_savings
name = "Life Savings"
- desc = "Rich are getting richer. Either because of your smart investments or your broad connections you recieve additional currency with each paycheck. Use them wisely or blow it all on drugs. They are yours after all."
+ desc = "Rich are getting richer. Either because of your smart investments or your broad connections you receive additional currency with each paycheck. Use them wisely or blow it all on drugs. They are yours after all."
icon = FA_ICON_PIGGY_BANK
value = 4
hardcore_value = -4
diff --git a/modular_skyrat/master_files/code/modules/antagonists/traitor/objectives/smuggling.dm b/modular_skyrat/master_files/code/modules/antagonists/traitor/objectives/smuggling.dm
index fa618b54e26..6b42e025f1c 100644
--- a/modular_skyrat/master_files/code/modules/antagonists/traitor/objectives/smuggling.dm
+++ b/modular_skyrat/master_files/code/modules/antagonists/traitor/objectives/smuggling.dm
@@ -16,7 +16,7 @@
progression_reward = list(5 MINUTES, 9 MINUTES)
telecrystal_reward = list(0, 1)
- /// area type the objective owner must be in to recieve the contraband
+ /// area type the objective owner must be in to receive the contraband
var/area/smuggle_spawn_type
/// the contraband that must be exported on the shuttle
var/obj/item/contraband
@@ -73,7 +73,7 @@
if(generating_for.assigned_role.departments_bitflags & DEPARTMENT_BITFLAG_CARGO)
return FALSE
- // choose starting area to recieve contraband
+ // choose starting area to receive contraband
var/list/possible_areas = GLOB.the_station_areas.Copy()
for(var/area/possible_area as anything in possible_areas)
// remove areas too close to the destination, too obvious for our poor shmuck, or just unfair
diff --git a/modular_skyrat/modules/assault_operatives/code/armaments/armament_implants.dm b/modular_skyrat/modules/assault_operatives/code/armaments/armament_implants.dm
index 5c635235eed..ae57e1eca4b 100644
--- a/modular_skyrat/modules/assault_operatives/code/armaments/armament_implants.dm
+++ b/modular_skyrat/modules/assault_operatives/code/armaments/armament_implants.dm
@@ -5,7 +5,7 @@
/datum/armament_entry/assault_operatives/implants/deathrattle
name = "Deathrattle Implant Kit"
description = "A collection of implants (and one reusable implanter) that should be injected into the team. When one of the team \
- dies, all other implant holders recieve a mental message informing them of their teammates' name \
+ dies, all other implant holders receive a mental message informing them of their teammates' name \
and the location of their death. Unlike most implants, these are designed to be implanted \
in any creature, biological or mechanical."
item_type = /obj/item/storage/box/syndie_kit/imp_deathrattle
diff --git a/modular_skyrat/modules/carriers/code/carrier_component.dm b/modular_skyrat/modules/carriers/code/carrier_component.dm
index 5304e531581..4a80209126e 100644
--- a/modular_skyrat/modules/carriers/code/carrier_component.dm
+++ b/modular_skyrat/modules/carriers/code/carrier_component.dm
@@ -121,16 +121,16 @@ GLOBAL_LIST_EMPTY(soulcatchers)
return holder
-/// Recieves a message from a carrier room.
-/datum/component/carrier/proc/recieve_message(message_to_recieve)
- if(!message_to_recieve)
+/// receives a message from a carrier room.
+/datum/component/carrier/proc/receive_message(message_to_receive)
+ if(!message_to_receive)
return FALSE
var/mob/living/carrier_owner = get_current_holder()
if(!istype(carrier_owner))
return FALSE
- to_chat(carrier_owner, message_to_recieve)
+ to_chat(carrier_owner, message_to_receive)
return TRUE
/// Attempts to ping the current user of the carrier, asking them if `joiner_name` is allowed in. If they are, the proc returns `TRUE`, otherwise returns FALSE
@@ -397,7 +397,7 @@ GLOBAL_LIST_EMPTY(soulcatchers)
if(!recepient_carrier)
return FALSE // This really isn't good.
- recepient_carrier.recieve_message(message)
+ recepient_carrier.receive_message(message)
return TRUE
/datum/carrier_room/Destroy(force, ...)
diff --git a/modular_skyrat/modules/customization/modules/client/augment/_augment.dm b/modular_skyrat/modules/customization/modules/client/augment/_augment.dm
index 6b53eb2ef27..e41427b987a 100644
--- a/modular_skyrat/modules/customization/modules/client/augment/_augment.dm
+++ b/modular_skyrat/modules/customization/modules/client/augment/_augment.dm
@@ -10,7 +10,7 @@
var/path
///How much quirky points does it cost?
var/cost = 0
- ///Which biotypes are allowed to recieve the augment
+ ///Which biotypes are allowed to receive the augment
var/allowed_biotypes = MOB_ORGANIC
/datum/augment_item/New()
diff --git a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/snout.dm b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/snout.dm
index 9b5e6fb1f8d..db698f0d979 100644
--- a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/snout.dm
+++ b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories/snout.dm
@@ -30,7 +30,7 @@
return !sprite_datum.is_hidden(human)
-/obj/item/organ/external/snout/Insert(mob/living/carbon/reciever, special, movement_flags)
+/obj/item/organ/external/snout/Insert(mob/living/carbon/receiver, special, movement_flags)
if(sprite_accessory_flags & SPRITE_ACCESSORY_USE_MUZZLED_SPRITE)
external_bodyshapes |= BODYSHAPE_SNOUTED
if(sprite_accessory_flags & SPRITE_ACCESSORY_USE_ALT_FACEWEAR_LAYER)
diff --git a/modular_skyrat/modules/customization/modules/surgery/organs/tails.dm b/modular_skyrat/modules/customization/modules/surgery/organs/tails.dm
index 3cafd6852a0..95a7bd1d0c4 100644
--- a/modular_skyrat/modules/customization/modules/surgery/organs/tails.dm
+++ b/modular_skyrat/modules/customization/modules/surgery/organs/tails.dm
@@ -41,7 +41,7 @@
return TRUE
-/obj/item/organ/external/tail/Insert(mob/living/carbon/reciever, special, movement_flags)
+/obj/item/organ/external/tail/Insert(mob/living/carbon/receiver, special, movement_flags)
if(sprite_accessory_flags & SPRITE_ACCESSORY_WAG_ABLE)
wag_flags |= WAG_ABLE
return ..()
diff --git a/modular_skyrat/modules/customization/modules/surgery/organs/taur_body.dm b/modular_skyrat/modules/customization/modules/surgery/organs/taur_body.dm
index 147c6b39fe6..709ac6f5a1f 100644
--- a/modular_skyrat/modules/customization/modules/surgery/organs/taur_body.dm
+++ b/modular_skyrat/modules/customization/modules/surgery/organs/taur_body.dm
@@ -31,12 +31,12 @@
return GLOB.sprite_accessories["taur"]
-/obj/item/organ/external/taur_body/Insert(mob/living/carbon/reciever, special, movement_flags)
+/obj/item/organ/external/taur_body/Insert(mob/living/carbon/receiver, special, movement_flags)
if(sprite_accessory_flags & SPRITE_ACCESSORY_HIDE_SHOES)
external_bodyshapes |= BODYSHAPE_HIDE_SHOES
- old_right_leg = reciever.get_bodypart(BODY_ZONE_R_LEG)
- old_left_leg = reciever.get_bodypart(BODY_ZONE_L_LEG)
+ old_right_leg = receiver.get_bodypart(BODY_ZONE_R_LEG)
+ old_left_leg = receiver.get_bodypart(BODY_ZONE_L_LEG)
var/obj/item/bodypart/leg/left/taur/new_left_leg
var/obj/item/bodypart/leg/right/taur/new_right_leg
@@ -50,12 +50,12 @@
new_left_leg.bodyshape |= external_bodyshapes
- new_left_leg.replace_limb(reciever, TRUE)
+ new_left_leg.replace_limb(receiver, TRUE)
if(old_left_leg)
old_left_leg.forceMove(src)
new_right_leg.bodyshape |= external_bodyshapes
- new_right_leg.replace_limb(reciever, TRUE)
+ new_right_leg.replace_limb(receiver, TRUE)
if(old_right_leg)
old_right_leg.forceMove(src)
diff --git a/modular_skyrat/modules/goofsec/code/sol_fed.dm b/modular_skyrat/modules/goofsec/code/sol_fed.dm
index 1753ec8e54a..b5bf59d3871 100644
--- a/modular_skyrat/modules/goofsec/code/sol_fed.dm
+++ b/modular_skyrat/modules/goofsec/code/sol_fed.dm
@@ -101,7 +101,7 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list(
if(EMERGENCY_RESPONSE_POLICE)
team_size = 8
cops_to_send = /datum/antagonist/ert/request_911/police
- announcement_message = "Crewmembers of [station_name()]. this is the Sol Federation. We've recieved a request for immediate marshal support, and we are \
+ announcement_message = "Crewmembers of [station_name()]. this is the Sol Federation. We've received a request for immediate marshal support, and we are \
sending our best marshals to support your station.\n\n\
If the first responders request that they need SWAT support to do their job, or to report a faulty 911 call, we will send them in at additional cost to your station to the \
tune of $20,000.\n\n\
@@ -112,7 +112,7 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list(
if(EMERGENCY_RESPONSE_ATMOS)
team_size = tgui_input_number(usr, "How many techs would you like dispatched?", "How badly did you screw up?", 3, 3, 1)
cops_to_send = /datum/antagonist/ert/request_911/atmos
- announcement_message = "Crewmembers of [station_name()]. this is the Sol Federation's 811 dispatch. We've recieved a report of stationwide structural damage, atmospherics loss, fire, or otherwise, and we are \
+ announcement_message = "Crewmembers of [station_name()]. this is the Sol Federation's 811 dispatch. We've received a report of stationwide structural damage, atmospherics loss, fire, or otherwise, and we are \
sending an Advanced Atmospherics team to support your station.\n\n\
The transcript of the call is as follows:\n\
[GLOB.call_911_msg]"
@@ -122,7 +122,7 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list(
if(EMERGENCY_RESPONSE_EMT)
team_size = 8
cops_to_send = /datum/antagonist/ert/request_911/emt
- announcement_message = "Crewmembers of [station_name()]. this is the Sol Federation. We've recieved a request for immediate medical support, and we are \
+ announcement_message = "Crewmembers of [station_name()]. this is the Sol Federation. We've received a request for immediate medical support, and we are \
sending our best emergency medical technicians to support your station.\n\n\
If the first responders request that they need SWAT support to do their job, or to report a faulty 911 call, we will send them in at additional cost to your station to the \
tune of $20,000.\n\n\
@@ -696,7 +696,7 @@ GLOBAL_LIST_INIT(call911_do_and_do_not, list(
you placed at the Dogginos that's the seventh furthest Dogginos in the galaxy from your station, and we want to ensure maximum customer satisfaction and \
employee satisfaction as well.\n\
We've gone ahead and sent some some of our finest regional managers to handle the situation.\n\
- We hope you enjoy your pizzas, and that we'll be able to recieve the bill of $35,000 plus the fifteen percent tip for our drivers shortly!"
+ We hope you enjoy your pizzas, and that we'll be able to receive the bill of $35,000 plus the fifteen percent tip for our drivers shortly!"
announcement_source = "Dogginos"
fine_station = FALSE
ghost_poll_msg = "Dogginos is sending regional managers to get the station to pay up the pizza money they owe. Are you ready to do some Customer Relations?"
diff --git a/modular_skyrat/modules/interaction_menu/code/interaction_datum.dm b/modular_skyrat/modules/interaction_menu/code/interaction_datum.dm
index d28aec8e8b0..7826e8d2850 100644
--- a/modular_skyrat/modules/interaction_menu/code/interaction_datum.dm
+++ b/modular_skyrat/modules/interaction_menu/code/interaction_datum.dm
@@ -30,17 +30,17 @@ GLOBAL_LIST_EMPTY_TYPED(interaction_instances, /datum/interaction)
var/list/user_required_parts = list()
/// What parts do they need(IMPORTANT TO GET IT TO THE CORRECT DEFINE, ORGAN SLOT)?
var/list/target_required_parts = list()
- /// The amount of pleasure the target recieves from this interaciton.
+ /// The amount of pleasure the target receives from this interaciton.
var/target_pleasure = 0
- /// The amount of arousal the target recieves from this interaction.
+ /// The amount of arousal the target receives from this interaction.
var/target_arousal = 0
- /// The amount of pain the target recieves.
+ /// The amount of pain the target receives.
var/target_pain = 0
- /// The amount of pleasure the user recieves.
+ /// The amount of pleasure the user receives.
var/user_pleasure = 0
- /// The amount of arousal the user recieves.
+ /// The amount of arousal the user receives.
var/user_arousal = 0
- /// The amount of pain the user recieves.
+ /// The amount of pain the user receives.
var/user_pain = 0
/// A list of possible sounds.
var/list/sound_possible = list()
diff --git a/modular_skyrat/modules/liquids/code/liquid_systems/liquid_turf.dm b/modular_skyrat/modules/liquids/code/liquid_systems/liquid_turf.dm
index 40a376605e1..e1da8f7bd13 100644
--- a/modular_skyrat/modules/liquids/code/liquid_systems/liquid_turf.dm
+++ b/modular_skyrat/modules/liquids/code/liquid_systems/liquid_turf.dm
@@ -164,8 +164,8 @@
liquids.reagent_list[reagent] += reagent_list[reagent]
liquids.total_reagents += reagent_list[reagent]
- var/recieved_thermal_energy = (liquids.total_reagents - prev_total_reagents) * chem_temp
- liquids.temp = (recieved_thermal_energy + prev_thermal_energy) / liquids.total_reagents
+ var/received_thermal_energy = (liquids.total_reagents - prev_total_reagents) * chem_temp
+ liquids.temp = (received_thermal_energy + prev_thermal_energy) / liquids.total_reagents
if(!no_react)
//We do react so, make a simulation
diff --git a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/shibari_worn_uniform.dm b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/shibari_worn_uniform.dm
index 866526dea48..10091f9651e 100644
--- a/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/shibari_worn_uniform.dm
+++ b/modular_skyrat/modules/modular_items/lewd_items/code/lewd_clothing/shibari_worn_uniform.dm
@@ -11,7 +11,7 @@
greyscale_colors = "#bd8fcf"
has_sensor = NO_SENSORS
- ///Tightness of the ropes can be low, medium and hard. This var works as multiplier for arousal and pleasure recieved while wearing this item
+ ///Tightness of the ropes can be low, medium and hard. This var works as multiplier for arousal and pleasure received while wearing this item
var/tightness = SHIBARI_TIGHTNESS_LOW
///should this clothing item use the emissive system
diff --git a/modular_skyrat/modules/oversized/readme.md b/modular_skyrat/modules/oversized/readme.md
index f35e32123ed..13ec69e4ca6 100644
--- a/modular_skyrat/modules/oversized/readme.md
+++ b/modular_skyrat/modules/oversized/readme.md
@@ -8,4 +8,4 @@ Adds a veteran-crew locked perk that makes your sprite much larger with some ass
### Code Embargo:
-Anything that could be percieved as a balance or feature change directly to the oversized quirk, be it code in this module or elsewhere in the code, must be passed by the maintainers prior to PRing, or else your PR risks being closed.
+Anything that could be perceived as a balance or feature change directly to the oversized quirk, be it code in this module or elsewhere in the code, must be passed by the maintainers prior to PRing, or else your PR risks being closed.
diff --git a/modular_skyrat/modules/verbs/code/subtle.dm b/modular_skyrat/modules/verbs/code/subtle.dm
index 084b77fccad..389127c2068 100644
--- a/modular_skyrat/modules/verbs/code/subtle.dm
+++ b/modular_skyrat/modules/verbs/code/subtle.dm
@@ -57,8 +57,8 @@
if((ghost.client?.prefs.chat_toggles & CHAT_GHOSTSIGHT) && !(ghost in viewers))
ghost.show_message(subtle_message)
- for(var/mob/reciever in viewers)
- reciever.show_message(subtle_message, alt_msg = subtle_message)
+ for(var/mob/receiver in viewers)
+ receiver.show_message(subtle_message, alt_msg = subtle_message)
return TRUE
@@ -158,8 +158,8 @@
if(holo?.Impersonation?.client)
ghostless |= holo.Impersonation
- for(var/mob/reciever in ghostless)
- reciever.show_message(subtler_message, alt_msg = subtler_message)
+ for(var/mob/receiver in ghostless)
+ receiver.show_message(subtler_message, alt_msg = subtler_message)
return TRUE
diff --git a/tgui/packages/tgui/interfaces/NifSoulPoem.jsx b/tgui/packages/tgui/interfaces/NifSoulPoem.jsx
index acbd502c1c7..9e397962c59 100644
--- a/tgui/packages/tgui/interfaces/NifSoulPoem.jsx
+++ b/tgui/packages/tgui/interfaces/NifSoulPoem.jsx
@@ -41,7 +41,7 @@ export const NifSoulPoem = (props) => {
-
Time Recieved: {message.timestamp}+
Time received: {message.timestamp}))} diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/skyrat/erp_preferences.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/skyrat/erp_preferences.tsx index fefa333fd7b..4830f93422a 100644 --- a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/skyrat/erp_preferences.tsx +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/skyrat/erp_preferences.tsx @@ -35,7 +35,7 @@ export const aphro_pref: FeatureToggle = { name: 'Aphrodisiacs', category: 'ERP', description: - 'Toggles whether you wish to recieve the effects of aphrodisiacs', + 'Toggles whether you wish to receive the effects of aphrodisiacs', component: CheckboxInput, }; diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/skyrat/ticket_ping.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/skyrat/ticket_ping.tsx index 55e07f0e10d..ed68e4bff93 100644 --- a/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/skyrat/ticket_ping.tsx +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/skyrat/ticket_ping.tsx @@ -5,6 +5,6 @@ export const ticket_ping_pref: FeatureToggle = { name: 'Ticket ping', category: 'ADMIN', description: - 'When enabled, you will recieve regular pings from unhandled tickets.', + 'When enabled, you will receive regular pings from unhandled tickets.', component: CheckboxInput, }; 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