From df9d1f285b71a797f6bb92dc0186e146c313cb3d Mon Sep 17 00:00:00 2001 From: vincibrv Date: Tue, 4 Feb 2025 10:04:52 +0100 Subject: [PATCH 1/2] announcement fix --- code/defines/procs/announcement.dm | 2 +- code/game/gamemodes/extended/cm_vs_upp.dm | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/code/defines/procs/announcement.dm b/code/defines/procs/announcement.dm index b6957040304f..846945ff2fe5 100644 --- a/code/defines/procs/announcement.dm +++ b/code/defines/procs/announcement.dm @@ -40,7 +40,7 @@ if(!istype(H) || H.stat != CONSCIOUS || isyautja(H)) //base human checks targets.Remove(H) continue - if(is_mainship_level(H.z)) // People on ship see everything + if(is_mainship_level(H.z) && istype(SSticker.gamemode, /datum/game_mode/extended/faction_clash ) // People on ship see everything, unless it is faction clash continue // If they have iff AND a marine headset they will recieve announcements diff --git a/code/game/gamemodes/extended/cm_vs_upp.dm b/code/game/gamemodes/extended/cm_vs_upp.dm index 5e890010eef0..5bae98d886d3 100644 --- a/code/game/gamemodes/extended/cm_vs_upp.dm +++ b/code/game/gamemodes/extended/cm_vs_upp.dm @@ -178,7 +178,11 @@ /datum/game_mode/extended/faction_clash/cm_vs_upp/announce() . = ..() + addtimer(CALLBACK(src,PROC_REF(deleyed_announce)), 10 SECONDS) + +/datum/game_mode/extended/faction_clash/cm_vs_upp/proc/deleyed_announce() marine_announcement("An automated distress call has been received from the local colony.\n\nAlert! Sensors have detected a Union of Progressive People's warship in orbit of colony. Enemy Vessel has refused automated hails and is entering lower-planetary orbit. High likelihood enemy vessel is preparing to deploy dropships to local colony. Authorization to interdict and repel hostile force from allied territory has been granted. Automated thawing of cryostasis marine reserves in progress.", "ARES 3.2", 'sound/AI/commandreport.ogg', FACTION_MARINE) marine_announcement("Alert! Sensors have detected encroaching USCM vessel on an intercept course with local colony.\n\nIntelligence suggests this is the [MAIN_SHIP_NAME]. Confidence is high that USCM force is acting counter to Union interests in this area. Authorization to deploy ground forces to disrupt foreign power attempt to encroach on Union interests has been granted. Emergency awakening of cryostasis troop reserves in progress.", "1VAN/3", 'sound/AI/commandreport.ogg', FACTION_UPP) + #undef ROUND_END_DELAY From ead34184fc09b77accfb5d3fb3e14eabe3cd0c0f Mon Sep 17 00:00:00 2001 From: vincibrv Date: Tue, 4 Feb 2025 11:27:47 +0100 Subject: [PATCH 2/2] ehm --- code/defines/procs/announcement.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/defines/procs/announcement.dm b/code/defines/procs/announcement.dm index 846945ff2fe5..66c2f2ad4b4e 100644 --- a/code/defines/procs/announcement.dm +++ b/code/defines/procs/announcement.dm @@ -40,7 +40,7 @@ if(!istype(H) || H.stat != CONSCIOUS || isyautja(H)) //base human checks targets.Remove(H) continue - if(is_mainship_level(H.z) && istype(SSticker.gamemode, /datum/game_mode/extended/faction_clash ) // People on ship see everything, unless it is faction clash + if(is_mainship_level(H.z) && istype(GLOB.master_mode, /datum/game_mode/extended/faction_clash )) // People on ship see everything, unless it is faction clash continue // If they have iff AND a marine headset they will recieve announcements