cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-28 22:47:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

recieve -> receive (#25123)

Browse Source 
* recieve -> receive

* Unfix.

---------

Co-authored-by: FunnyMan3595 (Charlie Nolan) <funnyman@google.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
This commit is contained in:
Charlie Nolan
2024-04-18 21:16:07 +00:00
committed by GitHub
co-authored by FunnyMan3595 S34N
parent c8e59706e2
commit 7562db8c3d
26 changed files with 47 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/banjob.dm
+1 -1
View File
@@ -35,7 +35,7 @@
/**
* Lists all active jobbans for src client
*
* from_client_connection - If true, user will not recieve any info in chat if they have no job bans, used when a player loads into to the lobby.
* from_client_connection - If true, user will not receive any info in chat if they have no job bans, used when a player loads into to the lobby.
*/
/client/proc/display_job_bans(from_client_connection = FALSE)
if(!from_client_connection) // Only reload if this is being checked by a user manually, as we load job bans at client new anyway
code/modules/admin/verbs/adminpm.dm
+17 -17
View File
@@ -78,7 +78,7 @@
adminhelp(msg) //admin we are replying to left. adminhelp instead
return
/*if(C && C.last_pm_recieved + config.simultaneous_pm_warning_timeout > world.time && holder)
/*if(C && C.last_pm_received + config.simultaneous_pm_warning_timeout > world.time && holder)
//send a warning to admins, but have a delay popup for mods
if(holder.rights & R_ADMIN)
to_chat(src, "<span class='danger'>Simultaneous PMs warning:</span> that player has been PM'd in the last [config.simultaneous_pm_warning_timeout / 10] seconds by: [C.ckey_last_pm]")
@@ -113,21 +113,21 @@
msg = admin_pencode_to_html(msg)
var/send_span
var/recieve_span
var/receive_span
var/send_pm_type = " "
var/recieve_pm_type = "Player"
var/receive_pm_type = "Player"
var/message_type
var/datum/controller/subsystem/tickets/tickets_system
// We treat PMs as mentorhelps if we were explicitly so, or if neither
// party is an admin.
if(type == "Mentorhelp" || !(check_rights(R_ADMIN|R_MOD, 0, C.mob) || check_rights(R_ADMIN|R_MOD, 0, mob)))
send_span = "mentorhelp"
recieve_span = "mentorhelp"
receive_span = "mentorhelp"
message_type = MESSAGE_TYPE_MENTORPM
tickets_system = SSmentor_tickets
else
send_span = "adminhelp"
recieve_span = "adminhelp"
receive_span = "adminhelp"
message_type = MESSAGE_TYPE_ADMINPM
tickets_system = SStickets
@@ -135,22 +135,22 @@
if(holder)
//PMs sent from admins and mods display their rank
send_pm_type = holder.rank + " "
recieve_pm_type = holder.rank
receive_pm_type = holder.rank
else if(!C.holder)
to_chat(src, "<span class='danger'>Error: Admin-PM: Non-admin to non-admin PM communication is forbidden.</span>")
return
var/recieve_message = ""
var/receive_message = ""
pm_tracker.add_message(C, src, msg, mob)
C.pm_tracker.add_message(src, src, msg, C.mob)
if(holder && !C.holder)
recieve_message = "<span class='[recieve_span]' size='3'>-- Click the [recieve_pm_type]'s name to reply --</span>\n"
receive_message = "<span class='[receive_span]' size='3'>-- Click the [receive_pm_type]'s name to reply --</span>\n"
if(C.adminhelped)
window_flash(C)
to_chat(C, recieve_message)
to_chat(C, receive_message)
C.adminhelped = 0
//AdminPM popup for ApocStation and anybody else who wants to use it. Set it with POPUP_ADMIN_PM in config.txt ~Carn
@@ -158,7 +158,7 @@
spawn(0) //so we don't hold the caller proc up
var/sender = src
var/sendername = key
var/reply = clean_input(msg,"[recieve_pm_type] [type] from-[sendername]", "", C) //show message and await a reply
var/reply = clean_input(msg,"[receive_pm_type] [type] from-[sendername]", "", C) //show message and await a reply
if(C && reply)
if(sender)
C.cmd_admin_pm(sender,reply) //sender is still about, let's reply to them
@@ -176,17 +176,17 @@
ticket_link = "(<a href='byond://?_src_=holder;openticket=[ticket_id]'>TICKET</a>)"
var/emoji_msg = "<span class='emoji_enabled'>[msg]</span>"
var/recieve_window_link = "(<a href='byond://?src=[C.pm_tracker.UID()];newtitle=[key]'>WINDOW</a>)"
var/receive_window_link = "(<a href='byond://?src=[C.pm_tracker.UID()];newtitle=[key]'>WINDOW</a>)"
if(message_type == MESSAGE_TYPE_MENTORPM && check_rights(R_ADMIN|R_MENTOR, 0, C.mob))
recieve_window_link = ticket_link
receive_window_link = ticket_link
else if(message_type == MESSAGE_TYPE_ADMINPM && check_rights(R_ADMIN, 0, C.mob))
recieve_window_link = ticket_link
recieve_message = "<span class='[recieve_span]'>[type] from-<b>[recieve_pm_type] [C.holder ? key_name(src, TRUE, type, ticket_id = ticket_id) : key_name_hidden(src, TRUE, type, ticket_id = ticket_id)]</b>:<br><br>[emoji_msg][C.holder ? "<br>[ping_link] [recieve_window_link] [alert_link]" : ""]</span>"
receive_window_link = ticket_link
receive_message = "<span class='[receive_span]'>[type] from-<b>[receive_pm_type] [C.holder ? key_name(src, TRUE, type, ticket_id = ticket_id) : key_name_hidden(src, TRUE, type, ticket_id = ticket_id)]</b>:<br><br>[emoji_msg][C.holder ? "<br>[ping_link] [receive_window_link] [alert_link]" : ""]</span>"
if(message_type == MESSAGE_TYPE_MENTORPM)
recieve_message = chat_box_mhelp(recieve_message)
receive_message = chat_box_mhelp(receive_message)
else
recieve_message = chat_box_ahelp(recieve_message)
to_chat(C, recieve_message)
receive_message = chat_box_ahelp(receive_message)
to_chat(C, receive_message)
var/send_window_link = "(<a href='byond://?src=[pm_tracker.UID()];newtitle=[C.key]'>WINDOW</a>)"
if(message_type == MESSAGE_TYPE_MENTORPM && check_rights(R_ADMIN|R_MENTOR, 0, mob))
send_window_link = ticket_link
code/modules/antagonists/_common/antag_datum.dm
+1 -1
View File
@@ -314,7 +314,7 @@ GLOBAL_LIST_EMPTY(antagonists)
owner.special_role = A.special_role
/**
* Checks if the person trying to recieve this datum is role banned from it.
* Checks if the person trying to receive this datum is role banned from it.
*/
/datum/antagonist/proc/is_banned(mob/M)
if(!M)
code/modules/economy/money_account.dm
+1 -1
View File
@@ -27,7 +27,7 @@
var/suspended = FALSE
///Type of account this is
var/account_type = ACCOUNT_TYPE_PERSONAL
///the amount this account recieves every payday
///the amount this account receives every payday
var/payday_amount = CREW_BASE_PAY_LOW
///The nanobank programs associated with this account, used for notifying crew members through PDA, this is a lazy list
code/modules/events/money_spam.dm
+1
View File
@@ -78,6 +78,7 @@
"We are happy to inform you that due to the delay, we have been instructed to IMMEDIATELY deposit all funds into your account",\
"Dear fund beneficiary, We have please to inform you that overdue funds payment has finally been approved and released for payment",\
"Due to my lack of agents I require an off-world financial account to immediately deposit the sum of 1 POINT FIVE MILLION credits.",\
// Intentional errors here, please do not fix.
"Greetings sir, I regretfully to inform you that as I lay dying here due to my lack ofheirs I have chosen you to recieve the full sum of my lifetime savings of 1.5 billion credits")
if(6)
sender = pick("Nanotrasen Morale Divison","Feeling Lonely?","Bored?","www.wetskrell.nt")
code/modules/mob/living/silicon/robot/robot_defense.dm
+1 -1
View File
@@ -30,7 +30,7 @@
damage = rand(20, 40)
else
damage = rand(5, 35)
damage = round(damage / 2) // borgs recieve half damage
damage = round(damage / 2) // borgs receive half damage
adjustBruteLoss(damage)
return
code/modules/mob/living/simple_animal/bot/floorbot.dm
+1 -1
View File
@@ -17,7 +17,7 @@
req_access = list(ACCESS_CONSTRUCTION, ACCESS_ROBOTICS)
window_id = "autofloor"
window_name = "Automatic Station Floor Repairer v1.1"
/// Determines what to do when process_scan() recieves a target. See process_scan() for details.
/// Determines what to do when process_scan() receives a target. See process_scan() for details.
var/process_type
/// Tiles in inventory
var/amount = 10
code/modules/pda/messenger.dm
+2 -2
View File
@@ -167,13 +167,13 @@
if(sendable && receivable)
break
if(!sendable) // Are we in the range of a reciever?
if(!sendable) // Are we in the range of a receiver?
to_chat(U, "<span class='warning'>ERROR: No connection to server.</span>")
if(!pda.silent)
playsound(pda, 'sound/machines/terminal_error.ogg', 15, TRUE)
return
if(!receivable) // Is our recipient in the range of a reciever?
if(!receivable) // Is our recipient in the range of a receiver?
to_chat(U, "<span class='warning'>ERROR: No connection to recipient.</span>")
if(!pda.silent)
playsound(pda, 'sound/machines/terminal_error.ogg', 15, TRUE)
code/modules/power/apc/apc.dm
+2 -2
View File
@@ -52,7 +52,7 @@
/*** APC Status Vars ***/
/// The wire panel associated with this APC
var/datum/wires/apc/wires = null
/// Can the APC recieve/transmit power? Determined by the condition of the 2 Main Power Wires
/// Can the APC receive/transmit power? Determined by the condition of the 2 Main Power Wires
var/shorted = FALSE
/// Is the APC on and transmitting power to enabled breakers? Think of this var as the master breaker for the APC
var/operating = TRUE
@@ -79,7 +79,7 @@
var/locked = TRUE
/// If TRUE, the APC will automatically draw power from connect terminal, if FALSE it will not charge
var/chargemode = TRUE
/// Counter var, ticks up when the APC recieves power from terminal and resets to 0 when not charging, used for the `var/charging` var
/// Counter var, ticks up when the APC receives power from terminal and resets to 0 when not charging, used for the `var/charging` var
var/chargecount = 0
var/report_power_alarm = TRUE
code/modules/power/generators/solar.dm
+1 -1
View File
@@ -102,7 +102,7 @@
panel.transform = M
. += panel
//calculates the fraction of the sunlight that the panel recieves
//calculates the fraction of the sunlight that the panel receives
/obj/machinery/power/solar/proc/update_solar_exposure()
if(obscured)
sunfrac = 0
code/modules/power/powernets/local_powernet.dm
+1 -1
View File
@@ -2,7 +2,7 @@
* # local_powernet
*
* Manages all power related mechanics for a single /area
* Machines in areas will directly register to this datum in order to recieve power
* Machines in areas will directly register to this datum in order to receive power
*
* Machine/Turf/Item -> Local Powernet -> APC -> Terminal -> Wirenet
*
code/modules/redis/redis_callback.dm
+1 -1
View File
@@ -14,7 +14,7 @@
/**
* Message handler callback
*
* This callback is ran when a message is recieved on the assigned channel.
* This callback is ran when a message is received on the assigned channel.
* Make sure you override it on subtypes or it wont work.
*
* Arguments:
code/modules/surgery/organs/subtypes/tajaran_organs.dm
+1 -1
View File
@@ -6,7 +6,7 @@
/obj/item/organ/internal/eyes/tajaran
icon = 'icons/obj/species_organs/tajaran.dmi'
name = "tajaran eyeballs"
colourblind_matrix = MATRIX_TAJ_CBLIND //The colour matrix and darksight parameters that the mob will recieve when they get the disability.
colourblind_matrix = MATRIX_TAJ_CBLIND //The colour matrix and darksight parameters that the mob will receive when they get the disability.
replace_colours = TRITANOPIA_COLOR_REPLACE
see_in_dark = 4
code/modules/surgery/organs/subtypes/vulpkanin_organs.dm
+1 -1
View File
@@ -6,7 +6,7 @@
/obj/item/organ/internal/eyes/vulpkanin
name = "vulpkanin eyeballs"
icon = 'icons/obj/species_organs/vulpkanin.dmi'
colourblind_matrix = MATRIX_VULP_CBLIND //The colour matrix and darksight parameters that the mob will recieve when they get the disability.
colourblind_matrix = MATRIX_VULP_CBLIND //The colour matrix and darksight parameters that the mob will receive when they get the disability.
replace_colours = PROTANOPIA_COLOR_REPLACE
see_in_dark = 4
code/modules/tgui/tgui_panel/README.md
+2 -2
View File
@@ -19,11 +19,11 @@ TgChat handles sending messages from the server to the client through the use of
### Reliability
In the past there have been issues where BYOND will silently and without reason lose a message we sent to the client, to detect this and recover from it seamlessly TgChat also has a baked in reliability layer. This reliability layer is very primitive, and simply keeps track of recieved sequence numbers. Should the client recieve an unexpected sequence number TgChat asks the server to resend any missing packets.
In the past there have been issues where BYOND will silently and without reason lose a message we sent to the client, to detect this and recover from it seamlessly TgChat also has a baked in reliability layer. This reliability layer is very primitive, and simply keeps track of received sequence numbers. Should the client receive an unexpected sequence number TgChat asks the server to resend any missing packets.
### Ping System
TgChat supports a round trip time ping measurement, which is displayed to the client so they can know how long it takes for their commands and inputs to reach the server. This is done by sending the client a ping request, `ping/soft`, which tells the client to send a ping to the server. When the server recieves said ping it sends a reply, `ping/reply`, to the client with a payload containing the current DateTime which the client can reference against the initial ping request.
TgChat supports a round trip time ping measurement, which is displayed to the client so they can know how long it takes for their commands and inputs to reach the server. This is done by sending the client a ping request, `ping/soft`, which tells the client to send a ping to the server. When the server receives said ping it sends a reply, `ping/reply`, to the client with a payload containing the current DateTime which the client can reference against the initial ping request.
### Chat Tabs, Local Storage, and Highlighting