mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-01-02 13:02:38 +00:00
* Simple suit storage fixes (#76267) ## About The Pull Request Makes toys, stamps, and spacecash invisible in suit storage, fixing some missing textures adds stamps to the allowed suit storage items for hop, qm, and cargo wintercoats ## Why It's Good For The Game The /datum/unit_test/suit_storage_icons failure list is awfully long, and while some of them require more thoughtful fixes, just these couple of lines clears more than 100 lines from the failure list. While I was here I added the stamps to the allowed suit storage for hop, qm, and cargo wintercoats cause that seems fair ## Changelog 🆑 Seven fix: toys, stamps, and spacecash no longer has a missing texture when put into suit storage qol: stamps are now allowed suit storage items in the hop, qm, and cargo wintercoats /🆑 * Simple suit storage fixes * Fixes the issue with tennis balls not showing up properly --------- Co-authored-by: Lufferly <40921881+Lufferly@users.noreply.github.com> Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
103 lines
2.7 KiB
Plaintext
103 lines
2.7 KiB
Plaintext
/obj/item/stack/spacecash //Don't use base space cash stacks. Any other space cash stack can merge with them, and could cause potential money duping exploits.
|
|
name = "space cash"
|
|
singular_name = "bill"
|
|
icon = 'icons/obj/economy.dmi'
|
|
icon_state = null
|
|
worn_icon_state = "nothing"
|
|
amount = 1
|
|
max_amount = INFINITY
|
|
throwforce = 0
|
|
throw_speed = 2
|
|
throw_range = 2
|
|
w_class = WEIGHT_CLASS_TINY
|
|
full_w_class = WEIGHT_CLASS_TINY
|
|
resistance_flags = FLAMMABLE
|
|
var/value = 0
|
|
grind_results = list(/datum/reagent/cellulose = 10)
|
|
|
|
/obj/item/stack/spacecash/Initialize(mapload, new_amount, merge = TRUE, list/mat_override=null, mat_amt=1)
|
|
. = ..()
|
|
update_desc()
|
|
|
|
/obj/item/stack/spacecash/update_desc()
|
|
. = ..()
|
|
var/total_worth = get_item_credit_value()
|
|
desc = "It's worth [total_worth] credit[(total_worth > 1) ? "s" : null] in total."
|
|
|
|
/obj/item/stack/spacecash/get_item_credit_value()
|
|
return (amount*value)
|
|
|
|
/obj/item/stack/spacecash/merge(obj/item/stack/S)
|
|
. = ..()
|
|
update_desc()
|
|
|
|
/obj/item/stack/spacecash/use(used, transfer = FALSE, check = TRUE)
|
|
. = ..()
|
|
update_desc()
|
|
|
|
/obj/item/stack/spacecash/update_icon_state()
|
|
. = ..()
|
|
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"
|
|
|
|
/obj/item/stack/spacecash/c1
|
|
icon_state = "spacecash1"
|
|
singular_name = "one credit bill"
|
|
value = 1
|
|
merge_type = /obj/item/stack/spacecash/c1
|
|
|
|
/obj/item/stack/spacecash/c10
|
|
icon_state = "spacecash10"
|
|
singular_name = "ten credit bill"
|
|
value = 10
|
|
merge_type = /obj/item/stack/spacecash/c10
|
|
|
|
/obj/item/stack/spacecash/c20
|
|
icon_state = "spacecash20"
|
|
singular_name = "twenty credit bill"
|
|
value = 20
|
|
merge_type = /obj/item/stack/spacecash/c20
|
|
|
|
/obj/item/stack/spacecash/c50
|
|
icon_state = "spacecash50"
|
|
singular_name = "fifty credit bill"
|
|
value = 50
|
|
merge_type = /obj/item/stack/spacecash/c50
|
|
|
|
/obj/item/stack/spacecash/c100
|
|
icon_state = "spacecash100"
|
|
singular_name = "one hundred credit bill"
|
|
value = 100
|
|
merge_type = /obj/item/stack/spacecash/c100
|
|
|
|
/obj/item/stack/spacecash/c200
|
|
icon_state = "spacecash200"
|
|
singular_name = "two hundred credit bill"
|
|
value = 200
|
|
merge_type = /obj/item/stack/spacecash/c200
|
|
|
|
/obj/item/stack/spacecash/c500
|
|
icon_state = "spacecash500"
|
|
singular_name = "five hundred credit bill"
|
|
value = 500
|
|
merge_type = /obj/item/stack/spacecash/c500
|
|
|
|
/obj/item/stack/spacecash/c1000
|
|
icon_state = "spacecash1000"
|
|
singular_name = "one thousand credit bill"
|
|
value = 1000
|
|
merge_type = /obj/item/stack/spacecash/c1000
|
|
|
|
/obj/item/stack/spacecash/c10000
|
|
icon_state = "spacecash10000"
|
|
singular_name = "ten thousand credit bill"
|
|
value = 10000
|
|
merge_type = /obj/item/stack/spacecash/c10000
|