mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-30 16:47:13 +01:00
Combine roundstart intercept and security level announcements (#80475)
## About The Pull Request At roundstart when the intercept report is sent, two announcements are created at the same time. It's loud and overlaps. This combines them into a single announcement. Before:  After:  ## Why It's Good For The Game Two Centcom or any other announcements playing at the same time (especially with two different sound files) can be annoying and the sounds distort each other. ## Changelog 🆑 LT3 qol: Roundstart intercept report and security level announcements are combined into a single announcement /🆑
This commit is contained in:
@@ -28,8 +28,9 @@ SUBSYSTEM_DEF(security_level)
|
||||
*
|
||||
* Arguments:
|
||||
* * new_level - The new security level that will become our current level
|
||||
* * announce - Play the announcement, set FALSE if you're doing your own custom announcement to prevent duplicates
|
||||
*/
|
||||
/datum/controller/subsystem/security_level/proc/set_level(new_level)
|
||||
/datum/controller/subsystem/security_level/proc/set_level(new_level, announce = TRUE)
|
||||
new_level = istext(new_level) ? new_level : number_level_to_text(new_level)
|
||||
if(new_level == current_security_level.name) // If we are already at the desired level, do nothing
|
||||
return
|
||||
@@ -42,7 +43,8 @@ SUBSYSTEM_DEF(security_level)
|
||||
if(SSnightshift.can_fire && (selected_level.number_level >= SEC_LEVEL_RED || current_security_level.number_level >= SEC_LEVEL_RED))
|
||||
SSnightshift.next_fire = world.time + 7 SECONDS // Fire nightshift after the security level announcement is complete
|
||||
|
||||
level_announce(selected_level, current_security_level.number_level) // We want to announce BEFORE updating to the new level
|
||||
if(announce)
|
||||
level_announce(selected_level, current_security_level.number_level) // We want to announce BEFORE updating to the new level
|
||||
|
||||
SSsecurity_level.current_security_level = selected_level
|
||||
|
||||
|
||||
Reference in New Issue
Block a user