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

Merge pull request #9094 from clusterfack/fix6

Browse Source 
Fix some shit
This commit is contained in:
clusterfack
2016-03-28 14:13:07 -05:00
parent 1477594bf1 0cef1eb885
commit 59a6ab0c77
2 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/admin/topic.dm
View File

@@ -1975,7 +1975,7 @@
to_chat(usr, "This mob type cannot be replied to")
return
var/input = input(src.owner, "Please enter a message to reply to [key_name(M)] via their [receive_type].","Outgoing message from The Syndicate", "")
var/input = input(src.owner, "Please enter a message to reply to [key_name(M)] via their [receive_type].","Outgoing message from Central Command", "")
if(!input) return
to_chat(src.owner, "You sent [input] to [M] via a secure channel.")
@@ -2001,9 +2001,9 @@
var/input = input(src.owner, "Please enter a message to reply to [key_name(M)] via their [receive_type].","Outgoing message from The Syndicate", "")
if(!input) return
to_chat(src.owner, "You sent [input] to [M] via a secure channel.")
log_admin("[src.owner] replied to [key_name(M)]'s Syndicate message with the message [input].")
message_admins("[src.owner] replied to [key_name(M)]'s Syndicate message with: \"[input]\"")
to_chat(M, "You hear something crackle from your [receive_type] for a moment before a voice speaks. \"Please stand by for a message from your benefactor. Message as follows, agent. <b>\"[input]\"</b> Message ends.\"")
else if(href_list["CentcommFaxView"])

23
code/modules/admin/verbs/pray.dm
View File

@@ -22,13 +22,7 @@
var/image/cross = image('icons/obj/storage.dmi',"bible")
msg = "<span class='notice'>[bicon(cross)] <b><font color='purple'>PRAY (DEITY:[ticker.Bible_deity_name]): </font>[key_name(src, 1)] (<A HREF='?_src_=holder;adminmoreinfo=\ref[src]'>?</A>) (<A HREF='?_src_=holder;adminplayeropts=\ref[src]'>PP</A>) (<A HREF='?_src_=vars;Vars=\ref[src]'>VV</A>) (<A HREF='?_src_=holder;subtlemessage=\ref[src]'>SM</A>) (<A HREF='?_src_=holder;adminplayerobservejump=\ref[src]'>JMP</A>) (<A HREF='?_src_=holder;secretsadmin=check_antagonist'>CA</A>) (<A HREF='?_src_=holder;adminspawncookie=\ref[src]'>SC</a>):</b> [msg]</span>"
for(var/client/C in admins)
if(C.prefs.toggles & CHAT_PRAYER)
if(C.prefs.special_popup)
C << output(msg, "window1.msay_output")//if i get told to make this a proc imma be fuckin mad
else
to_chat(C, msg)
C << 'sound/effects/prayer.ogg'
send_prayer_to_admins(msg,'sound/effects/prayer.ogg')
if(!stat)
usr.whisper(orig_message)
@@ -39,11 +33,18 @@
/proc/Centcomm_announce(var/text , var/mob/Sender)
var/msg = copytext(sanitize(text), 1, MAX_MESSAGE_LEN)
msg = "<span class='notice'><b><font color=orange>CENTCOMM:</font>[key_name(Sender, 1)] (<A HREF='?_src_=holder;adminplayeropts=\ref[Sender]'>PP</A>) (<A HREF='?_src_=vars;Vars=\ref[Sender]'>VV</A>) (<A HREF='?_src_=holder;subtlemessage=\ref[Sender]'>SM</A>) (<A HREF='?_src_=holder;adminplayerobservejump=\ref[Sender]'>JMP</A>) (<A HREF='?_src_=holder;secretsadmin=check_antagonist'>CA</A>) (<A HREF='?_src_=holder;BlueSpaceArtillery=\ref[Sender]'>BSA</A>) (<A HREF='?_src_=holder;CentcommReply=\ref[Sender]'>RPLY</A>):</b> [msg]</span>"
to_chat(admins, msg)
admins << 'sound/effects/msn.ogg'
send_prayer_to_admins(msg,'sound/effects/msn.ogg')
/proc/Syndicate_announce(var/text , var/mob/Sender)
var/msg = copytext(sanitize(text), 1, MAX_MESSAGE_LEN)
msg = "<span class='notice'><b><font color=crimson>SYNDICATE:</font>[key_name(Sender, 1)] (<A HREF='?_src_=holder;adminplayeropts=\ref[Sender]'>PP</A>) (<A HREF='?_src_=vars;Vars=\ref[Sender]'>VV</A>) (<A HREF='?_src_=holder;subtlemessage=\ref[Sender]'>SM</A>) (<A HREF='?_src_=holder;adminplayerobservejump=\ref[Sender]'>JMP</A>) (<A HREF='?_src_=holder;secretsadmin=check_antagonist'>CA</A>) (<A HREF='?_src_=holder;BlueSpaceArtillery=\ref[Sender]'>BSA</A>) (<A HREF='?_src_=holder;SyndicateReply=\ref[Sender]'>RPLY</A>):</b> [msg]</span>"
to_chat(admins, msg)
admins << 'sound/effects/inception.ogg'
send_prayer_to_admins(msg,'sound/effects/inception.ogg')
/proc/send_prayer_to_admins(var/msg,var/sound)
for(var/client/C in admins)
if(C.prefs.toggles & CHAT_PRAYER)
if(C.prefs.special_popup)
C << output(msg, "window1.msay_output")//if i get told to make this a proc imma be fuckin mad
else
to_chat(C, msg)
C << sound