cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-22 19:47:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixup merge, both VS and nebula hooks now

Browse Source
This commit is contained in:
Aronai Sieyes
2021-05-27 12:25:48 -04:00
parent 3f19eafeaa
commit 124eab8aa1
6 changed files with 12 additions and 860 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/verbs/adminhelp.dm
+2 -6
View File
@@ -183,11 +183,8 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
var/admin_number_present = send2irc_adminless_only(initiator_ckey, name)
log_admin("Ticket #[id]: [key_name(initiator)]: [name] - heard by [admin_number_present] non-AFK admins who have +BAN.")
if(admin_number_present <= 0)
<<<<<<< HEAD
to_chat(C, "<span class='notice'>No active admins are online, your adminhelp was sent to the admin discord.</span>") //VOREStation Edit
=======
to_chat(C, "<span class='notice'>No active admins are online, your adminhelp was sent to the admin irc.</span>")
// Also send it to discord since that's the hip cool thing now.
SSwebhooks.send(
WEBHOOK_AHELP_SENT,
@@ -197,8 +194,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
"color" = COLOR_WEBHOOK_POOR
)
)
>>>>>>> 4deffc7... Ports Nebula's Discord Webhook Integration (#8071)
GLOB.ahelp_tickets.active_tickets += src
/datum/admin_help/Destroy()