From f7ba75e2d8be42fa66abe6b8af106293d6566b71 Mon Sep 17 00:00:00 2001 From: MixityMaxity <189351891+MixityMaxity@users.noreply.github.com> Date: Thu, 2 Jul 2026 09:17:52 +1000 Subject: [PATCH] Resprites wallets, adds new wallet variants (#32136) * new wallets * fix id hanging * adds pink and TSF variants - suggested * adds crafting recipe for suggested wallets --- .../objects/items/stacks/sheets/leather.dm | 7 +++- code/game/objects/items/storage/wallets.dm | 31 ++++++++++++++++-- icons/obj/wallets.dmi | Bin 1091 -> 4105 bytes 3 files changed, 34 insertions(+), 4 deletions(-) diff --git a/code/game/objects/items/stacks/sheets/leather.dm b/code/game/objects/items/stacks/sheets/leather.dm index d3edc251e4e..9b5c796c434 100644 --- a/code/game/objects/items/stacks/sheets/leather.dm +++ b/code/game/objects/items/stacks/sheets/leather.dm @@ -139,6 +139,11 @@ GLOBAL_LIST_INIT(xeno_recipes, list ( GLOBAL_LIST_INIT(leather_recipes, list ( new /datum/stack_recipe_list("leather storages", list( new /datum/stack_recipe("wallet", /obj/item/storage/wallet, 1), + new /datum/stack_recipe("tanned wallet", /obj/item/storage/wallet/tanned, 1), + new /datum/stack_recipe("black wallet", /obj/item/storage/wallet/black, 1), + new /datum/stack_recipe("white wallet", /obj/item/storage/wallet/white, 1), + new /datum/stack_recipe("pink wallet", /obj/item/storage/wallet/pink, 1), + new /datum/stack_recipe("tsf wallet", /obj/item/storage/wallet/tsf, 1), new /datum/stack_recipe("toolbelt", /obj/item/storage/belt/utility, 4), new /datum/stack_recipe("leather satchel", /obj/item/storage/backpack/satchel, 5), new /datum/stack_recipe("briefcase", /obj/item/storage/briefcase, 4), @@ -209,7 +214,7 @@ GLOBAL_LIST_INIT(sinew_recipes, list ( if(D.hides >= HIDES_COVERED_FULL) to_chat(user, SPAN_WARNING("You can't improve [D] any further!")) return ITEM_INTERACT_COMPLETE - + if(D.plates || D.drake_hides) to_chat(user, SPAN_WARNING("[D] is already protected by a different kind of armor!")) return ITEM_INTERACT_COMPLETE diff --git a/code/game/objects/items/storage/wallets.dm b/code/game/objects/items/storage/wallets.dm index 05da9245a86..6646eda98f0 100644 --- a/code/game/objects/items/storage/wallets.dm +++ b/code/game/objects/items/storage/wallets.dm @@ -76,7 +76,7 @@ return . += mutable_appearance(front_id.icon, front_id.icon_state) . += front_id.overlays - . += mutable_appearance(icon, "wallet_overlay") + . += mutable_appearance(icon, "[icon_state]_overlay") // fuck yeah, ass photo in my wallet var/obj/item/photo/photo = locate(/obj/item/photo) in contents @@ -86,7 +86,7 @@ MA.pixel_x = 11 MA.pixel_y = 1 . += MA - . += mutable_appearance(icon, "photo_overlay") + . += mutable_appearance(icon, "[icon_state]_photo") /obj/item/storage/wallet/update_name(updates) . = ..() @@ -105,6 +105,17 @@ else return ..() +/obj/item/storage/wallet/random/Initialize(mapload) + . = ..() + icon_state = pick( + "wallet", + "wallet_tanned", + "wallet_black", + "wallet_white", + "wallet_pink", + "wallet_tsf", + ) + /obj/item/storage/wallet/random/populate_contents() var/cash = pick(/obj/item/stack/spacecash, /obj/item/stack/spacecash/c5, @@ -121,9 +132,23 @@ new cash(src) new coin(src) - // Arcade Wallet /obj/item/storage/wallet/cheap name = "cheap wallet" desc = "A cheap and flimsy wallet from the arcade." storage_slots = 5 //smaller storage than normal wallets + +/obj/item/storage/wallet/tanned + icon_state = "wallet_tanned" + +/obj/item/storage/wallet/black + icon_state = "wallet_black" + +/obj/item/storage/wallet/white + icon_state = "wallet_white" + +/obj/item/storage/wallet/pink + icon_state = "wallet_pink" + +/obj/item/storage/wallet/tsf + icon_state = "wallet_tsf" diff --git a/icons/obj/wallets.dmi b/icons/obj/wallets.dmi index 1c403d5160d704f830329c8b647cea68b02b5018..8464016b3169146ccae47aba594c32ecad27574b 100644 GIT binary patch literal 4105 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 literal 1091 zcmV-J1ibr+P)V=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+ z(=$pSoZ^zil2jm5sXQ?!C$&V0i!&v&s2C_<$i5SK@u}KMJ*0W zD~O<-idaOjNF9`dh*WT})}c!+bQH9ULrdK(rHI8v5e1PJ4K5b6gW1HS8KgsOaYzKU z4)MOvzT=wQ-FtUA`5okaAiUh&@9zD6zxREA?jDiBU@#b3mjt&1;6gT0RtJ4UOeQs8^Pl&hlb%p?QfyFZ(y*~Jxp1#q>#q)lbejDwJvj@|g>v!R|p|9nZ5 zSI(afb^qN*uly6xj65MRT3o5=B%$NdJ*qspP37`8aSUnt0iUYXs(oB26e*e1>js(3 zUQtiytyv;f0(6}5B3JmXZR-sF^>Uu}C3n(ve)GPY?MPSqC~SHTXSbb4BgrvAg%~rY zhQxnm0>a7@tvcS{t!4YO=Q`1|JNB^^{IFF#aI>|p6|E%9)SpN2x`QEXkB&}Q3LWrH z0OXIBko`=8{)X0)Qt~RvYE@k-j^M+B;DabY*15ya5W&jd&Bq@_iGAdHK;WPVE$gK{%Pnx=~T)NQqINBQl4)+bwk@BsKq(2Z;kT3Za=pf z0HCp)&+q~^utm29%4rY*dp*dvd@-qXMzZ_;Lt6ou-`6)bXsVCidf8)fdyN-DUnWf~CUg(C@K6gtEN-ch9tP%58Gt_7}4^W z`ekUidspapftgRgmCwg|qxaw*Po;SQl{nu9!`zS6s!{u%@B2xt6)*|lc7Pj`0B#4kF$v&yfE$wlZU?wA z3E*~s8jFXd=i@?T z3UKbu`XP5`<3gkg@Y}uy&i(ng@Lv?5vp*jfA{&Sn1`h?=;T>G~Eb8X|C>ogpg6_}9 zg~${TbdO)|&2uY&eJ002ov JPDHLkV1gld1bzSj