Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

возвращаем к жизни гвард #13456

Merged
merged 3 commits into from
Aug 10, 2024
Merged

возвращаем к жизни гвард #13456

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9001b56
some guard fixes
NinjaPikachuska Aug 9, 2024
34e0671
Update code/modules/admin/topic.dm
NinjaPikachuska Aug 9, 2024
aad7786
Update code/modules/admin/topic.dm
NinjaPikachuska Aug 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions code/modules/admin/admin.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,16 @@ var/global/BSACooldown = 0
<a href='?src=\ref[src];adminplayerobservefollow=\ref[M]'>FLW</a>
<br>
<b>Mob type</b> = [M.type]<br><br>
<b>Guard:</b> <A href='?src=\ref[src];guard=\ref[M]'>Show</A><br>
<b>Related accounts by current IP and CID</b>: <A href='?src=\ref[src];related_accounts=\ref[M]'>Get</A><br>
<b>Slow queries:</b> <A href='?src=\ref[src];cid_history=\ref[M]'>CID history</A> | <A href='?src=\ref[src];ip_history=\ref[M]'>IP history</A><br>
"}

if(M.client)
body += {"
<b>Guard:</b> <A href='?src=\ref[src];guard=\ref[M]'>Show</A><br>
<b>Related accounts by current IP and CID</b>: <A href='?src=\ref[src];related_accounts=\ref[M]'>Get</A><br>
<b>Slow queries:</b> <A href='?src=\ref[src];cid_history=\ref[M]'>CID history</A> | <A href='?src=\ref[src];ip_history=\ref[M]'>IP history</A><br>
"}

body += {"
<b>CentCom (other server bans)</b>: <A target='_blank' href='https://centcom.melonmesa.com/viewer/view/[M.ckey]'>CentCom (ENG)</A><br>
<b>BYOND profile</b>: <A target='_blank' href='http://byond.com/members/[M.ckey]'>[M.ckey]</A><br><br>
<A href='?src=\ref[src];boot2=\ref[M]'>Kick</A> |
Expand Down
20 changes: 16 additions & 4 deletions code/modules/admin/topic.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -900,6 +900,7 @@
var/mob/M = locate(href_list["guard"])
if (ismob(M))
if(!M.client)
show_player_panel(M)
return
M.client.prefs.guard.print_report()

Expand All @@ -908,7 +909,11 @@
return

var/mob/M = locate(href_list["cid_history"])
if (!ismob(M) || !M.client)
if (!ismob(M))
return

if(!M.client)
show_player_panel(M)
return

var/client/C = M.client
Expand Down Expand Up @@ -939,7 +944,11 @@
return

var/mob/M = locate(href_list["ip_history"])
if (!ismob(M) || !M.client)
if (!ismob(M))
return

if(!M.client)
show_player_panel(M)
return

var/client/C = M.client
Expand Down Expand Up @@ -972,6 +981,7 @@
var/mob/M = locate(href_list["related_accounts"])
if (ismob(M))
if(!M.client)
show_player_panel(M)
return
var/client/C = M.client

Expand Down Expand Up @@ -1068,6 +1078,7 @@
if(!ismob(M))
return
if(!M.client)
show_player_panel(M)
return

var/ban_mute_type = input("Choose chat for ban:", "Chat ban") as null|anything in global.mute_ban_bitfield
Expand Down Expand Up @@ -1116,6 +1127,7 @@
if(!ismob(M))
return
if(!M.client)
show_player_panel(M)
return

var/type = href_list["type"]
Expand Down Expand Up @@ -2354,7 +2366,7 @@
var/id = text2num(href_list["index"])

var/DBQuery/query = dbcon.NewQuery({"SELECT type, adminckey, text
FROM erro_messages
FROM erro_messages
NinjaPikachuska marked this conversation as resolved.
Show resolved Hide resolved
WHERE id='[id]' AND deleted=0"})
query.Execute()

Expand Down Expand Up @@ -2387,7 +2399,7 @@
var/id = text2num(href_list["index"])

var/DBQuery/query = dbcon.NewQuery({"SELECT type, adminckey, text
FROM erro_messages
FROM erro_messages
NinjaPikachuska marked this conversation as resolved.
Show resolved Hide resolved
WHERE id='[id]' AND deleted=0"})
query.Execute()

Expand Down
1 change: 1 addition & 0 deletions code/modules/client/preferences.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,7 @@ var/global/list/datum/preferences/preferences_datums = list()
// reattach existing datum to client if client was disconnected and connects again
/datum/preferences/proc/reattach_to_client(client/client)
parent = client
guard.holder = client

/datum/preferences/proc/init_chat_bans()
if(!config.sql_enabled)
Expand Down
Loading