diff --git a/code/__HELPERS/roundend.dm b/code/__HELPERS/roundend.dm index d8e97fd5..34456484 100644 --- a/code/__HELPERS/roundend.dm +++ b/code/__HELPERS/roundend.dm @@ -163,6 +163,7 @@ set waitfor = FALSE to_chat(world, "


The round has ended.") + var/botmsg = "**The Round has ended!**```Round ID: [GLOB.round_id]\nRound Time: [DisplayTimeText(world.time - SSticker.round_start_time)]\nTotal Population: [GLOB.joined_player_list.len]```" if(LAZYLEN(GLOB.round_end_notifiees)) send2irc("Notice", "[GLOB.round_end_notifiees.Join(", ")] the round has ended.") @@ -179,6 +180,20 @@ var/popcount = gather_roundend_feedback() display_report(popcount) + + CHECK_TICK + + //Hyper bot list players + botmsg += "**The Crew!** ```" + for(var/p in GLOB.player_list) + var/mob/P = p + botmsg += "[P.name]" + if(P.job) + botmsg += "([P.job])" + botmsg += "\n" + + botmsg += "```" + CHECK_TICK // Add AntagHUD to everyone, see who was really evil the whole time! @@ -208,10 +223,6 @@ if(length(CONFIG_GET(keyed_list/cross_server))) send_news_report() - //tell the nice people on discord what went on before the salt cannon happens. - world.TgsTargetedChatBroadcast("The current round has ended. Please standby for your shift interlude Kinaris News Network's report!", FALSE) - world.TgsTargetedChatBroadcast(send_news_report(),FALSE) - CHECK_TICK //These need update to actually reflect the real antagonists @@ -226,7 +237,6 @@ total_antagonists[A.name] += "[key_name(A.owner)]" CHECK_TICK - //Now print them all into the log! log_game("Antagonists at round end were...") for(var/antag_name in total_antagonists) @@ -243,6 +253,7 @@ SSblackbox.Seal() sleep(50) + world.hypermessage(botmsg) ready_for_reboot = TRUE standard_reboot() diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 3a24d7aa..02bf1fd9 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -72,6 +72,7 @@ GLOBAL_LIST_INIT(admin_verbs_admin, world.AVerbsAdmin()) /client/proc/cmd_admin_pm_panel, /*admin-pm list*/ /client/proc/panicbunker, /client/proc/addbunkerbypass, + /client/proc/discordmessage, /client/proc/revokebunkerbypass, /client/proc/stop_sounds, /client/proc/debugstatpanel, diff --git a/hyperstation/code/hyperbot/hyperbot.dm b/hyperstation/code/hyperbot/hyperbot.dm new file mode 100644 index 00000000..118e0114 --- /dev/null +++ b/hyperstation/code/hyperbot/hyperbot.dm @@ -0,0 +1,16 @@ +//not the most effient bot in the world, but it does its job. + +/client/proc/discordmessage(input as message) + set category = "Special Verbs" + set name = "Hyperbot Message" + set desc = "Makes the local bot say something in general chat on discord." + + if(input) + world.hypermessage(input) + message_admins("[key_name_admin(usr)] has made the Hyperbot post '[input]' in General.") + +/world/proc/hypermessage(message) + fdel("Hyperbot/message.txt") //cleaning up old message + if(message) + var botmsg = "![message]" + text2file(botmsg,"Hyperbot/message.txt") //the bot on local reads a new text file and sends it to the discord. \ No newline at end of file diff --git a/tgstation.dme b/tgstation.dme index 0464d400..fb822c78 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3042,6 +3042,7 @@ #include "hyperstation\code\gamemode\traitor_lewd.dm" #include "hyperstation\code\gamemode\traitor_thief.dm" #include "hyperstation\code\gamemode\werewolf\werewolf.dm" +#include "hyperstation\code\hyperbot\hyperbot.dm" #include "hyperstation\code\mobs\carrion.dm" #include "hyperstation\code\mobs\dancer.dm" #include "hyperstation\code\mobs\hugbot.dm"