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

Merge current master in

Browse Source
This commit is contained in:
Arokha Sieyes
2017-04-25 20:14:38 -04:00
parent e2be9cfdd2 4aa8df4171
commit 80670b420c
200 changed files with 3202 additions and 1744 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/admin.dm
+21 -18
View File
@@ -664,31 +664,34 @@ proc/admin_notice(var/message, var/rights)
log_admin("Announce: [key_name(usr)] : [message]")
feedback_add_details("admin_verb","A") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
//VOREStation Edit to this verb for the purpose of making it compliant with the annunciator system
var/datum/announcement/priority/admin_pri_announcer = new
var/datum/announcement/minor/admin_min_announcer = new
/datum/admins/proc/intercom()
set category = "Fun"
set name = "Intercom Msg"
set desc = "Send an intercom message, like an arrivals announcement."
if(!check_rights(0)) return
//This is basically how death alarms do it
var/obj/item/device/radio/headset/a = new /obj/item/device/radio/headset/ert(null)
a.icon = 'icons/obj/radio.dmi' //VOREStation Tweak
a.icon_state = "intercom" //VOREStation Tweak
var/sender = input("Name of sender (max 75):", "Intercom Msg", ANNOUNCER_NAME) as null|text
if(sender) //They put a sender
sender = sanitize(sender, 75, extra = 0)
var/message = input("Message content (max 500):", "Contents", "This is a test of the announcement system.") as null|message
if(message) //They put a message
message = sanitize(message, 500, extra = 0)
var/priority = alert("Priority or Normal?","Intercom Msg","Priority","Cancel","Normal")
var/datum/announcement/A
switch(priority)
if("Priority")
A = admin_pri_announcer
if("Normal")
A = admin_min_announcer
if(A)
A.announcer = sender
A.Announce(message)
A.announcer = ""
log_admin("Intercom Verb: [key_name(usr)] : [sender]:[message]")
var/channel = input("Channel for message:","Channel", null) as null|anything in (list("Common") + a.keyslot1.channels + a.keyslot2.channels)
if(channel) //They picked a channel
var/sender = input("Name of sender (max 75):", "Announcement", "Announcement Computer") as null|text
if(sender) //They put a sender
sender = sanitize(sender, 75, extra = 0)
var/message = input("Message content (max 500):", "Contents", "This is a test of the announcement system.") as null|message
if(message) //They put a message
message = sanitize(message, 500, extra = 0)
a.autosay("[message]", "[sender]", "[channel == "Common" ? null : channel]") //Common is a weird case, as it's not a "channel", it's just talking into a radio without a channel set.
log_admin("Intercom: [key_name(usr)] : [sender]:[message]")
qdel(a)
feedback_add_details("admin_verb","IN") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/datum/admins/proc/toggleooc()