cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleans up announcement sound handling. Plays communication blackout sound at half volume.

Browse Source
This commit is contained in:
PsiOmega
2015-03-31 14:51:22 +02:00
parent c4a10f05b1
commit e1f8af1997
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/defines/procs/announce.dm
View File

@@ -15,17 +15,17 @@
log = do_log log = do_log
newscast = do_newscast newscast = do_newscast
/datum/announcement/priority/New(var/do_log = 1, var/new_sound = sound('sound/misc/notice2.ogg'), var/do_newscast = 0) /datum/announcement/priority/New(var/do_log = 1, var/new_sound = 'sound/misc/notice2.ogg', var/do_newscast = 0)
..(do_log, new_sound, do_newscast) ..(do_log, new_sound, do_newscast)
title = "Priority Announcement" title = "Priority Announcement"
announcement_type = "Priority Announcement" announcement_type = "Priority Announcement"
/datum/announcement/priority/command/New(var/do_log = 1, var/new_sound = sound('sound/misc/notice2.ogg'), var/do_newscast = 0) /datum/announcement/priority/command/New(var/do_log = 1, var/new_sound = 'sound/misc/notice2.ogg', var/do_newscast = 0)
..(do_log, new_sound, do_newscast) ..(do_log, new_sound, do_newscast)
title = "[command_name()] Update" title = "[command_name()] Update"
announcement_type = "[command_name()] Update" announcement_type = "[command_name()] Update"
/datum/announcement/priority/security/New(var/do_log = 1, var/new_sound = sound('sound/misc/notice2.ogg'), var/do_newscast = 0) /datum/announcement/priority/security/New(var/do_log = 1, var/new_sound = 'sound/misc/notice2.ogg', var/do_newscast = 0)
..(do_log, new_sound, do_newscast) ..(do_log, new_sound, do_newscast)
title = "Security Announcement" title = "Security Announcement"
announcement_type = "Security Announcement" announcement_type = "Security Announcement"
@@ -34,7 +34,7 @@
if(!message) if(!message)
return return
var/message_title = new_title ? new_title : title var/message_title = new_title ? new_title : title
var/message_sound = new_sound ? sound(new_sound) : sound var/message_sound = new_sound ? new_sound : sound
message = sanitize(message, extra = 0) message = sanitize(message, extra = 0)
message_title = sanitizeSafe(message_title) message_title = sanitizeSafe(message_title)

2
code/modules/events/communications_blackout.dm
View File

@@ -12,7 +12,7 @@
A << "<br>" A << "<br>"
if(prob(30)) //most of the time, we don't want an announcement, so as to allow AIs to fake blackouts. if(prob(30)) //most of the time, we don't want an announcement, so as to allow AIs to fake blackouts.
command_announcement.Announce(alert, new_sound = 'sound/misc/interference.ogg') command_announcement.Announce(alert, new_sound = sound('sound/misc/interference.ogg', volume=50))
/datum/event/communications_blackout/start() /datum/event/communications_blackout/start()