cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make the global announcer really global

Browse Source
This commit is contained in:
Aronai Sieyes
2020-05-17 09:44:07 -04:00
parent ebc0bf425b
commit 0f1d00d13b
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/controllers/subsystems/ticker.dm
View File

@@ -55,6 +55,10 @@ var/global/datum/controller/subsystem/ticker/ticker
/datum/controller/subsystem/ticker/Initialize() /datum/controller/subsystem/ticker/Initialize()
pregame_timeleft = config.pregame_time pregame_timeleft = config.pregame_time
send2mainirc("Server lobby is loaded and open at byond://[config.serverurl ? config.serverurl : (config.server ? config.server : "[world.address]:[world.port]")]") send2mainirc("Server lobby is loaded and open at byond://[config.serverurl ? config.serverurl : (config.server ? config.server : "[world.address]:[world.port]")]")
// Set up the global announcer
GLOB.autospeaker = new (null, null, null, 1)
return ..() return ..()
/datum/controller/subsystem/ticker/fire(resumed = FALSE) /datum/controller/subsystem/ticker/fire(resumed = FALSE)

8
code/game/objects/items/devices/radio/radio.dm
View File

@@ -284,7 +284,10 @@ var/global/list/default_medbay_channels = list(
if(.) if(.)
SSnanoui.update_uis(src) SSnanoui.update_uis(src)
GLOBAL_DATUM(autospeaker, /mob/living/silicon/ai/announcer)
/obj/item/device/radio/proc/autosay(var/message, var/from, var/channel, var/list/zlevels) //BS12 EDIT /obj/item/device/radio/proc/autosay(var/message, var/from, var/channel, var/list/zlevels) //BS12 EDIT
if(!GLOB.autospeaker)
return
var/datum/radio_frequency/connection = null var/datum/radio_frequency/connection = null
if(channel && channels && channels.len > 0) if(channel && channels && channels.len > 0)
if(channel == "department") if(channel == "department")
@@ -299,9 +302,8 @@ var/global/list/default_medbay_channels = list(
if(!LAZYLEN(zlevels)) if(!LAZYLEN(zlevels))
zlevels = list(0) zlevels = list(0)
var/static/mob/living/silicon/ai/announcer/A = new /mob/living/silicon/ai/announcer(src, null, null, 1) GLOB.autospeaker.SetName(from)
A.SetName(from) Broadcast_Message(connection, GLOB.autospeaker,
Broadcast_Message(connection, A,
0, "*garbled automated announcement*", src, 0, "*garbled automated announcement*", src,
message_to_multilingual(message), from, "Automated Announcement", from, "synthesized voice", message_to_multilingual(message), from, "Automated Announcement", from, "synthesized voice",
DATA_FAKE, 0, zlevels, connection.frequency, "states") DATA_FAKE, 0, zlevels, connection.frequency, "states")