cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-23 13:05:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Tickets and assorted (#4433)

Browse Source 
* Fixes #4407
* Fixes #4393
* Fixes #4413
* Fixes #4231
This commit is contained in:
Erki
2018-03-18 12:30:27 +02:00
committed by GitHub
parent de19bc1b4e
commit 5c9a3dc675
7 changed files with 25 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/ticket.dm
+1 -1
View File
@@ -138,7 +138,7 @@ proc/get_open_ticket_by_ckey(var/owner)
var/ref_mob = ""
if(owner_client)
ref_mob = "\ref[owner_client.mob]"
ticket_dat += " - <A HREF='?_src_=holder;adminmoreinfo=[ref_mob]'>?</A> - <A HREF='?_src_=holder;adminplayeropts=[ref_mob]'>PP</A> - <A HREF='?_src_=vars;Vars=[ref_mob]'>VV</A> - <A HREF='?_src_=holder;subtlemessage=[ref_mob]'>SM</A>[owner_client ? "- [admin_jump_link(owner_client, src)]" : ""]"
ticket_dat += " - <A HREF='?_src_=holder;adminmoreinfo=[ref_mob]'>?</A> - <A HREF='?_src_=holder;adminplayeropts=[ref_mob]'>PP</A> - <A HREF='?_src_=vars;Vars=[ref_mob]'>VV</A> - <A HREF='?_src_=holder;subtlemessage=[ref_mob]'>SM</A>[owner_client ? "- [admin_jump_link(owner_client.mob, src)]" : ""]"
if(open_ticket && open_ticket == ticket)
ticket_dat += "</i>"
ticket_dat += "</li>"
code/modules/admin/verbs/adminjump.dm
+1 -1
View File
@@ -49,7 +49,7 @@
if(src.mob)
var/mob/A = src.mob
var/turf/T = get_turf(M)
if(T && isturf(T))
if(isturf(T))
feedback_add_details("admin_verb","JM") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
A.on_mob_jump()
A.loc = T
code/modules/admin/verbs/adminpm.dm
+10 -9
View File
@@ -46,9 +46,6 @@
else src << "<font color='red'>Error: Private-Message: Client not found. They may have lost connection, so try using an adminhelp!</font>"
return
if (src.handle_spam_prevention(msg,MUTE_ADMINHELP))
return
var/recieve_pm_type = "Player"
//mod PMs are maroon
//PMs sent from admins and mods display their rank
@@ -62,21 +59,25 @@
src << "<span class='warning'>Error: Admin-PM: Non-admin to non-admin PM communication is forbidden.</span>"
return
if(!check_rights(R_SERVER|R_DEBUG|R_DEV, 0))
msg = sanitize(msg)
//get message text, limit it's length.and clean/escape html
if(!msg)
msg = input(src,"Message:", "Private message to [key_name(C, 0, holder ? 1 : 0)]") as text|null
if(!msg) return
if(!msg)
return
if(!C)
if(holder) src << "<font color='red'>Error: Admin-PM: Client not found.</font>"
else src << "<font color='red'>Error: Private-Message: Client not found. They may have lost connection, so try using an adminhelp!</font>"
if(holder)
src << "<font color='red'>Error: Admin-PM: Client not found.</font>"
else
src << "<font color='red'>Error: Private-Message: Client not found. They may have lost connection, so try using an adminhelp!</font>"
return
if(!check_rights(R_SERVER|R_DEBUG|R_DEV, 0))
msg = sanitize(msg)
if (handle_spam_prevention(msg, MUTE_ADMINHELP))
return
// searches for an open ticket, in case an outdated link was clicked
// I'm paranoid about the problems that could be caused by accidentally finding the wrong ticket, which is why this is strict
if(isnull(ticket))