Skip to content
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

Jump to bottom

Touches up nuke messages for xenomorphs #5190

Merged
merged 16 commits into from
Dec 18, 2023
Merged

Touches up nuke messages for xenomorphs #5190

Changes from 14 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
3597d7c
firstfew
Dec 9, 2023
8ba8aad
Merge branch 'master' into nuke_grammarfix
Red-byte3D Dec 11, 2023
1ddd173
more changes
Dec 11, 2023
ddc5e87
Merge branch 'nuke_grammarfix' of https://github.com/InsaneRed/cmss13…
Dec 11, 2023
641095f
more changes / fixes
Dec 11, 2023
94804e3
changeeeees
Dec 11, 2023
9a6aca0
we
Dec 11, 2023
6981533
better defusal message
Dec 12, 2023
5748c13
i turn to the camera
Dec 12, 2023
1b6023d
we get a little grammatical
Dec 12, 2023
63117bb
Merge branch 'master' into nuke_grammarfix
Red-byte3D Dec 12, 2023
6e406dc
whenimetchainthesumma
Dec 12, 2023
54171d9
Merge branch 'nuke_grammarfix' of https://github.com/InsaneRed/cmss13…
Dec 12, 2023
c95a40b
moar dots
Dec 12, 2023
72692e5
im going to kill these grammar cops
Dec 13, 2023
89eacf4
Merge branch 'master' into nuke_grammarfix
Red-byte3D Dec 13, 2023
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
26 changes: 13 additions & 13 deletions code/game/machinery/nuclearbomb.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ GLOBAL_VAR_INIT(bomb_set, FALSE)

if(isqueen(user))
if(timing && GLOB.bomb_set)
user.visible_message(SPAN_INFO("[user] begins to defuse \the [src]."), SPAN_INFO("You begin to defuse \the [src]. This will take some time..."))
user.visible_message(SPAN_INFO("[user] begins covering \the [src] with resin."), SPAN_INFO("You start regurgitating and overflowing the \the [src] with resin... stopping the electronics from working, this will take some time..."))
Red-byte3D marked this conversation as resolved.
Show resolved Hide resolved
if(do_after(user, 5 SECONDS, INTERRUPT_NO_NEEDHAND, BUSY_ICON_HOSTILE))
disable()
return
Expand Down Expand Up @@ -333,13 +333,13 @@ GLOBAL_VAR_INIT(bomb_set, FALSE)
announcement_helper("WARNING.\n\nDETONATION IN [round(timeleft/10)] SECONDS.", "HQ Intel Division", humans_other, 'sound/misc/notice1.ogg')
//preds part
var/t_left = duration2text_sec(round(rand(timeleft - timeleft / 10, timeleft + timeleft / 10)))
yautja_announcement(SPAN_YAUTJABOLDBIG("WARNING!\n\nYou have approximately [t_left] seconds to abandon the hunting grounds before activation of human Purification Device."))
yautja_announcement(SPAN_YAUTJABOLDBIG("WARNING!\n\nYou have approximately [t_left] seconds to abandon the hunting grounds before activation of the human purification device."))
//xenos part
var/warning
if(timer_warning & NUKE_SHOW_TIMER_HALF)
warning = "Hive killer is halfway through preparation cycle!"
warning = "A shiver goes down our carapace as we feel the approaching end... the hive killer is halfway through it's preparation cycle!"
Red-byte3D marked this conversation as resolved.
Show resolved Hide resolved
else if(timer_warning & NUKE_SHOW_TIMER_MINUTE)
warning = "Hive killer is almost ready to trigger!"
warning = "Every sense in our form is screaming... the hive killer is almost ready to trigger!"
else
warning = "DISABLE IT! NOW!"
var/datum/hive_status/hive
Expand All @@ -355,7 +355,7 @@ GLOBAL_VAR_INIT(bomb_set, FALSE)
announcement_helper("ALERT.\n\nNUCLEAR EXPLOSIVE ORDNANCE ACTIVATED.\n\nDETONATION IN [round(timeleft/10)] SECONDS.", "[MAIN_AI_SYSTEM] Nuclear Tracker", humans_uscm, 'sound/misc/notice1.ogg')
announcement_helper("ALERT.\n\nNUCLEAR EXPLOSIVE ORDNANCE ACTIVATED.\n\nDETONATION IN [round(timeleft/10)] SECONDS.", "HQ Nuclear Tracker", humans_other, 'sound/misc/notice1.ogg')
var/t_left = duration2text_sec(round(rand(timeleft - timeleft / 10, timeleft + timeleft / 10)))
yautja_announcement(SPAN_YAUTJABOLDBIG("WARNING!<br>A human Purification Device has been detected. You have approximately [t_left] to abandon the hunting grounds before it activates."))
yautja_announcement(SPAN_YAUTJABOLDBIG("WARNING!<br>A human purification device has been detected. You have approximately [t_left] to abandon the hunting grounds before it activates."))
for(var/hivenumber in GLOB.hive_datum)
hive = GLOB.hive_datum[hivenumber]
if(!hive.totalXenos.len)
Expand All @@ -364,7 +364,7 @@ GLOBAL_VAR_INIT(bomb_set, FALSE)
else
announcement_helper("ALERT.\n\nNUCLEAR EXPLOSIVE ORDNANCE DEACTIVATED.", "[MAIN_AI_SYSTEM] Nuclear Tracker", humans_uscm, 'sound/misc/notice1.ogg')
announcement_helper("ALERT.\n\nNUCLEAR EXPLOSIVE ORDNANCE DEACTIVATED.", "HQ Intel Division", humans_other, 'sound/misc/notice1.ogg')
yautja_announcement(SPAN_YAUTJABOLDBIG("WARNING!<br>The human Purification Device's signature has disappeared."))
yautja_announcement(SPAN_YAUTJABOLDBIG("WARNING!<br>The human purification device's signature has disappeared."))
for(var/hivenumber in GLOB.hive_datum)
hive = GLOB.hive_datum[hivenumber]
if(!hive.totalXenos.len)
Expand Down Expand Up @@ -575,27 +575,27 @@ GLOBAL_VAR_INIT(bomb_set, FALSE)
announcement_helper("DECRYPTION COMPLETE", "[MAIN_AI_SYSTEM] Nuclear Tracker", humans_uscm, 'sound/misc/notice1.ogg')
announcement_helper("DECRYPTION COMPLETE", "HQ Intel Division", humans_other, 'sound/misc/notice1.ogg')

yautja_announcement(SPAN_YAUTJABOLDBIG("WARNING!\n\nThe human Purification Device is able to be activated."))
yautja_announcement(SPAN_YAUTJABOLDBIG("WARNING!\n\nThe human purification device is able to be activated."))

var/datum/hive_status/hive
for(var/hivenumber in GLOB.hive_datum)
hive = GLOB.hive_datum[hivenumber]
if(!length(hive.totalXenos))
return
xeno_announcement(SPAN_XENOANNOUNCE("The hive killer is ready to be activated! Assault at once!"), hive.hivenumber, XENO_GENERAL_ANNOUNCE)
xeno_announcement(SPAN_XENOANNOUNCE("We get a sense of impending doom...the hive killer is ready to be activated."), hive.hivenumber, XENO_GENERAL_ANNOUNCE)
Red-byte3D marked this conversation as resolved.
Show resolved Hide resolved
return

announcement_helper("DECRYPTION IN [round(decryption_time/10)] SECONDS.", "[MAIN_AI_SYSTEM] Nuclear Tracker", humans_uscm, 'sound/misc/notice1.ogg')
announcement_helper("DECRYPTION IN [round(decryption_time/10)] SECONDS.", "HQ Intel Division", humans_other, 'sound/misc/notice1.ogg')

//preds part
var/time_left = duration2text_sec(round(rand(decryption_time - decryption_time / 10, decryption_time + decryption_time / 10)))
yautja_announcement(SPAN_YAUTJABOLDBIG("WARNING!\n\nYou have approximately [time_left] seconds to abandon the hunting grounds before human Purification Device is able to be activated."))
yautja_announcement(SPAN_YAUTJABOLDBIG("WARNING!\n\nYou have approximately [time_left] seconds to abandon the hunting grounds before the human purification device is able to be activated."))

//xenos part
var/warning = "Hive killer is almost prepared to be activated!"
var/warning = "We are almost out of time, STOP THEM."
if(timer_warning & NUKE_DECRYPT_SHOW_TIMER_HALF)
warning = "Hive killer is halfway through its initial phase!"
warning = "The hive grows restless! its halfway done.."
Red-byte3D marked this conversation as resolved.
Show resolved Hide resolved
Red-byte3D marked this conversation as resolved.
Show resolved Hide resolved

var/datum/hive_status/hive
for(var/hivenumber in GLOB.hive_datum)
Expand All @@ -610,7 +610,7 @@ GLOBAL_VAR_INIT(bomb_set, FALSE)
announcement_helper("ALERT.\n\nNUCLEAR EXPLOSIVE ORDNANCE DECRYPTION STARTED.\n\nDECRYPTION IN [round(decryption_time/10)] SECONDS.", "[MAIN_AI_SYSTEM] Nuclear Tracker", humans_uscm, 'sound/misc/notice1.ogg')
announcement_helper("ALERT.\n\nNUCLEAR EXPLOSIVE ORDNANCE DECRYPTION STARTED.\n\nDECRYPTION IN [round(decryption_time/10)] SECONDS.", "HQ Nuclear Tracker", humans_other, 'sound/misc/notice1.ogg')
var/time_left = duration2text_sec(round(rand(decryption_time - decryption_time / 10, decryption_time + decryption_time / 10)))
yautja_announcement(SPAN_YAUTJABOLDBIG("WARNING!<br>A human Purification Device has been detected. You have approximately [time_left] before it finishes its initial phase."))
yautja_announcement(SPAN_YAUTJABOLDBIG("WARNING!<br>A human purification device has been detected. You have approximately [time_left] before it finishes its initial phase."))
for(var/hivenumber in GLOB.hive_datum)
hive = GLOB.hive_datum[hivenumber]
if(!length(hive.totalXenos))
Expand All @@ -620,7 +620,7 @@ GLOBAL_VAR_INIT(bomb_set, FALSE)

announcement_helper("ALERT.\n\nNUCLEAR EXPLOSIVE DECRYPTION HALTED.", "[MAIN_AI_SYSTEM] Nuclear Tracker", humans_uscm, 'sound/misc/notice1.ogg')
announcement_helper("ALERT.\n\nNUCLEAR EXPLOSIVE DECRYPTION HALTED.", "HQ Intel Division", humans_other, 'sound/misc/notice1.ogg')
yautja_announcement(SPAN_YAUTJABOLDBIG("WARNING!<br>The human Purification Device's signature has disappeared."))
yautja_announcement(SPAN_YAUTJABOLDBIG("WARNING!<br>The human purification device's signature has disappeared."))
for(var/hivenumber in GLOB.hive_datum)
hive = GLOB.hive_datum[hivenumber]
if(!length(hive.totalXenos))
Expand Down