From ac8a77dd06c686668a010e09883e3bf5b6f9fbcc Mon Sep 17 00:00:00 2001 From: Verkister Date: Wed, 10 Feb 2021 12:10:36 +0200 Subject: [PATCH] Merge pull request #9612 from VOREStation/upstream-merge-7839 [MIRROR] Fixed global_announce autospeaker --- code/controllers/subsystems/ticker.dm | 5 +---- code/game/objects/items/devices/radio/radio.dm | 9 +++++---- code/modules/admin/admin.dm | 2 +- code/modules/persistence/filth.dm | 2 +- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/code/controllers/subsystems/ticker.dm b/code/controllers/subsystems/ticker.dm index fcc076231d..a5ab4d94cb 100644 --- a/code/controllers/subsystems/ticker.dm +++ b/code/controllers/subsystems/ticker.dm @@ -49,10 +49,7 @@ var/global/datum/controller/subsystem/ticker/ticker /datum/controller/subsystem/ticker/Initialize() 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]")]") - - // Set up the global announcer - GLOB.autospeaker = new (null, null, null, 1) - + GLOB.autospeaker = new (null, null, null, 1) //Set up Global Announcer return ..() /datum/controller/subsystem/ticker/fire(resumed = FALSE) diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index d2511038dc..366853a7bf 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -297,7 +297,8 @@ var/global/list/default_medbay_channels = list( playsound(src, "button", 10) 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) return var/datum/radio_frequency/connection = null @@ -308,7 +309,7 @@ GLOBAL_DATUM(autospeaker, /mob/living/silicon/ai/announcer) else connection = radio_connection channel = null - if (!istype(connection)) + if(!istype(connection)) return 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 to_chat(loc, "\The [src] pings as it falls back to local radio transmission.") subspace_transmission = FALSE - + else //Oh well return FALSE @@ -594,7 +595,7 @@ GLOBAL_DATUM(autospeaker, /mob/living/silicon/ai/announcer) /obj/item/device/radio/examine(mob/user) . = ..() - + if((in_range(src, user) || loc == user)) if(b_stat) . += "\The [src] can be attached and modified!" diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index 3d169758f5..1a9bb0cdc5 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -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"].") 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! - + /datum/admins/proc/togglemaploadpersistence() set category = "Server" set desc="Whether mapload persistent data will be saved from now on." diff --git a/code/modules/persistence/filth.dm b/code/modules/persistence/filth.dm index a7aa9e9cd4..2d8e91b5ce 100644 --- a/code/modules/persistence/filth.dm +++ b/code/modules/persistence/filth.dm @@ -5,8 +5,8 @@ icon_state = "mfloor1" random_icon_states = list("mfloor1", "mfloor2", "mfloor3", "mfloor4", "mfloor5", "mfloor6", "mfloor7") color = "#464f33" - persistent = TRUE anchored = 1 + persistent = TRUE /obj/effect/decal/cleanable/filth/Initialize() . = ..()