cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 04:27:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix up a number of ID checks

Browse Source
This commit is contained in:
Markolie
2016-10-23 15:49:02 +02:00
parent 570b9b7ec0
commit 79be3ca8cf
10 changed files with 238 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/defines/procs/announce.dm
+13 -13
View File
@@ -60,7 +60,7 @@
Sound(message_sound)
Log(message, message_title)
datum/announcement/proc/Message(message as text, message_title as text)
/datum/announcement/proc/Message(message as text, message_title as text)
for(var/mob/M in player_list)
if(!istype(M,/mob/new_player) && !isdeaf(M))
to_chat(M, "<h2 class='alert'>[title]</h2>")
@@ -72,14 +72,14 @@ datum/announcement/proc/Message(message as text, message_title as text)
to_chat(world, "<b><font size=3><font color=red>[message_title]</font color></font></b>")
to_chat(world, "<b><font size=3>[message]</font size></font></b>")
datum/announcement/priority/Message(message as text, message_title as text)
/datum/announcement/priority/Message(message as text, message_title as text)
to_chat(world, "<h1 class='alert'>[message_title]</h1>")
to_chat(world, "<span class='alert'>[message]</span>")
if(announcer)
to_chat(world, "<span class='alert'> -[html_encode(announcer)]</span>")
to_chat(world, "<br>")
datum/announcement/priority/command/Message(message as text, message_title as text)
/datum/announcement/priority/command/Message(message as text, message_title as text)
var/command
command += "<h1 class='alert'>[command_name()] Update</h1>"
if(message_title)
@@ -91,7 +91,7 @@ datum/announcement/priority/command/Message(message as text, message_title as te
if(!istype(M,/mob/new_player) && !isdeaf(M))
to_chat(M, command)
datum/announcement/priority/enemy/Message(message as text, message_title as text, from as text)
/datum/announcement/priority/enemy/Message(message as text, message_title as text, from as text)
var/command
command += "<h1 class='alert'>[from]</h1>"
if(message_title)
@@ -103,11 +103,11 @@ datum/announcement/priority/enemy/Message(message as text, message_title as text
if(!istype(M,/mob/new_player) && !isdeaf(M))
to_chat(M, command)
datum/announcement/priority/security/Message(message as text, message_title as text)
/datum/announcement/priority/security/Message(message as text, message_title as text)
to_chat(world, "<font size=4 color='red'>[message_title]</font>")
to_chat(world, "<font color='red'>[message]</font>")
datum/announcement/proc/NewsCast(message as text, message_title as text)
/datum/announcement/proc/NewsCast(message as text, message_title as text)
if(disable_newscasts)
return
if(!newscast)
@@ -121,28 +121,28 @@ datum/announcement/proc/NewsCast(message as text, message_title as text)
news.can_be_redacted = 0
announce_newscaster_news(news)
datum/announcement/proc/PlaySound(var/message_sound)
/datum/announcement/proc/PlaySound(var/message_sound)
if(!message_sound)
return
for(var/mob/M in player_list)
if(!istype(M,/mob/new_player) && !isdeaf(M))
M << message_sound
datum/announcement/proc/Sound(var/message_sound)
/datum/announcement/proc/Sound(var/message_sound)
PlaySound(message_sound)
datum/announcement/priority/Sound(var/message_sound)
/datum/announcement/priority/Sound(var/message_sound)
if(sound)
world << sound
datum/announcement/priority/command/Sound(var/message_sound)
/datum/announcement/priority/command/Sound(var/message_sound)
PlaySound(message_sound)
datum/announcement/proc/Log(message as text, message_title as text)
/datum/announcement/proc/Log(message as text, message_title as text)
if(log)
log_say("[key_name(usr)] has made \a [announcement_type]: [message_title] - [message] - [announcer]")
message_admins("[key_name_admin(usr)] has made \a [announcement_type].", 1)
/proc/GetNameAndAssignmentFromId(var/obj/item/weapon/card/id/I)
// Format currently matches that of newscaster feeds: Registered Name (Assigned Rank)
return I.assignment ? "[I.registered_name] ([I.assignment])" : I.registered_name
return I.assignment ? "[I.registered_name] ([I.assignment])" : I.registered_name