Merge branch 'master' into upstream-merge-31727

code/game/objects/items/storage/firstaid.dm

@@ -167,6 +167,10 @@
 				usr.s_active.close(usr)
 			src.show_to(usr)
 
+/obj/item/storage/pill_bottle/suicide_act(mob/user)
+	user.visible_message("<span class='suicide'>[user] is trying to get the cap off [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
+	return (TOXLOSS)
+
 /obj/item/storage/pill_bottle/charcoal
 	name = "bottle of charcoal pills"
 	desc = "Contains pills used to counter toxins."

code/game/objects/items/storage/wallets.dm

@@ -72,6 +72,9 @@
 	else
 		return ..()
 
+/obj/item/storage/wallet/random
+	icon_state = "random_wallet"
+
 /obj/item/storage/wallet/random/PopulateContents()
 	var/item1_type = pick( /obj/item/stack/spacecash/c10, /obj/item/stack/spacecash/c100, /obj/item/stack/spacecash/c1000, /obj/item/stack/spacecash/c20, /obj/item/stack/spacecash/c200, /obj/item/stack/spacecash/c50, /obj/item/stack/spacecash/c500)
 	var/item2_type
@@ -86,3 +89,4 @@
 			new item2_type(src)
 		if(item3_type)
 			new item3_type(src)
+	update_icon()