diff --git a/code/game/machinery/supplybeacon.dm b/code/game/machinery/supplybeacon.dm
index 3441b09cbb..0f58bd9a48 100644
--- a/code/game/machinery/supplybeacon.dm
+++ b/code/game/machinery/supplybeacon.dm
@@ -47,7 +47,7 @@
/obj/machinery/power/supply_beacon/attackby(var/obj/item/weapon/W, var/mob/user)
if(!use_power && istype(W, /obj/item/weapon/wrench))
if(!anchored && !connect_to_network())
- user << "This device must be placed over an exposed cable."
+ to_chat(user, "This device must be placed over an exposed cable.")
return
anchored = !anchored
user.visible_message("\The [user] [anchored ? "secures" : "unsecures"] \the [src].")
@@ -59,13 +59,13 @@
if(expended)
use_power = 0
- user << "\The [src] has used up its charge."
+ to_chat (user, "\The [src] has used up its charge.")
return
if(anchored)
return use_power ? deactivate(user) : activate(user)
else
- user << "You need to secure the beacon with a wrench first!"
+ to_chat(user, "You need to secure the beacon with a wrench first!")
return
/obj/machinery/power/supply_beacon/attack_ai(var/mob/user)
@@ -76,12 +76,12 @@
if(expended)
return
if(surplus() < 500)
- if(user) user << "The connected wire doesn't have enough current."
+ if(user) to_chat(user, "The connected wire doesn't have enough current.")
return
set_light(3, 3, "#00CCAA")
icon_state = "beacon_active"
use_power = 1
- if(user) user << "You activate the beacon. The supply drop will be dispatched soon."
+ if(user) to_chat(user, "You activate the beacon. The supply drop will be dispatched soon.")
/obj/machinery/power/supply_beacon/proc/deactivate(var/mob/user, var/permanent)
if(permanent)
@@ -92,7 +92,7 @@
set_light(0)
use_power = 0
target_drop_time = null
- if(user) user << "You deactivate the beacon."
+ if(user) to_chat(user, "You deactivate the beacon.")
/obj/machinery/power/supply_beacon/Destroy()
if(use_power)
diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index c7d0bb262b..61f2d174ac 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -1467,7 +1467,7 @@ datum/admins/var/obj/item/weapon/paper/admin/faxreply // var to hold fax replies
- if(destination.recievefax(P))
+ if(destination.receivefax(P))
src.owner << "Message reply to transmitted successfully."
if(P.sender) // sent as a reply
log_admin("[key_name(src.owner)] replied to a fax message from [key_name(P.sender)]")
diff --git a/code/modules/overmap/ships/computers/shuttle.dm b/code/modules/overmap/ships/computers/shuttle.dm
index 5199b3e3eb..05d1a6d8c6 100644
--- a/code/modules/overmap/ships/computers/shuttle.dm
+++ b/code/modules/overmap/ships/computers/shuttle.dm
@@ -19,7 +19,7 @@
shuttle.area_offsite = shuttle.area_station
shuttle_controller.shuttles[shuttle_tag] = shuttle
shuttle_controller.process_shuttles += shuttle
- testing("Exploration shuttle '[shuttle_tag]' at zlevel [z] successfully added.")
+ testing("Exploration shuttle '[shuttle_tag]' at z-level [z] successfully added.")
//Sets destination to new sector. Can be null.
/obj/machinery/computer/shuttle_control/explore/proc/update_destination(var/obj/effect/map/D)
@@ -84,7 +84,7 @@
else
shuttle_status = "Standing-by at offsite location."
if(WAIT_LAUNCH, FORCE_LAUNCH)
- shuttle_status = "Shuttle has recieved command and will depart shortly."
+ shuttle_status = "Shuttle has received command and will depart shortly."
if(WAIT_ARRIVE)
shuttle_status = "Proceeding to destination."
if(WAIT_FINISH)
diff --git a/code/modules/paperwork/adminpaper.dm b/code/modules/paperwork/adminpaper.dm
index b17bdf29f2..6ed6ad93fc 100644
--- a/code/modules/paperwork/adminpaper.dm
+++ b/code/modules/paperwork/adminpaper.dm
@@ -58,7 +58,7 @@
text = "
"
text += "This transmission is intended only for the addressee and may contain confidential information. Any unauthorized disclosure is strictly prohibited.
"
- text += "If this transmission is recieved in error, please notify both the sender and the office of [using_map.boss_name] Internal Affairs immediately so that corrective action may be taken."
+ text += "If this transmission is received in error, please notify both the sender and the office of [using_map.boss_name] Internal Affairs immediately so that corrective action may be taken."
text += "Failure to comply is a breach of regulation and may be prosecuted to the fullest extent of the law, where applicable."
text += ""
diff --git a/code/modules/paperwork/faxmachine.dm b/code/modules/paperwork/faxmachine.dm
index 778abc4ee0..92076c0b15 100644
--- a/code/modules/paperwork/faxmachine.dm
+++ b/code/modules/paperwork/faxmachine.dm
@@ -80,7 +80,7 @@ var/list/adminfaxes = list() //cache for faxes that have been sent to admins
if(copyitem)
copyitem.loc = usr.loc
usr.put_in_hands(copyitem)
- usr << "You take \the [copyitem] out of \the [src]."
+ to_chat(usr, "You take \the [copyitem] out of \the [src].")
copyitem = null
if(href_list["scan"])
@@ -124,7 +124,7 @@ var/list/adminfaxes = list() //cache for faxes that have been sent to admins
var/success = 0
for(var/obj/machinery/photocopier/faxmachine/F in allfaxes)
if( F.department == destination )
- success = F.recievefax(copyitem)
+ success = F.receivefax(copyitem)
if (success)
visible_message("[src] beeps, \"Message transmitted successfully.\"")
@@ -132,7 +132,7 @@ var/list/adminfaxes = list() //cache for faxes that have been sent to admins
else
visible_message("[src] beeps, \"Error transmitting message.\"")
-/obj/machinery/photocopier/faxmachine/proc/recievefax(var/obj/item/incoming)
+/obj/machinery/photocopier/faxmachine/proc/receivefax(var/obj/item/incoming)
if(stat & (BROKEN|NOPOWER))
return 0
@@ -164,7 +164,7 @@ var/list/adminfaxes = list() //cache for faxes that have been sent to admins
use_power(200)
- //recieved copies should not use toner since it's being used by admins only.
+ //received copies should not use toner since it's being used by admins only.
var/obj/item/rcvdcopy
if (istype(copyitem, /obj/item/weapon/paper))
rcvdcopy = copy(copyitem, 0)
diff --git a/code/modules/shuttles/shuttle_emergency.dm b/code/modules/shuttles/shuttle_emergency.dm
index 347243ae5c..53d2570ca9 100644
--- a/code/modules/shuttles/shuttle_emergency.dm
+++ b/code/modules/shuttles/shuttle_emergency.dm
@@ -50,8 +50,8 @@
if (istype(user, /obj/machinery/computer/shuttle_control/emergency))
var/obj/machinery/computer/shuttle_control/emergency/C = user
- //initiating or cancelling a launch ALWAYS requires authorization, but if we are already set to launch anyways than forcing does not.
- //this is so that people can force launch if the docking controller cannot safely undock without needing X heads to swipe.
+ //Initiating or cancelling a launch ALWAYS requires authorization, but if we are already set to launch anyways than forcing does not.
+ //This is so that people can force launch if the docking controller cannot safely undock without needing X heads to swipe.
if (!(process_state == WAIT_LAUNCH || C.has_authorization()))
return 0
return ..()
@@ -69,11 +69,11 @@
if (istype(user, /obj/machinery/computer/shuttle_control/emergency)) //if we were given a command by an emergency shuttle console
if (emergency_shuttle.autopilot)
emergency_shuttle.autopilot = 0
- world << "Alert: The shuttle autopilot has been overridden. Launch sequence initiated!"
+ to_chat(world, "Alert: The shuttle autopilot has been overridden. Launch sequence initiated!")
if(usr)
- log_admin("[key_name(usr)] has overridden the shuttle autopilot and activated launch sequence")
- message_admins("[key_name_admin(usr)] has overridden the shuttle autopilot and activated launch sequence")
+ log_admin("[key_name(usr)] has overridden the departure shuttle's autopilot and activated the launch sequence.")
+ message_admins("[key_name_admin(usr)] has overridden the departure shuttle's autopilot and activated the launch sequence.")
..(user)
@@ -83,11 +83,11 @@
if (istype(user, /obj/machinery/computer/shuttle_control/emergency)) //if we were given a command by an emergency shuttle console
if (emergency_shuttle.autopilot)
emergency_shuttle.autopilot = 0
- world << "Alert: The shuttle autopilot has been overridden. Bluespace drive engaged!"
+ to_chat(world, "Alert: The shuttle autopilot has been overridden. Bluespace drive engaged!")
if(usr)
- log_admin("[key_name(usr)] has overridden the shuttle autopilot and forced immediate launch")
- message_admins("[key_name_admin(usr)] has overridden the shuttle autopilot and forced immediate launch")
+ log_admin("[key_name(usr)] has overridden the departure shuttle's autopilot and forced immediate launch.")
+ message_admins("[key_name_admin(usr)] has overridden the departure shuttle's autopilot and forced immediate launch.")
..(user)
@@ -97,11 +97,11 @@
if (istype(user, /obj/machinery/computer/shuttle_control/emergency)) //if we were given a command by an emergency shuttle console
if (emergency_shuttle.autopilot)
emergency_shuttle.autopilot = 0
- world << "Alert: The shuttle autopilot has been overridden. Launch sequence aborted!"
+ to_chat(world, "Alert: The shuttle autopilot has been overridden. Launch sequence aborted!")
if(usr)
- log_admin("[key_name(usr)] has overridden the shuttle autopilot and cancelled launch sequence")
- message_admins("[key_name_admin(usr)] has overridden the shuttle autopilot and cancelled launch sequence")
+ log_admin("[key_name(usr)] has overridden the departure shuttle's autopilot and cancelled the launch sequence.")
+ message_admins("[key_name_admin(usr)] has overridden the departure shuttle's autopilot and cancelled the launch sequence.")
..(user)
@@ -117,7 +117,7 @@
return (authorized.len >= req_authorizations || emagged)
/obj/machinery/computer/shuttle_control/emergency/proc/reset_authorization()
- //no need to reset emagged status. If they really want to go back to the station they can.
+ //No need to reset emagged status. If they really want to go back to the station they can.
authorized = initial(authorized)
//returns 1 if the ID was accepted and a new authorization was added, 0 otherwise
@@ -145,16 +145,19 @@
if (dna_hash in authorized)
src.visible_message("\The [src] buzzes. That ID has already been scanned.")
+ playsound(src.loc, 'sound/machines/buzz-sigh.ogg', 50, 0)
return 0
if (!(access_heads in access))
src.visible_message("\The [src] buzzes, rejecting [ident].")
+ playsound(src.loc, 'sound/machines/deniedbeep.ogg', 50, 0)
return 0
src.visible_message("\The [src] beeps as it scans [ident].")
+ playsound(src.loc, 'sound/machines/twobeep.ogg', 50, 0)
authorized[dna_hash] = auth_name
if (req_authorizations - authorized.len)
- world << "Alert: [req_authorizations - authorized.len] authorization\s needed to override the shuttle autopilot."
+ to_chat(world, "Alert: [req_authorizations - authorized.len] authorization\s needed to override the shuttle autopilot.") //TODO- Belsima, make this an announcement instead of magic.
if(usr)
log_admin("[key_name(usr)] has inserted [ID] into the shuttle control computer - [req_authorizations - authorized.len] authorisation\s needed")
@@ -164,7 +167,7 @@
/obj/machinery/computer/shuttle_control/emergency/emag_act(var/remaining_charges, var/mob/user)
if (!emagged)
- user << "You short out \the [src]'s authorization protocols."
+ to_chat(user, "You short out \the [src]'s authorization protocols.")
emagged = 1
return 1
@@ -190,11 +193,11 @@
if (shuttle.in_use)
shuttle_status = "Busy."
else if (!shuttle.location)
- shuttle_status = "Standing-by at [station_name()]."
+ shuttle_status = "Standing by at [station_name()]."
else
- shuttle_status = "Standing-by at [using_map.dock_name]."
+ shuttle_status = "Standing by at [using_map.dock_name]."
if(WAIT_LAUNCH, FORCE_LAUNCH)
- shuttle_status = "Shuttle has recieved command and will depart shortly."
+ shuttle_status = "Shuttle has received command and will depart shortly."
if(WAIT_ARRIVE)
shuttle_status = "Proceeding to destination."
if(WAIT_FINISH)
diff --git a/code/modules/shuttles/shuttles_multi.dm b/code/modules/shuttles/shuttles_multi.dm
index 85155f6119..043d066e80 100644
--- a/code/modules/shuttles/shuttles_multi.dm
+++ b/code/modules/shuttles/shuttles_multi.dm
@@ -174,7 +174,7 @@
return
if (MS.moving_status != SHUTTLE_IDLE)
- usr << "[shuttle_tag] vessel is moving."
+ to_chat(usr, "[shuttle_tag] vessel is moving.")
return
if(href_list["dock_command"])
@@ -187,11 +187,11 @@
if(href_list["start"])
if(MS.at_origin)
- usr << "You are already at your home base."
+ to_chat(usr, "You are already at the home base.")
return
if((MS.last_move + MS.cooldown*10) > world.time)
- usr << "The ship's drive is inoperable while the engines are charging."
+ to_chat(usr, "The ship's drive is inoperable while the engines are charging.")
return
if(!check_docking(MS))
@@ -214,11 +214,11 @@
if(!MS.can_cloak)
return
MS.cloaked = !MS.cloaked
- usr << "Ship stealth systems have been [(MS.cloaked ? "activated. The station will not" : "deactivated. The station will")] be warned of our arrival."
+ to_chat(usr, "Ship stealth systems have been [(MS.cloaked ? "activated. The station will not" : "deactivated. The station will")] be warned of our arrival.")
if(href_list["move_multi"])
if((MS.last_move + MS.cooldown*10) > world.time)
- usr << "The ship's drive is inoperable while the engines are charging."
+ to_chat(usr, "The ship's drive is inoperable while the engines are charging.")
return
if(!check_docking(MS))
@@ -228,7 +228,7 @@
var/choice = input("Select a destination.") as null|anything in MS.destinations
if(!choice) return
- usr << "[shuttle_tag] main computer recieved message."
+ to_chat(usr, "[shuttle_tag] main computer received message.")
if(MS.at_origin)
MS.announce_arrival()
diff --git a/nano/templates/request_console.tmpl b/nano/templates/request_console.tmpl
index f14e27190f..bd94cf7987 100644
--- a/nano/templates/request_console.tmpl
+++ b/nano/templates/request_console.tmpl
@@ -73,7 +73,7 @@ Used In File(s): \code\game\machinery\requests_console.dm
{{for data.message_log}}
{{:value}}
{{empty}}
- No messages have been recieved.
+ No messages have been received.
{{/for}}
{{:helper.link('Back', 'arrowreturnthick-1-w', { 'setScreen' : 0 })}}