Uplink changes and additions (#1645)

* Splits uplink categories into separate files and moves other files around

* Corrects an incorrect description

* Puts uplink categories in uplink_categories into the same order as they are individual files

* Mercenaries now spawn with their own private uplink.

* Adds a random discount to uplink items that is applied every 15 minutes

no message

no message

* Adds changelog

* Fakes announcements are now once again purchasable from the uplink and actually work

* Removes a debug line

* Adds several existing items to the antag uplink including stun rounds for shotguns, metal foam grenades and more

* Refactors boxes.dm to use absolute pathing and for loops for contents

Adds changelog

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

@@ -51,31 +51,24 @@
 	new src.foldable(get_turf(src))
 	qdel(src)
 
-/obj/item/weapon/storage/box/survival/
-	New()
-		..()
-		new /obj/item/clothing/mask/breath( src )
-		new /obj/item/weapon/tank/emergency_oxygen( src )
+/obj/item/weapon/storage/box/survival/New()
+	..()
+	new /obj/item/clothing/mask/breath(src)
+	new /obj/item/weapon/tank/emergency_oxygen(src)
 
-/obj/item/weapon/storage/box/engineer/
-	New()
-		..()
-		new /obj/item/clothing/mask/breath( src )
-		new /obj/item/weapon/tank/emergency_oxygen/engi( src )
+/obj/item/weapon/storage/box/engineer/New()
+	..()
+	new /obj/item/clothing/mask/breath(src)
+	new /obj/item/weapon/tank/emergency_oxygen/engi(src)
 
 /obj/item/weapon/storage/box/gloves
 	name = "box of latex gloves"
 	desc = "Contains white gloves."
 	icon_state = "latex"
 
-	New()
-		..()
-		new /obj/item/clothing/gloves/latex(src)
-		new /obj/item/clothing/gloves/latex(src)
-		new /obj/item/clothing/gloves/latex(src)
-		new /obj/item/clothing/gloves/latex(src)
-		new /obj/item/clothing/gloves/latex(src)
-		new /obj/item/clothing/gloves/latex(src)
+/obj/item/weapon/storage/box/gloves/New()
+	..()
+	for(var/i = 1 to 7)
 		new /obj/item/clothing/gloves/latex(src)
 
 /obj/item/weapon/storage/box/masks
@@ -83,75 +76,50 @@
 	desc = "This box contains masks of sterility."
 	icon_state = "sterile"
 
-	New()
-		..()
+/obj/item/weapon/storage/box/masks/New()
+	..()
+	for(var/i = 1 to 7)
 		new /obj/item/clothing/mask/surgical(src)
-		new /obj/item/clothing/mask/surgical(src)
-		new /obj/item/clothing/mask/surgical(src)
-		new /obj/item/clothing/mask/surgical(src)
-		new /obj/item/clothing/mask/surgical(src)
-		new /obj/item/clothing/mask/surgical(src)
-		new /obj/item/clothing/mask/surgical(src)
-
 
 /obj/item/weapon/storage/box/syringes
 	name = "box of syringes"
 	desc = "A box full of syringes."
 	icon_state = "syringe"
 
-	New()
-		..()
-		new /obj/item/weapon/reagent_containers/syringe( src )
-		new /obj/item/weapon/reagent_containers/syringe( src )
-		new /obj/item/weapon/reagent_containers/syringe( src )
-		new /obj/item/weapon/reagent_containers/syringe( src )
-		new /obj/item/weapon/reagent_containers/syringe( src )
-		new /obj/item/weapon/reagent_containers/syringe( src )
-		new /obj/item/weapon/reagent_containers/syringe( src )
+/obj/item/weapon/storage/box/syringes/New()
+	..()
+	for(var/i = 1 to 7)
+		new /obj/item/weapon/reagent_containers/syringe(src)
 
 /obj/item/weapon/storage/box/syringegun
 	name = "box of syringe gun cartridges"
 	desc = "A box full of compressed gas cartridges."
 	icon_state = "syringe"
 
-	New()
-		..()
-		new /obj/item/weapon/syringe_cartridge( src )
-		new /obj/item/weapon/syringe_cartridge( src )
-		new /obj/item/weapon/syringe_cartridge( src )
-		new /obj/item/weapon/syringe_cartridge( src )
-		new /obj/item/weapon/syringe_cartridge( src )
-		new /obj/item/weapon/syringe_cartridge( src )
-		new /obj/item/weapon/syringe_cartridge( src )
-
+/obj/item/weapon/storage/box/syringegun/New()
+	..()
+	for(var/i = 1 to 7)
+		new /obj/item/weapon/syringe_cartridge(src)
 
 /obj/item/weapon/storage/box/beakers
 	name = "box of beakers"
 	icon_state = "beaker"
 
-	New()
-		..()
-		new /obj/item/weapon/reagent_containers/glass/beaker( src )
-		new /obj/item/weapon/reagent_containers/glass/beaker( src )
-		new /obj/item/weapon/reagent_containers/glass/beaker( src )
-		new /obj/item/weapon/reagent_containers/glass/beaker( src )
-		new /obj/item/weapon/reagent_containers/glass/beaker( src )
-		new /obj/item/weapon/reagent_containers/glass/beaker( src )
-		new /obj/item/weapon/reagent_containers/glass/beaker( src )
+/obj/item/weapon/storage/box/beakers/New()
+	..()
+	for(var/i = 1 to 7)
+		new /obj/item/weapon/reagent_containers/glass/beaker(src)
 
 /obj/item/weapon/storage/box/injectors
 	name = "box of DNA injectors"
 	desc = "This box contains injectors it seems."
 
-	New()
-		..()
-		new /obj/item/weapon/dnainjector/h2m(src)
-		new /obj/item/weapon/dnainjector/h2m(src)
+/obj/item/weapon/storage/box/injectors/New()
+	..()
+	for(var/i = 1 to 3)
 		new /obj/item/weapon/dnainjector/h2m(src)
+	for(var/i = 1 to 3)
 		new /obj/item/weapon/dnainjector/m2h(src)
-		new /obj/item/weapon/dnainjector/m2h(src)
-		new /obj/item/weapon/dnainjector/m2h(src)
-
 
 /obj/item/weapon/storage/box/blanks
 	name = "box of blank shells"
@@ -159,14 +127,9 @@
 	icon_state = "blankshot_box"
 	item_state = "syringe_kit"
 
-	New()
-		..()
-		new /obj/item/ammo_casing/shotgun/blank(src)
-		new /obj/item/ammo_casing/shotgun/blank(src)
-		new /obj/item/ammo_casing/shotgun/blank(src)
-		new /obj/item/ammo_casing/shotgun/blank(src)
-		new /obj/item/ammo_casing/shotgun/blank(src)
-		new /obj/item/ammo_casing/shotgun/blank(src)
+/obj/item/weapon/storage/box/blanks/New()
+	..()
+	for(var/i = 1 to 7)
 		new /obj/item/ammo_casing/shotgun/blank(src)
 
 /obj/item/weapon/storage/box/beanbags
@@ -175,14 +138,9 @@
 	icon_state = "beanshot_box"
 	item_state = "syringe_kit"
 
-	New()
-		..()
-		new /obj/item/ammo_casing/shotgun/beanbag(src)
-		new /obj/item/ammo_casing/shotgun/beanbag(src)
-		new /obj/item/ammo_casing/shotgun/beanbag(src)
-		new /obj/item/ammo_casing/shotgun/beanbag(src)
-		new /obj/item/ammo_casing/shotgun/beanbag(src)
-		new /obj/item/ammo_casing/shotgun/beanbag(src)
+/obj/item/weapon/storage/box/beanbags/New()
+	..()
+	for(var/i = 1 to 7)
 		new /obj/item/ammo_casing/shotgun/beanbag(src)
 
 /obj/item/weapon/storage/box/shotgunammo
@@ -191,14 +149,9 @@
 	icon_state = "lethalshellshot_box"
 	item_state = "syringe_kit"
 
-	New()
-		..()
-		new /obj/item/ammo_casing/shotgun(src)
-		new /obj/item/ammo_casing/shotgun(src)
-		new /obj/item/ammo_casing/shotgun(src)
-		new /obj/item/ammo_casing/shotgun(src)
-		new /obj/item/ammo_casing/shotgun(src)
-		new /obj/item/ammo_casing/shotgun(src)
+/obj/item/weapon/storage/box/shotgunammo/New()
+	..()
+	for(var/i = 1 to 7)
 		new /obj/item/ammo_casing/shotgun(src)
 
 /obj/item/weapon/storage/box/shotgunshells
@@ -207,14 +160,9 @@
 	icon_state = "lethalslug_box"
 	item_state = "syringe_kit"
 
-	New()
-		..()
-		new /obj/item/ammo_casing/shotgun/pellet(src)
-		new /obj/item/ammo_casing/shotgun/pellet(src)
-		new /obj/item/ammo_casing/shotgun/pellet(src)
-		new /obj/item/ammo_casing/shotgun/pellet(src)
-		new /obj/item/ammo_casing/shotgun/pellet(src)
-		new /obj/item/ammo_casing/shotgun/pellet(src)
+/obj/item/weapon/storage/box/shotgunshells/New()
+	..()
+	for(var/i = 1 to 7)
 		new /obj/item/ammo_casing/shotgun/pellet(src)
 
 /obj/item/weapon/storage/box/flashshells
@@ -223,14 +171,9 @@
 	icon_state = "illumshot_box"
 	item_state = "syringe_kit"
 
-	New()
-		..()
-		new /obj/item/ammo_casing/shotgun/flash(src)
-		new /obj/item/ammo_casing/shotgun/flash(src)
-		new /obj/item/ammo_casing/shotgun/flash(src)
-		new /obj/item/ammo_casing/shotgun/flash(src)
-		new /obj/item/ammo_casing/shotgun/flash(src)
-		new /obj/item/ammo_casing/shotgun/flash(src)
+/obj/item/weapon/storage/box/flashshells/New()
+	..()
+	for(var/i = 1 to 7)
 		new /obj/item/ammo_casing/shotgun/flash(src)
 
 /obj/item/weapon/storage/box/stunshells
@@ -239,14 +182,9 @@
 	icon_state = "stunshot_box"
 	item_state = "syringe_kit"
 
-	New()
-		..()
-		new /obj/item/ammo_casing/shotgun/stunshell(src)
-		new /obj/item/ammo_casing/shotgun/stunshell(src)
-		new /obj/item/ammo_casing/shotgun/stunshell(src)
-		new /obj/item/ammo_casing/shotgun/stunshell(src)
-		new /obj/item/ammo_casing/shotgun/stunshell(src)
-		new /obj/item/ammo_casing/shotgun/stunshell(src)
+/obj/item/weapon/storage/box/stunshells/New()
+	..()
+	for(var/i = 1 to 7)
 		new /obj/item/ammo_casing/shotgun/stunshell(src)
 
 /obj/item/weapon/storage/box/practiceshells
@@ -255,28 +193,18 @@
 	icon_state = "blankshot_box"
 	item_state = "syringe_kit"
 
-	New()
-		..()
-		new /obj/item/ammo_casing/shotgun/practice(src)
-		new /obj/item/ammo_casing/shotgun/practice(src)
-		new /obj/item/ammo_casing/shotgun/practice(src)
-		new /obj/item/ammo_casing/shotgun/practice(src)
-		new /obj/item/ammo_casing/shotgun/practice(src)
-		new /obj/item/ammo_casing/shotgun/practice(src)
+/obj/item/weapon/storage/box/practiceshells/New()
+	..()
+	for(var/i = 1 to 7)
 		new /obj/item/ammo_casing/shotgun/practice(src)
 
 /obj/item/weapon/storage/box/sniperammo
 	name = "box of 14.5mm shells"
 	desc = "It has a picture of a gun and several warning symbols on the front.<br>WARNING: Live ammunition. Misuse may result in serious injury or death."
 
-	New()
-		..()
-		new /obj/item/ammo_casing/a145(src)
-		new /obj/item/ammo_casing/a145(src)
-		new /obj/item/ammo_casing/a145(src)
-		new /obj/item/ammo_casing/a145(src)
-		new /obj/item/ammo_casing/a145(src)
-		new /obj/item/ammo_casing/a145(src)
+/obj/item/weapon/storage/box/sniperammo/New()
+	..()
+	for(var/i = 1 to 7)
 		new /obj/item/ammo_casing/a145(src)
 
 /obj/item/weapon/storage/box/flashbangs
@@ -284,14 +212,9 @@
 	desc = "<B>WARNING: These devices are extremely dangerous and can cause blindness or deafness in repeated use.</B>"
 	icon_state = "flashbang"
 
-	New()
-		..()
-		new /obj/item/weapon/grenade/flashbang(src)
-		new /obj/item/weapon/grenade/flashbang(src)
-		new /obj/item/weapon/grenade/flashbang(src)
-		new /obj/item/weapon/grenade/flashbang(src)
-		new /obj/item/weapon/grenade/flashbang(src)
-		new /obj/item/weapon/grenade/flashbang(src)
+/obj/item/weapon/storage/box/flashbangs/New()
+	..()
+	for(var/i = 1 to 7)
 		new /obj/item/weapon/grenade/flashbang(src)
 
 /obj/item/weapon/storage/box/emps
@@ -299,41 +222,29 @@
 	desc = "A box containing 5 military grade EMP grenades.<br> WARNING: Do not use near unshielded electronics or biomechanical augmentations, death or permanent paralysis may occur."
 	icon_state = "emp"
 
-	New()
-		..()
-		new /obj/item/weapon/grenade/empgrenade(src)
-		new /obj/item/weapon/grenade/empgrenade(src)
-		new /obj/item/weapon/grenade/empgrenade(src)
-		new /obj/item/weapon/grenade/empgrenade(src)
-		new /obj/item/weapon/grenade/empgrenade(src)
+/obj/item/weapon/storage/box/emps/New()
+	..()
+	for(var/i = 1 to 5)
+	new /obj/item/weapon/grenade/empgrenade(src)
 
 /obj/item/weapon/storage/box/empslite
 	name = "box of low yield emp grenades"
 	desc = "A box containing 5 low yield EMP grenades.<br> WARNING: Do not use near unshielded electronics or biomechanical augmentations, death or permanent paralysis may occur."
 	icon_state = "emp"
 
-	New()
-		..()
-		new /obj/item/weapon/grenade/empgrenade/low_yield(src)
-		new /obj/item/weapon/grenade/empgrenade/low_yield(src)
-		new /obj/item/weapon/grenade/empgrenade/low_yield(src)
-		new /obj/item/weapon/grenade/empgrenade/low_yield(src)
+/obj/item/weapon/storage/box/empslite/New()
+	..()
+	for(var/i = 1 to 5)
 		new /obj/item/weapon/grenade/empgrenade/low_yield(src)
 
 /obj/item/weapon/storage/box/smokes
 	name = "box of smoke bombs"
-	desc = "A box containing 5 smoke bombs."
+	desc = "A box containing 7 smoke bombs."
 	icon_state = "flashbang"
 
-
 /obj/item/weapon/storage/box/smokes/New()
-		..()
-		new /obj/item/weapon/grenade/smokebomb(src)
-		new /obj/item/weapon/grenade/smokebomb(src)
-		new /obj/item/weapon/grenade/smokebomb(src)
-		new /obj/item/weapon/grenade/smokebomb(src)
-		new /obj/item/weapon/grenade/smokebomb(src)
-		new /obj/item/weapon/grenade/smokebomb(src)
+	..()
+	for(var/i = 1 to 7)
 		new /obj/item/weapon/grenade/smokebomb(src)
 
 /obj/item/weapon/storage/box/anti_photons
@@ -342,11 +253,8 @@
 	icon_state = "flashbang"
 
 /obj/item/weapon/storage/box/anti_photons/New()
-		..()
-		new /obj/item/weapon/grenade/anti_photon(src)
-		new /obj/item/weapon/grenade/anti_photon(src)
-		new /obj/item/weapon/grenade/anti_photon(src)
-		new /obj/item/weapon/grenade/anti_photon(src)
+	..()
+	for(var/i = 1 to 5)
 		new /obj/item/weapon/grenade/anti_photon(src)
 
 /obj/item/weapon/storage/box/frags
@@ -354,73 +262,63 @@
 	desc = "A box containing 5 military grade fragmentation grenades.<br> WARNING: These devices are extremely dangerous and can cause limb loss or death in repeated use."
 	icon_state = "frag"
 
+/obj/item/weapon/storage/box/frags/New()
+	..()
+	for(var/i = 1 to 5)
+		new /obj/item/weapon/grenade/explosive(src)
 
-	New()
-		..()
-		new /obj/item/weapon/grenade/explosive(src)
-		new /obj/item/weapon/grenade/explosive(src)
-		new /obj/item/weapon/grenade/explosive(src)
-		new /obj/item/weapon/grenade/explosive(src)
-		new /obj/item/weapon/grenade/explosive(src)
+/obj/item/weapon/storage/box/metalfoam
+	name = "box of metal foam grenades."
+	desc = "A box containing 7 metal foam grenades."
+	icon_state = "flashbang"
+
+/obj/item/weapon/storage/box/metalfoam/New()
+	..()
+	for(var/i = 1 to 7)
+		new /obj/item/weapon/grenade/chem_grenade/metalfoam
 
 /obj/item/weapon/storage/box/trackimp
 	name = "boxed tracking implant kit"
 	desc = "Box full of scum-bag tracking utensils."
 	icon_state = "implant"
 
-	New()
-		..()
+/obj/item/weapon/storage/box/trackimp/New()
+	..()
+	for(var/i = 1 to 4)
 		new /obj/item/weapon/implantcase/tracking(src)
-		new /obj/item/weapon/implantcase/tracking(src)
-		new /obj/item/weapon/implantcase/tracking(src)
-		new /obj/item/weapon/implantcase/tracking(src)
-		new /obj/item/weapon/implanter(src)
-		new /obj/item/weapon/implantpad(src)
-		new /obj/item/weapon/locator(src)
+	new /obj/item/weapon/implanter(src)
+	new /obj/item/weapon/implantpad(src)
+	new /obj/item/weapon/locator(src)
 
 /obj/item/weapon/storage/box/chemimp
 	name = "boxed chemical implant kit"
 	desc = "Box of stuff used to implant chemicals."
 	icon_state = "implant"
 
-	New()
-		..()
+/obj/item/weapon/storage/box/chemimp/New()
+	..()
+	for(var/i = 1 to 5)
 		new /obj/item/weapon/implantcase/chem(src)
-		new /obj/item/weapon/implantcase/chem(src)
-		new /obj/item/weapon/implantcase/chem(src)
-		new /obj/item/weapon/implantcase/chem(src)
-		new /obj/item/weapon/implantcase/chem(src)
-		new /obj/item/weapon/implanter(src)
-		new /obj/item/weapon/implantpad(src)
-
-
+	new /obj/item/weapon/implanter(src)
+	new /obj/item/weapon/implantpad(src)
 
 /obj/item/weapon/storage/box/rxglasses
 	name = "box of prescription glasses"
 	desc = "This box contains nerd glasses."
 	icon_state = "glasses"
 
-	New()
-		..()
-		new /obj/item/clothing/glasses/regular(src)
-		new /obj/item/clothing/glasses/regular(src)
-		new /obj/item/clothing/glasses/regular(src)
-		new /obj/item/clothing/glasses/regular(src)
-		new /obj/item/clothing/glasses/regular(src)
-		new /obj/item/clothing/glasses/regular(src)
+/obj/item/weapon/storage/box/rxglasses/New()
+	..()
+	for(var/i = 1 to 7)
 		new /obj/item/clothing/glasses/regular(src)
 
 /obj/item/weapon/storage/box/drinkingglasses
 	name = "box of drinking glasses"
 	desc = "It has a picture of drinking glasses on it."
 
-	New()
-		..()
-		new /obj/item/weapon/reagent_containers/food/drinks/drinkingglass(src)
-		new /obj/item/weapon/reagent_containers/food/drinks/drinkingglass(src)
-		new /obj/item/weapon/reagent_containers/food/drinks/drinkingglass(src)
-		new /obj/item/weapon/reagent_containers/food/drinks/drinkingglass(src)
-		new /obj/item/weapon/reagent_containers/food/drinks/drinkingglass(src)
+/obj/item/weapon/storage/box/drinkingglasses/New()
+	..()
+	for(var/i = 1 to 7)
 		new /obj/item/weapon/reagent_containers/food/drinks/drinkingglass(src)
 
 /obj/item/weapon/storage/box/cdeathalarm_kit
@@ -429,57 +327,38 @@
 	icon_state = "implant"
 	item_state = "syringe_kit"
 
-	New()
-		..()
-		new /obj/item/weapon/implanter(src)
-		new /obj/item/weapon/implantcase/death_alarm(src)
-		new /obj/item/weapon/implantcase/death_alarm(src)
-		new /obj/item/weapon/implantcase/death_alarm(src)
-		new /obj/item/weapon/implantcase/death_alarm(src)
-		new /obj/item/weapon/implantcase/death_alarm(src)
+/obj/item/weapon/storage/box/cdeathalarm_kit/New()
+	..()
+	for(var/i = 1 to 7)
 		new /obj/item/weapon/implantcase/death_alarm(src)
+	new /obj/item/weapon/implanter(src)
 
 /obj/item/weapon/storage/box/condimentbottles
 	name = "box of condiment bottles"
 	desc = "It has a large ketchup smear on it."
 
-	New()
-		..()
+/obj/item/weapon/storage/box/condimentbottles/New()
+	..()
+	for(var/i = 1 to 7)
 		new /obj/item/weapon/reagent_containers/food/condiment(src)
-		new /obj/item/weapon/reagent_containers/food/condiment(src)
-		new /obj/item/weapon/reagent_containers/food/condiment(src)
-		new /obj/item/weapon/reagent_containers/food/condiment(src)
-		new /obj/item/weapon/reagent_containers/food/condiment(src)
-		new /obj/item/weapon/reagent_containers/food/condiment(src)
-
-
 
 /obj/item/weapon/storage/box/cups
 	name = "box of paper cups"
 	desc = "It has pictures of paper cups on the front."
-	New()
-		..()
-		new /obj/item/weapon/reagent_containers/food/drinks/sillycup( src )
-		new /obj/item/weapon/reagent_containers/food/drinks/sillycup( src )
-		new /obj/item/weapon/reagent_containers/food/drinks/sillycup( src )
-		new /obj/item/weapon/reagent_containers/food/drinks/sillycup( src )
-		new /obj/item/weapon/reagent_containers/food/drinks/sillycup( src )
-		new /obj/item/weapon/reagent_containers/food/drinks/sillycup( src )
-		new /obj/item/weapon/reagent_containers/food/drinks/sillycup( src )
 
+/obj/item/weapon/storage/box/cups/New()
+	..()
+	for(var/i = 1 to 7)
+		new /obj/item/weapon/reagent_containers/food/drinks/sillycup(src)
 
 /obj/item/weapon/storage/box/donkpockets
 	name = "box of donk-pockets"
 	desc = "<B>Instructions:</B> <I>Heat in microwave. Product will cool if not eaten within seven minutes.</I>"
 	icon_state = "donk_kit"
 
-	New()
-		..()
-		new /obj/item/weapon/reagent_containers/food/snacks/donkpocket(src)
-		new /obj/item/weapon/reagent_containers/food/snacks/donkpocket(src)
-		new /obj/item/weapon/reagent_containers/food/snacks/donkpocket(src)
-		new /obj/item/weapon/reagent_containers/food/snacks/donkpocket(src)
-		new /obj/item/weapon/reagent_containers/food/snacks/donkpocket(src)
+/obj/item/weapon/storage/box/donkpockets/New()
+	..()
+	for(var/i = 1 to 7)
 		new /obj/item/weapon/reagent_containers/food/snacks/donkpocket(src)
 
 /obj/item/weapon/storage/box/sinpockets
@@ -487,13 +366,9 @@
 	desc = "<B>Instructions:</B> <I>Crush bottom of package to initiate chemical heating. Wait for 20 seconds before consumption. Product will cool if not eaten within seven minutes.</I>"
 	icon_state = "donk_kit"
 
-	New()
-		..()
-		new /obj/item/weapon/reagent_containers/food/snacks/donkpocket/sinpocket(src)
-		new /obj/item/weapon/reagent_containers/food/snacks/donkpocket/sinpocket(src)
-		new /obj/item/weapon/reagent_containers/food/snacks/donkpocket/sinpocket(src)
-		new /obj/item/weapon/reagent_containers/food/snacks/donkpocket/sinpocket(src)
-		new /obj/item/weapon/reagent_containers/food/snacks/donkpocket/sinpocket(src)
+/obj/item/weapon/storage/box/sinpockets/New()
+	..()
+	for(var/i = 1 to 7)
 		new /obj/item/weapon/reagent_containers/food/snacks/donkpocket/sinpocket(src)
 
 /obj/item/weapon/storage/box/monkeycubes
@@ -502,112 +377,88 @@
 	icon = 'icons/obj/food.dmi'
 	icon_state = "monkeycubebox"
 	can_hold = list(/obj/item/weapon/reagent_containers/food/snacks/monkeycube)
-	New()
-		..()
-		if(src.type == /obj/item/weapon/storage/box/monkeycubes)
-			for(var/i = 1 to 5)
-				new /obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped(src)
+
+/obj/item/weapon/storage/box/monkeycubes/New()
+	..()
+	if(src.type == /obj/item/weapon/storage/box/monkeycubes)
+		for(var/i = 1 to 4)
+			new /obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped(src)
 
 /obj/item/weapon/storage/box/monkeycubes/farwacubes
 	name = "farwa cube box"
 	desc = "Drymate brand farwa cubes, shipped from Ahdomai. Just add water!"
-	New()
-		..()
-		for(var/i = 1 to 5)
-			new /obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/farwacube(src)
+
+/obj/item/weapon/storage/box/monkeycubes/farwacubes/New()
+	..()
+	for(var/i = 1 to 4)
+		new /obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/farwacube(src)
 
 /obj/item/weapon/storage/box/monkeycubes/stokcubes
 	name = "stok cube box"
 	desc = "Drymate brand stok cubes, shipped from Moghes. Just add water!"
-	New()
-		..()
-		for(var/i = 1 to 5)
-			new /obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/stokcube(src)
+
+/obj/item/weapon/storage/box/monkeycubes/stokcubes/New()
+	..()
+	for(var/i = 1 to 4)
+		new /obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/stokcube(src)
 
 /obj/item/weapon/storage/box/monkeycubes/neaeracubes
 	name = "neaera cube box"
 	desc = "Drymate brand neaera cubes, shipped from Jargon 4. Just add water!"
-	New()
-		..()
-		for(var/i = 1 to 5)
-			new /obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/neaeracube(src)
+
+/obj/item/weapon/storage/box/monkeycubes/neaeracubes/New()
+	..()
+	for(var/i = 1 to 4)
+		new /obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/neaeracube(src)
 
 /obj/item/weapon/storage/box/ids
 	name = "box of spare IDs"
 	desc = "Has so many empty IDs."
 	icon_state = "id"
 
-	New()
-		..()
+/obj/item/weapon/storage/box/ids/New()
+	..()
+	for(var/i = 1 to 7)
 		new /obj/item/weapon/card/id(src)
-		new /obj/item/weapon/card/id(src)
-		new /obj/item/weapon/card/id(src)
-		new /obj/item/weapon/card/id(src)
-		new /obj/item/weapon/card/id(src)
-		new /obj/item/weapon/card/id(src)
-		new /obj/item/weapon/card/id(src)
-
 
 /obj/item/weapon/storage/box/seccarts
 	name = "box of spare R.O.B.U.S.T. Cartridges"
 	desc = "A box full of R.O.B.U.S.T. Cartridges, used by Security."
 	icon_state = "pda"
 
-	New()
-		..()
+/obj/item/weapon/storage/box/seccarts/New()
+	..()
+	for(var/i = 1 to 7)
 		new /obj/item/weapon/cartridge/security(src)
-		new /obj/item/weapon/cartridge/security(src)
-		new /obj/item/weapon/cartridge/security(src)
-		new /obj/item/weapon/cartridge/security(src)
-		new /obj/item/weapon/cartridge/security(src)
-		new /obj/item/weapon/cartridge/security(src)
-		new /obj/item/weapon/cartridge/security(src)
-
 
 /obj/item/weapon/storage/box/handcuffs
 	name = "box of spare handcuffs"
 	desc = "A box full of handcuffs."
 	icon_state = "handcuff"
 
-	New()
-		..()
+/obj/item/weapon/storage/box/handcuffs/New()
+	..()
+	for(var/i = 1 to 7)
 		new /obj/item/weapon/handcuffs(src)
-		new /obj/item/weapon/handcuffs(src)
-		new /obj/item/weapon/handcuffs(src)
-		new /obj/item/weapon/handcuffs(src)
-		new /obj/item/weapon/handcuffs(src)
-		new /obj/item/weapon/handcuffs(src)
-		new /obj/item/weapon/handcuffs(src)
-
 
 /obj/item/weapon/storage/box/mousetraps
 	name = "box of Pest-B-Gon mousetraps"
 	desc = "<B><FONT color='red'>WARNING:</FONT></B> <I>Keep out of reach of children</I>."
 	icon_state = "mousetraps"
 
-	New()
-		..()
-		new /obj/item/device/assembly/mousetrap( src )
-		new /obj/item/device/assembly/mousetrap( src )
-		new /obj/item/device/assembly/mousetrap( src )
-		new /obj/item/device/assembly/mousetrap( src )
-		new /obj/item/device/assembly/mousetrap( src )
-		new /obj/item/device/assembly/mousetrap( src )
+/obj/item/weapon/storage/box/mousetraps/New()
+	..()
+	for(var/i = 1 to 7)
+		new /obj/item/device/assembly/mousetrap(src)
 
 /obj/item/weapon/storage/box/pillbottles
 	name = "box of pill bottles"
 	desc = "It has pictures of pill bottles on its front."
 
-	New()
-		..()
-		new /obj/item/weapon/storage/pill_bottle( src )
-		new /obj/item/weapon/storage/pill_bottle( src )
-		new /obj/item/weapon/storage/pill_bottle( src )
-		new /obj/item/weapon/storage/pill_bottle( src )
-		new /obj/item/weapon/storage/pill_bottle( src )
-		new /obj/item/weapon/storage/pill_bottle( src )
-		new /obj/item/weapon/storage/pill_bottle( src )
-
+/obj/item/weapon/storage/box/pillbottles/New()
+	..()
+	for(var/i = 1 to 7)
+		new /obj/item/weapon/storage/pill_bottle(src)
 
 /obj/item/weapon/storage/box/snappops
 	name = "snap pop box"
@@ -615,10 +466,11 @@
 	icon = 'icons/obj/toy.dmi'
 	icon_state = "spbox"
 	can_hold = list(/obj/item/toy/snappop)
-	New()
-		..()
-		for(var/i = 1 to 8)
-			new /obj/item/toy/snappop(src)
+
+/obj/item/weapon/storage/box/snappops/New()
+	..()
+	for(var/i = 1 to 8)
+		new /obj/item/toy/snappop(src)
 
 /obj/item/weapon/storage/box/matches
 	name = "matchbox"
@@ -630,28 +482,29 @@
 	slot_flags = SLOT_BELT
 	can_hold = list(/obj/item/weapon/flame/match)
 
-	New()
-		..()
-		for(var/i=1 to 10)
-			new /obj/item/weapon/flame/match(src)
+/obj/item/weapon/storage/box/matches/New()
+	..()
+	for(var/i=1 to 10)
+		new /obj/item/weapon/flame/match(src)
 
-	attackby(obj/item/weapon/flame/match/W as obj, mob/user as mob)
-		if(istype(W) && !W.lit && !W.burnt)
-			W.lit = 1
-			W.damtype = "burn"
-			W.icon_state = "match_lit"
-			processing_objects.Add(W)
-		W.update_icon()
-		return
+/obj/item/weapon/storage/box/matches/attackby(obj/item/weapon/flame/match/W as obj, mob/user as mob)
+	if(istype(W) && !W.lit && !W.burnt)
+		W.lit = 1
+		W.damtype = "burn"
+		W.icon_state = "match_lit"
+		processing_objects.Add(W)
+	W.update_icon()
+	return
 
 /obj/item/weapon/storage/box/autoinjectors
 	name = "box of injectors"
 	desc = "Contains autoinjectors."
 	icon_state = "syringe"
-	New()
-		..()
-		for (var/i = 1 to 7)
-			new /obj/item/weapon/reagent_containers/hypospray/autoinjector(src)
+
+/obj/item/weapon/storage/box/autoinjectors/New()
+	..()
+	for (var/i = 1 to 7)
+		new /obj/item/weapon/reagent_containers/hypospray/autoinjector(src)
 
 /obj/item/weapon/storage/box/lights
 	name = "box of replacement bulbs"
@@ -666,7 +519,7 @@
 
 /obj/item/weapon/storage/box/lights/bulbs/New()
 	..()
-	for(var/i = 0; i < 21; i++)
+	for(var/i = 1 to 24)
 		new /obj/item/weapon/light/bulb(src)
 
 /obj/item/weapon/storage/box/lights/tubes
@@ -675,7 +528,7 @@
 
 /obj/item/weapon/storage/box/lights/tubes/New()
 	..()
-	for(var/i = 0; i < 21; i++)
+	for(var/i = 1 to 24)
 		new /obj/item/weapon/light/tube(src)
 
 /obj/item/weapon/storage/box/lights/mixed
@@ -684,9 +537,9 @@
 
 /obj/item/weapon/storage/box/lights/mixed/New()
 	..()
-	for(var/i = 0; i < 14; i++)
+	for(var/i = 1 to 16)
 		new /obj/item/weapon/light/tube(src)
-	for(var/i = 0; i < 7; i++)
+	for(var/i = 1 to 8)
 		new /obj/item/weapon/light/bulb(src)
 
 /obj/item/weapon/storage/box/freezer
@@ -701,3 +554,20 @@
 	max_storage_space = 21
 	use_to_pickup = 1 // for picking up broken bulbs, not that most people will try
 
+/obj/item/weapon/storage/box/ambrosia
+	name = "ambrosia seeds box"
+	desc = "Contains the seeds you need to get a little high."
+
+/obj/item/weapon/storage/box/ambrosia/New()
+	..()
+	for(var/i = 1 to 7)
+		new /obj/item/seeds/ambrosiavulgarisseed(src)
+
+/obj/item/weapon/storage/box/ambrosiadeus
+	name = "ambrosia deus seeds box"
+	desc = "Contains the seeds you need to get a proper healthy high."
+
+/obj/item/weapon/storage/box/ambrosiadeus/New()
+	..()
+	for(var/i = 1 to 7)
+		new /obj/item/seeds/ambrosiadeusseed(src)