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

Replaces the name "SHYLOCK" with "ATM" #18

Merged
merged 1 commit into from
Aug 18, 2024
Merged

Replaces the name "SHYLOCK" with "ATM" #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/modules/roguetown/roguemachine/ATM.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/obj/structure/roguemachine/atm
name = "SHYLOCK"
name = "ATM"
desc = "Stores and withdraws currency for accounts managed by the Kingdom of Rockhill."
icon = 'icons/roguetown/misc/machines.dmi'
icon_state = "atm"
Expand Down
14 changes: 7 additions & 7 deletions code/modules/roguetown/roguemachine/stockpile.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,23 +24,23 @@
return
if(href_list["navigate"])
return attack_hand(usr, href_list["navigate"])

if(withdraw_tab.perform_action(href, href_list))
if(href_list["remote"])
playsound(loc, 'sound/misc/disposalflush.ogg', 100, FALSE, -1)
return attack_hand(usr, "withdraw")

// If we don't get a valid option, default to returning to the directory
return attack_hand(usr, "directory")


/obj/structure/roguemachine/stockpile/proc/get_directory_contents()
var/contents = "<center>TOWN STOCKPILE<BR>"
contents += "--------------<BR>"

contents += "<a href='?src=[REF(src)];navigate=withdraw'>EXTRACT</a><BR>"
contents += "<a href='?src=[REF(src)];navigate=deposit'>FEED</a></center><BR><BR>"

return contents

/obj/structure/roguemachine/stockpile/proc/get_withdraw_contents()
Expand Down Expand Up @@ -78,7 +78,7 @@
contents = get_deposit_contents()
else
contents = get_directory_contents()

var/datum/browser/popup = new(user, "VENDORTHING", "", 370, 220)
popup.set_content(contents)
popup.open()
Expand All @@ -96,7 +96,7 @@
playsound(loc, 'sound/misc/hiss.ogg', 100, FALSE, -1)
var/amt = R.payout_price * B.amount
if(!SStreasury.give_money_account(amt, H, "+[amt] from [R.name] bounty") && message == TRUE)
say("No account found. Submit your fingers to a shylock for inspection.")
say("No account found. Submit your fingers to an ATM for inspection.")
continue
else if(istype(I,R.item_type))
if(!R.check_item(I))
Expand Down Expand Up @@ -125,7 +125,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 shylock for inspection.")
say("No account found. Submit your fingers to an ATM for inspection.")
return

/obj/structure/roguemachine/stockpile/attackby(obj/item/P, mob/user, params)
Expand All @@ -144,4 +144,4 @@
playsound(loc, 'sound/misc/hiss.ogg', 100, FALSE, -1)
playsound(loc, 'sound/misc/disposalflush.ogg', 100, FALSE, -1)


Loading