Merge remote-tracking branch 'upstream/master' into cyberiad-fix

code/__HELPERS/priority_announce.dm

@@ -83,7 +83,10 @@
 	else
 		finalized_announcement = CHAT_ALERT_DEFAULT_SPAN(jointext(announcement_strings, ""))
 
-	dispatch_announcement_to_players(finalized_announcement, players, sound, tts_override = tts_override) // Bandastation Addition: "tts_override = tts_override"
+	// BANDASTATION EDIT - START - add tts_message
+	var/tts_message = (SSstation.announcer.custom_alert_message && !has_important_message) ? SSstation.announcer.custom_alert_message : text
+	dispatch_announcement_to_players(finalized_announcement, players, sound, tts_override = tts_override, tts_message = tts_message)
+	// BANDASTATION EDIT - END
 
 	if(isnull(sender_override) && players == GLOB.player_list)
 		if(length(title) > 0)
@@ -123,7 +126,7 @@
  * should_play_sound - Whether the notice sound should be played or not. This can also be a callback, if you only want mobs to hear the sound based off of specific criteria.
  * color_override - optional, use the passed color instead of the default notice color.
  */
-/proc/minor_announce(message, title = "Attention:", alert = FALSE, html_encode = TRUE, list/players, sound_override, should_play_sound = TRUE, color_override)
+/proc/minor_announce(message, title = "Attention:", alert = FALSE, html_encode = TRUE, list/players, sound_override, should_play_sound = TRUE, color_override, tts_override) // BANDASTATION ADDITION - "tts_override"
 	if(!message)
 		return
 
@@ -143,7 +146,7 @@
 		finalized_announcement = CHAT_ALERT_DEFAULT_SPAN(jointext(minor_announcement_strings, ""))
 
 	var/custom_sound = sound_override || (alert ? 'sound/announcer/notice/notice1.ogg' : 'sound/announcer/notice/notice2.ogg')
-	dispatch_announcement_to_players(finalized_announcement, players, custom_sound, should_play_sound)
+	dispatch_announcement_to_players(finalized_announcement, players, custom_sound, should_play_sound, tts_override = tts_override, tts_message = message) // BANDASTATION ADDITION - "tts_override" & "tts_message"
 
 /// Sends an announcement about the level changing to players. Uses the passed in datum and the subsystem's previous security level to generate the message.
 /proc/level_announce(datum/security_level/selected_level, previous_level_number)
@@ -168,7 +171,7 @@
 
 	var/finalized_announcement = CHAT_ALERT_COLORED_SPAN(current_level_color, jointext(level_announcement_strings, ""))
 
-	dispatch_announcement_to_players(finalized_announcement, GLOB.player_list, current_level_sound)
+	dispatch_announcement_to_players(finalized_announcement, GLOB.player_list, current_level_sound, tts_message = finalized_announcement) // BANDASTATION ADDITION - "tts_message = finalized_announcement"
 
 /// Proc that just generates a custom header based on variables fed into `priority_announce()`
 /// Will return a string.
@@ -186,7 +189,7 @@
 
 /// Proc that just dispatches the announcement to our applicable audience. Only the announcement is a mandatory arg.
 /// `should_play_sound` can also be a callback, if you want to only play the sound to specific players.
-/proc/dispatch_announcement_to_players(announcement, list/players = GLOB.player_list, sound_override = null, should_play_sound = TRUE, datum/component/tts_component/tts_override = null) // Bandastation Addition: "datum/component/tts_component/tts_override = null"
+/proc/dispatch_announcement_to_players(announcement, list/players = GLOB.player_list, sound_override = null, should_play_sound = TRUE, datum/component/tts_component/tts_override = null, tts_message) // BANDASTATION ADDITION: "datum/component/tts_component/tts_override = null" & "tts_message"
 	var/sound_to_play = !isnull(sound_override) ? sound_override : 'sound/announcer/notice/notice2.ogg'
 
 	// note for later: low-hanging fruit to convert to astype() behind an experiment define whenever the 516 beta releases
@@ -216,7 +219,7 @@
 				TYPE_PROC_REF(/datum/controller/subsystem/tts220, get_tts), \
 				null, \
 				target, \
-				announcement, \
+				tts_message, \
 				announcement_tts_seed, \
 				FALSE, \
 				list(/datum/singleton/sound_effect/announcement), \

code/game/machinery/requests_console.dm

@@ -200,7 +200,7 @@ GLOBAL_LIST_EMPTY(req_console_ckey_departments)
 				var/mob/living/L = usr
 				message = L.treat_message(message)["message"]
 
-			minor_announce(message, "[department] Announcement:", html_encode = FALSE, sound_override = 'sound/announcer/announcement/announce_dig.ogg')
+			minor_announce(message, "[department] Announcement:", html_encode = FALSE, sound_override = 'sound/announcer/announcement/announce_dig.ogg', tts_override = usr.GetComponent(/datum/component/tts_component)) // BANDASTATION ADDITION: "tts_override"
 			GLOB.news_network.submit_article(message, department, "Station Announcements", null)
 			usr.log_talk(message, LOG_SAY, tag="station announcement from [src]")
 			message_admins("[ADMIN_LOOKUPFLW(usr)] has made a station announcement from [src] at [AREACOORD(usr)].")

html/changelogs/bandastation/AutoChangeLog-pr-1017.yml

@@ -0,0 +1,9 @@
+author: "dj-34"
+delete-after: True
+changes:
+  - map: "Кибериада: Стандартизировал все охранные пункты службы безопасности. Они все обзавелись камерами в прикрепленном отделе и соответствующей мониторинговой консолью, а также кнопками локдаунов отделов."
+  - map: "Кибериада: Стандартизировал тэги камер в отделах карго, рнд, инженерка, медбей."
+  - map: "Кибериада: Общая чистка типов камер, которые находились не в соответствующем типе. Ошибки еще могут присутствовать."
+  - map: "Кибериада: РнД обзавелся локдауном. Доступ у РД и СБ на охранном пункте."
+  - map: "Кибериада: Починил кнопки локдаунов транзит трубы и инженерки."
+  - map: "Кибериада: Некоторые окна в Медбее были заменены на обычные (не укрепленные)."

html/changelogs/bandastation/AutoChangeLog-pr-1027.yml

@@ -0,0 +1,4 @@
+author: "ss220app[bot]"
+delete-after: True
+changes:
+  - map: "Тестовый чейнджлог с Наномап апдейта."

html/changelogs/bandastation/archive/2025-01.yml

@@ -1,3 +1,14 @@
 2025-01-18:
   AyIong:
   - bugfix: Лейтджоин ИИ, больше не будут смотреть на лобби арт и общаться IC
+2025-01-20:
+  AyIong:
+  - qol: ТТС теперь озвучивает только текст оповещения, а не всё подряд в оповещении
+  - bugfix: Анонсы через реквест консоль, теперь говорят голосом анонсирующего
+  Gaxeer:
+  - rscadd: Добавляет новый эффект для ТТСа оповещений
+  - bugfix: preSXF и postSFX теперь синхронизируются с ТТСом
+  konushi:
+  - rscadd: Новый Трурль.
+  - bugfix: НТР и БЩ теперь имеют доступы в кабинеты глав на Кибериаде. НТР имеет
+      доступ ко всем радиочастотам станции. Фикс кнопки в кофейне Кибериады.

tools/UpdatePaths/Scripts/ss220/1017_cameras_to_dir.txt

@@ -0,0 +1,9 @@
+/obj/machinery/camera{dir = 1} : /obj/machinery/camera/directional/north{@OLD;dir=@SKIP}
+/obj/machinery/camera{dir = 2} : /obj/machinery/camera/directional/south{@OLD;dir=@SKIP}
+/obj/machinery/camera{dir = 4} : /obj/machinery/camera/directional/east{@OLD;dir=@SKIP}
+/obj/machinery/camera{dir = 5} : /obj/machinery/camera/directional/south{@OLD;dir=@SKIP}
+/obj/machinery/camera{dir = 6} : /obj/machinery/camera/directional/east{@OLD;dir=@SKIP}
+/obj/machinery/camera{dir = 8} : /obj/machinery/camera/directional/west{@OLD;dir=@SKIP}
+/obj/machinery/camera{dir = 9} : /obj/machinery/camera/directional/north{@OLD;dir=@SKIP}
+/obj/machinery/camera{dir = 10} : /obj/machinery/camera/directional/west{@OLD;dir=@SKIP}
+/obj/machinery/camera : /obj/machinery/camera/directional/south{@OLD;dir=@SKIP}

tools/maplint/lints/telescreen_varedits.yml

@@ -1,5 +1,5 @@
 help: "Use the directional variants when possible."
-/obj/machinery/computer/security/telescreen:
+=/obj/machinery/computer/security/telescreen: # BANDASTATION EDIT - check =
   banned_variables:
     pixel_x:
     pixel_y: