Merge branch 'master' of https://github.com/tgstation/tgstation into upstream-sync

code/datums/storage/storage.dm

@@ -701,9 +701,11 @@ GLOBAL_LIST_EMPTY(cached_storage_typecaches)
 	SIGNAL_HANDLER
 
 	for(var/mob/user as anything in is_using)
-		if(user.client)
-			var/client/cuser = user.client
-			cuser.screen -= gone
+		user.hud_used?.open_containers -= gone
+		if(!user.client)
+			continue
+		var/client/cuser = user.client
+		cuser.screen -= gone
 
 	reset_item(gone)
 	refresh_views()
@@ -1059,7 +1061,9 @@ GLOBAL_LIST_EMPTY(cached_storage_typecaches)
 
 	is_using |= to_show
 
+	to_show.hud_used.open_containers |= storage_interfaces[to_show].list_ui_elements()
 	to_show.client.screen |= storage_interfaces[to_show].list_ui_elements()
+	to_show.hud_used.open_containers |= real_location.contents
 	to_show.client.screen |= real_location.contents
 
 	return TRUE
@@ -1086,6 +1090,9 @@ GLOBAL_LIST_EMPTY(cached_storage_typecaches)
 	if(to_hide.client)
 		to_hide.client.screen -= storage_interfaces[to_hide].list_ui_elements()
 		to_hide.client.screen -= real_location.contents
+	if(to_hide.hud_used)
+		to_hide.hud_used.open_containers -= storage_interfaces[to_hide].list_ui_elements()
+		to_hide.hud_used.open_containers -=  real_location.contents
 	QDEL_NULL(storage_interfaces[to_hide])
 	storage_interfaces -= to_hide
 

code/datums/storage/subtypes/bags.dm

@@ -302,17 +302,25 @@
 
 ///Money bag
 /datum/storage/bag/money
-	max_slots = 40
-	max_specific_storage = 40
+	max_specific_storage = WEIGHT_CLASS_BULKY
+	max_total_storage = 1000
+	max_slots = 1000
 
 /datum/storage/bag/money/New(atom/parent, max_slots, max_specific_storage, max_total_storage, rustle_sound, remove_rustle_sound)
 	. = ..()
 	set_holdable(list(
 		/obj/item/coin,
 		/obj/item/stack/spacecash,
-		/obj/item/holochip
+		/obj/item/holochip,
+		/obj/item/poker_chip,
+		/obj/item/stack/sheet/mineral/diamond, // Precious gems and stones are something a sophisticated french thief might put in his thief bag.
+		/obj/item/stack/sheet/mineral/gold, // This is money, the only real money actually, if you ask a Ron Paul-style guy.
+		/obj/item/stack/sheet/mineral/silver,
+		/obj/item/stack/sheet/mineral/mythril,
+		/obj/item/stack/telecrystal,
 	))
 
+
 ///Fishing bag
 /datum/storage/bag/fishing
 	max_total_storage = 24 // Up to 8 normal fish

code/datums/storage/subtypes/others/misc.dm

@@ -211,6 +211,7 @@
 			/obj/item/stack/medical,
 			/obj/item/stamp,
 			/obj/item/toy/crayon,
+			/obj/item/poker_chip,
 			// SKYRAT EDIT BEGIN
 			/obj/item/condom_pack,
 			/obj/item/gbp_punchcard,