Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 6 additions & 6 deletions code/controllers/subsystem/treasury.dm
Original file line number Diff line number Diff line change
Expand Up @@ -199,18 +199,18 @@ SUBSYSTEM_DEF(treasury)
if (amt > 0)
// Player received money
if(source)
send_ooc_note("<b>MEISTER:</b> Your account has received [amt] mammon. ([source])", name = target_name)
send_ooc_note("<b>BANKHEAD:</b> Your account has received [amt] mammon. ([source])", name = target_name)
log_to_steward("+[amt] from treasury to [target_name] ([source])")
else
send_ooc_note("<b>MEISTER:</b> Your account has received [amt] mammon.", name = target_name)
send_ooc_note("<b>BANKHEAD:</b> Your account has received [amt] mammon.", name = target_name)
log_to_steward("+[amt] from treasury to [target_name]")
else if (amt < 0)
// Player was fined
if(source)
send_ooc_note("<b>MEISTER:</b> Your account was fined [abs(amt)] mammon. ([source])", name = target_name)
send_ooc_note("<b>BANKHEAD:</b> Your account was fined [abs(amt)] mammon. ([source])", name = target_name)
log_to_steward("[abs(amt)] was fined from [target_name] ([source])")
else
send_ooc_note("<b>MEISTER:</b> Your account was fined [abs(amt)] mammon.", name = target_name)
send_ooc_note("<b>BANKHEAD:</b> Your account was fined [abs(amt)] mammon.", name = target_name)
log_to_steward("[abs(amt)] was fined from [target_name]")

return TRUE
Expand Down Expand Up @@ -268,10 +268,10 @@ SUBSYSTEM_DEF(treasury)
for(var/X in bank_accounts)
if(X == target)
if(bank_accounts[X] < amt) // Check if the withdrawal amount exceeds the player's account balance
send_ooc_note("<b>MEISTER:</b> Error: Insufficient funds in the account to complete the withdrawal.", name = target_name)
send_ooc_note("<b>BANKHEAD:</b> Error: Insufficient funds in the account to complete the withdrawal.", name = target_name)
return // Return without processing the transaction
if(treasury_value < amt) // Check if the amount exceeds the treasury balance
send_ooc_note("<b>MEISTER:</b> Error: Insufficient funds in the treasury to complete the transaction.", name = target_name)
send_ooc_note("<b>BANKHEAD:</b> Error: Insufficient funds in the treasury to complete the transaction.", name = target_name)
return // Return early if the treasury balance is insufficient
bank_accounts[X] -= amt
treasury_value -= amt
Expand Down
10 changes: 5 additions & 5 deletions code/game/objects/structures/fake_machines/ATM.dm
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/obj/structure/fake_machine/atm
name = "MEISTER"
desc = "Stores and withdraws currency for accounts managed by the Kingdom."
name = "bankhead machina"
desc = "A woefully expensive Truetech machine used by nobles around the Goblet. A sliver of fractured air inside gives this object life, and its steam-powered guts work tirelessly to accurately and fairly serve as the face of your trusty bankers."
icon = 'icons/roguetown/misc/machines.dmi'
icon_state = "atm"
density = FALSE
Expand Down Expand Up @@ -61,10 +61,10 @@
record_round_statistic(STATS_MAMMONS_WITHDRAWN, coin_amt * mod)
budget2change(coin_amt*mod, user, selection)
else
to_chat(user, "<span class='warning'>The machine bites my finger.</span>")
to_chat(user, "<span class='warning'>The machine surveys my face, storing it in recognition.</span>")
icon_state = "atm-b"
H.flash_fullscreen("redflash3")
playsound(H, 'sound/combat/hits/bladed/genstab (1).ogg', 100, FALSE, -1)
playsound(H, 'sound/misc/beep.ogg', 100, FALSE, -1)
SStreasury.create_bank_account(H)
if(H.mind)
var/datum/job/target_job = SSjob.GetJob(H.mind.assigned_role)
Expand Down Expand Up @@ -106,4 +106,4 @@

/obj/structure/fake_machine/atm/examine(mob/user)
. += ..()
. += span_info("The current tax rate on deposits is [SStreasury.tax_value * 100] percent. Kingdom nobles exempt.")
. += span_info("The current tax rate on deposits is [SStreasury.tax_value * 100] percent. Etgard nobles exempt.")
8 changes: 4 additions & 4 deletions code/game/objects/structures/fake_machines/mail.dm
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
GLOBAL_LIST_EMPTY(letters_sent)

/obj/structure/fake_machine/mail
name = "HERMES"
desc = "Carrier zads have fallen severely out of fashion ever since the advent of this hydropneumatic mail system."
name = "speaking machina"
desc = "A Truetech machine of pipes and cleverly-placed aqueducts which ferry your mail to any one of its labelled constituents."
icon = 'icons/roguetown/misc/machines.dmi'
icon_state = "mail"
density = FALSE
Expand Down Expand Up @@ -71,7 +71,7 @@ GLOBAL_LIST_EMPTY(letters_sent)
. += span_info("Load a coin inside, then right click to send a letter.")
. += span_info("Left click with a paper to send a prewritten letter for free.")
if(HAS_TRAIT(user, TRAIT_INQUISITION))
. += span_info("<br>The Oratorium's reliquary can be accessed via a secret compartment fitted within the HERMES. Load a Marque to access it.")
. += span_info("<br>The Oratorium's reliquary can be accessed via a secret compartment fitted within the speaking machina. Load a Marque to access it.")

. += span_info("You can send arrival slips, accusation slips, fully loaded INDEXERs or confessions here.")
. += span_info("Properly sign them. Include an INDEXER where needed. Stamp them for two additional Marques.")
Expand Down Expand Up @@ -714,7 +714,7 @@ GLOBAL_LIST_EMPTY(letters_sent)
else
dat += "#[X.ournum] [capitalize(get_area_name(X))]<br>"

var/datum/browser/popup = new(user, "hermes_directory", "<center>HERMES DIRECTORY</center>", 387, 420)
var/datum/browser/popup = new(user, "hermes_directory", "<center>MAIL DIRECTORY</center>", 387, 420)
popup.set_content(dat)
popup.open(FALSE)

Expand Down
4 changes: 2 additions & 2 deletions code/game/objects/structures/fake_machines/scomm.dm
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

/obj/structure/fake_machine/scomm
name = "SCOM"
desc = ""
name = "farcrier telephone"
desc = "A miracle of magical technique which can broadcast a voice far and wide, so long as you stand close enough to it."
icon = 'icons/roguetown/misc/machines.dmi'
icon_state = "scomm1"
density = FALSE
Expand Down
6 changes: 3 additions & 3 deletions code/game/objects/structures/fake_machines/steward.dm
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@
. = ..()

/obj/structure/fake_machine/steward
name = "MASTER OF NERVES"
desc = ""
name = "prime stockhead"
desc = "A machine used by the Treasury to accurately account for its contents, and requisition pre-ordained materials from far away."
icon = 'icons/roguetown/misc/machines.dmi'
icon_state = "steward_machine"
density = TRUE
Expand All @@ -58,7 +58,7 @@
/obj/structure/fake_machine/steward/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/coin))
record_round_statistic(STATS_MAMMONS_DEPOSITED, I.get_real_price())
SStreasury.give_money_treasury(I.get_real_price(), "NERVE MASTER deposit")
SStreasury.give_money_treasury(I.get_real_price(), "BANKHEAD deposit")
qdel(I)
playsound(src, 'sound/misc/coininsert.ogg', 100, FALSE, -1)
return
Expand Down
6 changes: 3 additions & 3 deletions code/game/objects/structures/fake_machines/stockpile.dm
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
if(sound == TRUE)
playsound(loc, 'sound/misc/hiss.ogg', 100, FALSE, -1)
if(!SStreasury.give_money_account(amt, H, "+[amt] from [R.name] bounty") && message == TRUE)
say("No account found. Submit your fingers to a Meister for inspection.")
say("No account found. Submit your fingers to a Bankhead for inspection.")
record_round_statistic(STATS_STOCKPILE_EXPANSES, amt)
return amt
continue
Expand Down Expand Up @@ -139,7 +139,7 @@
playsound(loc, 'sound/misc/disposalflush.ogg', 100, FALSE, -1)
if(amt)
if(!SStreasury.give_money_account(amt, H, "+[amt] from [R.name] bounty") && message == TRUE)
say("No account found. Submit your fingers to a Meister for inspection.")
say("No account found. Submit your fingers to a Bankhead for inspection.")
record_round_statistic(STATS_STOCKPILE_EXPANSES, amt)
return amt

Expand Down Expand Up @@ -171,7 +171,7 @@
if(user in SStreasury.bank_accounts)
say("Bulk sold for [total_value] mammon...")
else
say("No account found. Submit your fingers to a Meister for inspection.")
say("No account found. Submit your fingers to a Bankhead for inspection.")

/datum/withdraw_tab
var/stockpile_index = -1
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/structures/fake_machines/vendor.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/obj/structure/fake_machine/vendor
name = "PEDDLER"
name = "peddler machina"
desc = "The stomach of this thing can be stuffed with fun things for you to buy."
icon = 'icons/roguetown/misc/machines.dmi'
icon_state = "streetvendor1"
Expand Down
2 changes: 1 addition & 1 deletion code/modules/spells/spell_types/pointed/appraise.dm
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
var/mammonsonperson = get_mammons_in_atom(cast_on)
var/mammonsinbank = SStreasury.bank_accounts[cast_on]
var/totalvalue = mammonsinbank + mammonsonperson
to_chat(owner, (span_notice("[cast_on] has [mammonsonperson] mammons on them, [mammonsinbank] in their meister, for a total of [totalvalue] mammons.")))
to_chat(owner, (span_notice("[cast_on] has [mammonsonperson] mammons on them, [mammonsinbank] in their bankhead, for a total of [totalvalue] mammons.")))

/datum/action/cooldown/spell/appraise/holy
name = "Appraise"
Expand Down
Binary file modified icons/roguetown/misc/decoration.dmi
Binary file not shown.
Binary file modified icons/roguetown/misc/gate.dmi
Binary file not shown.
Binary file modified icons/roguetown/misc/machines.dmi
Binary file not shown.
Binary file modified icons/roguetown/misc/psydon_cross.dmi
Binary file not shown.
Binary file modified icons/roguetown/misc/structure.dmi
Binary file not shown.
Loading