Added a canUseTopic()

This commit is contained in:
ikarrus
2014-05-14 20:50:46 -06:00
parent 96f489800b
commit 5ee453901a
2 changed files with 2 additions and 4 deletions
+1 -1
View File
@@ -8,7 +8,7 @@
announcement += "<h1 class='alert'>Priority Announcement</h1>"
else if(type == "Captain")
news_network.SubmitArticle(text, "Captain's Announcements", "Station Announcements", null)
news_network.SubmitArticle(text, "Captain's Announcement", "Station Announcements", null)
announcement += "<h1 class='alert'>Captain Announces</h1>"
else
@@ -555,7 +555,7 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12
/obj/machinery/computer/communications/proc/make_announcement(var/mob/living/user, var/is_silicon)
var/input = stripped_input(user, "Please choose a message to announce to the station crew.", "What?")
if(!input)
if(!input || !user.canUseTopic(src))
return
if(is_silicon)
priority_announce(input, null, null, "Priority")
@@ -563,8 +563,6 @@ var/const/CALL_SHUTTLE_REASON_LENGTH = 12
spawn(600)//One minute cooldown
ai_message_cooldown = 0
else
if(!(user in view(1,src)))
return
priority_announce(input, null, 'sound/misc/announce.ogg', "Captain")
message_cooldown = 1
spawn(600)//One minute cooldown