From 914b2e377095abeb2637735dd896a080bd8466b6 Mon Sep 17 00:00:00 2001 From: Cannibal Hunter <135169022+CannibalHunter@users.noreply.github.com> Date: Tue, 25 Jun 2024 00:49:06 -0500 Subject: [PATCH] yeah (#2402) --- monkestation/code/modules/store/atm/_atm.dm | 42 +++++++++++++------- monkestation/icons/obj/economy.dmi | Bin 399 -> 0 bytes monkestation/icons/obj/monkecoin.dmi | Bin 0 -> 6765 bytes 3 files changed, 28 insertions(+), 14 deletions(-) delete mode 100644 monkestation/icons/obj/economy.dmi create mode 100644 monkestation/icons/obj/monkecoin.dmi diff --git a/monkestation/code/modules/store/atm/_atm.dm b/monkestation/code/modules/store/atm/_atm.dm index afb175491c93..73ae049fad53 100644 --- a/monkestation/code/modules/store/atm/_atm.dm +++ b/monkestation/code/modules/store/atm/_atm.dm @@ -154,10 +154,12 @@ var/obj/item/stack/monkecoin/coin_stack = new(living_user.loc) coin_stack.amount = withdraw_amount + coin_stack.update_desc() living_user.put_in_hands(coin_stack) + /obj/machinery/atm/attacked_by(obj/item/attacking_item, mob/living/user) . = ..() if(do_after(user, 1 SECONDS, src)) @@ -222,8 +224,8 @@ /obj/item/stack/monkecoin name = "monkecoin" singular_name = "monkecoin" - icon = 'monkestation/icons/obj/economy.dmi' - icon_state = "coins" + icon = 'monkestation/icons/obj/monkecoin.dmi' + icon_state = "monkecoin" amount = 1 max_amount = INFINITY throwforce = 0 @@ -231,19 +233,20 @@ throw_range = 2 w_class = WEIGHT_CLASS_TINY full_w_class = WEIGHT_CLASS_TINY - resistance_flags = FLAMMABLE + resistance_flags = FIRE_PROOF | ACID_PROOF merge_type = /obj/item/stack/monkecoin var/value = 100 -/obj/item/stack/monkecoin/Initialize(mapload, new_amount, merge = TRUE, list/mat_override=null, mat_amt=1) +/obj/item/stack/monkecoin/Initialize(mapload, new_amount, merge = FALSE, list/mat_override=null, mat_amt=1) . = ..() update_desc() /obj/item/stack/monkecoin/update_desc() . = ..() var/total_worth = get_item_credit_value() - desc = "It's worth [total_worth] credit[(total_worth > 1) ? "s" : null] in total.\n" - desc += "Their are [amount] monkecoins in this stack." + desc = "Monkecoin, it's the backbone of the economy. " + desc += "It's worth [total_worth] credit[(total_worth > 1) ? "s" : null] in total." + update_icon_state() /obj/item/stack/monkecoin/get_item_credit_value() return (amount*value) @@ -258,12 +261,23 @@ /obj/item/stack/monkecoin/update_icon_state() . = ..() + var/coinpress = copytext("[amount]",1,2) switch(amount) - if(1) - icon_state = initial(icon_state) - if(2 to 9) - icon_state = "[initial(icon_state)]_2" - if(10 to 24) - icon_state = "[initial(icon_state)]_3" - if(25 to INFINITY) - icon_state = "[initial(icon_state)]_4" + if(1 to 9) + icon_state = "[initial(icon_state)][coinpress]" + if(10 to 99) + icon_state = "[initial(icon_state)][coinpress]0" + if(100 to 999) + icon_state = "[initial(icon_state)][coinpress]00" + if(1000 to 8999) + icon_state = "[initial(icon_state)][coinpress]000" + if(9000 to INFINITY) + icon_state = "[initial(icon_state)]9000" + +/obj/item/stack/monkecoin/suicide_act(mob/living/carbon/user) + user.visible_message(span_suicide("[user] begins to gouge [user.p_their()] eyes with the [src]! It looks like [user.p_theyre()] trying to commit suicide!")) + user.emote("scream") + if(do_after(user, 5 SECONDS, src)) + return BRUTELOSS + else + user.visible_message(span_suicide("[user] puts the [src] down away from [user.p_their()] eyes.")) diff --git a/monkestation/icons/obj/economy.dmi b/monkestation/icons/obj/economy.dmi deleted file mode 100644 index 20c15636815c3147e0b414e53108c420f30d6b8b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 399 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 Uht&e$|09r+oSJNzv{}gi0J6~T$^ZZW literal 0 HcmV?d00001