Skip to content

Roundstart announcement fix #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Steelpoint merged 2 commits into from
Feb 4, 2025
Merged

Roundstart announcement fix #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
df9d1f2
announcement fix
uuuuhuuuu Feb 4, 2025
ead3418
ehm
uuuuhuuuu Feb 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/defines/procs/announcement.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(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
Expand Down
4 changes: 4 additions & 0 deletions code/game/gamemodes/extended/cm_vs_upp.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading