Merge remote-tracking branch 'upstream/master' into I-guess-I-port-stuff-now-huh

code/game/objects/items/weapons/storage/belt.dm

@@ -230,7 +230,9 @@
 		/obj/item/flashlight/seclite,
 		/obj/item/holosign_creator/security,
 		/obj/item/melee/classic_baton/telescopic,
-		/obj/item/restraints/legcuffs/bola)
+		/obj/item/restraints/legcuffs/bola,
+		/obj/item/clothing/mask/gas/sechailer,
+		/obj/item/spacepod_key)
 
 /obj/item/storage/belt/security/sec/populate_contents()
 	new /obj/item/flashlight/seclite(src)
@@ -447,6 +449,7 @@
 	item_state = "bandolier"
 	storage_slots = 8
 	can_hold = list(/obj/item/ammo_casing/shotgun)
+	display_contents_with_number = TRUE
 
 /obj/item/storage/belt/bandolier/Initialize(mapload)
 	. = ..()

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

@@ -163,7 +163,7 @@
 /obj/item/storage/proc/show_to(mob/user)
 	if(!user.client)
 		return
-	if(user.s_active != src) // Switching from another container
+	if(user.s_active != src && !isobserver(user))
 		for(var/obj/item/I in src)
 			if(I.on_found(user)) // For mouse traps and such
 				return // If something triggered, don't open the UI
@@ -310,6 +310,9 @@
 	if(loc == I)
 		return FALSE //Means the item is already in the storage item
 
+	if(!I.can_enter_storage(src, usr))
+		return FALSE
+
 	if(length(contents) >= storage_slots)
 		if(!stop_messages)
 			to_chat(usr, "<span class='warning'>[I] won't fit in [src], make some space!</span>")