From 28adf72c82b275e688dd5adb308f854e5554db43 Mon Sep 17 00:00:00 2001 From: juniper <70682905+crunchypretzels@users.noreply.github.com> Date: Sat, 19 Oct 2024 19:25:29 -0400 Subject: [PATCH] goodbye, addmoney --- code/game/objects/items/cards_ids.dm | 33 ++++++++++--------- .../computers/item/computer.dm | 8 ++--- .../modular_computers/computers/item/pda.dm | 4 +-- 3 files changed, 24 insertions(+), 21 deletions(-) diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm index 2d1a16986fbe8..45c27b756804c 100644 --- a/code/game/objects/items/cards_ids.dm +++ b/code/game/objects/items/cards_ids.dm @@ -580,23 +580,26 @@ if(ispath(trim)) SSid_access.apply_trim_to_card(src, trim) -/obj/item/card/id/item_interaction(mob/living/user, obj/item/tool, list/modifiers) - if(istype(tool, /obj/item/rupee)) - to_chat(user, span_warning("Your ID smartly rejects the strange shard of glass. Who knew, apparently it's not ACTUALLY valuable!")) +/obj/item/card/id/item_interaction(mob/living/user, obj/item/tool, list/modifiers) // DOPPLER EDIT - REMOVING INSERT_MONEY AND HOLOCHIPS. I also had to remove the rupee interaction, but that doesn't seem a great loss. +// if(istype(tool, /obj/item/rupee)) +// to_chat(user, span_warning("Your ID smartly rejects the strange shard of glass. Who knew, apparently it's not ACTUALLY valuable!")) +// return ITEM_INTERACT_BLOCKING + if(iscash(tool)) + to_chat(user, span_notice("You'll need to visit an ATM to get your money into your account.")) return ITEM_INTERACT_BLOCKING - else if(iscash(tool)) - return insert_money(tool, user) ? ITEM_INTERACT_SUCCESS : ITEM_INTERACT_BLOCKING - else if(istype(tool, /obj/item/storage/bag/money)) +// return insert_money(tool, user) ? ITEM_INTERACT_SUCCESS : ITEM_INTERACT_BLOCKING + +/** else if(istype(tool, /obj/item/storage/bag/money)) var/obj/item/storage/bag/money/money_bag = tool var/list/money_contained = money_bag.contents var/money_added = mass_insert_money(money_contained, user) if(!money_added) return ITEM_INTERACT_BLOCKING to_chat(user, span_notice("You stuff the contents into the card! They disappear in a puff of bluespace smoke, adding [money_added] worth of credits to the linked account.")) - return ITEM_INTERACT_SUCCESS + return ITEM_INTERACT_SUCCESS [END DOPPLER EDIT SEGMENT] **/ return NONE -/** +/** DOPPLER EDIT - REMOVING INSERT_MONEY AND HOLOCHIPS * Insert credits or coins into the ID card and add their value to the associated bank account. * * Returns TRUE if the money was successfully inserted, FALSE otherwise. @@ -604,7 +607,7 @@ * money - The item to attempt to convert to credits and insert into the card. * user - The user inserting the item. * physical_currency - Boolean, whether this is a physical currency such as a coin and not a holochip. - */ + /obj/item/card/id/proc/insert_money(obj/item/money, mob/user) var/physical_currency if(istype(money, /obj/item/stack/spacecash) || istype(money, /obj/item/coin)) @@ -636,7 +639,7 @@ * money - List of items to attempt to convert to credits and insert into the card. * user - The user inserting the items. */ -/obj/item/card/id/proc/mass_insert_money(list/money, mob/user) + /obj/item/card/id/proc/mass_insert_money(list/money, mob/user) if(!registered_account) to_chat(user, span_warning("[src] doesn't have a linked account to deposit into!")) return FALSE @@ -655,7 +658,7 @@ log_econ("[total] credits were inserted into [src] owned by [src.registered_name]") QDEL_LIST(money) - return total + return total END DOPPLER EDIT SEGMENT **/ /// Helper proc. Can the user alt-click the ID? /obj/item/card/id/proc/alt_click_can_use_id(mob/living/user) @@ -695,7 +698,7 @@ if(!alt_click_can_use_id(user)) return NONE if(registered_account.account_debt) - var/choice = tgui_alert(user, "Choose An Action", "Bank Account", list("Withdraw", "Pay Debt")) + var/choice = tgui_alert(user, "Choose An Action", "Bank Account", list("Pay Debt")) if(!choice || QDELETED(user) || QDELETED(src) || !alt_click_can_use_id(user) || loc != user) return CLICK_ACTION_BLOCKING if(choice == "Pay Debt") @@ -763,7 +766,7 @@ . += span_notice("Alt-Right-Click the ID to set the linked bank account.") if(HAS_TRAIT(user, TRAIT_ID_APPRAISER)) - . += HAS_TRAIT(src, TRAIT_JOB_FIRST_ID_CARD) ? span_boldnotice("Hmm... yes, this ID was issued from Central Command!") : span_boldnotice("This ID was created in this sector, not by Central Command.") + . += HAS_TRAIT(src, TRAIT_JOB_FIRST_ID_CARD) ? span_boldnotice("Hmm... yes, this ID was issued by the Port Authority!") : span_boldnotice("This ID was created in this sector, not by the Port Authority.") // DOPPLER EDIT - while I'm here... if(HAS_TRAIT(src, TRAIT_TASTEFULLY_THICK_ID_CARD) && (user.is_holding(src) || (user.CanReach(src) && user.put_in_hands(src, ignore_animation = FALSE)))) ADD_TRAIT(src, TRAIT_NODROP, "psycho") . += span_hypnophrase("Look at that subtle coloring... The tasteful thickness of it. Oh my God, it even has a watermark...") @@ -864,8 +867,8 @@ return trim?.sechud_icon_state || SECHUD_UNKNOWN /obj/item/card/id/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers) - if(iscash(interacting_with)) - return insert_money(interacting_with, user) ? ITEM_INTERACT_SUCCESS : ITEM_INTERACT_BLOCKING + //if(iscash(interacting_with)) DOPPLER EDIT - REMOVING INSERT_MONEY AND HOLOCHIPS + // return insert_money(interacting_with, user) ? ITEM_INTERACT_SUCCESS : ITEM_INTERACT_BLOCKING return NONE /obj/item/card/id/away diff --git a/code/modules/modular_computers/computers/item/computer.dm b/code/modules/modular_computers/computers/item/computer.dm index 3f29e3006befa..2f2eab80f3962 100644 --- a/code/modules/modular_computers/computers/item/computer.dm +++ b/code/modules/modular_computers/computers/item/computer.dm @@ -822,8 +822,8 @@ if(isidcard(tool)) return InsertID(tool, user) ? ITEM_INTERACT_SUCCESS : ITEM_INTERACT_BLOCKING - if(iscash(tool)) - return money_act(user, tool) + //if(iscash(tool)) DOPPLER EDIT - removing ID money insertion. + // return money_act(user, tool) if(istype(tool, /obj/item/pai_card)) return pai_act(user, tool) @@ -849,12 +849,12 @@ if(istype(tool, /obj/item/computer_disk)) return computer_disk_act(user, tool) -/obj/item/modular_computer/proc/money_act(mob/user, obj/item/money) +/** /obj/item/modular_computer/proc/money_act(mob/user, obj/item/money) DOPPLER EDIT - removing insert_money. Sneaky one, this. var/obj/item/card/id/inserted_id = computer_id_slot?.GetID() if(!inserted_id) balloon_alert(user, "no ID!") return ITEM_INTERACT_BLOCKING - return inserted_id.insert_money(money, user) ? ITEM_INTERACT_SUCCESS : ITEM_INTERACT_BLOCKING + return inserted_id.insert_money(money, user) ? ITEM_INTERACT_SUCCESS : ITEM_INTERACT_BLOCKING **/ /obj/item/modular_computer/proc/pai_act(mob/user, obj/item/pai_card/card) if(inserted_pai) diff --git a/code/modules/modular_computers/computers/item/pda.dm b/code/modules/modular_computers/computers/item/pda.dm index d21a3e2047559..04b13420956d6 100644 --- a/code/modules/modular_computers/computers/item/pda.dm +++ b/code/modules/modular_computers/computers/item/pda.dm @@ -142,8 +142,8 @@ return . || NONE /obj/item/modular_computer/pda/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers) - if(iscash(interacting_with)) - return money_act(user,interacting_with) +// if(iscash(interacting_with)) +// return money_act(user,interacting_with) return NONE /obj/item/modular_computer/pda/item_interaction(mob/living/user, obj/item/tool, list/modifiers)