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 1c403d5160d..8464016b316 100644 Binary files a/icons/obj/wallets.dmi and b/icons/obj/wallets.dmi differ