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
This commit is contained in:
kingofkosmos
2015-04-03 19:42:34 +03:00
parent 5be93a2b1a
commit 2e4a8fcce8
15 changed files with 24 additions and 45 deletions

View File

@@ -243,7 +243,7 @@
src.text += "<BR><HR>" src.text += "<BR><HR>"
/datum/intercept_text/proc/build_nuke(datum/mind/correct_person) /datum/intercept_text/proc/build_nuke(datum/mind/correct_person)
src.text += "<BR><BR>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 += "<BR><BR>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 += "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 += "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." src.text += "the most trusted crew-members."

View File

@@ -10,7 +10,7 @@ var/list/possible_uplinker_IDs = list("Alfa","Bravo","Charlie","Delta","Echo","F
///////////////////////////////////////////// /////////////////////////////////////////////
/obj/machinery/computer/telecrystals/uplinker /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 \ 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." you can upload your telecrystals to the group's pool using the console, or be assigned additional telecrystals by your lieutenant."
icon_state = "tcstation" icon_state = "tcstation"
@@ -75,7 +75,7 @@ var/list/possible_uplinker_IDs = list("Alfa","Bravo","Charlie","Delta","Echo","F
uplinkholder.hidden_uplink.uses += amt uplinkholder.hidden_uplink.uses += amt
linkedboss.storedcrystals -= amt linkedboss.storedcrystals -= amt
if(addLog) 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 += "<br><a href='byond://?src=\ref[src];eject=1'>Eject Uplink</a>" dat += "<br><a href='byond://?src=\ref[src];eject=1'>Eject Uplink</a>"
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_content(dat)
popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state)) popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state))
popup.open() popup.open()

View File

@@ -34,7 +34,7 @@
log_game("[key_name(user)] has recalled the shuttle with a recaller.") 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) message_admins("[key_name_admin(user)] has recalled the shuttle with a recaller.", 1)
if(!SSshuttle.cancelEvac(user)) if(!SSshuttle.cancelEvac(user))
loc << "<span class='info'>\icon[src]No response recieved. Emergency shuttle cannot be recalled at this time.</span>" loc << "<span class='info'>\icon[src]No response received. Emergency shuttle cannot be recalled at this time.</span>"
return return
user << "<span class='info'>\icon[src]Emergency shuttle cannot be recalled at this time.</span>" user << "<span class='info'>\icon[src]Emergency shuttle cannot be recalled at this time.</span>"

View File

@@ -159,7 +159,7 @@ Code:
return 1 return 1
/obj/item/device/assembly/signaler/reciever/describe() /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) /obj/item/device/assembly/signaler/reciever/receive_signal(datum/signal/signal)
if(!on) return if(!on) return

View File

@@ -132,7 +132,7 @@ var/sc_safecode5 = "[rand(0,9)]"
<br> <br>
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 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 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.<br> secure anything found inside. If possible, recover the imprisioned syndicate operative and receive the code from him.<br>
<br> <br>
<u>As always, eliminate anyone who gets in the way.</u><br> <u>As always, eliminate anyone who gets in the way.</u><br>
<br> <br>

View File

@@ -57,7 +57,7 @@
/client/proc/toggleadminhelpsound() /client/proc/toggleadminhelpsound()
set name = "Hear/Silence Adminhelps" set name = "Hear/Silence Adminhelps"
set category = "Preferences" 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 if(!holder) return
prefs.toggles ^= SOUND_ADMINHELP prefs.toggles ^= SOUND_ADMINHELP
prefs.save_preferences() prefs.save_preferences()

View File

@@ -145,7 +145,7 @@
/obj/item/clothing/tie/medal/gold/heroism /obj/item/clothing/tie/medal/gold/heroism
name = "medal of exceptional 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// //Armbands//

View File

@@ -4,8 +4,8 @@
// PARTS // // PARTS //
/obj/item/weaponcrafting/reciever /obj/item/weaponcrafting/reciever
name = "modular reciever" name = "modular receiver"
desc = "A prototype modular reciever and trigger assembly for a firearm." desc = "A prototype modular receiver and trigger assembly for a firearm."
icon = 'icons/obj/improvised.dmi' icon = 'icons/obj/improvised.dmi'
icon_state = "reciever" icon_state = "reciever"
@@ -20,7 +20,7 @@
/obj/item/weaponcrafting/reciever/attackby(obj/item/W as obj, mob/user as mob, params) /obj/item/weaponcrafting/reciever/attackby(obj/item/W as obj, mob/user as mob, params)
if(istype(W,/obj/item/pipe)) 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 var/obj/item/weaponcrafting/ishotgunconstruction/I = new /obj/item/weaponcrafting/ishotgunconstruction
user.unEquip(src) user.unEquip(src)
user.put_in_hands(I) user.put_in_hands(I)
@@ -32,7 +32,7 @@
/obj/item/weaponcrafting/ishotgunconstruction /obj/item/weaponcrafting/ishotgunconstruction
name = "slightly conspicuous metal construction" 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 = 'icons/obj/improvised.dmi'
icon_state = "ishotgunstep1" icon_state = "ishotgunstep1"
@@ -42,7 +42,7 @@
var/obj/item/weaponcrafting/ishotgunconstruction2/C = new /obj/item/weaponcrafting/ishotgunconstruction2 var/obj/item/weaponcrafting/ishotgunconstruction2/C = new /obj/item/weaponcrafting/ishotgunconstruction2
user.unEquip(src) user.unEquip(src)
user.put_in_hands(C) user.put_in_hands(C)
user << "<span class='notice'>You screw the pins into place, securing the pipe to the reciever.</span>" user << "<span class='notice'>You screw the pins into place, securing the pipe to the receiver.</span>"
qdel(src) qdel(src)
/obj/item/weaponcrafting/ishotgunconstruction2 /obj/item/weaponcrafting/ishotgunconstruction2
@@ -53,7 +53,7 @@
/obj/item/weaponcrafting/ishotgunconstruction2/attackby(obj/item/W as obj, mob/user as mob, params) /obj/item/weaponcrafting/ishotgunconstruction2/attackby(obj/item/W as obj, mob/user as mob, params)
if(istype(W,/obj/item/weaponcrafting/stock)) 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 var/obj/item/weaponcrafting/ishotgunconstruction3/I = new /obj/item/weaponcrafting/ishotgunconstruction3
user.unEquip(src) user.unEquip(src)
user.put_in_hands(I) user.put_in_hands(I)
@@ -63,7 +63,7 @@
/obj/item/weaponcrafting/ishotgunconstruction3 /obj/item/weaponcrafting/ishotgunconstruction3
name = "extremely conspicuous metal construction" 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 = 'icons/obj/improvised.dmi'
icon_state = "ishotgunstep2" icon_state = "ishotgunstep2"

View File

@@ -105,7 +105,7 @@
else else
Radio.set_frequency(SEC_FREQ) 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) Radio.talk_into(src, "[inserted_id.registered_name] has returned to the station. Minerals and Prisoner ID card ready for retrieval.", SEC_FREQ)
usr << "<span class='notice'>Shuttle recieved message and will be sent shortly.</span>" usr << "<span class='notice'>Shuttle received message and will be sent shortly.</span>"
if(href_list["choice"] == "release") if(href_list["choice"] == "release")
if(alone_in_area(get_area(loc), usr)) if(alone_in_area(get_area(loc), usr))

View File

@@ -2,7 +2,7 @@
/obj/item/weapon/katana/energy /obj/item/weapon/katana/energy
name = "energy katana" name = "energy katana"
desc = "a katana infused with a strong energy" desc = "A katana infused with strong energy."
icon_state = "energy_katana" icon_state = "energy_katana"
item_state = "energy_katana" item_state = "energy_katana"
force = 40 force = 40

View File

@@ -107,7 +107,7 @@
/obj/item/weapon/gun/projectile/automatic/l6_saw /obj/item/weapon/gun/projectile/automatic/l6_saw
name = "syndicate LMG" 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" icon_state = "l6closed100"
item_state = "l6closedmag" item_state = "l6closedmag"
w_class = 5 w_class = 5

View File

@@ -1,6 +1,6 @@
/obj/item/device/firing_pin /obj/item/device/firing_pin
name = "electronic 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 = 'icons/obj/device.dmi'
icon_state = "firing_pin" icon_state = "firing_pin"
item_state = "pen" item_state = "pen"

View File

@@ -166,8 +166,8 @@
category = list("Weapons") category = list("Weapons")
/datum/design/reciever /datum/design/reciever
name = "Modular Reciever" name = "Modular Receiver"
desc = "A prototype modular reciever and trigger assembly for a variety of firearms." desc = "A prototype modular receiver and trigger assembly for a variety of firearms."
id = "reciever" id = "reciever"
req_tech = list("combat" = 5, "materials" = 4) req_tech = list("combat" = 5, "materials" = 4)
build_type = PROTOLATHE build_type = PROTOLATHE

View File

@@ -516,7 +516,7 @@
if(href_list["move"]) if(href_list["move"])
switch(SSshuttle.moveShuttle(shuttleId, href_list["move"], 1)) switch(SSshuttle.moveShuttle(shuttleId, href_list["move"], 1))
if(0) usr << "<span class='notice'>Shuttle recieved message and will be sent shortly.</span>" if(0) usr << "<span class='notice'>Shuttle received message and will be sent shortly.</span>"
if(1) usr << "<span class='warning'>Invalid shuttle requested.</span>" if(1) usr << "<span class='warning'>Invalid shuttle requested.</span>"
else usr << "<span class='notice'>Unable to comply.</span>" else usr << "<span class='notice'>Unable to comply.</span>"

View File

@@ -7,8 +7,6 @@
# NOTE: if the rank-name cannot be found in admin_ranks.txt, they will not be adminned! ~Carn # # 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. # # NOTE: syntax was changed to allow hyphenation of ranknames, since spaces are stripped. #
############################################################################################### ###############################################################################################
MrStonedOne = Host
Gun Hog = Game Master
razharas = Game Master razharas = Game Master
Niknakflak = Game Master Niknakflak = Game Master
rolan7 = Game Master rolan7 = Game Master
@@ -61,23 +59,4 @@ hornygranny = Game Master
yota = Game Master yota = Game Master
firecage = Game Master firecage = Game Master
donkieyo = Game Master donkieyo = Game Master
argoneus = Game Master kingofkosmos = 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