shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Made some events still show messages with intern

Browse Source
This commit is contained in:
Putnam3145
2022-08-29 03:06:21 -07:00
parent cea3c6b7ad
commit 0a31d4cf12
25 changed files with 34 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/events/pirates.dm
+4 -4
View File
@@ -37,7 +37,7 @@
// if(PIRATES_DUTCHMAN)
// ship_name = "Flying Dutchman"
priority_announce("Incoming subspace communication. Secure channel opened at all communication consoles.", "Incoming Message", SSstation.announcer.get_rand_report_sound())
priority_announce("Incoming subspace communication. Secure channel opened at all communication consoles.", "Incoming Message", SSstation.announcer.get_rand_report_sound(), has_important_message = TRUE)
var/datum/bank_account/D = SSeconomy.get_dep_account(ACCOUNT_CAR)
if(D)
payoff = max(payoff_min, FLOOR(D.account_balance * 0.80, 1000))
@@ -63,16 +63,16 @@
/proc/pirates_answered(datum/comm_message/threat_msg, payoff, ship_name, initial_send_time, response_max_time, ship_template)
if(world.time > initial_send_time + response_max_time)
priority_announce("Too late to beg for mercy!",sender_override = ship_name)
priority_announce("Too late to beg for mercy!",sender_override = ship_name, has_important_message = TRUE)
return
if(threat_msg && threat_msg.answered == 1)
var/datum/bank_account/D = SSeconomy.get_dep_account(ACCOUNT_CAR)
if(D)
if(D.adjust_money(-payoff))
priority_announce("Thanks for the credits, landlubbers.",sender_override = ship_name)
priority_announce("Thanks for the credits, landlubbers.",sender_override = ship_name, has_important_message = TRUE)
return
else
priority_announce("Trying to cheat us? You'll regret this!",sender_override = ship_name)
priority_announce("Trying to cheat us? You'll regret this!",sender_override = ship_name, has_important_message = TRUE)
spawn_pirates(threat_msg, ship_template, TRUE)
/proc/spawn_pirates(datum/comm_message/threat_msg, ship_template, skip_answer_check)