Revert "Merge remote-tracking branch 'upstream/master'"

This reverts commit 135608551f, reversing
changes made to ce7e9ac452.

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

@@ -60,7 +60,7 @@
 	. = ..()
 	var/datum/component/storage/STR = GetComponent(/datum/component/storage)
 	STR.allow_big_nesting = TRUE
-	STR.max_w_class = WEIGHT_CLASS_BULKY
+	STR.max_w_class = WEIGHT_CLASS_GIGANTIC
 	STR.max_combined_w_class = 35
 
 /obj/item/storage/backpack/holding/suicide_act(mob/living/user)

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

@@ -239,8 +239,8 @@ GLOBAL_LIST_EMPTY(rubber_toolbox_icons)
 /obj/item/storage/toolbox/gold_real
 	name = "golden toolbox"
 	desc = "A larger then normal toolbox made of gold plated plastitanium."
+	item_state = "gold"
 	icon_state = "gold"
-	item_state = "toolbox_gold"
 	has_latches = FALSE
 	force = 16 // Less then a spear
 	throwforce = 14
@@ -266,7 +266,7 @@ GLOBAL_LIST_EMPTY(rubber_toolbox_icons)
 	name = "golden toolbox"
 	desc = "A gold plated toolbox, fancy and harmless due to the gold plating being on cardboard!"
 	icon_state = "gold"
-	item_state = "toolbox_gold"
+	item_state = "gold"
 	has_latches = FALSE
 	force = 0
 	throwforce = 0

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

@@ -381,13 +381,3 @@
 	new /obj/item/gun/ballistic/automatic/pistol/m1911/kitchengun(src)
 	new /obj/item/ammo_box/magazine/m45/kitchengun(src)
 	new /obj/item/ammo_box/magazine/m45/kitchengun(src)
-
-
-/obj/item/storage/box/strange_seeds_10pack
-
-/obj/item/storage/box/strange_seeds_10pack/PopulateContents()
-	for(var/i in 1 to 10)
-		new /obj/item/seeds/random(src)
-
-	if(prob(50))
-		new /obj/item/seeds/random(src) //oops, an additional packet might have slipped its way into the box