diff --git a/code/modules/tgs/v5/chat_commands.dm b/code/modules/tgs/v5/chat_commands.dm index 961d3e2dbf..a8f031dc99 100644 --- a/code/modules/tgs/v5/chat_commands.dm +++ b/code/modules/tgs/v5/chat_commands.dm @@ -15,13 +15,13 @@ counts++ if(C && !(istype(C.mob,/mob/new_player) || istype(C.mob, /mob/observer))) if(C && C.mob && isbelly(C.mob.loc)) - bellied++ + bellied++ if(C.is_afk()) afks++ else active++ - return "Current server status:\n**Web Manifest:** \n**Players:** [counts]\n**AFK:** [afks]\n**Active:** [active]\n**Bellied:** [bellied]\n\nRound Duration:** [roundduration2text()]" //CHOMP Edit changed manifest to chomp manifest link + return "Current server status:\n**Web Manifest:** " //CHOMPEdit /datum/tgs_chat_command/parsetest name = "parsetest" @@ -95,13 +95,12 @@ GLOBAL_LIST_EMPTY(pending_discord_registrations) qdel(query) //CHOMPEdit TGSQL return "[sender.friendly_name], your Discord ID is already registered to a Byond username. Please contact an administrator if you changed your Byond username or Discord ID." qdel(query) //CHOMPEdit TGSQL - var/key_to_find = "[ckey(params)]" // They didn't provide anything worth looking up. if(!length(key_to_find)) return "[sender.friendly_name], you need to provide your Byond username at the end of the command. It can be in 'key' format (with spaces and characters) or 'ckey' format (without spaces or special characters)." - + // Try to find their client. var/client/user for(var/client/C in GLOB.clients) @@ -112,15 +111,11 @@ GLOBAL_LIST_EMPTY(pending_discord_registrations) // Couldn't find them logged in. if(!user) return "[sender.friendly_name], I couldn't find a logged-in user with the username of '[key_to_find]', which is what you provided after conversion to Byond's ckey format. Please connect to the game server and try again." - + //var/sql_ckey = sql_sanitize_text(key_to_find) //CHOMPEdit TGSQL var/DBQuery/query2 = SSdbcore.NewQuery("SELECT discord_id FROM erro_player WHERE ckey = :t_ckey",list("t_ckey" = key_to_find)) //CHOMPEdit TGSQL query2.Execute() //CHOMPEdit TGSQL - var/sql_ckey = sql_sanitize_text(key_to_find) - query = dbcon.NewQuery("SELECT discord_id FROM erro_player WHERE ckey = '[sql_ckey]'") - query.Execute() - // We somehow found their client, BUT they don't exist in the database if(!query2.NextRow()) //CHOMPEdit TGSQL qdel(query2) //CHOMPEdit TGSQL @@ -131,7 +126,6 @@ GLOBAL_LIST_EMPTY(pending_discord_registrations) qdel(query2) //CHOMPEdit TGSQL return "[sender.friendly_name], it appears you've already registered your chat and game IDs. If you've changed game or chat usernames, please contact an administrator for help." qdel(query2) //CHOMPEdit TGSQL - // Okay. We found them, they're in the DB, and they have no discord ID set. var/message = "A request has been sent from Discord to validate your Byond username, by '[sender.friendly_name]' in '[sender.channel.friendly_name]'\
If you did not send this request, do not click the link below, and do notify an administrator in-game or on Discord ASAP.\ @@ -144,13 +138,11 @@ GLOBAL_LIST_EMPTY(pending_discord_registrations) return "[sender.friendly_name], I've sent you a message in-game. Please verify your username there to complete your registration within 10 minutes." -/* CHOMP Commenting this out to see what happens, lol. It should return vorestation's status fields instead of YW's -//YW Commands +/*//YW Commands //CHOMP Commenting this out for now. Should now be using Virgo's version. //Status /datum/tgs_chat_command/status/Run(datum/tgs_chat_user/sender, params) return "Current server status:**Players:** [TGS_CLIENT_COUNT]\n**Round Duration:** [roundduration2text()]" */ - // - FAX /datum/tgs_chat_command/readfax name = "readfax"