diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index 3eedc4074ef..868fdf15bc4 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -78,7 +78,8 @@ proc/admin_notice(var/message, var/rights) if(M.client) body += "| Prison | " - body += "Wind" + body += "Wind | " + body += "\ Send back to Lobby" var/muted = M.client.prefs.muted body += {"
Mute: \[IC | diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 90a783a3a71..906373190cd 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -664,6 +664,30 @@ log_admin("[key_name(usr)] sent [key_name(M)] to the prison station.",,admin_key=key_name(usr),ckey=key_name(M)) message_admins("[key_name_admin(usr)] sent [key_name_admin(M)] to the prison station.", 1) + else if(href_list["sendbacktolobby"]) + if(!check_rights(R_ADMIN)) + return + + var/mob/M = locate(href_list["sendbacktolobby"]) + + if(!isobserver(M)) + to_chat(usr, "You can only send ghost players back to the Lobby.") + return + + if(!M.client) + to_chat(usr, "[M] doesn't seem to have an active client.") + return + + if(alert(usr, "Send [key_name(M)] back to Lobby?", "Message", "Yes", "No") != "Yes") + return + + log_admin("[key_name(usr)] has sent [key_name(M)] back to the Lobby.") + message_admins("[key_name(usr)] has sent [key_name(M)] back to the Lobby.") + + var/mob/abstract/new_player/NP = new /mob/abstract/new_player() + NP.key = M.ckey + qdel(M) + else if(href_list["tdome1"]) if(!check_rights(R_FUN)) return diff --git a/html/changelogs/Afya_Lobby.yml b/html/changelogs/Afya_Lobby.yml new file mode 100644 index 00000000000..03a675bad6c --- /dev/null +++ b/html/changelogs/Afya_Lobby.yml @@ -0,0 +1,41 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: Afya + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - admin: Send to Lobby verb in PP