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

Merge pull request #9612 from VOREStation/upstream-merge-7839

Browse Source 
[MIRROR] Fixed global_announce autospeaker
This commit is contained in:
Verkister
2021-02-10 12:10:36 +02:00
committed by Chompstation Bot
parent 26d1ac519a
commit ac8a77dd06
4 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,10 +49,7 @@ 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]")]")
GLOB.autospeaker = new (null, null, null, 1) //Set up Global Announcer
// 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)

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

@@ -297,7 +297,8 @@ var/global/list/default_medbay_channels = list(
playsound(src, "button", 10) playsound(src, "button", 10)
GLOBAL_DATUM(autospeaker, /mob/living/silicon/ai/announcer) 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)
if(!GLOB.autospeaker) if(!GLOB.autospeaker)
return return
var/datum/radio_frequency/connection = null var/datum/radio_frequency/connection = null
@@ -308,7 +309,7 @@ GLOBAL_DATUM(autospeaker, /mob/living/silicon/ai/announcer)
else else
connection = radio_connection connection = radio_connection
channel = null channel = null
if (!istype(connection)) if(!istype(connection))
return return
if(!LAZYLEN(zlevels)) if(!LAZYLEN(zlevels))
@@ -507,7 +508,7 @@ GLOBAL_DATUM(autospeaker, /mob/living/silicon/ai/announcer)
else if(adhoc_fallback) //Less huzzah, we have to fallback else if(adhoc_fallback) //Less huzzah, we have to fallback
to_chat(loc, "<span class='warning'>\The [src] pings as it falls back to local radio transmission.</span>") to_chat(loc, "<span class='warning'>\The [src] pings as it falls back to local radio transmission.</span>")
subspace_transmission = FALSE subspace_transmission = FALSE
else //Oh well else //Oh well
return FALSE return FALSE
@@ -594,7 +595,7 @@ GLOBAL_DATUM(autospeaker, /mob/living/silicon/ai/announcer)
/obj/item/device/radio/examine(mob/user) /obj/item/device/radio/examine(mob/user)
. = ..() . = ..()
if((in_range(src, user) || loc == user)) if((in_range(src, user) || loc == user))
if(b_stat) if(b_stat)
. += "<span class='notice'>\The [src] can be attached and modified!</span>" . += "<span class='notice'>\The [src] can be attached and modified!</span>"

2
code/modules/admin/admin.dm
View File

@@ -948,7 +948,7 @@ var/datum/announcement/minor/admin_min_announcer = new
log_admin("[key_name(usr)] toggled persistence to [config.persistence_disabled ? "Off" : "On"].") log_admin("[key_name(usr)] toggled persistence to [config.persistence_disabled ? "Off" : "On"].")
world.update_status() world.update_status()
feedback_add_details("admin_verb","TPD") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! feedback_add_details("admin_verb","TPD") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
/datum/admins/proc/togglemaploadpersistence() /datum/admins/proc/togglemaploadpersistence()
set category = "Server" set category = "Server"
set desc="Whether mapload persistent data will be saved from now on." set desc="Whether mapload persistent data will be saved from now on."

2
code/modules/persistence/filth.dm
View File

@@ -5,8 +5,8 @@
icon_state = "mfloor1" icon_state = "mfloor1"
random_icon_states = list("mfloor1", "mfloor2", "mfloor3", "mfloor4", "mfloor5", "mfloor6", "mfloor7") random_icon_states = list("mfloor1", "mfloor2", "mfloor3", "mfloor4", "mfloor5", "mfloor6", "mfloor7")
color = "#464f33" color = "#464f33"
persistent = TRUE
anchored = 1 anchored = 1
persistent = TRUE
/obj/effect/decal/cleanable/filth/Initialize() /obj/effect/decal/cleanable/filth/Initialize()
. = ..() . = ..()