Skip to content

Commit

Permalink
Improves the ahelp resolution message (BeeStation#7376)
Browse files Browse the repository at this point in the history 
* Improves the ahelp resolution message

* Improves the messages, adds ones for rejection, IC and MHELP

* Fixes unterminated text

* Fixes unterminated text again

* Fixes another case of unterminated text

* Update adminhelp.dm

* Address meow reviews
  • Loading branch information
@PowerfulBacon
PowerfulBacon authored Oct 11, 2022
1 parent 762f87c commit de7aec1
Show file tree
Hide file tree
Showing 4 changed files with 52 additions and 15 deletions.
37 changes: 22 additions & 15 deletions code/modules/admin/verbs/adminhelp.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -615,17 +615,23 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
discordsendmsg("ahelp", "Ticket #[id] closed by [key_name(usr, include_link=0)]")

//Mark open ticket as resolved/legitimate, returns ahelp verb
/datum/admin_help/proc/Resolve(key_name = key_name_admin(usr), silent = FALSE)
/datum/admin_help/proc/Resolve(key_name = key_name_admin(usr), silent = FALSE, status = "Resolved", message = null)
if(state > AHELP_ACTIVE)
return

var/final_output = "<span class='adminhelp_conclusion'><span class='big'><b>Adminhelp [status]</b></span><br />"
final_output += message || "An administrator has handled your ticket. If your ticket was a report, then the appropriate action has been taken where necessary.<br />\
Thank you for creating a ticket, the adminhelp verb will be returned to you shortly.<br />"
final_output += "Your ticket was handled by: <span class='adminooc'>[usr.ckey]</span></span>"

RemoveActive()
state = AHELP_RESOLVED
GLOB.ahelp_tickets.ListInsert(src)

addtimer(CALLBACK(initiator, /client/proc/giveadminhelpverb), 50)

AddInteraction("green", "Resolved by [key_name].")
to_chat(initiator, "<span class='adminhelp'>Your ticket has been resolved by an admin. The Adminhelp verb will be returned to you shortly.</span>")
to_chat(initiator, final_output)
if(!silent)
SSblackbox.record_feedback("tally", "ahelp_stats", 1, "resolved")
var/msg = "Ticket [TicketHref("#[id]")] resolved by [key_name]"
Expand All @@ -645,9 +651,10 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)

SEND_SOUND(initiator, sound('sound/effects/adminhelp.ogg'))

to_chat(initiator, "<font color='red' size='4'><b>- AdminHelp Rejected! -</b></font>")
to_chat(initiator, "<font color='red'><b>The administrators could not resolve your ticket.</b> The adminhelp verb has been returned to you so that you may try again.</font>")
to_chat(initiator, "Please try to be calm, clear, and descriptive in admin helps, do not assume the admin has seen any related events, and clearly state the names of anybody you are reporting.")
to_chat(initiator, "<span class='adminhelp_conclusion'><span class='big'><b>Adminhelp Rejected</b></span><br/>\
<b>The administrators could not resolve your ticket.</b> The adminhelp verb has been returned to you so that you may try again.<br/>\
Please try to be calm, clear, and descriptive in admin helps, do not assume the admin has seen any related events, and clearly state the names of anybody you are reporting.<br/>\
Your ticket was handled by: <span class='adminooc'>[usr.ckey]</span></span>")

SSblackbox.record_feedback("tally", "ahelp_stats", 1, "rejected")
var/msg = "Ticket [TicketHref("#[id]")] rejected by [key_name]"
Expand All @@ -664,18 +671,17 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
if(state > AHELP_ACTIVE)
return

var/msg = "<font color='red' size='4'><b>- AdminHelp marked as IC issue! -</b></font><br>"
msg += "<font color='red'>Your issue has been determined by an administrator to be an in character issue and does NOT require administrator intervention at this time. For further resolution you should pursue options that are in character.</font><br>"

if(initiator)
to_chat(initiator, msg)

SSblackbox.record_feedback("tally", "ahelp_stats", 1, "IC")
msg = "Ticket [TicketHref("#[id]")] marked as IC by [key_name]"
var/msg = "Ticket [TicketHref("#[id]")] marked as IC by [key_name]"
message_admins(msg)
log_admin_private(msg)
AddInteraction("red", "Marked as IC issue by [key_name]")
Resolve(silent = TRUE)
Resolve(
silent = TRUE,
status = "Resolved - IC Issue",
message = "An administrator has handled your ticket and has determined that the issue you are facing is an in-character issue and does not require administrator intervention at this time.<br />\
For further resolution, you should pursue options that are in character, such as filing a report with security or a head of staff.<br>\
Thank you for creating a ticket, the adminhelp verb will be returned to you shortly.<br />")

if(!bwoink)
discordsendmsg("ahelp", "Ticket #[id] marked as IC by [key_name(usr, include_link=0)]")
Expand All @@ -689,8 +695,9 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)

SEND_SOUND(initiator, sound('sound/effects/adminhelp.ogg'))

to_chat(initiator, "<font color='red' size='4'><b>- AdminHelp Rejected! -</b></font>")
to_chat(initiator, "<font color='red'>This question may regard <b>game mechanics or how-tos</b>. Such questions should be asked with <b>Mentorhelp</b>.</font>")
to_chat(initiator, "<span class='adminhelp_conclusion'><span class='big'><b>Adminhelp Rejected</b></span><br/>\
This question may regard <b>game mechanics or how-tos</b>. Such questions should be asked with <b>Mentorhelp</b><br/>\
Your ticket was handled by: <span class='adminooc'>[usr.ckey]</span></span>")

SSblackbox.record_feedback("tally", "ahelp_stats", 1, "mhelp this")
var/msg = "Ticket [TicketHref("#[id]")] told to mentorhelp by [key_name]"
Expand Down
10 changes: 10 additions & 0 deletions interface/stylesheet.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,16 @@ h1.alert, h2.alert {color: #000000;}
.boldnotice {color: #000099; font-weight: bold;}
.adminnotice {color: #0000ff;}
.adminhelp {color: #ff0000; font-weight: bold;}
.adminhelp_conclusion {
display: block;
color: white;
text-align: center;
background-color: black;
border: 2px solid red;
border-radius: 10px;
padding: 10px;
margin: 10px 20px;
}
.unconscious {color: #0000ff; font-weight: bold;}
.suicide {color: #ff5050; font-style: italic;}
.green {color: #03ff39;}
Expand Down
10 changes: 10 additions & 0 deletions tgui/packages/tgui-panel/styles/goon/chat-dark.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,16 @@ em {font-style: normal; font-weight: bold;}
.boldnotice {color: #6685f5; font-weight: bold;}
.adminnotice {color: #6685f5;}
.adminhelp {color: #ff0000; font-weight: bold;}
.adminhelp_conclusion {
display: block;
color: white;
text-align: center;
background-color: black;
border: 2px solid red;
border-radius: 10px;
padding: 10px;
margin: 10px 20px;
}
.unconscious {color: #a4bad6; font-weight: bold;}
.suicide {color: #ff5050; font-style: italic;}
.green {color: #059223;}
Expand Down
10 changes: 10 additions & 0 deletions tgui/packages/tgui-panel/styles/goon/chat-light.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -321,6 +321,16 @@ h1.alert, h2.alert {color: #000000;}
.boldnotice {color: #000099; font-weight: bold;}
.adminnotice {color: #0000ff;}
.adminhelp {color: #ff0000; font-weight: bold;}
.adminhelp_conclusion {
display: block;
color: white;
text-align: center;
background-color: black;
border: 2px solid red;
border-radius: 10px;
padding: 10px;
margin: 10px 20px;
}
.unconscious {color: #0000ff; font-weight: bold;}
.suicide {color: #ff5050; font-style: italic;}
.green {color: #03ff39;}
Expand Down

0 comments on commit de7aec1

Please sign in to comment.