From 2e4a8fcce8e01ed1a5775dee5e360d611a50f1ab Mon Sep 17 00:00:00 2001 From: kingofkosmos Date: Fri, 3 Apr 2015 19:42:34 +0300 Subject: [PATCH] Recieve --> receive grammarfix Changes all "recieve"s in descriptions around the tgstation to "receive". Also energy katana description high priority fix. Fixes #8576 Fixes #8504 --- code/game/gamemodes/intercept_report.dm | 2 +- .../machinery/computer/telecrystalconsoles.dm | 6 ++--- code/game/objects/items/devices/recaller.dm | 2 +- code/modules/assembly/signaler.dm | 2 +- .../mission_code/stationCollision.dm | 2 +- code/modules/client/preferences_toggles.dm | 2 +- code/modules/clothing/under/ties.dm | 2 +- code/modules/crafting/guncrafting.dm | 14 +++++------ code/modules/mining/laborcamp/laborstacker.dm | 2 +- code/modules/ninja/energy_katana.dm | 2 +- .../projectiles/guns/projectile/automatic.dm | 2 +- code/modules/projectiles/pins.dm | 2 +- .../research/designs/weapon_designs.dm | 4 ++-- code/modules/shuttle/shuttle.dm | 2 +- config/admins.txt | 23 +------------------ 15 files changed, 24 insertions(+), 45 deletions(-) diff --git a/code/game/gamemodes/intercept_report.dm b/code/game/gamemodes/intercept_report.dm index a19846888be..81ed244f086 100644 --- a/code/game/gamemodes/intercept_report.dm +++ b/code/game/gamemodes/intercept_report.dm @@ -243,7 +243,7 @@ src.text += "
" /datum/intercept_text/proc/build_nuke(datum/mind/correct_person) - src.text += "

Centcom recently recieved a report of a plot to destroy one of our stations in your area. We believe the Nuclear Authentication Disc " + src.text += "

Centcom recently received a report of a plot to destroy one of our stations in your area. We believe the Nuclear Authentication Disc " src.text += "that is standard issue aboard your vessel may be a target. We recommend removal of this object, and it's storage in a safe " src.text += "environment. As this may cause panic among the crew, all efforts should be made to keep this information a secret from all but " src.text += "the most trusted crew-members." diff --git a/code/game/machinery/computer/telecrystalconsoles.dm b/code/game/machinery/computer/telecrystalconsoles.dm index 2d78380fc63..79032b6f001 100644 --- a/code/game/machinery/computer/telecrystalconsoles.dm +++ b/code/game/machinery/computer/telecrystalconsoles.dm @@ -10,7 +10,7 @@ var/list/possible_uplinker_IDs = list("Alfa","Bravo","Charlie","Delta","Echo","F ///////////////////////////////////////////// /obj/machinery/computer/telecrystals/uplinker - name = "\improper Telecrystal upload/recieve station" + name = "\improper Telecrystal upload/receive station" desc = "A device used to manage telecrystals during group operations. To use, simply insert your uplink. With your uplink installed \ you can upload your telecrystals to the group's pool using the console, or be assigned additional telecrystals by your lieutenant." icon_state = "tcstation" @@ -75,7 +75,7 @@ var/list/possible_uplinker_IDs = list("Alfa","Bravo","Charlie","Delta","Echo","F uplinkholder.hidden_uplink.uses += amt linkedboss.storedcrystals -= amt if(addLog) - linkedboss.logTransfer("[src] recieved [amt] telecrystals from [linkedboss].") + linkedboss.logTransfer("[src] received [amt] telecrystals from [linkedboss].") /////// @@ -98,7 +98,7 @@ var/list/possible_uplinker_IDs = list("Alfa","Bravo","Charlie","Delta","Echo","F dat += "
Eject Uplink" - var/datum/browser/popup = new(user, "computer", "Telecrystal Upload/Recieve Station", 700, 500) + var/datum/browser/popup = new(user, "computer", "Telecrystal Upload/Receive Station", 700, 500) popup.set_content(dat) popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state)) popup.open() diff --git a/code/game/objects/items/devices/recaller.dm b/code/game/objects/items/devices/recaller.dm index 641c7755af6..c6e43c89717 100644 --- a/code/game/objects/items/devices/recaller.dm +++ b/code/game/objects/items/devices/recaller.dm @@ -34,7 +34,7 @@ log_game("[key_name(user)] has recalled the shuttle with a recaller.") message_admins("[key_name_admin(user)] has recalled the shuttle with a recaller.", 1) if(!SSshuttle.cancelEvac(user)) - loc << "\icon[src]No response recieved. Emergency shuttle cannot be recalled at this time." + loc << "\icon[src]No response received. Emergency shuttle cannot be recalled at this time." return user << "\icon[src]Emergency shuttle cannot be recalled at this time." \ No newline at end of file diff --git a/code/modules/assembly/signaler.dm b/code/modules/assembly/signaler.dm index c85e9eb5222..e28da00a535 100644 --- a/code/modules/assembly/signaler.dm +++ b/code/modules/assembly/signaler.dm @@ -159,7 +159,7 @@ Code: return 1 /obj/item/device/assembly/signaler/reciever/describe() - return "The radio reciever is [on?"on":"off"]." + return "The radio receiver is [on?"on":"off"]." /obj/item/device/assembly/signaler/reciever/receive_signal(datum/signal/signal) if(!on) return diff --git a/code/modules/awaymissions/mission_code/stationCollision.dm b/code/modules/awaymissions/mission_code/stationCollision.dm index b8cfb519a50..f6d98d784dc 100644 --- a/code/modules/awaymissions/mission_code/stationCollision.dm +++ b/code/modules/awaymissions/mission_code/stationCollision.dm @@ -132,7 +132,7 @@ var/sc_safecode5 = "[rand(0,9)]"
Our on-board spy has learned the code and has hidden away a few copies of the code around the station. Unfortunatly he has been captured by security Your objective is to split up, locate any of the papers containing the captain's safe code, open the safe and - secure anything found inside. If possible, recover the imprisioned syndicate operative and recieve the code from him.
+ secure anything found inside. If possible, recover the imprisioned syndicate operative and receive the code from him.

As always, eliminate anyone who gets in the way.

diff --git a/code/modules/client/preferences_toggles.dm b/code/modules/client/preferences_toggles.dm index f24d7e2a301..712d14979b1 100644 --- a/code/modules/client/preferences_toggles.dm +++ b/code/modules/client/preferences_toggles.dm @@ -57,7 +57,7 @@ /client/proc/toggleadminhelpsound() set name = "Hear/Silence Adminhelps" set category = "Preferences" - set desc = "Toggle hearing a notification when admin PMs are recieved" + set desc = "Toggle hearing a notification when admin PMs are received" if(!holder) return prefs.toggles ^= SOUND_ADMINHELP prefs.save_preferences() diff --git a/code/modules/clothing/under/ties.dm b/code/modules/clothing/under/ties.dm index 17c224df9a3..92fe8b9272c 100644 --- a/code/modules/clothing/under/ties.dm +++ b/code/modules/clothing/under/ties.dm @@ -145,7 +145,7 @@ /obj/item/clothing/tie/medal/gold/heroism name = "medal of exceptional heroism" - desc = "An extremely rare golden medal awarded only by Centcom. To recieve such a medal is the highest honor and as such, very few exist. This medal is almost never awarded to anybody but commanders." + desc = "An extremely rare golden medal awarded only by Centcom. To receive such a medal is the highest honor and as such, very few exist. This medal is almost never awarded to anybody but commanders." //////////// //Armbands// diff --git a/code/modules/crafting/guncrafting.dm b/code/modules/crafting/guncrafting.dm index ca3da0b965d..45d4d340ecd 100644 --- a/code/modules/crafting/guncrafting.dm +++ b/code/modules/crafting/guncrafting.dm @@ -4,8 +4,8 @@ // PARTS // /obj/item/weaponcrafting/reciever - name = "modular reciever" - desc = "A prototype modular reciever and trigger assembly for a firearm." + name = "modular receiver" + desc = "A prototype modular receiver and trigger assembly for a firearm." icon = 'icons/obj/improvised.dmi' icon_state = "reciever" @@ -20,7 +20,7 @@ /obj/item/weaponcrafting/reciever/attackby(obj/item/W as obj, mob/user as mob, params) if(istype(W,/obj/item/pipe)) - user << "You attach the shotgun barrel to the reciever. The pins seem loose." + user << "You attach the shotgun barrel to the receiver. The pins seem loose." var/obj/item/weaponcrafting/ishotgunconstruction/I = new /obj/item/weaponcrafting/ishotgunconstruction user.unEquip(src) user.put_in_hands(I) @@ -32,7 +32,7 @@ /obj/item/weaponcrafting/ishotgunconstruction name = "slightly conspicuous metal construction" - desc = "A long pipe attached to a firearm reciever. The pins seem loose." + desc = "A long pipe attached to a firearm receiver. The pins seem loose." icon = 'icons/obj/improvised.dmi' icon_state = "ishotgunstep1" @@ -42,7 +42,7 @@ var/obj/item/weaponcrafting/ishotgunconstruction2/C = new /obj/item/weaponcrafting/ishotgunconstruction2 user.unEquip(src) user.put_in_hands(C) - user << "You screw the pins into place, securing the pipe to the reciever." + user << "You screw the pins into place, securing the pipe to the receiver." qdel(src) /obj/item/weaponcrafting/ishotgunconstruction2 @@ -53,7 +53,7 @@ /obj/item/weaponcrafting/ishotgunconstruction2/attackby(obj/item/W as obj, mob/user as mob, params) if(istype(W,/obj/item/weaponcrafting/stock)) - user << "You attach the stock to the reciever-barrel assembly." + user << "You attach the stock to the receiver-barrel assembly." var/obj/item/weaponcrafting/ishotgunconstruction3/I = new /obj/item/weaponcrafting/ishotgunconstruction3 user.unEquip(src) user.put_in_hands(I) @@ -63,7 +63,7 @@ /obj/item/weaponcrafting/ishotgunconstruction3 name = "extremely conspicuous metal construction" - desc = "A reciever-barrel shotgun assembly with a loose wooden stock. There's no way you can fire it without the stock coming loose." + desc = "A receiver-barrel shotgun assembly with a loose wooden stock. There's no way you can fire it without the stock coming loose." icon = 'icons/obj/improvised.dmi' icon_state = "ishotgunstep2" diff --git a/code/modules/mining/laborcamp/laborstacker.dm b/code/modules/mining/laborcamp/laborstacker.dm index 8bfe24ce149..e9dc6f7d14f 100644 --- a/code/modules/mining/laborcamp/laborstacker.dm +++ b/code/modules/mining/laborcamp/laborstacker.dm @@ -105,7 +105,7 @@ else Radio.set_frequency(SEC_FREQ) Radio.talk_into(src, "[inserted_id.registered_name] has returned to the station. Minerals and Prisoner ID card ready for retrieval.", SEC_FREQ) - usr << "Shuttle recieved message and will be sent shortly." + usr << "Shuttle received message and will be sent shortly." if(href_list["choice"] == "release") if(alone_in_area(get_area(loc), usr)) diff --git a/code/modules/ninja/energy_katana.dm b/code/modules/ninja/energy_katana.dm index 0a398a7ba27..513e5963de6 100644 --- a/code/modules/ninja/energy_katana.dm +++ b/code/modules/ninja/energy_katana.dm @@ -2,7 +2,7 @@ /obj/item/weapon/katana/energy name = "energy katana" - desc = "a katana infused with a strong energy" + desc = "A katana infused with strong energy." icon_state = "energy_katana" item_state = "energy_katana" force = 40 diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm index aa1b315ef26..5fe4cac6f8f 100644 --- a/code/modules/projectiles/guns/projectile/automatic.dm +++ b/code/modules/projectiles/guns/projectile/automatic.dm @@ -107,7 +107,7 @@ /obj/item/weapon/gun/projectile/automatic/l6_saw name = "syndicate LMG" - desc = "A heavily modified 7.62 light machine gun, designated 'L6 SAW'. Has 'Aussec Armoury - 2531' engraved on the reciever below the designation." + desc = "A heavily modified 7.62 light machine gun, designated 'L6 SAW'. Has 'Aussec Armoury - 2531' engraved on the receiver below the designation." icon_state = "l6closed100" item_state = "l6closedmag" w_class = 5 diff --git a/code/modules/projectiles/pins.dm b/code/modules/projectiles/pins.dm index bc814b09fec..92e5326599b 100644 --- a/code/modules/projectiles/pins.dm +++ b/code/modules/projectiles/pins.dm @@ -1,6 +1,6 @@ /obj/item/device/firing_pin name = "electronic firing pin" - desc = "A small authentication device, to be inserted into a firearm reciever to allow operation. NT safety regulations require all new designs to incorporate one." + desc = "A small authentication device, to be inserted into a firearm receiver to allow operation. NT safety regulations require all new designs to incorporate one." icon = 'icons/obj/device.dmi' icon_state = "firing_pin" item_state = "pen" diff --git a/code/modules/research/designs/weapon_designs.dm b/code/modules/research/designs/weapon_designs.dm index 42fcc6c1b1f..94c96d445a6 100644 --- a/code/modules/research/designs/weapon_designs.dm +++ b/code/modules/research/designs/weapon_designs.dm @@ -166,8 +166,8 @@ category = list("Weapons") /datum/design/reciever - name = "Modular Reciever" - desc = "A prototype modular reciever and trigger assembly for a variety of firearms." + name = "Modular Receiver" + desc = "A prototype modular receiver and trigger assembly for a variety of firearms." id = "reciever" req_tech = list("combat" = 5, "materials" = 4) build_type = PROTOLATHE diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm index b41d28366d8..846f7e28c14 100644 --- a/code/modules/shuttle/shuttle.dm +++ b/code/modules/shuttle/shuttle.dm @@ -516,7 +516,7 @@ if(href_list["move"]) switch(SSshuttle.moveShuttle(shuttleId, href_list["move"], 1)) - if(0) usr << "Shuttle recieved message and will be sent shortly." + if(0) usr << "Shuttle received message and will be sent shortly." if(1) usr << "Invalid shuttle requested." else usr << "Unable to comply." diff --git a/config/admins.txt b/config/admins.txt index ceced3eb60e..60a581e623a 100644 --- a/config/admins.txt +++ b/config/admins.txt @@ -7,8 +7,6 @@ # NOTE: if the rank-name cannot be found in admin_ranks.txt, they will not be adminned! ~Carn # # NOTE: syntax was changed to allow hyphenation of ranknames, since spaces are stripped. # ############################################################################################### -MrStonedOne = Host -Gun Hog = Game Master razharas = Game Master Niknakflak = Game Master rolan7 = Game Master @@ -61,23 +59,4 @@ hornygranny = Game Master yota = Game Master firecage = Game Master donkieyo = Game Master -argoneus = Game Master -paprka = Game Master -cookingboy3 = Game Master -limeliz = Game Master -steelpoint = Game Master -phil235 = Game Master -xxnoob = Game Master -tkdrg = Game Master -Cuboos = Game Master -thunder12345 = Game Master -wjohnston = Game Master -mandurrh = Game Master -thurgatar = Game Master -xerux = Game Master -dannno = Game Master -allura = Game Master -lo6a4evskiy = Game Master -vekter = Game Master -Ahammer18 = Game Master -ACCount12 = Game Master \ No newline at end of file +kingofkosmos = Game Master