From 1fa828a3f79de7d6716f2db785775209f5da51a8 Mon Sep 17 00:00:00 2001 From: SandPoot Date: Wed, 30 Dec 2020 13:57:10 -0300 Subject: [PATCH 1/2] upload files --- code/game/objects/items/credit_holochip.dm | 11 +++++++++++ code/game/objects/items/stacks/cash.dm | 14 ++++++++++++++ code/modules/mining/ores_coins.dm | 11 +++++++++++ 3 files changed, 36 insertions(+) diff --git a/code/game/objects/items/credit_holochip.dm b/code/game/objects/items/credit_holochip.dm index 21cfd1fbad..b7f7f5f2d1 100644 --- a/code/game/objects/items/credit_holochip.dm +++ b/code/game/objects/items/credit_holochip.dm @@ -80,6 +80,17 @@ to_chat(user, "You insert the credits into [src].") update_icon() qdel(H) + if(istype(I, /obj/item/card/id)) + var/obj/item/card/id/ID = I + if(!ID.registered_account) + to_chat(user, "[ID] doesn't have a linked account to deposit into!") + return + for(var/obj/item/holochip/money in src.loc.contents) + ID.attackby(money, user) + for(var/obj/item/stack/spacecash/money in src.loc.contents) + ID.attackby(money, user) + for(var/obj/item/coin/money in src.loc.contents) + ID.attackby(money, user) /obj/item/holochip/AltClick(mob/user) if(!istype(user) || !user.canUseTopic(src, BE_CLOSE, ismonkey(user))) diff --git a/code/game/objects/items/stacks/cash.dm b/code/game/objects/items/stacks/cash.dm index 954950f5e6..e2036835ce 100644 --- a/code/game/objects/items/stacks/cash.dm +++ b/code/game/objects/items/stacks/cash.dm @@ -33,6 +33,20 @@ . = ..() update_desc() +/obj/item/stack/spacecash/attackby(obj/item/W, mob/user, params) + . = ..() + if(istype(W, /obj/item/card/id)) + var/obj/item/card/id/ID = W + if(!ID.registered_account) + to_chat(user, "[ID] doesn't have a linked account to deposit into!") + return + for(var/obj/item/holochip/money in src.loc.contents) + ID.attackby(money, user) + for(var/obj/item/stack/spacecash/money in src.loc.contents) + ID.attackby(money, user) + for(var/obj/item/coin/money in src.loc.contents) + ID.attackby(money, user) + /obj/item/stack/spacecash/c1 icon_state = "spacecash" singular_name = "one credit bill" diff --git a/code/modules/mining/ores_coins.dm b/code/modules/mining/ores_coins.dm index 8bc9cc4512..81014be6f9 100644 --- a/code/modules/mining/ores_coins.dm +++ b/code/modules/mining/ores_coins.dm @@ -397,6 +397,17 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ else to_chat(user, "You need one length of cable to attach a string to the coin!") return + if(istype(W, /obj/item/card/id)) + var/obj/item/card/id/ID = W + if(!ID.registered_account) + to_chat(user, "[ID] doesn't have a linked account to deposit into!") + return + for(var/obj/item/holochip/money in src.loc.contents) + ID.attackby(money, user) + for(var/obj/item/stack/spacecash/money in src.loc.contents) + ID.attackby(money, user) + for(var/obj/item/coin/money in src.loc.contents) + ID.attackby(money, user) else ..() From a0e95b7c3d5af1ff7b1691c1f77879b10595614e Mon Sep 17 00:00:00 2001 From: SandPoot <43283559+SandPoot@users.noreply.github.com> Date: Thu, 31 Dec 2020 16:59:33 -0300 Subject: [PATCH 2/2] Update code/modules/mining/ores_coins.dm Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com> --- code/modules/mining/ores_coins.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mining/ores_coins.dm b/code/modules/mining/ores_coins.dm index 81014be6f9..26a3ca1b70 100644 --- a/code/modules/mining/ores_coins.dm +++ b/code/modules/mining/ores_coins.dm @@ -397,7 +397,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\ else to_chat(user, "You need one length of cable to attach a string to the coin!") return - if(istype(W, /obj/item/card/id)) + else if(istype(W, /obj/item/card/id)) var/obj/item/card/id/ID = W if(!ID.registered_account) to_chat(user, "[ID] doesn't have a linked account to deposit into!")