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

Merge VS changes for telecomms

Browse Source
This commit is contained in:
Aronai Sieyes
2020-04-29 10:24:37 -04:00
parent eb6eb7bcd6
commit c2ca984d18
12 changed files with 0 additions and 713 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/defines/procs/announce.dm
-16
View File
@@ -32,11 +32,7 @@
title = "Security Announcement"
announcement_type = "Security Announcement"
<<<<<<< HEAD
/datum/announcement/proc/Announce(var/message as text, var/new_title = "", var/new_sound = null, var/do_newscast = newscast, var/msg_sanitized = 0, zlevel)
=======
/datum/announcement/proc/Announce(var/message as text, var/new_title = "", var/new_sound = null, var/do_newscast = newscast, var/msg_sanitized = 0, var/zlevel)
>>>>>>> e92ed43... Merge pull request #6990 from VOREStation/pol-tcomupdate
if(!message)
return
var/message_title = new_title ? new_title : title
@@ -56,13 +52,6 @@
Sound(message_sound, zlevels)
Log(message, message_title)
<<<<<<< HEAD
datum/announcement/proc/Message(var/message as text, var/message_title as text, var/list/zlevels)
global_announcer.autosay("<span class='alert'>[message_title]:</span> [message]", announcer ? announcer : ANNOUNCER_NAME, zlevels)
datum/announcement/minor/Message(var/message as text, var/message_title as text, var/list/zlevels)
global_announcer.autosay(message, announcer ? announcer : ANNOUNCER_NAME, zlevels)
=======
datum/announcement/proc/Message(message as text, message_title as text, var/list/zlevels)
for(var/mob/M in player_list)
if(!istype(M,/mob/new_player) && !isdeaf(M))
@@ -95,7 +84,6 @@ datum/announcement/priority/command/Message(message as text, message_title as te
continue
if(!istype(M,/mob/new_player) && !isdeaf(M))
to_chat(M, command)
>>>>>>> e92ed43... Merge pull request #6990 from VOREStation/pol-tcomupdate
datum/announcement/priority/Message(var/message as text, var/message_title as text, var/list/zlevels)
global_announcer.autosay("<span class='alert'>[message_title]:</span> [message]", announcer ? announcer : ANNOUNCER_NAME, zlevels)
@@ -161,8 +149,4 @@ datum/announcement/proc/Log(message as text, message_title as text)
AnnounceArrivalSimple(character.real_name, rank, join_message, channel, zlevels)
/proc/AnnounceArrivalSimple(var/name, var/rank = "visitor", var/join_message = "will arrive at the station shortly", var/channel = "Common", var/list/zlevels)
<<<<<<< HEAD
global_announcer.autosay("[name], [rank], [join_message].", "Arrivals Announcement Computer", channel, zlevels)
=======
global_announcer.autosay("[name], [rank], [join_message].", "Arrivals Announcement Computer", channel, zlevels)
>>>>>>> e92ed43... Merge pull request #6990 from VOREStation/pol-tcomupdate