Merge branch 'master' into upstream-merge-27773

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

@@ -83,7 +83,7 @@
 
 /obj/item/weapon/storage/backpack/holding/singularity_act(current_size)
 	var/dist = max((current_size - 2),1)
-	explosion(src.loc,(dist),(dist*2),(dist*4))
+	explosion(src.loc,(dist),(dist*2),(dist*4))
 	return
 
 

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

@@ -203,7 +203,7 @@
 		/obj/item/organ/regenerative_core,
 		/obj/item/device/wormhole_jaunter,
 		/obj/item/weapon/storage/bag/plants,
-
+		/obj/item/stack/marker_beacon
 		)
 
 
@@ -249,8 +249,8 @@
 /obj/item/weapon/storage/belt/military
 	name = "chest rig"
 	desc = "A set of tactical webbing worn by Syndicate boarding parties."
-	icon_state = "explorer1"
-	item_state = "explorer1"
+	icon_state = "militarywebbing"
+	item_state = "militarywebbing"
 	max_w_class = WEIGHT_CLASS_SMALL
 
 /obj/item/weapon/storage/belt/military/abductor

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

@@ -405,10 +405,9 @@
 	if(iscyborg(user))
 		return	//Robots can't interact with storage items.
 
-	if(contents.len >= storage_slots) //don't use items on the backpack if they don't fit
-		return 1
-
 	if(!can_be_inserted(W, 0 , user))
+		if(contents.len >= storage_slots) //don't use items on the backpack if they don't fit
+			return 1
 		return 0
 
 	handle_item_insertion(W, 0 , user)