Skip to content

Commit

Permalink
[MIRROR] Pirate request reject fix [MDB IGNORE] (#585)
Browse files Browse the repository at this point in the history
* Pirate request reject fix  (#79646)

---------

Co-authored-by: SkyratBot <[email protected]>
Co-authored-by: Yaroslav Nurkov <[email protected]>
  • Loading branch information
3 people authored Nov 13, 2023
1 parent 9add99e commit c50e854
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 0 deletions.
11 changes: 11 additions & 0 deletions code/modules/antagonists/pirate/pirate_event.dm
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
#define NO_ANSWER 0
#define POSITIVE_ANSWER 1
#define NEGATIVE_ANSWER 2

/datum/round_event_control/pirates
name = "Space Pirates"
typepath = /datum/round_event/pirates
Expand Down Expand Up @@ -46,6 +50,9 @@
return
if(!threat?.answered)
return
if(threat.answered == NEGATIVE_ANSWER)
priority_announce(chosen_gang.response_rejected, sender_override = chosen_gang.ship_name, color_override = chosen_gang.announcement_color)
return

var/datum/bank_account/plundered_account = SSeconomy.get_dep_account(ACCOUNT_CAR)
if(plundered_account)
Expand Down Expand Up @@ -108,3 +115,7 @@
event.gang_list = GLOB.light_pirate_gangs + GLOB.heavy_pirate_gangs
else
event.gang_list = list(new chosen)

#undef NO_ANSWER
#undef POSITIVE_ANSWER
#undef NEGATIVE_ANSWER
9 changes: 9 additions & 0 deletions code/modules/antagonists/pirate/pirate_gangs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ GLOBAL_LIST_INIT(heavy_pirate_gangs, init_pirate_gangs(is_heavy = TRUE))

///station responds to message and pays the pirates
var/response_received = "Yum! Bungopoints!"
///station responds to message and pays the pirates
var/response_rejected = "Foo! No Bungopoints!"
///station pays the pirates, but after the ship spawned
var/response_too_late = "Your Bungopoints arrived too late, rebooting world..."
///station pays the pirates... but doesn't have enough cash.
Expand Down Expand Up @@ -81,6 +83,7 @@ GLOBAL_LIST_INIT(heavy_pirate_gangs, init_pirate_gangs(is_heavy = TRUE))
possible_answers = list("Purchase Insurance.","Reject Offer.")

response_received = "Sweet, free cash. Let's get outta here, boys."
response_rejected = "Not paying was a mistake, now you need to take an economics class."
response_too_late = "Payment or not, ignoring us was a matter of pride. Now it's time for us to teach some respect."
response_not_enough = "You thought we wouldn't notice if you underpaid? Funny. We'll be seeing you soon."

Expand All @@ -98,6 +101,7 @@ GLOBAL_LIST_INIT(heavy_pirate_gangs, init_pirate_gangs(is_heavy = TRUE))
possible_answers = list("We'll pay.","Tribute? Really? Go away.")

response_received = "A most generous donation. May the claws of Tizira reach into the furthest points of the cosmos."
response_rejected = "That's for nothing, the first rule of hunting is don't leave without booty."
response_too_late = "I see you're trying to pay, but the hunt is already on."
response_not_enough = "You've sent an insulting \"donation\". The hunt is on for you."

Expand All @@ -115,6 +119,7 @@ GLOBAL_LIST_INIT(heavy_pirate_gangs, init_pirate_gangs(is_heavy = TRUE))
possible_answers = list("We'll pay.","We will not be extorted.")

response_received = "Thanks for the credits, landlubbers."
response_rejected = "Blimey! All hands on deck, we're going to get their riches!"
response_too_late = "Too late to beg for mercy!"
response_not_enough = "Trying to cheat us? You'll regret this!"

Expand All @@ -133,6 +138,7 @@ GLOBAL_LIST_INIT(heavy_pirate_gangs, init_pirate_gangs(is_heavy = TRUE))
possible_answers = list("Very well.","Get a job!")

response_received = "Thank you for your generosity. Your money will not be wasted."
response_rejected = "Oh, you're not a station, you're a tumor. Well, we're gonna have to cut it out."
response_too_late = "We hope you like skin cancer!"
response_not_enough = "This is not nearly enough for our operations. I'm afraid we'll have to borrow some."
announcement_color = "purple"
Expand All @@ -151,6 +157,7 @@ GLOBAL_LIST_INIT(heavy_pirate_gangs, init_pirate_gangs(is_heavy = TRUE))
possible_answers = list("Please don't hurt me.","YOU WILL ANSWER TO THE LAW!!")

response_received = "Wait, you ACTUALLY gave us the money? Thanks, but we're coming for the rest anyways!"
response_rejected = "The answer to the law? We are the law! And you will be held responsible!"
response_too_late = "Nothing, huh? Looks like the Tide's coming aboard!"
response_not_enough = "You trying to cheat us? That's fine, we'll take your station as collateral."
announcement_color = "yellow"
Expand All @@ -174,6 +181,7 @@ GLOBAL_LIST_INIT(heavy_pirate_gangs, init_pirate_gangs(is_heavy = TRUE))
possible_answers = list("You know, I was just about to pay that. Thanks for the reminder!","I don't care WHO the IRS sends, I'm not paying for my taxes!")

response_received = "Payment received, We salute you for being law-abiding tax-paying citizens"
response_rejected = "We understand, I'm sending a team to your station to resolve the matter."
response_too_late = "Too late, A team has already been sent out resolve this matter directly."
response_not_enough = "You filed your taxes incorrectly, A team has been sent to assist in liquidating assets and arrest you for tax fraud. \
Nothing personel kid."
Expand All @@ -194,6 +202,7 @@ GLOBAL_LIST_INIT(heavy_pirate_gangs, init_pirate_gangs(is_heavy = TRUE))


response_received = "An excellent haul, the synthesis shall resume."
response_rejected = "The rudeness in your speech needs to be neutralized. And we can help you with that right now."
response_too_late = "You were not ready then, and now that time has passed. We can only go forward, never back."
response_not_enough = "You have insulted us, but there shall be no feud, only swift justice!"
announcement_color = "purple"

0 comments on commit c50e854

Please sign in to comment.