cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-09 16:14:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fucking hell Celt (#11748)

Browse Source
This commit is contained in:
PJB3005
2016-09-04 19:29:54 +02:00
committed by clusterfack
parent 0d7d2a73ff
commit 413a5fd4e4
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/gamemodes/gameticker.dm
View File

@@ -216,7 +216,7 @@ var/global/datum/controller/gameticker/ticker
if(0 == admins.len)
send2adminirc("Round has started with no admins online.")
send2admindiscord("**Round has started with no admins online.** {ADMIN_PING}")
send2admindiscord("**Round has started with no admins online.**", TRUE)
/*
supply_shuttle.process() //Start the supply shuttle regenerating points -- TLE

6
code/modules/admin/verbs/adminhelp.dm
View File

@@ -117,14 +117,14 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey","
if(admin_number_present <= 0)
if(!admin_number_afk)
send2adminirc("HELP [key_name(src)]: [original_msg] - No admins online")
send2admindiscord("**Help**: [key_name(src)]: `[original_msg]` - **No admins online** {ADMIN_PING}")
send2admindiscord("**Help**: [key_name(src)]: `[replacetext(original_msg, "`", "\\`")]` - **No admins online**", TRUE)
else
send2adminirc("HELP [key_name(src)]: [original_msg] - All admins AFK ([admin_number_afk])")
send2admindiscord("**Help**: [key_name(src)]: `[original_msg]` - **All admins AFK** ([admin_number_afk]) {ADMIN_PING}")
send2admindiscord("**Help**: [key_name(src)]: `[replacetext(original_msg, "`", "\\`")]` - **All admins AFK** ([admin_number_afk])", TRUE)
else
send2adminirc("HELP [key_name(src)]: [original_msg]")
send2admindiscord("**Help**: [key_name(src)]: `[original_msg]` - **[admin_number_present]** Active admins, **[admin_number_afk]** AFK admins.")
send2admindiscord("**Help**: [key_name(src)]: `[replacetext(original_msg, "`", "\\`")]` - **[admin_number_present]** Active admins, **[admin_number_afk]** AFK admins.")
feedback_add_details("admin_verb","AH") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!

8
code/modules/ext_scripts/discord.dm
View File

@@ -1,12 +1,12 @@
/proc/send2maindiscord(var/msg)
send2discord(msg, FALSE)
/proc/send2admindiscord(var/msg)
send2discord(msg, TRUE)
/proc/send2admindiscord(var/msg, var/ping = FALSE)
send2discord(msg, TRUE, ping)
/proc/send2discord(var/msg, var/admin = FALSE)
/proc/send2discord(var/msg, var/admin = FALSE, var/ping = FALSE)
if (!global.config.discord_url || !global.config.discord_password)
return
var/url = "[global.config.discord_url]?pass=[url_encode(global.config.discord_password)]&admin=[admin ? "true" : "false"]&content=[url_encode(msg)]"
var/url = "[global.config.discord_url]?pass=[url_encode(global.config.discord_password)]&admin=[admin ? "true" : "false"]&content=[url_encode(msg)]&ping=[ping ? "true" : "false"]"
world.Export(url)

2
code/modules/mob/logout.dm
View File

@@ -32,7 +32,7 @@
message_admins("Admin logout: [key_name(src)]")
if(available_admins == 0) // Apparently the admin logging out is no longer an admin at this point, so we have to check this towards 0 and not towards 1. Awell.
send2adminirc("[key_name(src)] logged out - no more admins online.")
send2admindiscord("[key_name(src)] logged out. **No more non-AFK admins online.** - **[admin_number_afk]** AFK {ADMIN_PING}")
send2admindiscord("[key_name(src)] logged out. **No more non-AFK admins online.** - **[admin_number_afk]** AFK", TRUE)
INVOKE_EVENT(on_logout, list())