diff --git a/code/__DEFINES/color.dm b/code/__DEFINES/color.dm
index fda24977e72f..30b6e748b4de 100644
--- a/code/__DEFINES/color.dm
+++ b/code/__DEFINES/color.dm
@@ -104,6 +104,8 @@
#define COLOR_LINOLEUM "#4E4D41"
#define COLOR_LEATHER "#5C4831"
#define COLOR_RAIDER "#6C7364"
+#define COLOR_CARDBOARD "#7A7F8B"
+#define COLOR_REDBOX "#B62B2B"
#define COLOR_TOOLS "#eac041"
diff --git a/code/datums/outfits/ert/coalition.dm b/code/datums/outfits/ert/coalition.dm
index 27149d042e01..65ff95434503 100644
--- a/code/datums/outfits/ert/coalition.dm
+++ b/code/datums/outfits/ert/coalition.dm
@@ -63,7 +63,7 @@
suit_store = /obj/item/gun/projectile/shotgun/pump/combat
backpack_contents = list(
/obj/item/plastique = 3,
- /obj/item/storage/box/shotgunshells = 1,
+ /obj/item/storage/box/shells/buckshot = 1,
/obj/item/ammo_magazine/c45m = 3,
/obj/item/handcuffs/ziptie = 1,
/obj/item/clothing/glasses/welding/superior = 1,
diff --git a/code/datums/outfits/ert/fsf.dm b/code/datums/outfits/ert/fsf.dm
index 7bd9b3fb594a..58b8a30233df 100644
--- a/code/datums/outfits/ert/fsf.dm
+++ b/code/datums/outfits/ert/fsf.dm
@@ -45,7 +45,7 @@
backpack_contents = list(
/obj/item/storage/firstaid/combat = 1,
/obj/item/ammo_magazine/mc9mm = 2,
- /obj/item/storage/box/shotgunshells = 1,
+ /obj/item/storage/box/shells/buckshot = 1,
/obj/item/storage/firstaid/adv = 1,
/obj/item/handcuffs/ziptie = 1,
/obj/item/device/healthanalyzer = 1,
@@ -81,7 +81,7 @@
/obj/item/melee/energy/sword/knife/sol = 1,
/obj/item/handcuffs/ziptie = 1,
/obj/item/clothing/glasses/welding/superior = 1,
- /obj/item/storage/box/shotgunshells = 1,
+ /obj/item/storage/box/shells/buckshot = 1,
/obj/item/gun/projectile/pistol/sol = 1,
/obj/item/ammo_magazine/mc9mm = 2,
/obj/item/grenade/frag = 2
diff --git a/code/datums/outfits/ert/hephaestus_ert.dm b/code/datums/outfits/ert/hephaestus_ert.dm
index 03e72c547094..18520eefac4c 100644
--- a/code/datums/outfits/ert/hephaestus_ert.dm
+++ b/code/datums/outfits/ert/hephaestus_ert.dm
@@ -29,8 +29,8 @@
backpack_contents = list(
/obj/item/gun/projectile/sec/lethal = 1,
- /obj/item/storage/box/shotgunammo = 1,
- /obj/item/storage/box/shotgunshells = 1
+ /obj/item/storage/box/shells/slugs = 1,
+ /obj/item/storage/box/shells/buckshot = 1
)
id_iff = IFF_HEPH
@@ -63,8 +63,8 @@
/obj/item/melee/baton/loaded = 1,
/obj/item/shield/energy = 1,
/obj/item/gun/projectile/sec/lethal = 1,
- /obj/item/storage/box/shotgunammo = 1,
- /obj/item/storage/box/shotgunshells = 1
+ /obj/item/storage/box/shells/slugs = 1,
+ /obj/item/storage/box/shells/buckshot = 1
)
belt_contents = list(
@@ -95,8 +95,8 @@
/obj/item/melee/baton/loaded = 1,
/obj/item/clothing/glasses/welding/superior = 1,
/obj/item/gun/projectile/sec/lethal = 1,
- /obj/item/storage/box/shotgunammo = 1,
- /obj/item/storage/box/shotgunshells = 1
+ /obj/item/storage/box/shells/slugs = 1,
+ /obj/item/storage/box/shells/buckshot = 1
)
belt_contents = null
diff --git a/code/datums/outfits/ert/kataphract.dm b/code/datums/outfits/ert/kataphract.dm
index 8f34c23a5228..b58aa5ed0027 100644
--- a/code/datums/outfits/ert/kataphract.dm
+++ b/code/datums/outfits/ert/kataphract.dm
@@ -24,7 +24,7 @@
/obj/item/handcuffs/ziptie = 2,
/obj/item/shield/energy/hegemony/kataphract = 1,
/obj/item/crowbar = 1,
- /obj/item/storage/box/donkpockets = 1
+ /obj/item/storage/box/unique/donkpockets = 1
)
id_iff = IFF_KATAPHRACT
@@ -58,8 +58,8 @@
/obj/item/handcuffs/ziptie = 2,
/obj/item/shield/energy/hegemony/kataphract = 1,
/obj/item/crowbar = 1,
- /obj/item/storage/box/smokebombs = 1,
- /obj/item/storage/box/anti_photons = 1,
+ /obj/item/storage/box/tactical/smokebombs = 1,
+ /obj/item/storage/box/tactical/anti_photons = 1,
/obj/item/reagent_containers/food/snacks/koisbar_clean = 3
)
@@ -99,7 +99,7 @@
backpack_contents = list(
/obj/item/handcuffs/ziptie = 2,
/obj/item/shield/energy/hegemony = 1,
- /obj/item/storage/box/donkpockets = 1,
+ /obj/item/storage/box/unique/donkpockets = 1,
/obj/item/crowbar = 1,
/obj/item/storage/firstaid/adv = 1,
/obj/item/device/healthanalyzer = 1,
diff --git a/code/datums/outfits/ert/mercenary.dm b/code/datums/outfits/ert/mercenary.dm
index de562683a360..059ea4ffb320 100644
--- a/code/datums/outfits/ert/mercenary.dm
+++ b/code/datums/outfits/ert/mercenary.dm
@@ -82,7 +82,7 @@
/obj/item/storage/box/survival = 1,
/obj/item/clothing/glasses/welding/superior = 1,
/obj/item/gun/projectile/shotgun/pump/combat/sol = 1,
- /obj/item/storage/box/shotgunshells = 1,
+ /obj/item/storage/box/shells/buckshot = 1,
/obj/item/landmine/frag = 1,
/obj/item/landmine/emp = 1,
/obj/item/storage/belt/utility/very_full = 1,
diff --git a/code/datums/trading/weaponry.dm b/code/datums/trading/weaponry.dm
index a0bec6dcad63..fafdd11fe143 100644
--- a/code/datums/trading/weaponry.dm
+++ b/code/datums/trading/weaponry.dm
@@ -35,15 +35,15 @@
/obj/item/ammo_magazine/mc10mm = TRADER_ALL,
/obj/item/ammo_magazine/mc10mm/leyon = TRADER_BLACKLIST,
/obj/item/ammo_magazine/mc10mm/empty = TRADER_BLACKLIST,
- /obj/item/storage/box/ammo10mm = TRADER_THIS_TYPE,
+ /obj/item/storage/box/ammo/ammo10mm = TRADER_THIS_TYPE,
/obj/item/ammo_magazine/c38 = TRADER_ALL,
/obj/item/ammo_magazine/c45m/auto = TRADER_THIS_TYPE,
- /obj/item/storage/box/beanbags = TRADER_THIS_TYPE,
- /obj/item/storage/box/shotgunammo = TRADER_THIS_TYPE,
- /obj/item/storage/box/shotgunshells = TRADER_THIS_TYPE,
- /obj/item/storage/box/haywireshells = TRADER_THIS_TYPE,
- /obj/item/storage/box/incendiaryshells = TRADER_THIS_TYPE,
- /obj/item/storage/box/governmentammo = TRADER_THIS_TYPE,
+ /obj/item/storage/box/shells/beanbags = TRADER_THIS_TYPE,
+ /obj/item/storage/box/shells/slugs = TRADER_THIS_TYPE,
+ /obj/item/storage/box/shells/buckshot = TRADER_THIS_TYPE,
+ /obj/item/storage/box/shells/haywireshells = TRADER_THIS_TYPE,
+ /obj/item/storage/box/shells/incendiaryshells = TRADER_THIS_TYPE,
+ /obj/item/storage/box/ammo/governmentammo = TRADER_THIS_TYPE,
/obj/item/clothing/accessory/holster = TRADER_SUBTYPES_ONLY,
/obj/item/clothing/accessory/holster/thigh/fluff = TRADER_BLACKLIST_ALL
)
diff --git a/code/datums/uplink/ammunition.dm b/code/datums/uplink/ammunition.dm
index 8e940ca023bd..42a88aaa634d 100644
--- a/code/datums/uplink/ammunition.dm
+++ b/code/datums/uplink/ammunition.dm
@@ -59,13 +59,13 @@
/datum/uplink_item/item/ammo/shotgun_shells
name = "Box of Shells"
- path = /obj/item/storage/box/shotgunshells
+ path = /obj/item/storage/box/shells/buckshot
desc = "Contains eight shotgun buckshot shells."
/datum/uplink_item/item/ammo/government
name = "Box of .45-70 Govt. ammo"
telecrystal_cost = 2
- path = /obj/item/storage/box/governmentammo
+ path = /obj/item/storage/box/ammo/governmentammo
desc = "Contains eight .45-70 Govt. bullets."
/datum/uplink_item/item/ammo/plasma_mag
diff --git a/code/datums/uplink/grenades.dm b/code/datums/uplink/grenades.dm
index 2231240a349f..1f20ace01068 100644
--- a/code/datums/uplink/grenades.dm
+++ b/code/datums/uplink/grenades.dm
@@ -20,28 +20,28 @@
name = "5xSmoke Grenades"
telecrystal_cost = 1
bluecrystal_cost = 1
- path = /obj/item/storage/box/smokes
+ path = /obj/item/storage/box/tactical/smokes
desc = "A box of five grenades that deploy smoke in the thrown area. Targets hidden in smoke are much harder to hit with ranged weaponry."
/datum/uplink_item/item/grenades/emp
name = "5xEMP Grenades"
telecrystal_cost = 2
- path = /obj/item/storage/box/emps
+ path = /obj/item/storage/box/tactical/emps
desc = "A box of five grenades that cause a risky EMP explosion, capable of toggling headsets off, permanently destroying IPC units and draining a stationbound completely."
/datum/uplink_item/item/grenades/frag
name = "5xFrag Grenades"
telecrystal_cost = 6
- path = /obj/item/storage/box/frags
+ path = /obj/item/storage/box/tactical/frags
/datum/uplink_item/item/grenades/cardox
name = "5xCardox Grenades"
telecrystal_cost = 2
- path = /obj/item/storage/box/cardox
+ path = /obj/item/storage/box/tactical/cardox
desc = "A box of five grenades that deploy cardox smoke in the thrown area. This smoke is incredibly toxic, especially to vaurca. It can also clear K'ois outbreaks with ease."
/datum/uplink_item/item/grenades/napalm
name = "3x Napalm Grenades"
telecrystal_cost = 8
- path = /obj/item/storage/box/grenades/napalm
+ path = /obj/item/storage/box/tactical/napalm
desc = "A box of three grenades that deploy napalm in the thrown area, and ignite it."
diff --git a/code/datums/uplink/medical.dm b/code/datums/uplink/medical.dm
index c8f93174ff23..a2f8cd646564 100644
--- a/code/datums/uplink/medical.dm
+++ b/code/datums/uplink/medical.dm
@@ -7,7 +7,7 @@
/datum/uplink_item/item/medical/sinpockets
name = "Box of Sin-Pockets"
bluecrystal_cost = 1
- path = /obj/item/storage/box/sinpockets
+ path = /obj/item/storage/box/unique/donkpockets/sinpockets
/datum/uplink_item/item/medical/lunchbox
name = "Tactical Lunchbox"
diff --git a/code/datums/uplink/stealth and camouflage items.dm b/code/datums/uplink/stealth and camouflage items.dm
index 44d1d8e53f0f..b15ee8da5484 100644
--- a/code/datums/uplink/stealth and camouflage items.dm
+++ b/code/datums/uplink/stealth and camouflage items.dm
@@ -73,7 +73,7 @@
desc = "Snap pops with a compound added which deploys a small smokescreen upon exploding."
telecrystal_cost = 1
bluecrystal_cost = 1
- path = /obj/item/storage/box/snappops/syndi
+ path = /obj/item/storage/box/unique/snappops/syndi
/datum/uplink_item/item/stealth_items/closet_teleporter
name = "Closet Teleportation Set-up"
diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/civilian.dm
index 5866de1a7449..c18b82191b81 100644
--- a/code/game/jobs/job/civilian.dm
+++ b/code/game/jobs/job/civilian.dm
@@ -93,7 +93,7 @@
messengerbag_faction = /obj/item/storage/backpack/messenger/nt
backpack_contents = list(
- /obj/item/storage/box/produce = 1
+ /obj/item/storage/box/large/produce = 1
)
/datum/job/hydro
diff --git a/code/game/machinery/vending/food.dm b/code/game/machinery/vending/food.dm
index bbe0d33eda21..461349e38969 100644
--- a/code/game/machinery/vending/food.dm
+++ b/code/game/machinery/vending/food.dm
@@ -97,7 +97,7 @@
/obj/item/storage/box/fancy/toptarts_strawberry = 3,
/obj/item/storage/box/fancy/toptarts_chocolate_peanutbutter = 3,
/obj/item/storage/box/fancy/toptarts_blueberry = 3,
- /obj/item/storage/box/donkpockets = 3
+ /obj/item/storage/box/unique/donkpockets = 3
)
premium = list(
/obj/item/storage/box/fancy/packaged_mossburger = 2
@@ -115,5 +115,5 @@
/obj/item/storage/box/fancy/toptarts_strawberry = 5.00,
/obj/item/storage/box/fancy/toptarts_chocolate_peanutbutter = 5.00,
/obj/item/storage/box/fancy/toptarts_blueberry = 5.00,
- /obj/item/storage/box/donkpockets = 11.00
+ /obj/item/storage/box/unique/donkpockets = 11.00
)
diff --git a/code/game/machinery/vending/security.dm b/code/game/machinery/vending/security.dm
index 8751b4d82364..00ef9b9d1d43 100644
--- a/code/game/machinery/vending/security.dm
+++ b/code/game/machinery/vending/security.dm
@@ -67,8 +67,8 @@
req_access = list(ACCESS_SECURITY)
vend_id = "tactical" // Refill cartridge DNE 2025/07
products = list(
- /obj/item/storage/box/shotgunammo = 2,
- /obj/item/storage/box/shotgunshells = 2,
+ /obj/item/storage/box/shells/slugs = 2,
+ /obj/item/storage/box/shells/buckshot = 2,
/obj/item/ammo_magazine/c45m = 6,
/obj/item/grenade/chem_grenade/teargas = 6,
/obj/item/ammo_magazine/mc9mmt = 2,
@@ -91,8 +91,8 @@
req_access = list(ACCESS_SECURITY)
vend_id = "ert" // Refill cartridge DNE 2025/07
products = list(
- /obj/item/storage/box/shotgunammo = 2,
- /obj/item/storage/box/shotgunshells = 2,
+ /obj/item/storage/box/shells/slugs = 2,
+ /obj/item/storage/box/shells/buckshot = 2,
/obj/item/grenade/chem_grenade/gas = 6,
/obj/item/clothing/mask/gas/tactical = 8,
/obj/item/shield/riot/tact = 4,
diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm
index cc54d1ca6f3a..838c3a3fd008 100644
--- a/code/game/objects/items/weapons/storage/boxes.dm
+++ b/code/game/objects/items/weapons/storage/boxes.dm
@@ -29,6 +29,8 @@
icon_state = "box"
item_state = "box"
contained_sprite = TRUE
+ color = COLOR_CARDBOARD
+ var/label = "label"
var/illustration = "writing"
// BubbleWrap - if set, can be folded (when empty) into a sheet of cardboard
@@ -58,11 +60,20 @@
if(ispath(src.trash))
. += "This can be crumpled up into a trash item when empty, or forcibly crumpled on harm intent. "
+/obj/item/storage/box/update_icon()
+ . = ..()
+ if(illustration)
+ var/image/label_img = image(icon, label)
+ var/image/illustration_img = image(icon, illustration)
+ label_img.appearance_flags |= RESET_COLOR
+ illustration_img.appearance_flags |= RESET_COLOR
+ AddOverlays(label_img)
+ AddOverlays(illustration_img)
+
/obj/item/storage/box/Initialize()
. = ..()
health = maxHealth
- if(illustration)
- AddOverlays(illustration)
+ update_icon()
/obj/item/storage/box/proc/damage(var/severity)
health -= severity
@@ -146,10 +157,21 @@
else
..()
+/obj/item/storage/box/large
+ name = "large box"
+ icon_state = "largebox"
+ label = "label_large"
+ illustration = "writing_large"
+ max_storage_space = DEFAULT_LARGEBOX_STORAGE
+
+/obj/item/storage/box/blank
+ label = null
+ illustration = null
+
/obj/item/storage/box/survival
name = "emergency survival box"
desc = "A faithful box that will remain with you, no matter where you go, and probably save you."
- icon_state = "redbox"
+ color = COLOR_REDBOX
illustration = "survival"
max_storage_space = DEFAULT_BOX_STORAGE
can_hold = list(
@@ -190,7 +212,7 @@
/obj/item/reagent_containers/hypospray/autoinjector/inaprovaline = 1
)
-/obj/item/storage/box/vaurca
+/obj/item/storage/box/survival/vaurca
icon_state = "redbox"
illustration = "survivalvox"
starts_with = list(/obj/item/clothing/mask/breath = 1, /obj/item/reagent_containers/inhaler/phoron_special = 1)
@@ -198,6 +220,7 @@
/obj/item/storage/box/gloves
name = "box of sterile gloves"
desc = "Contains sterile gloves."
+ color = COLOR_IAC
illustration = "latex"
max_storage_space = DEFAULT_BOX_STORAGE
starts_with = list(/obj/item/clothing/gloves/latex = 2,
@@ -205,207 +228,239 @@
/obj/item/clothing/gloves/latex/nitrile/unathi = 1,
/obj/item/clothing/gloves/latex/nitrile/tajara = 1,
/obj/item/clothing/gloves/latex/nitrile/vaurca = 1)
+
/obj/item/storage/box/masks
name = "box of surgical masks"
desc = "This box contains masks of surgicality."
+ color = COLOR_IAC
illustration = "sterile"
starts_with = list(/obj/item/clothing/mask/surgical = 4, /obj/item/clothing/mask/surgical/w = 3)
/obj/item/storage/box/syringes
name = "box of syringes"
desc = "A box full of syringes."
- icon_state = "secbox"
- item_state = "secbox"
+ color = COLOR_IAC
illustration = "syringe"
starts_with = list(/obj/item/reagent_containers/syringe = 20)
/obj/item/storage/box/syringegun
name = "box of syringe gun cartridges"
desc = "A box full of compressed gas cartridges."
- icon_state = "secbox"
- item_state = "secbox"
illustration = "syringe"
starts_with = list(/obj/item/syringe_cartridge = 7)
/obj/item/storage/box/beakers
name = "box of beakers"
+ color = COLOR_IAC
illustration = "beaker"
starts_with = list(/obj/item/reagent_containers/glass/beaker = 7)
/obj/item/storage/box/injectors
name = "box of DNA injectors"
desc = "This box contains injectors it seems."
- icon_state = "secbox"
- item_state = "secbox"
illustration = "dna"
starts_with = list(/obj/item/dnainjector/h2m = 3, /obj/item/dnainjector/m2h = 3)
-/obj/item/storage/box/tungstenslugs
- name = "box of compact tungsten slugs"
+// Ammunition
+
+/obj/item/storage/box/ammo
+ name = "ammo box"
desc = "A box with several compact tungsten slugs, aimed for use in gauss carbines."
icon_state = "ammobox"
item_state = "ammobox"
illustration = null
drop_sound = 'sound/items/drop/ammobox.ogg'
pickup_sound = 'sound/items/pickup/ammobox.ogg'
+ foldable = null
+ chewable = FALSE
+
+/obj/item/storage/box/ammo/tungstenslugs
+ name = "box of compact tungsten slugs"
+ desc = "A box with several compact tungsten slugs, aimed for use in gauss carbines."
starts_with = list(/obj/item/ammo_casing/gauss/carbine = 4)
-/obj/item/storage/box/blanks
- name = "box of blank shells"
+/obj/item/storage/box/ammo/sniperammo
+ name = "box of 14.5mm shells"
+ desc = "It has a picture of a gun and several warning symbols on the front.
WARNING: Live ammunition. Misuse may result in serious injury or death."
+ starts_with = list(/obj/item/ammo_casing/a145 = 7)
+
+/obj/item/storage/box/ammo/ammo10mm
+ name = "box of 10mm shells"
+ desc = "It has a picture of a gun and several warning symbols on the front.
WARNING: Live ammunition. Misuse may result in serious injury or death."
+ starts_with = list(/obj/item/ammo_casing/c10mm = 10)
+
+/obj/item/storage/box/ammo/governmentammo
+ name = "box of .45-70 Govt. rounds"
+ desc = "It has a picture of a rifle shell and several warning symbols on the front.
WARNING: Live ammunition. Misuse may result in serious injury or death."
+ starts_with = list(/obj/item/ammo_casing/govt = 8)
+
+// Shells
+
+/obj/item/storage/box/shells
+ name = "empty shotgun shell box"
desc = "It has a picture of a shotgun shell and several warning symbols on the front."
+ color = COLOR_DARK_GUNMETAL
icon_state = "shellbox"
- item_state = "shellbox"
+ label = "label_shell"
illustration = "blankshot"
drop_sound = 'sound/items/drop/ammobox.ogg'
pickup_sound = 'sound/items/pickup/ammobox.ogg'
+
+/obj/item/storage/box/shells/tranquilizer
+ name = "box of tranquilizer darts"
+ desc = "It has a picture of a tranquilizer dart and several warning symbols on the front.
WARNING: Live ammunition. Misuse may result in serious injury or death."
+ illustration = "incendiaryshot"
+ starts_with = list(/obj/item/ammo_casing/tranq = 8)
+
+/obj/item/storage/box/shells/blanks
+ name = "box of blank shells"
+ desc = "It has a picture of a shotgun shell and several warning symbols on the front."
+ illustration = "blankshot"
starts_with = list(/obj/item/ammo_casing/shotgun/blank = 8)
-/obj/item/storage/box/beanbags
+/obj/item/storage/box/shells/beanbags
name = "box of beanbag shells"
desc = "It has a picture of a shotgun shell and several warning symbols on the front.
WARNING: Live ammunition. Misuse may result in serious injury or death."
- icon_state = "shellbox"
- item_state = "shellbox"
illustration = "beanshot"
- drop_sound = 'sound/items/drop/ammobox.ogg'
- pickup_sound = 'sound/items/pickup/ammobox.ogg'
starts_with = list(/obj/item/ammo_casing/shotgun/beanbag = 8)
-/obj/item/storage/box/shotgunammo
+/obj/item/storage/box/shells/slugs
name = "box of shotgun slugs"
desc = "It has a picture of a shotgun shell and several warning symbols on the front.
WARNING: Live ammunition. Misuse may result in serious injury or death."
- icon_state = "shellbox"
- item_state = "shellbox"
illustration = "lethalslug"
- drop_sound = 'sound/items/drop/ammobox.ogg'
- pickup_sound = 'sound/items/pickup/ammobox.ogg'
starts_with = list(/obj/item/ammo_casing/shotgun = 8)
-/obj/item/storage/box/shotgunshells
+/obj/item/storage/box/shells/buckshot
name = "box of shotgun shells"
desc = "It has a picture of a shotgun shell and several warning symbols on the front.
WARNING: Live ammunition. Misuse may result in serious injury or death."
- icon_state = "shellbox"
- item_state = "shellbox"
illustration = "lethalshell"
- drop_sound = 'sound/items/drop/ammobox.ogg'
- pickup_sound = 'sound/items/pickup/ammobox.ogg'
starts_with = list(/obj/item/ammo_casing/shotgun/pellet = 8)
-/obj/item/storage/box/flashshells
+/obj/item/storage/box/shells/flashshells
name = "box of illumination shells"
desc = "It has a picture of a shotgun shell and several warning symbols on the front.
WARNING: Live ammunition. Misuse may result in serious injury or death."
- icon_state = "shellbox"
- item_state = "shellbox"
illustration = "illumshot"
- drop_sound = 'sound/items/drop/ammobox.ogg'
- pickup_sound = 'sound/items/pickup/ammobox.ogg'
starts_with = list(/obj/item/ammo_casing/shotgun/flash = 8)
-/obj/item/storage/box/stunshells
+/obj/item/storage/box/shells/stunshells
name = "box of stun shells"
desc = "It has a picture of a shotgun shell and several warning symbols on the front.
WARNING: Live ammunition. Misuse may result in serious injury or death."
- icon_state = "shellbox"
- item_state = "shellbox"
illustration = "stunshot"
- drop_sound = 'sound/items/drop/ammobox.ogg'
- pickup_sound = 'sound/items/pickup/ammobox.ogg'
starts_with = list(/obj/item/ammo_casing/shotgun/stunshell = 8)
-/obj/item/storage/box/practiceshells
+/obj/item/storage/box/shells/practiceshells
name = "box of practice shells"
desc = "It has a picture of a shotgun shell and several warning symbols on the front.
WARNING: Live ammunition. Misuse may result in serious injury or death."
- icon_state = "shellbox"
- item_state = "shellbox"
illustration = "blankshot"
- drop_sound = 'sound/items/drop/ammobox.ogg'
- pickup_sound = 'sound/items/pickup/ammobox.ogg'
starts_with = list(/obj/item/ammo_casing/shotgun/practice = 8)
-/obj/item/storage/box/haywireshells
+/obj/item/storage/box/shells/haywireshells
name = "box of haywire shells"
desc = "It has a picture of a shotgun shell and several warning symbols on the front.
WARNING: Live ammunition. Misuse may result in serious injury or death."
- icon_state = "shellbox"
- item_state = "shellbox"
illustration = "empshot"
- drop_sound = 'sound/items/drop/ammobox.ogg'
- pickup_sound = 'sound/items/pickup/ammobox.ogg'
starts_with = list(/obj/item/ammo_casing/shotgun/emp = 8)
-/obj/item/storage/box/incendiaryshells
+/obj/item/storage/box/shells/incendiaryshells
name = "box of incendiary shells"
desc = "It has a picture of a shotgun shell and several warning symbols on the front.
WARNING: Live ammunition. Misuse may result in serious injury or death."
- icon_state = "shellbox"
- item_state = "shellbox"
illustration = "incendiaryshot"
- drop_sound = 'sound/items/drop/ammobox.ogg'
- pickup_sound = 'sound/items/pickup/ammobox.ogg'
starts_with = list(/obj/item/ammo_casing/shotgun/incendiary = 8)
-/obj/item/storage/box/trackingslugs
+/obj/item/storage/box/shells/trackingslugs
name = "box of tracking slugs"
desc = "It has a picture of a shotgun shell and several warning symbols on the front.
WARNING: Live ammunition. Misuse may result in serious injury or death."
- icon_state = "shellbox"
- item_state = "shellbox"
illustration = "trackingshot"
- drop_sound = 'sound/items/drop/ammobox.ogg'
- pickup_sound = 'sound/items/pickup/ammobox.ogg'
starts_with = list(/obj/item/ammo_casing/shotgun/tracking = 4)
-/obj/item/storage/box/wallgunammo
+/obj/item/storage/box/shells/wallgunammo
name = "box of wall gun slugs"
desc = "It has a picture of a shotgun shell and several warning symbols on the front.
WARNING: Live ammunition. Misuse may result in serious injury or death."
- icon_state = "shellbox"
- item_state = "shellbox"
illustration = "lethalslug"
- drop_sound = 'sound/items/drop/ammobox.ogg'
- pickup_sound = 'sound/items/pickup/ammobox.ogg'
starts_with = list(/obj/item/ammo_casing/shotgun/moghes = 8)
-/obj/item/storage/box/sniperammo
- name = "box of 14.5mm shells"
- desc = "It has a picture of a gun and several warning symbols on the front.
WARNING: Live ammunition. Misuse may result in serious injury or death."
- icon_state = "ammobox"
- item_state = "ammobox"
- illustration = null
- drop_sound = 'sound/items/drop/ammobox.ogg'
- pickup_sound = 'sound/items/pickup/ammobox.ogg'
- starts_with = list(/obj/item/ammo_casing/a145 = 7)
-
-/obj/item/storage/box/ammo10mm
- name = "box of 10mm shells"
- desc = "It has a picture of a gun and several warning symbols on the front.
WARNING: Live ammunition. Misuse may result in serious injury or death."
- icon_state = "ammobox"
- item_state = "ammobox"
- illustration = null
- drop_sound = 'sound/items/drop/ammobox.ogg'
- pickup_sound = 'sound/items/pickup/ammobox.ogg'
- starts_with = list(/obj/item/ammo_casing/c10mm = 10)
+// Tactical boxes
-/obj/item/storage/box/governmentammo
- name = "box of .45-70 Govt. rounds"
- desc = "It has a picture of a rifle shell and several warning symbols on the front.
WARNING: Live ammunition. Misuse may result in serious injury or death."
- icon_state = "ammobox"
- item_state = "ammobox"
- illustration = null
- drop_sound = 'sound/items/drop/ammobox.ogg'
- pickup_sound = 'sound/items/pickup/ammobox.ogg'
- starts_with = list(/obj/item/ammo_casing/govt = 8)
+/obj/item/storage/box/tactical
+ name = "tactical equipment box"
+ color = COLOR_GUNMETAL
+ label = "label_sec"
-/obj/item/storage/box/flashbangs
+/obj/item/storage/box/tactical/flashbangs
name = "box of flashbangs"
desc = "A box containing 7 antipersonnel flashbang grenades.
WARNING: These devices are extremely dangerous and can cause blindness or deafness in repeated use."
- icon_state = "secbox"
- item_state = "secbox"
illustration = "flashbang"
starts_with = list(/obj/item/grenade/flashbang = 7)
-/obj/item/storage/box/stingers
+/obj/item/storage/box/tactical/stingers
name = "box of stinger grenades"
desc = "A box containing 7 antipersonnel stinger grenades.
WARNING: These devices are extremely dangerous and can cause injury."
- icon_state = "secbox"
- item_state = "secbox"
illustration = "stinger"
starts_with = list(/obj/item/grenade/stinger = 7)
+/obj/item/storage/box/tactical/teargas
+ name = "box of pepperspray grenades"
+ desc = "A box containing 7 tear gas grenades. A gas mask is printed on the label.
WARNING: Exposure carries risk of serious injury or death. Keep away from persons with lung conditions."
+ illustration = "grenade"
+ starts_with = list(/obj/item/grenade/chem_grenade/teargas = 6)
+
+/obj/item/storage/box/tactical/smokebombs
+ name = "box of smoke grenades"
+ desc = "A box full of smoke grenades, used by special law enforcement teams and military organisations. Provides cover, confusion, and distraction."
+ illustration = "grenade"
+ starts_with = list(/obj/item/grenade/smokebomb = 7)
+
+/obj/item/storage/box/tactical/emps
+ name = "box of emp grenades"
+ desc = "A box containing 5 military grade EMP grenades.
WARNING: Do not use near unshielded electronics or biomechanical augmentations, death or permanent paralysis may occur."
+ illustration = "emp"
+ starts_with = list(/obj/item/grenade/empgrenade = 5)
+
+/obj/item/storage/box/tactical/smokes
+ name = "box of smoke bombs"
+ desc = "A box containing 5 smoke bombs."
+ illustration = "grenade"
+ starts_with = list(/obj/item/grenade/smokebomb = 5)
+
+/obj/item/storage/box/tactical/anti_photons
+ name = "box of anti-photon grenades"
+ desc = "A box containing 5 experimental photon disruption grenades."
+ illustration = "grenade"
+ starts_with = list(/obj/item/grenade/anti_photon = 5)
+
+/obj/item/storage/box/tactical/frags
+ name = "box of frag grenades"
+ desc = "A box containing 5 military grade fragmentation grenades.
WARNING: Live explosives. Misuse may result in serious injury or death."
+ illustration = "grenade"
+ starts_with = list(/obj/item/grenade/frag = 5)
+
+/obj/item/storage/box/tactical/napalm
+ name = "box of napalm grenades"
+ desc = "A box containing 3 napalm grenades."
+ illustration = "grenade"
+ starts_with = list(/obj/item/grenade/napalm = 3)
+
+/obj/item/storage/box/tactical/cardox
+ name = "box of cardox grenades"
+ desc = "A box containing 5 experimental cardox grenades."
+ illustration = "grenade"
+ starts_with = list(/obj/item/grenade/chem_grenade/large/phoroncleaner = 5)
+
+/obj/item/storage/box/tactical/trackimp
+ name = "boxed tracking implant kit"
+ desc = "Box full of scum-bag tracking utensils."
+ illustration = "implant"
+ starts_with = list(/obj/item/implantcase/tracking = 4, /obj/item/implanter = 1, /obj/item/implantpad = 1, /obj/item/locator = 1)
+
+/obj/item/storage/box/handcuffs
+ name = "box of spare handcuffs"
+ desc = "A box full of handcuffs."
+ icon_state = "secbox"
+ item_state = "secbox"
+ illustration = "handcuff"
+ starts_with = list(/obj/item/handcuffs = 7)
+
+// Firing pins
+
/obj/item/storage/box/firingpins
name = "box of firing pins"
desc = "A box of NT brand Firearm authentication pins; Needed to operate most weapons."
@@ -455,79 +510,6 @@
starts_with = list(/obj/item/tethering_device = 8)
make_exact_fit = TRUE
-/obj/item/storage/box/teargas
- name = "box of pepperspray grenades"
- desc = "A box containing 7 tear gas grenades. A gas mask is printed on the label.
WARNING: Exposure carries risk of serious injury or death. Keep away from persons with lung conditions."
- icon_state = "secbox"
- item_state = "secbox"
- illustration = "grenade"
- starts_with = list(/obj/item/grenade/chem_grenade/teargas = 6)
-
-/obj/item/storage/box/smokebombs
- name = "box of smoke grenades"
- desc = "A box full of smoke grenades, used by special law enforcement teams and military organisations. Provides cover, confusion, and distraction."
- icon_state = "secbox"
- item_state = "secbox"
- illustration = "grenade"
- starts_with = list(/obj/item/grenade/smokebomb = 7)
-
-/obj/item/storage/box/emps
- name = "box of emp grenades"
- desc = "A box containing 5 military grade EMP grenades.
WARNING: Do not use near unshielded electronics or biomechanical augmentations, death or permanent paralysis may occur."
- icon_state = "secbox"
- item_state = "secbox"
- illustration = "emp"
- starts_with = list(/obj/item/grenade/empgrenade = 5)
-
-/obj/item/storage/box/smokes
- name = "box of smoke bombs"
- desc = "A box containing 5 smoke bombs."
- icon_state = "secbox"
- item_state = "secbox"
- illustration = "grenade"
- starts_with = list(/obj/item/grenade/smokebomb = 5)
-
-/obj/item/storage/box/anti_photons
- name = "box of anti-photon grenades"
- desc = "A box containing 5 experimental photon disruption grenades."
- icon_state = "secbox"
- item_state = "secbox"
- illustration = "grenade"
- starts_with = list(/obj/item/grenade/anti_photon = 5)
-
-/obj/item/storage/box/frags
- name = "box of frag grenades"
- desc = "A box containing 5 military grade fragmentation grenades.
WARNING: Live explosives. Misuse may result in serious injury or death."
- icon_state = "secbox"
- item_state = "secbox"
- illustration = "grenade"
- starts_with = list(/obj/item/grenade/frag = 5)
-
-/obj/item/storage/box/grenades/napalm
- name = "box of napalm grenades"
- desc = "A box containing 3 napalm grenades."
- icon_state = "secbox"
- item_state = "secbox"
- illustration = "grenade"
- starts_with = list(/obj/item/grenade/napalm = 3)
-
-/obj/item/storage/box/cardox
- name = "box of cardox grenades"
- desc = "A box containing 5 experimental cardox grenades."
- icon_state = "secbox"
- item_state = "secbox"
- illustration = "grenade"
- starts_with = list(/obj/item/grenade/chem_grenade/large/phoroncleaner = 5)
-
-/obj/item/storage/box/trackimp
- name = "boxed tracking implant kit"
- desc = "Box full of scum-bag tracking utensils."
- icon_state = "secbox"
- item_state = "secbox"
- illustration = "implant"
- starts_with = list(/obj/item/implantcase/tracking = 4, /obj/item/implanter = 1, /obj/item/implantpad = 1, /obj/item/locator = 1)
-
-
/obj/item/storage/box/chemimp
name = "boxed chemical implant kit"
desc = "Box of stuff used to implant chemicals."
@@ -562,7 +544,7 @@
illustration = "implant"
starts_with = list(/obj/item/implanter = 1, /obj/item/implantcase/death_alarm = 6, /obj/item/implantpad = 1)
-/obj/item/storage/box/condimentbottles
+/obj/item/storage/box/large/condimentbottles
name = "box of condiment bottles"
desc = "It has a large ketchup smear on it."
illustration = "condiment"
@@ -574,38 +556,6 @@
desc = "It has pictures of paper cups on the front."
starts_with = list(/obj/item/reagent_containers/food/drinks/sillycup = 7)
-/obj/item/storage/box/donkpockets
- name = "box of donk-pockets"
- desc = "Instructions: Heat in microwave. Product will cool if not eaten within seven minutes."
- icon_state = "donkpocketbox"
- item_state = "redbox"
- illustration = null
- starts_with = list(/obj/item/reagent_containers/food/snacks/donkpocket = 6)
-
-/obj/item/storage/box/sinpockets
- name = "box of donk-pockets"
- desc = "Instructions: Heat in microwave. Product will cool if not eaten within seven minutes."
- icon_state = "donkpocketbox"
- item_state = "redbox"
- illustration = null
- starts_with = list(/obj/item/reagent_containers/food/snacks/donkpocket/sinpocket = 6)
-
-/obj/item/storage/box/sinpockets/antagonist_hints(mob/user, distance, is_adjacent)
- . += ..()
- . += "Crush bottom of each package to initiate chemical heating. Wait for 20 seconds before consumption."
- . += "Product will cool if not eaten within seven minutes."
-
-/obj/item/storage/box/donkpockets/gwok
- name = "box of teriyaki Gwok-pockets"
- icon_state = "donkpocketboxteriyaki"
- item_state = "redbox"
- illustration = null
- starts_with = list(/obj/item/reagent_containers/food/snacks/donkpocket/teriyaki = 6)
-
-/obj/item/storage/box/donkpockets/gwok/takoyaki
- name = "box of takoyaki Gwok-pockets"
- starts_with = list(/obj/item/reagent_containers/food/snacks/donkpocket/takoyaki = 6)
-
/obj/item/storage/box/janitorgloves
name = "janitorial gloves box"
desc = "A box full of janitorial gloves of all shapes and sizes."
@@ -620,50 +570,112 @@
/obj/item/clothing/gloves/janitor/vaurca = 1
)
-/obj/item/storage/box/monkeycubes
+/obj/item/storage/box/unique //unique sprite/properties
+ name = "unique box"
+ desc = "A unique box. How is it unique? You have no idea."
+ color = COLOR_WHITE
+ illustration = null
+ chewable = FALSE
+
+/obj/item/storage/box/unique/monkeycubes
name = "monkey cube box"
desc = "Drymate brand monkey cubes. Just add water!"
desc_extended = "The manufacture of a cubed animal produces subjects that are similar but have marked differences compared to their ordinary cousins. Higher brain functions are all but destroyed \
and the life expectancy of the cubed animal is greatly reduced, with most expiring only a few days after introduction with water."
icon_state = "monkeycubebox"
- illustration = null
can_hold = list(/obj/item/reagent_containers/food/snacks/monkeycube)
starts_with = list(/obj/item/reagent_containers/food/snacks/monkeycube/wrapped = 5)
-/obj/item/storage/box/monkeycubes/farwacubes
+/obj/item/storage/box/unique/monkeycubes/farwacubes
name = "farwa cube box"
desc = "Drymate brand farwa cubes, shipped from Adhomai. Just add water!"
starts_with = list(/obj/item/reagent_containers/food/snacks/monkeycube/wrapped/farwacube = 5)
-/obj/item/storage/box/monkeycubes/stokcubes
+/obj/item/storage/box/unique/monkeycubes/stokcubes
name = "stok cube box"
desc = "Drymate brand stok cubes, shipped from Moghes. Just add water!"
starts_with = list(/obj/item/reagent_containers/food/snacks/monkeycube/wrapped/stokcube = 5)
-/obj/item/storage/box/monkeycubes/neaeracubes
+/obj/item/storage/box/unique/monkeycubes/neaeracubes
name = "neaera cube box"
desc = "Drymate brand neaera cubes, shipped from Nralakk IV. Just add water!"
starts_with = list(/obj/item/reagent_containers/food/snacks/monkeycube/wrapped/neaeracube = 5)
-/obj/item/storage/box/monkeycubes/vkrexicubes
+/obj/item/storage/box/unique/monkeycubes/vkrexicubes
name = "vkrexi cube box"
desc = "Drymate brand vkrexi cubes. Just add water!"
starts_with = list(/obj/item/reagent_containers/food/snacks/monkeycube/wrapped/vkrexicube = 5)
+/obj/item/storage/box/unique/sharps
+ name = "sharps disposal box"
+ desc = "A plastic box for disposal of used needles and other sharp, potentially-contaminated tools. There is a large biohazard sign on the front."
+ illustration = null
+ icon_state = "sharpsbox"
+ use_sound = 'sound/items/storage/briefcase.ogg'
+ max_storage_space = DEFAULT_BOX_STORAGE
+ foldable = null
+
+/obj/item/storage/box/unique/freezer
+ name = "portable freezer"
+ desc = "This nifty shock-resistant device will keep your 'groceries' nice and non-spoiled."
+ icon_state = "portafreezer"
+ item_state = "medicalpack"
+ max_w_class = WEIGHT_CLASS_NORMAL
+ max_storage_space = DEFAULT_LARGEBOX_STORAGE
+ use_to_pickup = FALSE // for picking up broken bulbs, not that most people will try
+ chewable = FALSE
+
+/obj/item/storage/box/unique/freezer/organcooler
+ name = "organ cooler"
+ desc = "A sealed, cooled container to keep organs from decaying."
+ icon_state = "organcooler"
+ item_state = "redbox"
+ max_w_class = WEIGHT_CLASS_NORMAL
+ foldable = FALSE
+ w_class = WEIGHT_CLASS_BULKY
+ can_hold = list(
+ /obj/item/organ,
+ /obj/item/reagent_containers/food,
+ /obj/item/reagent_containers/glass,
+ /obj/item/gun
+ )
+ storage_slots = 2
+
+/obj/item/storage/box/unique/donkpockets
+ name = "box of donk-pockets"
+ desc = "Instructions: Heat in microwave. Product will cool if not eaten within seven minutes."
+ icon_state = "donkpocketbox"
+ item_state = "redbox"
+ starts_with = list(/obj/item/reagent_containers/food/snacks/donkpocket = 6)
+
+/obj/item/storage/box/unique/donkpockets/sinpockets
+ name = "box of donk-pockets"
+ desc = "Instructions: Heat in microwave. Product will cool if not eaten within seven minutes."
+ illustration = null
+ starts_with = list(/obj/item/reagent_containers/food/snacks/donkpocket/sinpocket = 6)
+
+/obj/item/storage/box/unique/donkpockets/sinpockets/antagonist_hints(mob/user, distance, is_adjacent)
+ . += ..()
+ . += "Crush bottom of each package to initiate chemical heating. Wait for 20 seconds before consumption."
+ . += "Product will cool if not eaten within seven minutes."
+
+/obj/item/storage/box/unique/donkpockets/gwok
+ name = "box of teriyaki Gwok-pockets"
+ icon_state = "donkpocketboxteriyaki"
+ item_state = "redbox"
+ illustration = null
+ starts_with = list(/obj/item/reagent_containers/food/snacks/donkpocket/teriyaki = 6)
+
+/obj/item/storage/box/unique/donkpockets/gwok/takoyaki
+ name = "box of takoyaki Gwok-pockets"
+ starts_with = list(/obj/item/reagent_containers/food/snacks/donkpocket/takoyaki = 6)
+
/obj/item/storage/box/ids
name = "box of spare IDs"
desc = "Has so many empty IDs."
illustration = "id"
starts_with = list(/obj/item/card/id = 7)
-/obj/item/storage/box/handcuffs
- name = "box of spare handcuffs"
- desc = "A box full of handcuffs."
- icon_state = "secbox"
- item_state = "secbox"
- illustration = "handcuff"
- starts_with = list(/obj/item/handcuffs = 7)
-
/obj/item/storage/box/zipties
name = "box of zipties"
desc = "A box full of zipties."
@@ -679,6 +691,7 @@
/obj/item/storage/box/pillbottles
name = "box of pill bottles"
desc = "It has pictures of pill bottles on its front."
+ color = COLOR_IAC
illustration = "pillbox"
starts_with = list(/obj/item/storage/pill_bottle = 7)
@@ -688,7 +701,7 @@
illustration = "spray"
starts_with = list(/obj/item/reagent_containers/spray = 7)
-/obj/item/storage/box/snappops
+/obj/item/storage/box/unique/snappops
name = "snap pop box"
desc = "Eight wrappers of fun! Ages 8 and up. Not suitable for children."
icon = 'icons/obj/toy.dmi'
@@ -696,22 +709,24 @@
can_hold = list(/obj/item/toy/snappop)
starts_with = list(/obj/item/toy/snappop = 8)
-/obj/item/storage/box/snappops/syndi
+/obj/item/storage/box/unique/snappops/syndi
starts_with = list(/obj/item/toy/snappop/syndi = 8)
-/obj/item/storage/box/snappops/syndi/antagonist_hints(mob/user, distance, is_adjacent)
+/obj/item/storage/box/unique/snappops/syndi/antagonist_hints(mob/user, distance, is_adjacent)
. += ..()
. += "These snap pops have an extra compound added that will deploy a tiny smokescreen when snapped."
/obj/item/storage/box/partypopper
name = "party popper box"
desc = "Six cones of confetti conflagarating fun!"
+ color = COLOR_PALE_PINK
illustration = "partypopper"
starts_with = list(/obj/item/toy/partypopper = 6)
/obj/item/storage/box/autoinjectors
name = "box of empty injectors"
desc = "Contains empty autoinjectors."
+ color = COLOR_IAC
illustration = "epipen"
starts_with = list(/obj/item/reagent_containers/hypospray/autoinjector = 7)
@@ -719,6 +734,7 @@
name = "box of replacement bulbs"
illustration = "light"
desc = "This box is shaped on the inside so that only light tubes and bulbs fit."
+ color = COLOR_DARK_BLUE_GRAY
use_to_pickup = TRUE // for picking up broken bulbs, not that most people will try
make_exact_fit = TRUE
@@ -794,32 +810,6 @@
illustration = "lightmixed"
starts_with = list(/obj/item/light/tube/colored/magenta = 14, /obj/item/light/bulb/colored/magenta = 7)
-/obj/item/storage/box/freezer
- name = "portable freezer"
- desc = "This nifty shock-resistant device will keep your 'groceries' nice and non-spoiled."
- icon_state = "portafreezer"
- item_state = "medicalpack"
- max_w_class = WEIGHT_CLASS_NORMAL
- max_storage_space = DEFAULT_LARGEBOX_STORAGE
- use_to_pickup = FALSE // for picking up broken bulbs, not that most people will try
- chewable = FALSE
-
-/obj/item/storage/box/freezer/organcooler
- name = "organ cooler"
- desc = "A sealed, cooled container to keep organs from decaying."
- icon_state = "organcooler"
- item_state = "redbox"
- max_w_class = WEIGHT_CLASS_NORMAL
- foldable = FALSE
- w_class = WEIGHT_CLASS_BULKY
- can_hold = list(
- /obj/item/organ,
- /obj/item/reagent_containers/food,
- /obj/item/reagent_containers/glass,
- /obj/item/gun
- )
- storage_slots = 2
-
/obj/item/storage/box/kitchen
name = "kitchen supplies"
illustration = "knife"
@@ -884,7 +874,7 @@
/obj/item/storage/box/stims
name = "stimpack value kit"
desc = "A box with several stimpack medipens for the economical miner."
- icon_state = "syringe"
+ illustration = "syringe"
starts_with = list(/obj/item/reagent_containers/hypospray/autoinjector/stimpack = 4)
/obj/item/storage/box/inhalers
@@ -902,8 +892,6 @@
/obj/item/storage/box/inhalers_auto
name = "autoinhaler kit"
desc = "A box filled with a combat inhaler and several large empty inhaler cartridges."
- icon_state = "secbox"
- item_state = "secbox"
illustration = "inhalers"
starts_with = list(/obj/item/reagent_containers/inhaler = 8)
@@ -912,7 +900,7 @@
desc = "A box filled with clams from the Ras'val sea, imported by Njadra'Akhar Enterprises."
starts_with = list(/obj/item/reagent_containers/food/snacks/clam = 5)
-/obj/item/storage/box/produce
+/obj/item/storage/box/large/produce
name = "produce box"
desc = "A large box of random, leftover produce."
icon_state = "largebox"
@@ -920,29 +908,29 @@
starts_with = list(/obj/random_produce/box = 15)
make_exact_fit = TRUE
-/obj/item/storage/box/produce/adhomai
+/obj/item/storage/box/large/produce/adhomai
name = "adhomian produce box"
desc = "A large box of produce originating from the frigid world of Adhomai."
starts_with = list(/obj/random_produce/box/adhomai = 15)
-/obj/item/storage/box/produce/nralakk
+/obj/item/storage/box/large/produce/nralakk
name = "nralakk produce box"
desc = "A large box of produce originating from the Nralakk Federation."
starts_with = list(/obj/random_produce/box/nralakk = 15)
-/obj/item/storage/box/produce/moghes
+/obj/item/storage/box/large/produce/moghes
name = "moghresian produce box"
desc = "A large box of produce originating from Moghes, home of the Izweski Hegemony."
starts_with = list(/obj/random_produce/box/moghes = 15)
-/obj/item/storage/box/candy
+/obj/item/storage/box/large/candy
name = "candy box"
desc = "A large box of assorted small candy."
icon_state = "largebox"
illustration = "writing_large"
make_exact_fit = TRUE
-/obj/item/storage/box/candy/fill()
+/obj/item/storage/box/large/candy/fill()
var/list/assorted_list = list(
/obj/item/reagent_containers/food/snacks/cb01 = 1,
/obj/item/reagent_containers/food/snacks/cb02 = 1,
@@ -966,16 +954,6 @@
desc = "A box filled with high-quality crab legs. Shipped on-board by popular demand!"
starts_with = list(/obj/item/reagent_containers/food/snacks/crabmeat = 5)
-/obj/item/storage/box/tranquilizer
- name = "box of tranquilizer darts"
- desc = "It has a picture of a tranquilizer dart and several warning symbols on the front.
WARNING: Live ammunition. Misuse may result in serious injury or death."
- icon_state = "shellbox"
- item_state = "shellbox"
- illustration = "incendiaryshot"
- drop_sound = 'sound/items/drop/ammobox.ogg'
- pickup_sound = 'sound/items/pickup/ammobox.ogg'
- starts_with = list(/obj/item/ammo_casing/tranq = 8)
-
/obj/item/storage/box/toothpaste
can_hold = list(/obj/item/reagent_containers/toothpaste,
/obj/item/reagent_containers/toothbrush,
@@ -1065,17 +1043,16 @@
)
/// Parent object of various national flag boxes. Original intention for random cargo spawn.
-/obj/item/storage/box/flags
+/obj/item/storage/box/large/flags
name = "national flag box - PARENT ITEM DO NOT USE"
desc = "A box filled to the brim with various flags."
- icon_state = "largebox"
- illustration = "flags"
+ illustration = "flagslg"
make_exact_fit = TRUE
can_hold = list(
/obj/item/flag
)
-/obj/item/storage/box/flags/sol
+/obj/item/storage/box/large/flags/sol
name = "Solarian Alliance flag box"
desc = "A box filled to the brim with various national flags."
starts_with = list(
@@ -1105,7 +1082,7 @@
/obj/item/flag/ssrm/l = 1
)
-/obj/item/storage/box/flags/biesel
+/obj/item/storage/box/large/flags/biesel
name = "Republic of Biesel flag box"
desc = "A box filled to the brim with various national flags."
starts_with = list(
@@ -1121,7 +1098,7 @@
/obj/item/flag/newgibson/l = 1
)
-/obj/item/storage/box/flags/coc
+/obj/item/storage/box/large/flags/coc
name = "Coalition of Colonies flag box"
desc = "A box filled to the brim with various national flags."
starts_with = list(
@@ -1145,7 +1122,7 @@
/obj/item/flag/scarab/l = 2
)
-/obj/item/storage/box/flags/galataea
+/obj/item/storage/box/large/flags/galataea
name = "Technocracy of Galatea flag box"
desc = "A box filled to the brim with various national flags."
starts_with = list(
@@ -1161,7 +1138,7 @@
/obj/item/flag/empyrean/l = 1
)
-/obj/item/storage/box/flags/dominia
+/obj/item/storage/box/large/flags/dominia
name = "Empire of Dominia flag box"
desc = "A box filled to the brim with various national flags."
starts_with = list(
@@ -1177,7 +1154,7 @@
/obj/item/flag/imperial_frontier/l = 2
)
-/obj/item/storage/box/flags/elyra
+/obj/item/storage/box/large/flags/elyra
name = "Serene Republic of Elyra flag box"
desc = "A box filled to the brim with various national flags."
starts_with = list(
@@ -1195,7 +1172,7 @@
/obj/item/flag/aemaq/l = 1
)
-/obj/item/storage/box/flags/diona
+/obj/item/storage/box/large/flags/diona
name = "Diona flag box"
desc = "A box filled to the brim with various national flags."
starts_with = list(
@@ -1207,7 +1184,7 @@
/obj/item/flag/narrows/l = 1
)
-/obj/item/storage/box/flags/unathi
+/obj/item/storage/box/large/flags/unathi
name = "Unathi flag box"
desc = "A box filled to the brim with various national flags."
starts_with = list(
@@ -1218,7 +1195,7 @@
/obj/item/flag/fishingleague = 2
)
-/obj/item/storage/box/flags/skrell
+/obj/item/storage/box/large/flags/skrell
name = "Skrell flag box"
desc = "A box filled to the brim with various waterproof national flags."
starts_with = list(
@@ -1228,7 +1205,7 @@
/obj/item/flag/traverse/l = 1
)
-/obj/item/storage/box/flags/tajara
+/obj/item/storage/box/large/flags/tajara
name = "Tajaran collected flag box"
desc = "A box filled to the brim with various national flags. Whoever chose the selection for this one was either brave or stupid or both."
starts_with = list(
@@ -1242,7 +1219,7 @@
/obj/item/flag/ftc/l = 3
)
-/obj/item/storage/box/flags/vaurca
+/obj/item/storage/box/large/flags/vaurca
name = "Vaurca flag box"
desc = "A box filled to the brim with various hive flags."
starts_with = list(
@@ -1256,7 +1233,7 @@
/obj/item/flag/cthur/l = 3
)
-/obj/item/storage/box/flags/goldendeep
+/obj/item/storage/box/large/flags/goldendeep
name = "Golden Deep flag box"
desc = "A box filled to the brim with various national flags. It's made from a bit sturdier board than most boxes."
starts_with = list(
@@ -1266,7 +1243,7 @@
/obj/item/stack/material/gold
)
-/obj/item/storage/box/flags/corporate
+/obj/item/storage/box/large/flags/corporate
name = "Corporate flag box"
desc = "A box filled to the brim with various corporate flags, flying in service to the almighty credit."
starts_with = list(
@@ -1293,7 +1270,7 @@
)
/// Random misc flags- either non-national or no longer in use or controversial or straight-up contraband. Randomized contents from Initialize().
-/obj/item/storage/box/flags/misc
+/obj/item/storage/box/large/flags/misc
name = "miscellaneous flag box"
desc = "A box filled to the brim with various disorganized flags that might provoke a variety of reactions."
@@ -1301,7 +1278,7 @@
* We don't want this box to always have every possible misc flag every time it spawns. Mix it up each time.
*/
-/obj/item/storage/box/flags/misc/fill()
+/obj/item/storage/box/large/flags/misc/fill()
..()
var/list/flag_options = list(
/obj/item/flag/red_coalition = 1,
@@ -1340,16 +1317,6 @@
illustration = "paper"
starts_with = list(/obj/item/book/manual/tcaf_pamphlet = 6)
-/obj/item/storage/box/sharps
- name = "sharps disposal box"
- desc = "A plastic box for disposal of used needles and other sharp, potentially-contaminated tools. There is a large biohazard sign on the front."
- illustration = null
- icon_state = "sharpsbox"
- use_sound = 'sound/items/storage/briefcase.ogg'
- max_storage_space = DEFAULT_BOX_STORAGE
- chewable = FALSE
- foldable = null
-
/obj/item/storage/box/fountainpens
name = "box of fountain pens"
illustration = "fpen"
@@ -1373,20 +1340,18 @@
. += ..()
. += "This box contains encryption keys that gives the user a safe channel to chatter in. Access the safe comms with :x."
-/obj/item/storage/box/dynamite
+/obj/item/storage/box/unique/dynamite
name = "wooden crate"
desc = "An ordinary wooden crate."
icon_state = "dynamite"
foldable = null
- illustration = null
use_sound = 'sound/effects/doorcreaky.ogg'
drop_sound = 'sound/items/drop/wooden.ogg'
pickup_sound = 'sound/items/pickup/wooden.ogg'
- chewable = FALSE
w_class = WEIGHT_CLASS_BULKY
starts_with = list(/obj/item/grenade/dynamite = 6)
-/obj/item/storage/box/dynamite/throw_impact(atom/hit_atom)
+/obj/item/storage/box/unique/dynamite/throw_impact(atom/hit_atom)
..()
spill()
@@ -1409,7 +1374,7 @@
/obj/item/storage/box/folders/blue
starts_with = list(/obj/item/folder/sec = 5)
-/obj/item/storage/box/papersack
+/obj/item/storage/box/unique/papersack
name = "paper sack"
desc = "A sack neatly crafted out of paper."
icon = 'icons/obj/storage/paperbag.dmi'
@@ -1431,14 +1396,14 @@
var/static/list/papersack_designs
var/choice = "None"
-/obj/item/storage/box/papersack/update_icon()
+/obj/item/storage/box/unique/papersack/update_icon()
. = ..()
if(length(contents) == 0)
icon_state = "paperbag_[choice]"
else if(length(contents) < 8)
icon_state = "paperbag_[choice]-food"
-/obj/item/storage/box/papersack/attackby(obj/item/attacking_item, mob/user)
+/obj/item/storage/box/unique/papersack/attackby(obj/item/attacking_item, mob/user)
if(attacking_item.ispen())
if(!papersack_designs)
papersack_designs = sortList(list(
@@ -1487,10 +1452,9 @@
..()
// Flares
-/obj/item/storage/box/flares
+/obj/item/storage/box/large/flares
name = "flares box"
desc = "A box full of flares."
- icon_state = "largebox"
illustration = "flare"
foldable = FALSE
max_storage_space = DEFAULT_BOX_STORAGE
@@ -1520,6 +1484,7 @@
/obj/item/storage/box/cell
name = "power cell box"
desc = "A box full of power cells."
+ color = COLOR_TOOLS
foldable = FALSE
make_exact_fit = TRUE
can_hold = list(
@@ -1533,15 +1498,16 @@
/obj/item/storage/box/cell/high
name = "high-capacity power cell box"
desc = "A box full of high-capacity power cells."
+ color = COLOR_TOOLS
starts_with = list(
/obj/item/cell/high = 3
)
-/obj/item/storage/box/condiment
+/obj/item/storage/box/large/condiment
name = "condiment box"
desc = "A large box of condiments, syrups, flavorings."
- icon_state = "largebox"
- illustration = "condiment"
+ color = COLOR_REDBOX
+ illustration = "condimentlg"
starts_with = list(
/obj/item/reagent_containers/food/condiment/enzyme = 1,
/obj/item/reagent_containers/food/condiment/shaker/peppermill = 2,
@@ -1559,6 +1525,7 @@
/obj/item/storage/box/cleaner_tablets
name = "\improper Idris cleaner tablets box"
desc = "A box of advanced formula chemical tablets designed by Idris Incorporated."
+ color = COLOR_GREEN_GRAY
desc_extended = "A new generation of cleaning chemicals, according to Idris at least. The instructions on the box reads: \"Dissolve tablet fully in container of water\". A warning label mentions that you should not consume the tablets nor drink the mixture after dissolving them."
illustration = "soapbucket"
starts_with = list(
@@ -1595,7 +1562,7 @@
/obj/item/device/assembly/signaler = 6
)
-/obj/item/storage/box/tea
+/obj/item/storage/box/unique/tea
name = "sencha cha-tin"
desc = "A tin bearing the logo of the Konyang-cha tea company. This one contains a bag of sencha, a type of green tea."
desc_extended = "A subsidiary of Gwok Group, the Konyang-cha tea company is the spur's foremost vendor of artisanal loose leaf tea, \
@@ -1615,7 +1582,7 @@
)
foldable = null
-/obj/item/storage/box/tea/tieguanyin
+/obj/item/storage/box/unique/tea/tieguanyin
name = "tieguanyin cha-tin"
desc = "A tin bearing the logo of the Konyang-cha tea company. This one contains a bag of tieguanyin, a type of oolong tea."
icon_state = "can_tie"
@@ -1623,7 +1590,7 @@
/obj/item/reagent_containers/food/snacks/grown/konyang_tea/tieguanyin = 7
)
-/obj/item/storage/box/tea/jaekseol
+/obj/item/storage/box/unique/tea/jaekseol
name = "jaekseol cha-tin"
desc = "A tin bearing the logo of the Konyang-cha tea company. This one contains a bag of jaekseol, a type of black tea."
icon_state = "can_jaek"
diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm
index 5bc4abcdc705..c46919790ef4 100644
--- a/code/game/objects/items/weapons/storage/fancy.dm
+++ b/code/game/objects/items/weapons/storage/fancy.dm
@@ -25,6 +25,7 @@
var/opened_icon_state = null //for items that have unique base icons but look the same opened, such as all the various microwave pizzas.
foldable = null // most of this stuff isn't foldable by default, e.g. cig packets and vial boxes
contained_sprite = TRUE
+ color = COLOR_WHITE
/obj/item/storage/box/fancy/mechanics_hints(mob/user, distance, is_adjacent)
. += ..()
diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm
index da7e75836ae1..ddef9f7cecc2 100644
--- a/code/game/objects/items/weapons/storage/uplink_kits.dm
+++ b/code/game/objects/items/weapons/storage/uplink_kits.dm
@@ -1,7 +1,8 @@
/obj/item/storage/box/syndie_kit
name = "box"
desc = "A sleek, sturdy box."
- icon_state = "syndiebox"
+ color = COLOR_WALL_GUNMETAL
+ label = "label_syndie"
worn_overlay = "writing_syndie"
/obj/item/storage/box/syndie_kit/imp_freedom
diff --git a/code/game/objects/random/loot.dm b/code/game/objects/random/loot.dm
index fe92ab761fe6..761174c75fd2 100644
--- a/code/game/objects/random/loot.dm
+++ b/code/game/objects/random/loot.dm
@@ -108,8 +108,8 @@
/obj/item/spacecash/ewallet/lotto = 0.3,
/obj/item/staff/broom = 0.5,
/obj/item/storage/bag/plasticbag = 1,
- /obj/item/storage/box/condimentbottles = 0.2,
- /obj/item/storage/box/donkpockets = 0.6,
+ /obj/item/storage/box/large/condimentbottles = 0.2,
+ /obj/item/storage/box/unique/donkpockets = 0.6,
/obj/item/storage/box/drinkingglasses = 0.2,
/obj/item/storage/box/lights = 0.5,
/obj/item/storage/box/lights/colored/blue = 0.1,
@@ -123,7 +123,7 @@
/obj/item/storage/box/cleaner_tablets = 0.4,
/obj/item/storage/box/mousetraps = 0.3,
/obj/item/storage/box/pineapple = 0.1,
- /obj/item/storage/box/smokebombs = 0.1,
+ /obj/item/storage/box/tactical/smokebombs = 0.1,
/obj/item/storage/box/syringes = 0.3,
/obj/item/storage/box/fancy/cigarettes = 1.2,
/obj/item/storage/box/fancy/cigarettes/acmeco = 0.3,
@@ -343,7 +343,7 @@
/obj/item/reagent_containers/syringe/heroin = 1,
/obj/item/reagent_containers/inhaler/raskara_dust = 2,
/obj/item/reagent_containers/inhaler/space_drugs = 2,
- /obj/item/storage/box/smokes = 0.7,
+ /obj/item/storage/box/tactical/smokes = 0.7,
/obj/item/grenade/napalm = 0.4,
/obj/item/reagent_containers/glass/beaker/vial/random/toxin = 1,
/obj/item/material/knife/butterfly = 2,
diff --git a/code/game/objects/random/misc.dm b/code/game/objects/random/misc.dm
index 0df0c4bd8ee8..2e379489ffdb 100644
--- a/code/game/objects/random/misc.dm
+++ b/code/game/objects/random/misc.dm
@@ -170,7 +170,7 @@
desc = "Arcade loot!"
icon_state = "toy"
spawnlist = list(
- /obj/item/storage/box/snappops = 11,
+ /obj/item/storage/box/unique/snappops = 11,
/obj/item/clothing/under/syndicate/tacticool = 5,
/obj/item/toy/sword = 22,
/obj/item/gun/projectile/revolver/capgun = 11,
diff --git a/code/game/objects/random/weapon.dm b/code/game/objects/random/weapon.dm
index f2d89ba76974..2deb772c4662 100644
--- a/code/game/objects/random/weapon.dm
+++ b/code/game/objects/random/weapon.dm
@@ -36,10 +36,10 @@
icon = 'icons/obj/ammo.dmi'
icon_state = "45-10"
problist = list(
- /obj/item/storage/box/beanbags = 6,
- /obj/item/storage/box/shotgunammo = 2,
- /obj/item/storage/box/shotgunshells = 4,
- /obj/item/storage/box/stunshells = 1,
+ /obj/item/storage/box/shells/beanbags = 6,
+ /obj/item/storage/box/shells/slugs = 2,
+ /obj/item/storage/box/shells/buckshot = 4,
+ /obj/item/storage/box/shells/stunshells = 1,
/obj/item/ammo_magazine/c45m = 2,
/obj/item/ammo_magazine/c45m/rubber = 4,
/obj/item/ammo_magazine/c45m/flash = 4,
diff --git a/code/game/objects/structures/crates_lockers/closets/gimmick.dm b/code/game/objects/structures/crates_lockers/closets/gimmick.dm
index 8335169cdc01..663530c5baa3 100644
--- a/code/game/objects/structures/crates_lockers/closets/gimmick.dm
+++ b/code/game/objects/structures/crates_lockers/closets/gimmick.dm
@@ -91,9 +91,9 @@
new /obj/item/melee/baton(src)
new /obj/item/melee/baton(src)
new /obj/item/melee/baton(src)
- new /obj/item/storage/box/flashbangs(src)
- new /obj/item/storage/box/flashbangs(src)
- new /obj/item/storage/box/flashbangs(src)
+ new /obj/item/storage/box/tactical/flashbangs(src)
+ new /obj/item/storage/box/tactical/flashbangs(src)
+ new /obj/item/storage/box/tactical/flashbangs(src)
new /obj/item/clothing/head/helmet/thunderdome(src)
new /obj/item/clothing/head/helmet/thunderdome(src)
new /obj/item/clothing/head/helmet/thunderdome(src)
@@ -115,9 +115,9 @@
new /obj/item/melee/baton(src)
new /obj/item/melee/baton(src)
new /obj/item/melee/baton(src)
- new /obj/item/storage/box/flashbangs(src)
- new /obj/item/storage/box/flashbangs(src)
- new /obj/item/storage/box/flashbangs(src)
+ new /obj/item/storage/box/tactical/flashbangs(src)
+ new /obj/item/storage/box/tactical/flashbangs(src)
+ new /obj/item/storage/box/tactical/flashbangs(src)
new /obj/item/clothing/head/helmet/thunderdome(src)
new /obj/item/clothing/head/helmet/thunderdome(src)
new /obj/item/clothing/head/helmet/thunderdome(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
index 695e096edfd5..0f5163f3bdfc 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
@@ -48,7 +48,7 @@
new /obj/item/device/megaphone/sci(src)
new /obj/item/device/taperecorder(src)
new /obj/item/sampler(src)
- new /obj/item/storage/box/tranquilizer(src)
+ new /obj/item/storage/box/shells/tranquilizer(src)
/// Used for when we want to populate the contents of this locker ourself. Good for away sites
/obj/structure/closet/secure_closet/RD/empty
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
index 176d5cf58ef1..5e48a6fb5f27 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
@@ -105,9 +105,9 @@
/obj/structure/closet/secure_closet/hos/fill()
..()
//Supply
- new /obj/item/storage/box/flashbangs(src)
+ new /obj/item/storage/box/tactical/flashbangs(src)
new /obj/item/storage/box/ids(src)
- new /obj/item/storage/box/stingers(src)
+ new /obj/item/storage/box/tactical/stingers(src)
//Appearance
if(prob(50))
new /obj/item/storage/backpack/security(src)
@@ -179,9 +179,9 @@
/obj/structure/closet/secure_closet/warden/fill()
//Supply
new /obj/item/storage/box/ids(src)
- new /obj/item/storage/box/flashbangs(src)
- new /obj/item/storage/box/teargas(src)
- new /obj/item/storage/box/stingers(src)
+ new /obj/item/storage/box/tactical/flashbangs(src)
+ new /obj/item/storage/box/tactical/teargas(src)
+ new /obj/item/storage/box/tactical/stingers(src)
//Appearance
if(prob(50))
new /obj/item/storage/backpack/security(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/syndicate.dm b/code/game/objects/structures/crates_lockers/closets/syndicate.dm
index 111ec739a299..f9a0ac5f5842 100644
--- a/code/game/objects/structures/crates_lockers/closets/syndicate.dm
+++ b/code/game/objects/structures/crates_lockers/closets/syndicate.dm
@@ -41,8 +41,8 @@
new /obj/item/ammo_magazine/a10mm(src)
new /obj/item/ammo_magazine/a10mm(src)
new /obj/item/storage/box/handcuffs(src)
- new /obj/item/storage/box/flashbangs(src)
- new /obj/item/storage/box/stingers(src)
+ new /obj/item/storage/box/tactical/flashbangs(src)
+ new /obj/item/storage/box/tactical/stingers(src)
new /obj/item/gun/energy/gun(src)
new /obj/item/gun/energy/gun(src)
new /obj/item/gun/energy/gun(src)
diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm
index cb0aeb2046b3..0e13a4913980 100644
--- a/code/game/objects/structures/crates_lockers/crates.dm
+++ b/code/game/objects/structures/crates_lockers/crates.dm
@@ -638,7 +638,7 @@
new /obj/item/storage/box/kitchen(src)
new /obj/item/reagent_containers/spray/cleaner(src)
new /obj/item/storage/box/gloves(src)
- new /obj/item/storage/box/condiment(src)
+ new /obj/item/storage/box/large/condiment(src)
//A crate that populates itself with randomly selected loot from randomstock.dm
//Can be passed in a rarity value, which is used as a multiplier on the rare/uncommon chance
diff --git a/code/game/objects/structures/trash_pile.dm b/code/game/objects/structures/trash_pile.dm
index 302f1829ca6b..5295b18236de 100644
--- a/code/game/objects/structures/trash_pile.dm
+++ b/code/game/objects/structures/trash_pile.dm
@@ -153,7 +153,7 @@
/obj/item/spacecash/c10 = 3,
/obj/item/spacecash/c20 = 3,
/obj/item/storage/backpack/duffel = 3,
- /obj/item/storage/box/donkpockets = 3,
+ /obj/item/storage/box/unique/donkpockets = 3,
/obj/item/storage/box/mousetraps = 3,
/obj/item/storage/wallet = 3,
/obj/item/clothing/gloves/yellow/budget = 2,
@@ -170,7 +170,7 @@
/obj/item/cell/super = 2,
/obj/item/contraband/poster = 2,
/obj/item/reagent_containers/glass/rag = 2,
- /obj/item/storage/box/sinpockets = 2,
+ /obj/item/storage/box/unique/donkpockets/sinpockets = 2,
/obj/item/storage/secure/briefcase = 2,
/obj/item/clothing/glasses/sunglasses = 1,
/obj/item/clothing/glasses/welding = 1,
diff --git a/code/modules/cargo/items/hospitality.dm b/code/modules/cargo/items/hospitality.dm
index 910c11a57f41..af670f2f1d74 100644
--- a/code/modules/cargo/items/hospitality.dm
+++ b/code/modules/cargo/items/hospitality.dm
@@ -173,7 +173,7 @@
description = "A large box of random, leftover produce."
price = 35
items = list(
- /obj/item/storage/box/produce
+ /obj/item/storage/box/large/produce
)
access = 0
container_type = "crate"
@@ -1388,7 +1388,7 @@
description = "A box containing some tins of green tea leaves."
price = 20
items = list(
- /obj/item/storage/box/tea
+ /obj/item/storage/box/unique/tea
)
access = 0
container_type = "crate"
@@ -1401,7 +1401,7 @@
description = "A box containing some tins of oolong tea leaves."
price = 20
items = list(
- /obj/item/storage/box/tea/tieguanyin
+ /obj/item/storage/box/unique/tea/tieguanyin
)
access = 0
container_type = "crate"
@@ -1414,7 +1414,7 @@
description = "A box containing some tins of black tea leaves."
price = 20
items = list(
- /obj/item/storage/box/tea/jaekseol
+ /obj/item/storage/box/unique/tea/jaekseol
)
access = 0
container_type = "crate"
diff --git a/code/modules/cargo/items/medical.dm b/code/modules/cargo/items/medical.dm
index 050c6dcc042f..3ea0c165fe4d 100644
--- a/code/modules/cargo/items/medical.dm
+++ b/code/modules/cargo/items/medical.dm
@@ -753,7 +753,7 @@
description = "A sealed, cooled container to keep organs from decaying."
price = 300
items = list(
- /obj/item/storage/box/freezer/organcooler
+ /obj/item/storage/box/unique/freezer/organcooler
)
access = ACCESS_MEDICAL
container_type = "crate"
diff --git a/code/modules/cargo/items/science.dm b/code/modules/cargo/items/science.dm
index 217d21a4c6fb..96592e075266 100644
--- a/code/modules/cargo/items/science.dm
+++ b/code/modules/cargo/items/science.dm
@@ -5,7 +5,7 @@
description = "Drymate brand stok cubes, shipped from Moghes. Just add water!"
price = 250
items = list(
- /obj/item/storage/box/monkeycubes/stokcubes
+ /obj/item/storage/box/unique/monkeycubes/stokcubes
)
access = 0
container_type = "crate"
@@ -19,7 +19,7 @@
description = "Drymate brand vkrexi cubes. Just add water!"
price = 250
items = list(
- /obj/item/storage/box/monkeycubes/vkrexicubes
+ /obj/item/storage/box/unique/monkeycubes/vkrexicubes
)
access = 0
container_type = "crate"
@@ -33,7 +33,7 @@
description = "Drymate brand farwa cubes, shipped from Adhomai. Just add water!"
price = 250
items = list(
- /obj/item/storage/box/monkeycubes/farwacubes
+ /obj/item/storage/box/unique/monkeycubes/farwacubes
)
access = 0
container_type = "crate"
@@ -47,7 +47,7 @@
description = "Drymate brand monkey cubes. Just add water!"
price = 250
items = list(
- /obj/item/storage/box/monkeycubes
+ /obj/item/storage/box/unique/monkeycubes
)
access = 0
container_type = "crate"
@@ -61,7 +61,7 @@
description = "Drymate brand neaera cubes, shipped from Jargon 4. Just add water!"
price = 250
items = list(
- /obj/item/storage/box/monkeycubes/neaeracubes
+ /obj/item/storage/box/unique/monkeycubes/neaeracubes
)
access = 0
container_type = "crate"
diff --git a/code/modules/cargo/items/security.dm b/code/modules/cargo/items/security.dm
index 7be8cd65bb08..7da20366b9e3 100644
--- a/code/modules/cargo/items/security.dm
+++ b/code/modules/cargo/items/security.dm
@@ -133,7 +133,7 @@
description = "A box containing 7 tear gas grenades. A gas mask is printed on the label. WARNING: Exposure carries risk of serious injuries."
price = 450
items = list(
- /obj/item/storage/box/teargas
+ /obj/item/storage/box/tactical/teargas
)
access = ACCESS_SECURITY
container_type = "crate"
@@ -147,7 +147,7 @@
description = "A box containing 7 antipersonnel flashbang grenades. WARNING: Can cause permanent vision or hearing loss. Use with caution."
price = 520
items = list(
- /obj/item/storage/box/flashbangs
+ /obj/item/storage/box/tactical/flashbangs
)
access = ACCESS_SECURITY
container_type = "crate"
@@ -161,7 +161,7 @@
description = "A box containing 5 military grade EMP grenades. WARNING: Do not use near unshielded electronics or biomechanical augmentations."
price = 1450
items = list(
- /obj/item/storage/box/emps
+ /obj/item/storage/box/tactical/emps
)
access = ACCESS_SECURITY
container_type = "crate"
diff --git a/code/modules/cargo/items/weaponry.dm b/code/modules/cargo/items/weaponry.dm
index c0ea2f5f134f..106a72f2c8b4 100644
--- a/code/modules/cargo/items/weaponry.dm
+++ b/code/modules/cargo/items/weaponry.dm
@@ -245,7 +245,7 @@
description = "A box of less-lethal beanbag shells."
price = 65
items = list(
- /obj/item/storage/box/beanbags
+ /obj/item/storage/box/shells/beanbags
)
access = ACCESS_SECURITY
container_type = "crate"
@@ -259,7 +259,7 @@
description = "A box of EMP-inducing 'haywire' shotgun shells."
price = 90
items = list(
- /obj/item/storage/box/haywireshells
+ /obj/item/storage/box/shells/haywireshells
)
access = ACCESS_SECURITY
container_type = "crate"
@@ -273,7 +273,7 @@
description = "A box of incendiary shotgun shells."
price = 95
items = list(
- /obj/item/storage/box/incendiaryshells
+ /obj/item/storage/box/shells/incendiaryshells
)
access = ACCESS_SECURITY
container_type = "crate"
@@ -287,7 +287,7 @@
description = "A box of shotgun buckshot shells."
price = 70
items = list(
- /obj/item/storage/box/shotgunshells
+ /obj/item/storage/box/shells/buckshot
)
access = ACCESS_SECURITY
container_type = "crate"
@@ -301,7 +301,7 @@
description = "A box of shotgun slugs."
price = 80
items = list(
- /obj/item/storage/box/shotgunammo
+ /obj/item/storage/box/shells/slugs
)
access = ACCESS_SECURITY
container_type = "crate"
@@ -315,7 +315,7 @@
description = "A box of illuminating shotgun shells."
price = 65
items = list(
- /obj/item/storage/box/flashshells
+ /obj/item/storage/box/shells/flashshells
)
access = ACCESS_SECURITY
container_type = "crate"
@@ -483,7 +483,7 @@
description = "A box of 50-caliber tranquilizer darts."
price = 50
items = list(
- /obj/item/storage/box/tranquilizer
+ /obj/item/storage/box/shells/tranquilizer
)
access = ACCESS_ARMORY
container_type = "crate"
@@ -497,7 +497,7 @@
description = "A box with several compact tungsten slugs, aimed for use in gauss carbines."
price = 125
items = list(
- /obj/item/storage/box/tungstenslugs
+ /obj/item/storage/box/ammo/tungstenslugs
)
access = ACCESS_ARMORY
container_type = "crate"
diff --git a/code/modules/cargo/random_stock/t1_common.dm b/code/modules/cargo/random_stock/t1_common.dm
index 198064333598..69610dae35a5 100644
--- a/code/modules/cargo/random_stock/t1_common.dm
+++ b/code/modules/cargo/random_stock/t1_common.dm
@@ -306,7 +306,7 @@ STOCK_ITEM_COMMON(rollerbed, 2.2)
new /obj/item/roller(L)
STOCK_ITEM_COMMON(smokebombs, 1.1)
- new /obj/item/storage/box/smokebombs(L)
+ new /obj/item/storage/box/tactical/smokebombs(L)
STOCK_ITEM_COMMON(jar, 2)
new /obj/item/glass_jar(L)
@@ -428,10 +428,10 @@ STOCK_ITEM_COMMON(snacks, 4)
L = get_turf(pick(CS.tables))
var/list/snacks = list(
- /obj/item/storage/box/donkpockets = 10,
- /obj/item/storage/box/sinpockets = 5,
+ /obj/item/storage/box/unique/donkpockets = 10,
+ /obj/item/storage/box/unique/donkpockets/sinpockets = 5,
/obj/item/storage/box/snack = 10,
- /obj/item/storage/box/produce = 8,
+ /obj/item/storage/box/large/produce = 8,
/obj/item/storage/field_ration = 3,
/obj/item/storage/field_ration/nka = 1
)
@@ -504,7 +504,7 @@ STOCK_ITEM_COMMON(gasmask, 2)
new type(L)
STOCK_ITEM_COMMON(mining, 2)
- var/list/mine_items = list(/obj/item/shovel, /obj/item/device/flashlight/lantern, /obj/item/mining_scanner, /obj/item/storage/box/excavation)
+ var/list/mine_items = list(/obj/item/shovel, /obj/item/device/flashlight/lantern, /obj/item/mining_scanner, /obj/item/storage/box/unique/excavation)
for(var/i in 1 to rand(1, 2))
var/to_spawn = pick(mine_items)
new to_spawn(L)
@@ -528,20 +528,20 @@ STOCK_ITEM_COMMON(camera, 1)
STOCK_ITEM_COMMON(flagbox, 3)
var/list/flagbox_type = list(
- /obj/item/storage/box/flags/sol,
- /obj/item/storage/box/flags/biesel,
- /obj/item/storage/box/flags/coc,
- /obj/item/storage/box/flags/galataea,
- /obj/item/storage/box/flags/dominia,
- /obj/item/storage/box/flags/elyra,
- /obj/item/storage/box/flags/diona,
- /obj/item/storage/box/flags/unathi,
- /obj/item/storage/box/flags/skrell,
- /obj/item/storage/box/flags/tajara,
- /obj/item/storage/box/flags/vaurca,
- /obj/item/storage/box/flags/goldendeep,
- /obj/item/storage/box/flags/corporate,
- /obj/item/storage/box/flags/misc
+ /obj/item/storage/box/large/flags/sol,
+ /obj/item/storage/box/large/flags/biesel,
+ /obj/item/storage/box/large/flags/coc,
+ /obj/item/storage/box/large/flags/galataea,
+ /obj/item/storage/box/large/flags/dominia,
+ /obj/item/storage/box/large/flags/elyra,
+ /obj/item/storage/box/large/flags/diona,
+ /obj/item/storage/box/large/flags/unathi,
+ /obj/item/storage/box/large/flags/skrell,
+ /obj/item/storage/box/large/flags/tajara,
+ /obj/item/storage/box/large/flags/vaurca,
+ /obj/item/storage/box/large/flags/goldendeep,
+ /obj/item/storage/box/large/flags/corporate,
+ /obj/item/storage/box/large/flags/misc
)
var/type = pick(flagbox_type)
new type(L)
diff --git a/code/modules/cargo/random_stock/t2_uncommon.dm b/code/modules/cargo/random_stock/t2_uncommon.dm
index c2aabcd2055b..1a7b7819937e 100644
--- a/code/modules/cargo/random_stock/t2_uncommon.dm
+++ b/code/modules/cargo/random_stock/t2_uncommon.dm
@@ -43,13 +43,13 @@ STOCK_ITEM_UNCOMMON(implants, 1)
if(prob(50))
new /obj/item/storage/box/cdeathalarm_kit(L)
else
- new /obj/item/storage/box/trackimp(L)
+ new /obj/item/storage/box/tactical/trackimp(L)
STOCK_ITEM_UNCOMMON(flashbang, 0.75)
- new /obj/item/storage/box/flashbangs(L)
+ new /obj/item/storage/box/tactical/flashbangs(L)
STOCK_ITEM_UNCOMMON(stinger, 0.75)
- new /obj/item/storage/box/stingers(L)
+ new /obj/item/storage/box/tactical/stingers(L)
STOCK_ITEM_UNCOMMON(arrest, 1)
if(prob(60))
@@ -60,13 +60,13 @@ STOCK_ITEM_UNCOMMON(arrest, 1)
STOCK_ITEM_UNCOMMON(monkey, 2)
if(prob(40))
var/type = pick( \
- /obj/item/storage/box/monkeycubes/farwacubes, \
- /obj/item/storage/box/monkeycubes/stokcubes, \
- /obj/item/storage/box/monkeycubes/neaeracubes \
+ /obj/item/storage/box/unique/monkeycubes/farwacubes, \
+ /obj/item/storage/box/unique/monkeycubes/stokcubes, \
+ /obj/item/storage/box/unique/monkeycubes/neaeracubes \
)
new type(L)
else
- new /obj/item/storage/box/monkeycubes(L)
+ new /obj/item/storage/box/unique/monkeycubes(L)
STOCK_ITEM_UNCOMMON(specialcrayon, 1.5)
if(prob(50))
@@ -340,9 +340,9 @@ STOCK_ITEM_UNCOMMON(wristbound, 0.5)
STOCK_ITEM_UNCOMMON(pops, 0.5)
if(prob(85))
- new /obj/item/storage/box/snappops(L)
+ new /obj/item/storage/box/unique/snappops(L)
else if (prob(25))
- new /obj/item/storage/box/snappops/syndi(L)
+ new /obj/item/storage/box/unique/snappops/syndi(L)
else
new /obj/item/storage/box/partypopper(L)
diff --git a/code/modules/cargo/random_stock/t3_rare.dm b/code/modules/cargo/random_stock/t3_rare.dm
index bb3a2a88a6a8..7662c3e251bd 100644
--- a/code/modules/cargo/random_stock/t3_rare.dm
+++ b/code/modules/cargo/random_stock/t3_rare.dm
@@ -10,7 +10,7 @@ STOCK_ITEM_RARE(uranium, 3)
new /obj/item/stack/material/uranium(L, rand(5,30))
STOCK_ITEM_RARE(EMP, 0.75)
- new /obj/item/storage/box/emps(L)
+ new /obj/item/storage/box/tactical/emps(L)
STOCK_ITEM_RARE(hypercell, 3)
new /obj/item/cell/hyper(L)
diff --git a/code/modules/client/preference_setup/loadout/items/general.dm b/code/modules/client/preference_setup/loadout/items/general.dm
index cf9fdd62dbe3..3160dfed075d 100644
--- a/code/modules/client/preference_setup/loadout/items/general.dm
+++ b/code/modules/client/preference_setup/loadout/items/general.dm
@@ -172,14 +172,14 @@
display_name = "konyang-cha tins"
description = "Tins of tea leaves made by Konyang-cha."
cost = 1
- path = /obj/item/storage/box/tea
+ path = /obj/item/storage/box/unique/tea
/datum/gear/chatins/New()
..()
var/list/chatins = list()
- chatins["sencha cha-tin"] = /obj/item/storage/box/tea
- chatins["tieguanyin cha-tin"] = /obj/item/storage/box/tea/tieguanyin
- chatins["jaekseol cha-tin"] = /obj/item/storage/box/tea/jaekseol
+ chatins["sencha cha-tin"] = /obj/item/storage/box/unique/tea
+ chatins["tieguanyin cha-tin"] = /obj/item/storage/box/unique/tea/tieguanyin
+ chatins["jaekseol cha-tin"] = /obj/item/storage/box/unique/tea/jaekseol
gear_tweaks += new /datum/gear_tweak/path(chatins)
/datum/gear/teapots
diff --git a/code/modules/clothing/spacesuits/rig/suits/station.dm b/code/modules/clothing/spacesuits/rig/suits/station.dm
index ab362a173402..e96cd7261f1b 100644
--- a/code/modules/clothing/spacesuits/rig/suits/station.dm
+++ b/code/modules/clothing/spacesuits/rig/suits/station.dm
@@ -292,7 +292,7 @@
helm_type = /obj/item/clothing/head/helmet/space/rig/hazmat
- allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/stack/flag,/obj/item/storage/box/excavation,/obj/item/pickaxe,/obj/item/device/healthanalyzer,/obj/item/device/measuring_tape,/obj/item/device/ano_scanner,/obj/item/device/depth_scanner,/obj/item/device/core_sampler,/obj/item/device/gps,/obj/item/device/beacon_locator,/obj/item/device/radio/beacon,/obj/item/pickaxe/hand,/obj/item/storage/bag/fossils,/obj/item/material/twohanded/fireaxe,/obj/item/device/breath_analyzer)
+ allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/stack/flag,/obj/item/storage/box/unique/excavation,/obj/item/pickaxe,/obj/item/device/healthanalyzer,/obj/item/device/measuring_tape,/obj/item/device/ano_scanner,/obj/item/device/depth_scanner,/obj/item/device/core_sampler,/obj/item/device/gps,/obj/item/device/beacon_locator,/obj/item/device/radio/beacon,/obj/item/pickaxe/hand,/obj/item/storage/bag/fossils,/obj/item/material/twohanded/fireaxe,/obj/item/device/breath_analyzer)
req_access = list()
req_one_access = list()
diff --git a/code/modules/holidays/christmas/props.dm b/code/modules/holidays/christmas/props.dm
index 7e4c3bd61dc7..6787d6d8e35c 100644
--- a/code/modules/holidays/christmas/props.dm
+++ b/code/modules/holidays/christmas/props.dm
@@ -104,7 +104,7 @@
var/gift_type = pick(
/obj/item/storage/wallet,
/obj/item/storage/photo_album,
- /obj/item/storage/box/snappops,
+ /obj/item/storage/box/unique/snappops,
/obj/item/storage/box/fancy/crayons,
/obj/item/storage/belt/champion,
/obj/item/soap/deluxe,
@@ -202,7 +202,7 @@
/obj/random/wizard_dressup,
/obj/item/storage/wallet,
/obj/item/storage/photo_album,
- /obj/item/storage/box/snappops,
+ /obj/item/storage/box/unique/snappops,
/obj/item/storage/box/fancy/crayons,
/obj/item/soap/deluxe,
/obj/item/pen/invisible,
@@ -294,7 +294,7 @@
/obj/item/device/paicard,
/obj/item/clothing/accessory/horrible,
/obj/item/clothing/shoes/heels,
- /obj/item/storage/box/donkpockets,
+ /obj/item/storage/box/unique/donkpockets,
/obj/item/reagent_containers/glass/beaker/teapot,
/obj/item/device/flashlight/lantern,
/obj/item/clothing/mask/balaclava,
@@ -366,7 +366,7 @@
/mob/living/simple_animal/parrot,
/mob/living/simple_animal/hostile/commanded/dog/pug,
/obj/item/target/alien,
- /obj/item/storage/box/candy)
+ /obj/item/storage/box/large/candy)
return picked_gift_type
diff --git a/code/modules/materials/material_recipes.dm b/code/modules/materials/material_recipes.dm
index 3cc43ed85a93..40b0931b60f8 100644
--- a/code/modules/materials/material_recipes.dm
+++ b/code/modules/materials/material_recipes.dm
@@ -186,13 +186,13 @@
..()
recipes += new /datum/stack_recipe_list("[display_name] recipes",
list(
- new /datum/stack_recipe("box", /obj/item/storage/box),
+ new /datum/stack_recipe("box", /obj/item/storage/box/blank),
new /datum/stack_recipe("donut box", /obj/item/storage/box/fancy/donut/empty),
new /datum/stack_recipe("egg carton", /obj/item/storage/box/fancy/egg_box),
new /datum/stack_recipe("candle pack", /obj/item/storage/box/fancy/candle_box/empty),
new /datum/stack_recipe("crayon box", /obj/item/storage/box/fancy/crayons/empty),
new /datum/stack_recipe("pizza box", /obj/item/pizzabox),
- new /datum/stack_recipe("papersack", /obj/item/storage/box/papersack),
+ new /datum/stack_recipe("papersack", /obj/item/storage/box/unique/papersack),
new /datum/stack_recipe("cardborg suit", /obj/item/clothing/suit/cardborg, 3),
new /datum/stack_recipe("cardborg helmet", /obj/item/clothing/head/cardborg)
))
diff --git a/code/modules/materials/materials.dm b/code/modules/materials/materials.dm
index 4b4996bd6c50..2d163279a4e8 100644
--- a/code/modules/materials/materials.dm
+++ b/code/modules/materials/materials.dm
@@ -891,7 +891,7 @@
stack_type = /obj/item/stack/material/cardboard
flags = MATERIAL_BRITTLE
integrity = 10
- icon_colour = "#AAAAAA"
+ icon_colour = COLOR_CARDBOARD
hardness = 1
weight = 1
protectiveness = 0 // 0%
diff --git a/code/modules/organs/organ.dm b/code/modules/organs/organ.dm
index 4b8399ffc480..fe5ed37df036 100644
--- a/code/modules/organs/organ.dm
+++ b/code/modules/organs/organ.dm
@@ -152,7 +152,7 @@ INITIALIZE_IMMEDIATE(/obj/item/organ)
// Don't process if we're in a freezer, an MMI or a stasis bag.or a freezer or something I dunno
if(istype(loc,/obj/item/device/mmi))
return
- if(istype(loc,/obj/structure/closet/body_bag/cryobag) || istype(loc,/obj/structure/closet/crate/freezer) || istype(loc,/obj/item/storage/box/freezer))
+ if(istype(loc,/obj/structure/closet/body_bag/cryobag) || istype(loc,/obj/structure/closet/crate/freezer) || istype(loc,/obj/item/storage/box/unique/freezer))
return
//Process infections
if ((status & ORGAN_ROBOT) || (owner && owner.species && (owner.species.flags & IS_PLANT)))
diff --git a/code/modules/research/designs/protolathe/mining_designs.dm b/code/modules/research/designs/protolathe/mining_designs.dm
index db591e5da9b9..8fbc175efe04 100644
--- a/code/modules/research/designs/protolathe/mining_designs.dm
+++ b/code/modules/research/designs/protolathe/mining_designs.dm
@@ -41,7 +41,7 @@
/datum/design/item/mining/pick_set
req_tech = list(TECH_ENGINEERING = 2, TECH_MATERIAL = 2)
materials = list(DEFAULT_WALL_MATERIAL = 1700, MATERIAL_GLASS = 200)
- build_path = /obj/item/storage/box/excavation
+ build_path = /obj/item/storage/box/unique/excavation
//Frames
/datum/design/item/mining/ka_frame01
diff --git a/code/modules/research/xenoarchaeology/misc.dm b/code/modules/research/xenoarchaeology/misc.dm
index d0a4ef35ed0d..4dbe40bf51e3 100644
--- a/code/modules/research/xenoarchaeology/misc.dm
+++ b/code/modules/research/xenoarchaeology/misc.dm
@@ -27,7 +27,7 @@
new /obj/item/clothing/glasses/safety/goggles/science(src)
new /obj/item/device/radio/headset/headset_sci(src)
new /obj/item/storage/belt/archaeology(src)
- new /obj/item/storage/box/excavation(src)
+ new /obj/item/storage/box/unique/excavation(src)
new /obj/item/taperoll/science(src)
new /obj/item/clothing/head/hardhat(src)
new /obj/item/sampler(src)
@@ -39,7 +39,7 @@
/obj/structure/closet/excavation/fill()
new /obj/item/storage/belt/archaeology(src)
- new /obj/item/storage/box/excavation(src)
+ new /obj/item/storage/box/unique/excavation(src)
new /obj/item/device/flashlight/lantern(src)
new /obj/item/device/ano_scanner(src)
new /obj/item/device/depth_scanner(src)
diff --git a/code/modules/research/xenoarchaeology/tools/gearbelt.dm b/code/modules/research/xenoarchaeology/tools/gearbelt.dm
index f6962ae3d99b..2b268d7fd167 100644
--- a/code/modules/research/xenoarchaeology/tools/gearbelt.dm
+++ b/code/modules/research/xenoarchaeology/tools/gearbelt.dm
@@ -26,7 +26,7 @@
/obj/item/anodevice,
/obj/item/clothing/glasses,
/obj/item/wrench,
- /obj/item/storage/box/excavation,
+ /obj/item/storage/box/unique/excavation,
/obj/item/anobattery,
/obj/item/device/ano_scanner,
/obj/item/ore_detector,
@@ -39,7 +39,7 @@
/obj/item/device/gps = 1,
/obj/item/device/measuring_tape = 1,
/obj/item/pickaxe/hand = 1,
- /obj/item/storage/box/excavation = 1,
+ /obj/item/storage/box/unique/excavation = 1,
/obj/item/device/depth_scanner = 1,
/obj/item/device/ano_scanner = 1,
/obj/item/ore_detector = 1,
diff --git a/code/modules/research/xenoarchaeology/tools/tools_pickaxe.dm b/code/modules/research/xenoarchaeology/tools/tools_pickaxe.dm
index 73031f95c408..4997b1e13798 100644
--- a/code/modules/research/xenoarchaeology/tools/tools_pickaxe.dm
+++ b/code/modules/research/xenoarchaeology/tools/tools_pickaxe.dm
@@ -156,13 +156,13 @@
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// Pack for holding pickaxes
-/obj/item/storage/box/excavation
+/obj/item/storage/box/unique/excavation
name = "excavation pick set"
icon = 'icons/obj/storage/boxes.dmi'
icon_state = "excavation"
desc = "A rugged metal case containing a set of standardized picks used in archaeological digs."
item_state = "box"
- foldable = /obj/item/stack/material/cardboard //BubbleWrap
+ foldable = null
storage_slots = 7
w_class = WEIGHT_CLASS_SMALL
can_hold = list(/obj/item/pickaxe/brush,\
@@ -176,7 +176,7 @@
max_w_class = WEIGHT_CLASS_NORMAL
use_to_pickup = TRUE // for picking up broken bulbs, not that most people will try
-/obj/item/storage/box/excavation/fill()
+/obj/item/storage/box/unique/excavation/fill()
..()
new /obj/item/pickaxe/brush(src)
new /obj/item/pickaxe/one_pick(src)
diff --git a/html/changelogs/nauticall-newboxes.yml b/html/changelogs/nauticall-newboxes.yml
new file mode 100644
index 000000000000..3127ae80e469
--- /dev/null
+++ b/html/changelogs/nauticall-newboxes.yml
@@ -0,0 +1,59 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+# bugfix
+# - (fixes bugs)
+# wip
+# - (work in progress)
+# qol
+# - (quality of life)
+# soundadd
+# - (adds a sound)
+# sounddel
+# - (removes a sound)
+# rscadd
+# - (adds a feature)
+# rscdel
+# - (removes a feature)
+# imageadd
+# - (adds an image or sprite)
+# imagedel
+# - (removes an image or sprite)
+# spellcheck
+# - (fixes spelling or grammar)
+# experiment
+# - (experimental change)
+# balance
+# - (balance changes)
+# code_imp
+# - (misc internal code change)
+# refactor
+# - (refactors code)
+# config
+# - (makes a change to the config files)
+# admin
+# - (makes changes to administrator tools)
+# server
+# - (miscellaneous changes to server)
+#################################
+
+# Your name.
+author: nauticall
+
+# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made. See valid prefix list above.
+# INDENT WITH TWO SPACES. NOT TABS. SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit.
+# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
+changes:
+ - imageadd: "Resprited boxes; made them both colorable and modular."
+ - code_imp: "Repathed box paths behind the scenes."
diff --git a/icons/obj/item/stacks/materials.dmi b/icons/obj/item/stacks/materials.dmi
index 943b0f9d1341..3c4a425cf44c 100644
Binary files a/icons/obj/item/stacks/materials.dmi and b/icons/obj/item/stacks/materials.dmi differ
diff --git a/icons/obj/storage/boxes.dmi b/icons/obj/storage/boxes.dmi
index 7b8d92a725d8..427cb4372e8c 100644
Binary files a/icons/obj/storage/boxes.dmi and b/icons/obj/storage/boxes.dmi differ
diff --git a/maps/away/away_site/abandoned_diner/abandoned_diner.dmm b/maps/away/away_site/abandoned_diner/abandoned_diner.dmm
index 9b8663f8cdce..e962416f8378 100644
--- a/maps/away/away_site/abandoned_diner/abandoned_diner.dmm
+++ b/maps/away/away_site/abandoned_diner/abandoned_diner.dmm
@@ -1458,10 +1458,10 @@
/obj/structure/table/reinforced/steel,
/obj/effect/floor_decal/corner/grey/diagonal,
/obj/structure/extinguisher_cabinet/east,
-/obj/item/storage/box/condiment{
+/obj/item/storage/box/large/condiment{
pixel_y = 13
},
-/obj/item/storage/box/condiment{
+/obj/item/storage/box/large/condiment{
pixel_y = 3
},
/turf/simulated/floor/tiled/dark,
diff --git a/maps/away/away_site/abandoned_industrial/abandoned_industrial_station.dmm b/maps/away/away_site/abandoned_industrial/abandoned_industrial_station.dmm
index 2e516b197d6f..aeac9fea22d0 100644
--- a/maps/away/away_site/abandoned_industrial/abandoned_industrial_station.dmm
+++ b/maps/away/away_site/abandoned_industrial/abandoned_industrial_station.dmm
@@ -13290,7 +13290,7 @@
/turf/simulated/floor/plating,
/area/abandoned_industrial_station/hangar)
"Qc" = (
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = -5
},
diff --git a/maps/away/away_site/abandoned_mining/cursed.dmm b/maps/away/away_site/abandoned_mining/cursed.dmm
index f4db06cb409d..8adc1757f4f1 100644
--- a/maps/away/away_site/abandoned_mining/cursed.dmm
+++ b/maps/away/away_site/abandoned_mining/cursed.dmm
@@ -1200,7 +1200,7 @@
/turf/simulated/floor,
/area/cursed/engineering)
"gZj" = (
-/obj/item/storage/box/dynamite,
+/obj/item/storage/box/unique/dynamite,
/turf/template_noop,
/area/space)
"hdf" = (
@@ -1757,7 +1757,7 @@
/area/cursed/computer_core)
"kLZ" = (
/obj/structure/table/steel,
-/obj/item/storage/box/dynamite,
+/obj/item/storage/box/unique/dynamite,
/turf/simulated/floor/exoplanet/asteroid/ash/rocky,
/area/space)
"kMz" = (
@@ -2736,8 +2736,8 @@
/area/cursed/living_area)
"pYQ" = (
/obj/structure/table/steel,
-/obj/item/storage/box/dynamite,
-/obj/item/storage/box/dynamite{
+/obj/item/storage/box/unique/dynamite,
+/obj/item/storage/box/unique/dynamite{
pixel_y = 11
},
/turf/simulated/floor/exoplanet/asteroid/ash/rocky,
diff --git a/maps/away/away_site/blueriver/blueriver.dmm b/maps/away/away_site/blueriver/blueriver.dmm
index bf6f12840ec0..8498f9df3045 100644
--- a/maps/away/away_site/blueriver/blueriver.dmm
+++ b/maps/away/away_site/blueriver/blueriver.dmm
@@ -1029,7 +1029,7 @@
/area/bluespaceriver/ship)
"Va" = (
/obj/structure/closet/excavation,
-/obj/item/storage/box/flares,
+/obj/item/storage/box/large/flares,
/turf/simulated/floor/exoplanet/barren{
temperature = 250
},
diff --git a/maps/away/away_site/crystal_planet_outpost/crystal_planet_outpost_.dmm b/maps/away/away_site/crystal_planet_outpost/crystal_planet_outpost_.dmm
index 419095ed4af1..e6e6c3792430 100644
--- a/maps/away/away_site/crystal_planet_outpost/crystal_planet_outpost_.dmm
+++ b/maps/away/away_site/crystal_planet_outpost/crystal_planet_outpost_.dmm
@@ -733,8 +733,8 @@
"jX" = (
/obj/effect/floor_decal/corner_wide/black/diagonal,
/obj/structure/closet/crate/freezer,
-/obj/item/storage/box/produce,
-/obj/item/storage/box/produce,
+/obj/item/storage/box/large/produce,
+/obj/item/storage/box/large/produce,
/obj/item/reagent_containers/food/snacks/meat/chicken,
/obj/item/reagent_containers/food/snacks/meat/chicken,
/obj/item/reagent_containers/food/snacks/meat/chicken,
@@ -1787,7 +1787,7 @@
/area/crystal_planet_outpost/living)
"zW" = (
/obj/structure/table/standard,
-/obj/item/storage/box/excavation{
+/obj/item/storage/box/unique/excavation{
pixel_x = -2;
pixel_y = 7
},
@@ -2081,7 +2081,7 @@
/area/crystal_planet_outpost/medbay)
"DG" = (
/obj/item/storage/belt/archaeology,
-/obj/item/storage/box/excavation,
+/obj/item/storage/box/unique/excavation,
/obj/item/device/flashlight/lantern,
/obj/item/device/ano_scanner,
/obj/item/device/depth_scanner,
@@ -3084,11 +3084,11 @@
/area/crystal_planet_outpost/surface)
"QD" = (
/obj/structure/table/wood,
-/obj/item/storage/box/tea/tieguanyin{
+/obj/item/storage/box/unique/tea/tieguanyin{
pixel_x = 6;
pixel_y = 3
},
-/obj/item/storage/box/tea/jaekseol{
+/obj/item/storage/box/unique/tea/jaekseol{
pixel_x = -5;
pixel_y = 7
},
@@ -3695,7 +3695,7 @@
/obj/structure/closet/crate/freezer{
name = "Fridge"
},
-/obj/item/storage/box/freezer/organcooler,
+/obj/item/storage/box/unique/freezer/organcooler,
/turf/simulated/floor/tiled/white,
/area/crystal_planet_outpost/medbay)
"ZH" = (
diff --git a/maps/away/away_site/crystal_planet_outpost/crystal_planet_outpost_submaps.dmm b/maps/away/away_site/crystal_planet_outpost/crystal_planet_outpost_submaps.dmm
index 3cbb8e6b1585..a589d35f36d4 100644
--- a/maps/away/away_site/crystal_planet_outpost/crystal_planet_outpost_submaps.dmm
+++ b/maps/away/away_site/crystal_planet_outpost/crystal_planet_outpost_submaps.dmm
@@ -265,7 +265,7 @@
/turf/simulated/floor/tiled,
/area/template_noop)
"le" = (
-/obj/item/storage/box/excavation{
+/obj/item/storage/box/unique/excavation{
pixel_x = -9;
pixel_y = 7
},
@@ -819,7 +819,7 @@
"Bp" = (
/obj/random/dirt_75,
/obj/item/storage/belt/archaeology,
-/obj/item/storage/box/excavation,
+/obj/item/storage/box/unique/excavation,
/obj/item/device/flashlight/lantern,
/obj/item/device/ano_scanner,
/obj/item/device/depth_scanner,
@@ -1083,7 +1083,7 @@
/area/template_noop)
"GP" = (
/obj/item/storage/belt/archaeology,
-/obj/item/storage/box/excavation,
+/obj/item/storage/box/unique/excavation,
/obj/item/device/flashlight/lantern,
/obj/item/device/ano_scanner,
/obj/item/device/depth_scanner,
@@ -1423,7 +1423,7 @@
/turf/simulated/floor/tiled/dark,
/area/template_noop)
"RL" = (
-/obj/item/storage/box/excavation{
+/obj/item/storage/box/unique/excavation{
pixel_x = -9;
pixel_y = 7
},
diff --git a/maps/away/away_site/cult_base/cult_base.dmm b/maps/away/away_site/cult_base/cult_base.dmm
index 77b07172f8ab..7da219197c39 100644
--- a/maps/away/away_site/cult_base/cult_base.dmm
+++ b/maps/away/away_site/cult_base/cult_base.dmm
@@ -4642,7 +4642,7 @@
dir = 1
},
/obj/random/dirt_75,
-/obj/item/storage/box/excavation{
+/obj/item/storage/box/unique/excavation{
pixel_x = 8;
pixel_y = -2
},
@@ -9135,7 +9135,7 @@
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/drinks/carton/milk,
/obj/item/reagent_containers/food/drinks/carton/milk,
-/obj/item/storage/box/produce,
+/obj/item/storage/box/large/produce,
/obj/item/reagent_containers/food/drinks/carton/applejuice,
/obj/random/dirt_75,
/turf/simulated/floor/tiled/white,
diff --git a/maps/away/away_site/first_aurora/first_aurora.dmm b/maps/away/away_site/first_aurora/first_aurora.dmm
index ce59a485cf38..b575184ec4cc 100644
--- a/maps/away/away_site/first_aurora/first_aurora.dmm
+++ b/maps/away/away_site/first_aurora/first_aurora.dmm
@@ -863,7 +863,7 @@
/turf/simulated/floor/airless,
/area/derelict/hallway/northeast)
"de" = (
-/obj/item/storage/box/flashbangs,
+/obj/item/storage/box/tactical/flashbangs,
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/tiled/airless,
/area/derelict/hallway/northeast)
@@ -1991,7 +1991,7 @@
/turf/template_noop,
/area/template_noop)
"gE" = (
-/obj/item/storage/box/flashbangs,
+/obj/item/storage/box/tactical/flashbangs,
/turf/template_noop,
/area/template_noop)
"gF" = (
diff --git a/maps/away/away_site/hivebot_hub/hivebot_hub.dmm b/maps/away/away_site/hivebot_hub/hivebot_hub.dmm
index 78896f2c050a..697e311effd8 100644
--- a/maps/away/away_site/hivebot_hub/hivebot_hub.dmm
+++ b/maps/away/away_site/hivebot_hub/hivebot_hub.dmm
@@ -3294,7 +3294,7 @@
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet/crate,
-/obj/item/storage/box/shotgunammo,
+/obj/item/storage/box/shells/slugs,
/turf/simulated/floor/tiled/dark/full/airless,
/area/hivebothub/portdocks)
"vW" = (
@@ -4250,8 +4250,8 @@
opened = 1
},
/obj/item/gun/energy/disruptorpistol,
-/obj/item/storage/box/beanbags,
-/obj/item/storage/box/beanbags,
+/obj/item/storage/box/shells/beanbags,
+/obj/item/storage/box/shells/beanbags,
/turf/simulated/floor/tiled/dark/full/airless,
/area/hivebothub/bridge)
"Co" = (
diff --git a/maps/away/away_site/idris_wreck/idris_wreck.dmm b/maps/away/away_site/idris_wreck/idris_wreck.dmm
index e03c8ea1678a..0957da8d8df4 100644
--- a/maps/away/away_site/idris_wreck/idris_wreck.dmm
+++ b/maps/away/away_site/idris_wreck/idris_wreck.dmm
@@ -575,8 +575,8 @@
},
/obj/item/gun/projectile/shotgun/pump,
/obj/item/gun/projectile/shotgun/pump,
-/obj/item/storage/box/shotgunammo,
-/obj/item/storage/box/shotgunammo,
+/obj/item/storage/box/shells/slugs,
+/obj/item/storage/box/shells/slugs,
/turf/simulated/floor/tiled,
/area/idris_wreck/armory)
"fD" = (
diff --git a/maps/away/away_site/konyang/point_verdant/point_verdant.dmm b/maps/away/away_site/konyang/point_verdant/point_verdant.dmm
index 89e649a79301..6177a1442e02 100644
--- a/maps/away/away_site/konyang/point_verdant/point_verdant.dmm
+++ b/maps/away/away_site/konyang/point_verdant/point_verdant.dmm
@@ -1601,8 +1601,8 @@
/obj/random/tool,
/obj/item/storage/box/lights,
/obj/item/storage/box/lights/coloredmixed,
-/obj/item/storage/box/papersack,
-/obj/item/storage/box/candy,
+/obj/item/storage/box/unique/papersack,
+/obj/item/storage/box/large/candy,
/obj/item/storage/box/cups,
/obj/item/storage/box/fancy/cigarettes/dromedaryco,
/obj/random/dirt_75,
@@ -3331,7 +3331,7 @@
/obj/item/storage/box/magnetic_locks{
pixel_y = -6
},
-/obj/item/storage/box/flares{
+/obj/item/storage/box/large/flares{
pixel_y = 5
},
/obj/random/dirt_75,
@@ -7061,9 +7061,9 @@
/area/point_verdant/interior/hotel)
"dQO" = (
/obj/structure/table/rack/retail_shelf,
-/obj/item/storage/box/produce,
-/obj/item/storage/box/produce,
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce,
+/obj/item/storage/box/large/produce,
+/obj/item/storage/box/large/produce{
pixel_y = 11
},
/turf/simulated/floor/tiled,
@@ -9253,7 +9253,7 @@
/obj/structure/closet/crate/freezer,
/obj/item/reagent_containers/blood/OPlus,
/obj/item/reagent_containers/blood/OMinus,
-/obj/item/storage/box/freezer/organcooler,
+/obj/item/storage/box/unique/freezer/organcooler,
/obj/item/soap/syndie,
/obj/item/reagent_containers/glass/rag,
/turf/simulated/floor/tiled/white,
@@ -13935,7 +13935,7 @@
pixel_x = -4;
pixel_y = 6
},
-/obj/item/storage/box/sharps{
+/obj/item/storage/box/unique/sharps{
pixel_x = 2;
pixel_y = -1
},
@@ -15040,7 +15040,7 @@
/area/point_verdant/outdoors)
"iwH" = (
/obj/structure/table/rack,
-/obj/item/storage/box/flares,
+/obj/item/storage/box/large/flares,
/obj/machinery/light/small{
dir = 4
},
@@ -19981,39 +19981,39 @@
/turf/simulated/floor/exoplanet/konyang,
/area/point_verdant/outdoors)
"lnl" = (
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = -5
},
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = 4
},
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = 15
},
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = -5
},
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = -5
},
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = 4
},
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = 4
},
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = 15
},
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = 15
},
@@ -23108,7 +23108,7 @@
/obj/structure/table/wood,
/obj/item/device/toner,
/obj/item/device/toner,
-/obj/item/storage/box/donkpockets,
+/obj/item/storage/box/unique/donkpockets,
/turf/simulated/floor/wood,
/area/point_verdant/interior/tailor)
"mUB" = (
@@ -28755,7 +28755,7 @@
"qyA" = (
/obj/structure/rod_railing,
/obj/structure/table/wood,
-/obj/item/storage/box/donkpockets{
+/obj/item/storage/box/unique/donkpockets{
pixel_y = 6;
pixel_x = -11
},
@@ -37446,9 +37446,9 @@
/area/point_verdant/interior/shallow)
"vFC" = (
/obj/structure/table/rack/retail_shelf,
-/obj/item/storage/box/produce,
-/obj/item/storage/box/produce,
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce,
+/obj/item/storage/box/large/produce,
+/obj/item/storage/box/large/produce{
pixel_y = 11
},
/obj/machinery/light/small,
diff --git a/maps/away/away_site/pirate_base/pirate_base.dmm b/maps/away/away_site/pirate_base/pirate_base.dmm
index c8ca5114f300..5f0de8b99f91 100644
--- a/maps/away/away_site/pirate_base/pirate_base.dmm
+++ b/maps/away/away_site/pirate_base/pirate_base.dmm
@@ -1458,13 +1458,13 @@
"gM" = (
/obj/random/dirt_75,
/obj/structure/closet/secure_closet/refrigerator/standard,
-/obj/item/storage/box/produce,
-/obj/item/storage/box/produce,
-/obj/item/storage/box/produce,
-/obj/item/storage/box/produce,
-/obj/item/storage/box/produce,
-/obj/item/storage/box/produce,
-/obj/item/storage/box/produce,
+/obj/item/storage/box/large/produce,
+/obj/item/storage/box/large/produce,
+/obj/item/storage/box/large/produce,
+/obj/item/storage/box/large/produce,
+/obj/item/storage/box/large/produce,
+/obj/item/storage/box/large/produce,
+/obj/item/storage/box/large/produce,
/obj/machinery/button/remote/airlock{
id = "pirate_base_freezer_door";
specialfunctions = 4;
@@ -3175,11 +3175,11 @@
"pd" = (
/obj/effect/floor_decal/industrial/outline/grey,
/obj/structure/table/rack,
-/obj/item/storage/box/donkpockets{
+/obj/item/storage/box/unique/donkpockets{
pixel_x = 6;
pixel_y = 6
},
-/obj/item/storage/box/donkpockets{
+/obj/item/storage/box/unique/donkpockets{
pixel_x = -3;
pixel_y = 1
},
@@ -3529,7 +3529,7 @@
/obj/machinery/body_scanconsole{
dir = 4
},
-/obj/item/storage/box/freezer/organcooler{
+/obj/item/storage/box/unique/freezer/organcooler{
pixel_y = -9;
pixel_x = -12
},
@@ -8695,15 +8695,15 @@
/area/piratebase/hallway_south)
"Ri" = (
/obj/structure/closet/crate/freezer,
-/obj/item/storage/box/freezer/organcooler{
+/obj/item/storage/box/unique/freezer/organcooler{
pixel_x = -1;
pixel_y = 3
},
-/obj/item/storage/box/freezer/organcooler{
+/obj/item/storage/box/unique/freezer/organcooler{
pixel_x = -1;
pixel_y = 3
},
-/obj/item/storage/box/freezer/organcooler{
+/obj/item/storage/box/unique/freezer/organcooler{
pixel_x = -1;
pixel_y = 3
},
@@ -8864,7 +8864,7 @@
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat,
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = -5
},
@@ -10102,11 +10102,11 @@
"Ya" = (
/obj/effect/floor_decal/industrial/outline/grey,
/obj/structure/table/rack,
-/obj/item/storage/box/smokebombs{
+/obj/item/storage/box/tactical/smokebombs{
pixel_x = 6;
pixel_y = 6
},
-/obj/item/storage/box/flashbangs{
+/obj/item/storage/box/tactical/flashbangs{
pixel_x = -3
},
/obj/machinery/light{
diff --git a/maps/away/away_site/racers/racers.dmm b/maps/away/away_site/racers/racers.dmm
index 13947d643147..e0775131eca0 100644
--- a/maps/away/away_site/racers/racers.dmm
+++ b/maps/away/away_site/racers/racers.dmm
@@ -456,7 +456,7 @@
/obj/item/material/knife{
pixel_x = -9
},
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3
},
/turf/simulated/floor/tiled/white,
@@ -2958,7 +2958,7 @@
"olo" = (
/obj/structure/dispenser/oxygen,
/obj/item/tank/oxygen,
-/obj/item/storage/box/stunshells{
+/obj/item/storage/box/shells/stunshells{
pixel_x = 1;
pixel_y = 15
},
@@ -3736,7 +3736,7 @@
/obj/item/reagent_containers/food/snacks/koisbar,
/obj/item/reagent_containers/food/snacks/koisbar,
/obj/item/reagent_containers/food/snacks/koisbar,
-/obj/item/storage/box/monkeycubes/neaeracubes,
+/obj/item/storage/box/unique/monkeycubes/neaeracubes,
/turf/simulated/floor/plating,
/area/racers)
"scQ" = (
diff --git a/maps/away/away_site/sensor_relay/hegemony_waypoint/hegemony_waypoint_submaps.dmm b/maps/away/away_site/sensor_relay/hegemony_waypoint/hegemony_waypoint_submaps.dmm
index 33222768e0e8..ac8fbbaad6dc 100644
--- a/maps/away/away_site/sensor_relay/hegemony_waypoint/hegemony_waypoint_submaps.dmm
+++ b/maps/away/away_site/sensor_relay/hegemony_waypoint/hegemony_waypoint_submaps.dmm
@@ -478,7 +478,7 @@
/area/hegemony_waypoint/atmos)
"lO" = (
/obj/structure/table/reinforced/steel,
-/obj/item/storage/box/donkpockets{
+/obj/item/storage/box/unique/donkpockets{
pixel_y = 9;
pixel_x = 1
},
@@ -515,7 +515,7 @@
/obj/item/reagent_containers/food/snacks/fish/fishfillet,
/obj/item/reagent_containers/food/snacks/meat/chicken,
/obj/item/reagent_containers/food/snacks/meat/chicken,
-/obj/item/storage/box/produce,
+/obj/item/storage/box/large/produce,
/turf/simulated/floor/tiled/dark/full/airless,
/area/hegemony_waypoint/kitchen)
"mo" = (
@@ -2471,7 +2471,7 @@
/obj/random/dirt_75,
/obj/effect/decal/cleanable/blood/drip,
/obj/effect/decal/cleanable/blood/drip,
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_y = -7
},
/obj/item/reagent_containers/food/snacks/fish/fishfillet{
@@ -2930,7 +2930,7 @@
/obj/item/reagent_containers/food/snacks/fish/fishfillet,
/obj/item/reagent_containers/food/snacks/meat/chicken,
/obj/item/reagent_containers/food/snacks/meat/chicken,
-/obj/item/storage/box/produce,
+/obj/item/storage/box/large/produce,
/obj/item/storage/box/fancy/vkrexi_swollen_organ,
/turf/simulated/floor/carpet/rubber,
/area/hegemony_waypoint/kitchen)
diff --git a/maps/away/away_site/shady/shady.dmm b/maps/away/away_site/shady/shady.dmm
index fafdfa11d7db..3af124b456d9 100644
--- a/maps/away/away_site/shady/shady.dmm
+++ b/maps/away/away_site/shady/shady.dmm
@@ -1470,8 +1470,8 @@
dir = 8
},
/obj/structure/lattice/catwalk/indoor/grate/old,
-/obj/item/storage/box/shotgunshells,
-/obj/item/storage/box/shotgunshells,
+/obj/item/storage/box/shells/buckshot,
+/obj/item/storage/box/shells/buckshot,
/turf/simulated/floor/plating,
/area/hideout)
"va" = (
diff --git a/maps/away/away_site/sol_bunker/bunker.dmm b/maps/away/away_site/sol_bunker/bunker.dmm
index 178271ddadba..962dcc5d595d 100644
--- a/maps/away/away_site/sol_bunker/bunker.dmm
+++ b/maps/away/away_site/sol_bunker/bunker.dmm
@@ -331,7 +331,7 @@
"kL" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/gun/projectile/shotgun/pump/combat/sol,
-/obj/item/storage/box/shotgunshells,
+/obj/item/storage/box/shells/buckshot,
/obj/effect/floor_decal/corner_wide/dark_blue{
dir = 9
},
diff --git a/maps/away/away_site/tajara/peoples_station/peoples_station.dmm b/maps/away/away_site/tajara/peoples_station/peoples_station.dmm
index 3a6f33474cb2..c8290e7a2387 100644
--- a/maps/away/away_site/tajara/peoples_station/peoples_station.dmm
+++ b/maps/away/away_site/tajara/peoples_station/peoples_station.dmm
@@ -2012,7 +2012,7 @@
/area/peoples_station/barracks)
"hc" = (
/obj/structure/closet/secure_closet/kitchen_cabinet/standard,
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = -11
},
diff --git a/maps/away/away_site/uueoaesa/reclamation/ihss_reclamation.dmm b/maps/away/away_site/uueoaesa/reclamation/ihss_reclamation.dmm
index cd508afa6deb..9daff0ba863a 100644
--- a/maps/away/away_site/uueoaesa/reclamation/ihss_reclamation.dmm
+++ b/maps/away/away_site/uueoaesa/reclamation/ihss_reclamation.dmm
@@ -8463,8 +8463,8 @@
dir = 5
},
/obj/structure/table/standard,
-/obj/item/storage/box/monkeycubes/stokcubes,
-/obj/item/storage/box/monkeycubes/stokcubes,
+/obj/item/storage/box/unique/monkeycubes/stokcubes,
+/obj/item/storage/box/unique/monkeycubes/stokcubes,
/obj/item/paper/fluff/ihss_reclamation_cell{
pixel_x = 6;
pixel_y = 4
diff --git a/maps/away/away_site/uueoaesa/tret/tret_industrial_complex.dmm b/maps/away/away_site/uueoaesa/tret/tret_industrial_complex.dmm
index ac9602d73d79..b25ffeb075fe 100644
--- a/maps/away/away_site/uueoaesa/tret/tret_industrial_complex.dmm
+++ b/maps/away/away_site/uueoaesa/tret/tret_industrial_complex.dmm
@@ -10192,7 +10192,7 @@
/turf/simulated/floor/plating,
/area/tret_industrial/inside/engineering)
"nvo" = (
-/obj/item/storage/box/dynamite{
+/obj/item/storage/box/unique/dynamite{
pixel_x = 4;
pixel_y = 5
},
diff --git a/maps/away/away_site/wrecked_nt_ship/wrecked_nt_ship.dmm b/maps/away/away_site/wrecked_nt_ship/wrecked_nt_ship.dmm
index 083ac0b40207..2ed45a5b576b 100644
--- a/maps/away/away_site/wrecked_nt_ship/wrecked_nt_ship.dmm
+++ b/maps/away/away_site/wrecked_nt_ship/wrecked_nt_ship.dmm
@@ -1545,7 +1545,7 @@
dir = 1
},
/obj/item/trash/uselessplastic,
-/obj/item/storage/box/anti_photons,
+/obj/item/storage/box/tactical/anti_photons,
/turf/simulated/floor/tiled/steel/airless,
/area/wrecked_nt_ship)
"JI" = (
diff --git a/maps/away/scenarios/cryo_outpost/cryo_outpost.dmm b/maps/away/scenarios/cryo_outpost/cryo_outpost.dmm
index e7af471d9752..4e6f859f8111 100644
--- a/maps/away/scenarios/cryo_outpost/cryo_outpost.dmm
+++ b/maps/away/scenarios/cryo_outpost/cryo_outpost.dmm
@@ -238,7 +238,7 @@
/area/cryo_outpost/inside/habitation_west)
"aoj" = (
/obj/effect/floor_decal/corner/blue/diagonal,
-/obj/item/storage/box/smokes{
+/obj/item/storage/box/tactical/smokes{
pixel_x = -4;
pixel_y = -5
},
@@ -2332,7 +2332,7 @@
"cBq" = (
/obj/structure/closet/crate/freezer,
/obj/effect/floor_decal/industrial/outline/research,
-/obj/item/storage/box/freezer/organcooler,
+/obj/item/storage/box/unique/freezer/organcooler,
/turf/simulated/floor/tiled/dark,
/area/cryo_outpost/inside/labs_cryo_n)
"cBJ" = (
@@ -3461,7 +3461,7 @@
"dPk" = (
/obj/structure/table/stone/marble,
/obj/effect/floor_decal/corner/paleblue/diagonal,
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_y = 3
},
/turf/simulated/floor/tiled/white,
@@ -3675,7 +3675,7 @@
/area/cryo_outpost/inside/engineering)
"eeS" = (
/obj/effect/floor_decal/industrial/outline/research,
-/obj/item/storage/box/freezer/organcooler,
+/obj/item/storage/box/unique/freezer/organcooler,
/turf/simulated/floor/tiled/dark,
/area/cryo_outpost/inside/labs_cryo_s)
"egh" = (
@@ -4956,7 +4956,7 @@
/area/cryo_outpost/inside/security)
"fww" = (
/obj/effect/floor_decal/industrial/outline/research,
-/obj/item/storage/box/freezer/organcooler,
+/obj/item/storage/box/unique/freezer/organcooler,
/turf/simulated/floor/tiled/dark,
/area/cryo_outpost/inside/labs_cryo_n)
"fwA" = (
@@ -5019,7 +5019,7 @@
"fxU" = (
/obj/structure/table/standard,
/obj/effect/floor_decal/corner_wide/green/diagonal,
-/obj/item/storage/box/freezer/organcooler{
+/obj/item/storage/box/unique/freezer/organcooler{
pixel_x = -3;
pixel_y = 4
},
@@ -6296,7 +6296,7 @@
"hbb" = (
/obj/structure/closet/crate/freezer,
/obj/effect/floor_decal/corner_wide/green/diagonal,
-/obj/item/storage/box/freezer/organcooler,
+/obj/item/storage/box/unique/freezer/organcooler,
/turf/simulated/floor/tiled/white,
/area/cryo_outpost/inside/labs_surgery)
"hbh" = (
@@ -8925,7 +8925,7 @@
"kby" = (
/obj/structure/table/standard,
/obj/effect/floor_decal/corner/pink,
-/obj/item/storage/box/freezer/organcooler{
+/obj/item/storage/box/unique/freezer/organcooler{
pixel_x = 4;
pixel_y = -5
},
@@ -10746,11 +10746,11 @@
/area/cryo_outpost/inside/labs_maint_w)
"lYa" = (
/obj/structure/closet/secure_closet/freezer,
-/obj/item/storage/box/produce,
-/obj/item/storage/box/produce,
-/obj/item/storage/box/produce,
-/obj/item/storage/box/produce,
-/obj/item/storage/box/produce,
+/obj/item/storage/box/large/produce,
+/obj/item/storage/box/large/produce,
+/obj/item/storage/box/large/produce,
+/obj/item/storage/box/large/produce,
+/obj/item/storage/box/large/produce,
/turf/simulated/floor/tiled/freezer{
name = "cold storage tiles";
temperature = 278
@@ -14645,7 +14645,7 @@
/area/cryo_outpost/inside/habitation_west)
"qxH" = (
/obj/effect/floor_decal/industrial/outline/grey,
-/obj/item/storage/box/freezer/organcooler,
+/obj/item/storage/box/unique/freezer/organcooler,
/obj/random/dirt_75,
/turf/simulated/floor/tiled/freezer{
name = "cold storage tiles";
@@ -16189,7 +16189,7 @@
"sif" = (
/obj/effect/floor_decal/corner_wide/green/diagonal,
/obj/structure/table/standard,
-/obj/item/storage/box/sharps{
+/obj/item/storage/box/unique/sharps{
pixel_y = 4
},
/obj/machinery/light{
@@ -16377,7 +16377,7 @@
/obj/effect/floor_decal/industrial/outline_straight/red{
dir = 8
},
-/obj/item/storage/box/freezer/organcooler,
+/obj/item/storage/box/unique/freezer/organcooler,
/turf/simulated/floor/tiled/freezer{
name = "cold storage tiles";
temperature = 278
@@ -16519,7 +16519,7 @@
pixel_y = 12
},
/obj/effect/floor_decal/corner_wide/green/diagonal,
-/obj/item/storage/box/freezer/organcooler{
+/obj/item/storage/box/unique/freezer/organcooler{
pixel_x = -1;
pixel_y = 3
},
@@ -17397,7 +17397,7 @@
/area/cryo_outpost/inside/engineering)
"txZ" = (
/obj/structure/table/standard,
-/obj/item/storage/box/sharps{
+/obj/item/storage/box/unique/sharps{
pixel_x = -3;
pixel_y = 3
},
@@ -17910,7 +17910,7 @@
/area/cryo_outpost/inside/labs_maint_w)
"uaK" = (
/obj/structure/table/standard,
-/obj/item/storage/box/sharps{
+/obj/item/storage/box/unique/sharps{
pixel_x = -3;
pixel_y = -7
},
@@ -18862,7 +18862,7 @@
/area/cryo_outpost/inside/engineering)
"vcc" = (
/obj/structure/table/reinforced/steel,
-/obj/item/storage/box/monkeycubes{
+/obj/item/storage/box/unique/monkeycubes{
pixel_x = 3;
pixel_y = 7
},
@@ -19784,7 +19784,7 @@
"weW" = (
/obj/structure/table/standard,
/obj/effect/floor_decal/corner_wide/green/diagonal,
-/obj/item/storage/box/freezer/organcooler{
+/obj/item/storage/box/unique/freezer/organcooler{
pixel_x = 3;
pixel_y = 5
},
@@ -20409,7 +20409,7 @@
/area/cryo_outpost/outside/surface)
"wRv" = (
/obj/effect/floor_decal/industrial/outline/grey,
-/obj/item/storage/box/freezer/organcooler,
+/obj/item/storage/box/unique/freezer/organcooler,
/obj/machinery/light/small/broken{
dir = 4
},
diff --git a/maps/away/scenarios/cryo_outpost/cryo_outpost_outfits.dm b/maps/away/scenarios/cryo_outpost/cryo_outpost_outfits.dm
index 4e459db52d09..ee8f60f4fde0 100644
--- a/maps/away/scenarios/cryo_outpost/cryo_outpost_outfits.dm
+++ b/maps/away/scenarios/cryo_outpost/cryo_outpost_outfits.dm
@@ -97,7 +97,7 @@
/obj/item/storage/box/survival = 1,
/obj/item/clothing/glasses/welding/superior = 1,
/obj/item/gun/projectile/shotgun/pump/combat/sol = 1,
- /obj/item/storage/box/shotgunshells = 1,
+ /obj/item/storage/box/shells/buckshot = 1,
/obj/item/landmine/frag = 1,
/obj/item/landmine/emp = 1,
/obj/item/storage/belt/utility/very_full = 1,
diff --git a/maps/away/scenarios/enviro_testing_facility/enviro_testing_facility_submaps_layouts.dmm b/maps/away/scenarios/enviro_testing_facility/enviro_testing_facility_submaps_layouts.dmm
index 81d0fc9bd432..7322e8b818bf 100644
--- a/maps/away/scenarios/enviro_testing_facility/enviro_testing_facility_submaps_layouts.dmm
+++ b/maps/away/scenarios/enviro_testing_facility/enviro_testing_facility_submaps_layouts.dmm
@@ -5370,10 +5370,10 @@
/area/enviro_testing_facility/inside/maintenance/control)
"rX" = (
/obj/structure/closet/crate/freezer,
-/obj/item/storage/box/produce,
-/obj/item/storage/box/produce,
-/obj/item/storage/box/produce,
-/obj/item/storage/box/produce,
+/obj/item/storage/box/large/produce,
+/obj/item/storage/box/large/produce,
+/obj/item/storage/box/large/produce,
+/obj/item/storage/box/large/produce,
/obj/effect/floor_decal/industrial/outline/service,
/turf/simulated/floor/plating,
/area/enviro_testing_facility/inside/maintenance/center_east)
diff --git a/maps/away/scenarios/enviro_testing_facility/enviro_testing_facility_submaps_main.dmm b/maps/away/scenarios/enviro_testing_facility/enviro_testing_facility_submaps_main.dmm
index 187be9788435..4ce934661e67 100644
--- a/maps/away/scenarios/enviro_testing_facility/enviro_testing_facility_submaps_main.dmm
+++ b/maps/away/scenarios/enviro_testing_facility/enviro_testing_facility_submaps_main.dmm
@@ -939,7 +939,7 @@
/obj/effect/floor_decal/industrial/warning/corner{
dir = 4
},
-/obj/item/storage/box/monkeycubes,
+/obj/item/storage/box/unique/monkeycubes,
/obj/structure/table/steel,
/obj/machinery/light{
dir = 8
@@ -3081,11 +3081,11 @@
req_access = null;
name = "ammunition cabinet"
},
-/obj/item/storage/box/haywireshells,
-/obj/item/storage/box/haywireshells,
-/obj/item/storage/box/flashshells,
-/obj/item/storage/box/shotgunshells,
-/obj/item/storage/box/stunshells,
+/obj/item/storage/box/shells/haywireshells,
+/obj/item/storage/box/shells/haywireshells,
+/obj/item/storage/box/shells/flashshells,
+/obj/item/storage/box/shells/buckshot,
+/obj/item/storage/box/shells/stunshells,
/obj/effect/floor_decal/industrial/outline/red,
/turf/simulated/floor/tiled/dark,
/area/enviro_testing_facility/inside/security/storage)
@@ -3540,7 +3540,7 @@
},
/area/template_noop)
"dvB" = (
-/obj/item/storage/box/freezer/organcooler{
+/obj/item/storage/box/unique/freezer/organcooler{
pixel_x = 5;
pixel_y = -4
},
@@ -5288,10 +5288,10 @@
"fqV" = (
/obj/structure/table/rack,
/obj/effect/floor_decal/industrial/outline/security,
-/obj/item/storage/box/smokebombs{
+/obj/item/storage/box/tactical/smokebombs{
pixel_y = 5
},
-/obj/item/storage/box/teargas,
+/obj/item/storage/box/tactical/teargas,
/turf/simulated/floor/tiled,
/area/enviro_testing_facility/inside/security/equipment)
"frP" = (
@@ -5772,7 +5772,7 @@
/obj/effect/floor_decal/corner/green{
dir = 10
},
-/obj/item/storage/box/sharps{
+/obj/item/storage/box/unique/sharps{
pixel_x = -3;
pixel_y = 9
},
@@ -6514,11 +6514,11 @@
/obj/structure/table/rack,
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/effect/map_effect/marker/mapmanip/submap/extract/enviro_testing_facility/misc/armory,
-/obj/item/storage/box/emps{
+/obj/item/storage/box/tactical/emps{
pixel_x = -3;
pixel_y = 6
},
-/obj/item/storage/box/smokebombs,
+/obj/item/storage/box/tactical/smokebombs,
/turf/template_noop,
/area/template_noop)
"gwR" = (
@@ -7309,10 +7309,10 @@
/obj/structure/table/rack,
/obj/effect/floor_decal/corner/dark_blue/diagonal,
/obj/effect/floor_decal/industrial/outline/security,
-/obj/item/storage/box/smokebombs{
+/obj/item/storage/box/tactical/smokebombs{
pixel_y = 5
},
-/obj/item/storage/box/flashbangs,
+/obj/item/storage/box/tactical/flashbangs,
/turf/simulated/floor/tiled,
/area/enviro_testing_facility/inside/security/equipment)
"hnr" = (
@@ -9240,11 +9240,11 @@
"jga" = (
/obj/structure/table/rack,
/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/item/storage/box/emps{
+/obj/item/storage/box/tactical/emps{
pixel_x = -3;
pixel_y = 6
},
-/obj/item/storage/box/smokebombs,
+/obj/item/storage/box/tactical/smokebombs,
/turf/template_noop,
/area/template_noop)
"jge" = (
@@ -10038,7 +10038,7 @@
"kay" = (
/obj/structure/table/standard,
/obj/effect/floor_decal/corner_wide/paleblue/diagonal,
-/obj/item/storage/box/sharps{
+/obj/item/storage/box/unique/sharps{
pixel_x = 4;
pixel_y = -1
},
@@ -10317,7 +10317,7 @@
/area/enviro_testing_facility/inside/crew/quarters)
"kqo" = (
/obj/structure/table/rack,
-/obj/item/storage/box/smokebombs,
+/obj/item/storage/box/tactical/smokebombs,
/turf/template_noop,
/area/template_noop)
"kqT" = (
@@ -10453,7 +10453,7 @@
/area/enviro_testing_facility/inside/security/hallway)
"kuh" = (
/obj/structure/table/stone/marble,
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 6;
pixel_y = 6
},
@@ -11563,7 +11563,7 @@
/obj/machinery/light{
dir = 4
},
-/obj/item/storage/box/sharps{
+/obj/item/storage/box/unique/sharps{
pixel_x = -4;
pixel_y = 4
},
@@ -12911,14 +12911,14 @@
/area/enviro_testing_facility/inside/engineering/reactors)
"nbn" = (
/obj/structure/closet/secure_closet/freezer,
-/obj/item/storage/box/produce,
-/obj/item/storage/box/produce,
-/obj/item/storage/box/produce,
-/obj/item/storage/box/produce,
+/obj/item/storage/box/large/produce,
+/obj/item/storage/box/large/produce,
+/obj/item/storage/box/large/produce,
+/obj/item/storage/box/large/produce,
/obj/effect/floor_decal/corner/lime/diagonal,
-/obj/item/storage/box/produce,
-/obj/item/storage/box/produce,
-/obj/item/storage/box/produce,
+/obj/item/storage/box/large/produce,
+/obj/item/storage/box/large/produce,
+/obj/item/storage/box/large/produce,
/turf/simulated/floor/tiled/freezer,
/area/enviro_testing_facility/inside/crew/canteen)
"nbt" = (
@@ -13138,11 +13138,11 @@
"nnS" = (
/obj/structure/table/rack,
/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/item/storage/box/frags{
+/obj/item/storage/box/tactical/frags{
pixel_x = -3;
pixel_y = 6
},
-/obj/item/storage/box/smokebombs,
+/obj/item/storage/box/tactical/smokebombs,
/turf/template_noop,
/area/template_noop)
"nol" = (
@@ -20936,15 +20936,15 @@
/area/enviro_testing_facility/inside/security/lobby)
"vhv" = (
/obj/structure/closet/secure_closet/freezer,
-/obj/item/storage/box/produce,
-/obj/item/storage/box/produce,
-/obj/item/storage/box/produce,
-/obj/item/storage/box/produce,
+/obj/item/storage/box/large/produce,
+/obj/item/storage/box/large/produce,
+/obj/item/storage/box/large/produce,
+/obj/item/storage/box/large/produce,
/obj/effect/floor_decal/corner/lime/diagonal,
/obj/machinery/light{
dir = 4
},
-/obj/item/storage/box/produce,
+/obj/item/storage/box/large/produce,
/turf/simulated/floor/tiled/white,
/area/enviro_testing_facility/inside/crew/canteen)
"vhB" = (
diff --git a/maps/away/scenarios/nuclear_silo/nuclear_silo.dmm b/maps/away/scenarios/nuclear_silo/nuclear_silo.dmm
index 88cc45eca911..6ec984cfd23b 100644
--- a/maps/away/scenarios/nuclear_silo/nuclear_silo.dmm
+++ b/maps/away/scenarios/nuclear_silo/nuclear_silo.dmm
@@ -196,7 +196,7 @@
pixel_y = -1;
pixel_x = 9
},
-/obj/item/storage/box/tea{
+/obj/item/storage/box/unique/tea{
pixel_x = 10;
pixel_y = 12
},
@@ -1612,8 +1612,8 @@
dir = 6
},
/obj/structure/table/standard,
-/obj/item/storage/box/monkeycubes,
-/obj/item/storage/box/freezer/organcooler,
+/obj/item/storage/box/unique/monkeycubes,
+/obj/item/storage/box/unique/freezer/organcooler,
/turf/simulated/floor/tiled/white,
/area/nuclear_silo/lower_level/medbay)
"dG" = (
@@ -9316,7 +9316,7 @@
/area/nuclear_silo/lower_level/civilian/janitor)
"uI" = (
/obj/structure/table/standard,
-/obj/item/storage/box/sharps{
+/obj/item/storage/box/unique/sharps{
pixel_x = -3;
pixel_y = -7
},
@@ -15468,7 +15468,7 @@
"Im" = (
/obj/random/dirt_75,
/obj/structure/table/wood,
-/obj/item/storage/box/tea/tieguanyin{
+/obj/item/storage/box/unique/tea/tieguanyin{
pixel_x = -8
},
/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/teacup{
@@ -16535,7 +16535,7 @@
/area/nuclear_silo/lower_level/civilian/messhall)
"KF" = (
/obj/structure/closet/secure_closet/freezer/meat,
-/obj/item/storage/box/produce,
+/obj/item/storage/box/large/produce,
/obj/item/reagent_containers/food/drinks/carton/soymilk,
/obj/item/reagent_containers/food/drinks/carton/milk,
/obj/item/storage/box/fancy/egg_box,
@@ -19565,7 +19565,7 @@
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat,
-/obj/item/storage/box/produce,
+/obj/item/storage/box/large/produce,
/obj/random/dirt_75,
/obj/random/kitchen_staples,
/obj/random/kitchen_staples,
@@ -20197,7 +20197,7 @@
"SP" = (
/obj/structure/table/stone/marble,
/obj/effect/floor_decal/corner/paleblue/diagonal,
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = -3
},
/obj/structure/cable/green{
@@ -21696,8 +21696,8 @@
"Wf" = (
/obj/structure/closet/crate/freezer,
/obj/effect/floor_decal/corner/grey/diagonal,
-/obj/item/storage/box/produce,
-/obj/item/storage/box/produce,
+/obj/item/storage/box/large/produce,
+/obj/item/storage/box/large/produce,
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat/chicken,
@@ -22022,7 +22022,7 @@
name = "Messhall Shutters";
req_one_access = list(248,247)
},
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_y = 9
},
/obj/random/dirt_75,
diff --git a/maps/away/scenarios/nuclear_silo/nuclear_silo_submaps.dmm b/maps/away/scenarios/nuclear_silo/nuclear_silo_submaps.dmm
index 556421d302ff..c146051ac5e7 100644
--- a/maps/away/scenarios/nuclear_silo/nuclear_silo_submaps.dmm
+++ b/maps/away/scenarios/nuclear_silo/nuclear_silo_submaps.dmm
@@ -475,10 +475,10 @@
req_access = list(247)
},
/obj/effect/floor_decal/industrial/hatch/red,
-/obj/item/storage/box/frags,
-/obj/item/storage/box/smokebombs,
-/obj/item/storage/box/flashbangs,
-/obj/item/storage/box/teargas,
+/obj/item/storage/box/tactical/frags,
+/obj/item/storage/box/tactical/smokebombs,
+/obj/item/storage/box/tactical/flashbangs,
+/obj/item/storage/box/tactical/teargas,
/obj/effect/map_effect/marker/mapmanip/submap/extract/nuclear_silo/armoury,
/turf/simulated/floor/tiled/dark,
/area/template_noop)
@@ -792,10 +792,10 @@
req_access = list(247)
},
/obj/effect/floor_decal/industrial/hatch/red,
-/obj/item/storage/box/frags,
-/obj/item/storage/box/smokebombs,
-/obj/item/storage/box/flashbangs,
-/obj/item/storage/box/teargas,
+/obj/item/storage/box/tactical/frags,
+/obj/item/storage/box/tactical/smokebombs,
+/obj/item/storage/box/tactical/flashbangs,
+/obj/item/storage/box/tactical/teargas,
/obj/item/recharger_backpack,
/obj/item/recharger_backpack,
/obj/item/recharger_backpack,
@@ -1228,9 +1228,9 @@
/obj/item/ammo_magazine/c45m/rubber,
/obj/item/ammo_magazine/c45m/rubber,
/obj/item/ammo_magazine/c45m/rubber,
-/obj/item/storage/box/stunshells,
-/obj/item/storage/box/flashshells,
-/obj/item/storage/box/beanbags,
+/obj/item/storage/box/shells/stunshells,
+/obj/item/storage/box/shells/flashshells,
+/obj/item/storage/box/shells/beanbags,
/turf/simulated/floor/tiled/dark,
/area/template_noop)
"we" = (
@@ -1804,8 +1804,8 @@
/obj/item/ammo_magazine/a556/carbine,
/obj/item/ammo_magazine/a556/carbine,
/obj/item/ammo_magazine/a556/carbine,
-/obj/item/storage/box/shotgunshells,
-/obj/item/storage/box/shotgunshells,
+/obj/item/storage/box/shells/buckshot,
+/obj/item/storage/box/shells/buckshot,
/turf/simulated/floor/tiled/dark,
/area/template_noop)
"FB" = (
@@ -2233,9 +2233,9 @@
req_access = list(247)
},
/obj/effect/floor_decal/industrial/hatch/red,
-/obj/item/storage/box/teargas,
-/obj/item/storage/box/smokebombs,
-/obj/item/storage/box/flashbangs,
+/obj/item/storage/box/tactical/teargas,
+/obj/item/storage/box/tactical/smokebombs,
+/obj/item/storage/box/tactical/flashbangs,
/obj/effect/map_effect/marker/mapmanip/submap/extract/nuclear_silo/armoury,
/turf/simulated/floor/tiled/dark,
/area/template_noop)
diff --git a/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette.dmm b/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette.dmm
index a0445355ddec..fe18805fc1cc 100644
--- a/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette.dmm
+++ b/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette.dmm
@@ -1442,8 +1442,8 @@
"fa" = (
/obj/effect/floor_decal/industrial/outline/service,
/obj/structure/closet/secure_closet/refrigerator,
-/obj/item/storage/box/produce,
-/obj/item/storage/box/produce,
+/obj/item/storage/box/large/produce,
+/obj/item/storage/box/large/produce,
/obj/item/storage/box/fancy/egg_box,
/obj/item/storage/box/fancy/egg_box,
/obj/item/reagent_containers/food/condiment/enzyme,
@@ -2734,7 +2734,7 @@
/area/tcaf_corvette/autocannon)
"jT" = (
/obj/structure/table/stone/marble,
-/obj/item/storage/box/condiment{
+/obj/item/storage/box/large/condiment{
pixel_y = 14
},
/obj/item/reagent_containers/spray/cleaner{
@@ -3751,7 +3751,7 @@
/obj/item/storage/firstaid/surgery{
pixel_y = 10
},
-/obj/item/storage/box/sharps{
+/obj/item/storage/box/unique/sharps{
pixel_y = 2;
pixel_x = 6
},
@@ -4429,7 +4429,7 @@
req_access = list(204)
},
/obj/effect/floor_decal/industrial/outline/security,
-/obj/item/storage/box/frags,
+/obj/item/storage/box/tactical/frags,
/obj/item/gun/energy/blaster/revolver,
/obj/item/gun/energy/blaster/revolver,
/obj/item/gun/energy/blaster/revolver,
@@ -4437,10 +4437,10 @@
/obj/item/gun/energy/blaster/revolver,
/obj/item/gun/energy/blaster/revolver,
/obj/item/gun/projectile/shotgun/pump,
-/obj/item/storage/box/shotgunammo,
-/obj/item/storage/box/shotgunammo,
-/obj/item/storage/box/beanbags,
-/obj/item/storage/box/beanbags,
+/obj/item/storage/box/shells/slugs,
+/obj/item/storage/box/shells/slugs,
+/obj/item/storage/box/shells/beanbags,
+/obj/item/storage/box/shells/beanbags,
/obj/item/gun/energy/rifle/laser/noctiluca,
/obj/item/gun/energy/blaster/tcaf,
/obj/item/gun/energy/blaster/tcaf,
@@ -7102,8 +7102,8 @@
/obj/item/device/flashlight/maglight,
/obj/item/device/flashlight/maglight,
/obj/item/storage/box/handcuffs,
-/obj/item/storage/box/flashbangs,
-/obj/item/storage/box/smokebombs,
+/obj/item/storage/box/tactical/flashbangs,
+/obj/item/storage/box/tactical/smokebombs,
/obj/item/shield/riot/tact/legion,
/obj/item/shield/riot/tact/legion,
/obj/item/shield/riot/tact/legion,
@@ -8054,7 +8054,7 @@
/obj/item/material/stool/chair/wheelchair,
/obj/item/cane/crutch,
/obj/item/cane/crutch,
-/obj/item/storage/box/monkeycubes,
+/obj/item/storage/box/unique/monkeycubes,
/obj/item/storage/box/autoinjectors,
/obj/item/storage/box/inhalers_auto,
/obj/item/storage/box/syringes,
@@ -10505,7 +10505,7 @@
/obj/item/storage/firstaid/surgery{
pixel_y = 13
},
-/obj/item/storage/box/sharps{
+/obj/item/storage/box/unique/sharps{
pixel_y = 3;
pixel_x = 6
},
diff --git a/maps/away/ships/biesel/tcfl_patrol/tcfl_peacekeeper_ship.dmm b/maps/away/ships/biesel/tcfl_patrol/tcfl_peacekeeper_ship.dmm
index e8505bf3f3c4..4b4534155cb7 100644
--- a/maps/away/ships/biesel/tcfl_patrol/tcfl_peacekeeper_ship.dmm
+++ b/maps/away/ships/biesel/tcfl_patrol/tcfl_peacekeeper_ship.dmm
@@ -2537,7 +2537,7 @@
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat,
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = -11
},
@@ -2662,7 +2662,7 @@
/obj/machinery/light/small{
dir = 1
},
-/obj/item/storage/box/flashbangs,
+/obj/item/storage/box/tactical/flashbangs,
/obj/item/storage/belt/security,
/turf/simulated/floor/shuttle/tan,
/area/ship/tcfl_peacekeeper_ship)
@@ -2676,7 +2676,7 @@
/obj/item/storage/box/zipties,
/obj/item/device/flash,
/obj/item/reagent_containers/spray/pepper,
-/obj/item/storage/box/smokebombs,
+/obj/item/storage/box/tactical/smokebombs,
/obj/item/storage/belt/security,
/turf/simulated/floor/shuttle/tan,
/area/ship/tcfl_peacekeeper_ship)
diff --git a/maps/away/ships/casino/casino.dmm b/maps/away/ships/casino/casino.dmm
index 879fb0f92d81..04ed3ee8c566 100644
--- a/maps/away/ships/casino/casino.dmm
+++ b/maps/away/ships/casino/casino.dmm
@@ -1186,11 +1186,11 @@
/area/casino/casino_security)
"dB" = (
/obj/structure/table/rack,
-/obj/item/storage/box/beanbags{
+/obj/item/storage/box/shells/beanbags{
pixel_x = -4;
pixel_y = 4
},
-/obj/item/storage/box/beanbags{
+/obj/item/storage/box/shells/beanbags{
pixel_x = 5;
pixel_y = -6
},
diff --git a/maps/away/ships/coc/coc_ranger/coc_ship.dmm b/maps/away/ships/coc/coc_ranger/coc_ship.dmm
index 67f681f65a34..dbec99b4ee88 100644
--- a/maps/away/ships/coc/coc_ranger/coc_ship.dmm
+++ b/maps/away/ships/coc/coc_ranger/coc_ship.dmm
@@ -3661,7 +3661,7 @@
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat,
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = -11
},
@@ -5382,9 +5382,9 @@
/obj/item/ammo_magazine/c762,
/obj/item/ammo_magazine/c762,
/obj/item/gun/projectile/shotgun/pump,
-/obj/item/storage/box/shotgunshells,
-/obj/item/storage/box/flashshells,
-/obj/item/storage/box/beanbags,
+/obj/item/storage/box/shells/buckshot,
+/obj/item/storage/box/shells/flashshells,
+/obj/item/storage/box/shells/beanbags,
/obj/item/gun/projectile/automatic/tommygun,
/obj/item/ammo_magazine/submachinemag,
/obj/item/ammo_magazine/submachinemag,
diff --git a/maps/away/ships/coc/coc_scarab/coc_scarab.dmm b/maps/away/ships/coc/coc_scarab/coc_scarab.dmm
index 42594a0d8017..d965e9f34222 100644
--- a/maps/away/ships/coc/coc_scarab/coc_scarab.dmm
+++ b/maps/away/ships/coc/coc_scarab/coc_scarab.dmm
@@ -790,11 +790,11 @@
/obj/item/reagent_containers/food/drinks/cans/beetle_milk,
/obj/item/reagent_containers/food/drinks/cans/beetle_milk,
/obj/item/reagent_containers/food/drinks/cans/beetle_milk,
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = 4
},
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = -5
},
@@ -8154,9 +8154,9 @@
must_start_working = 1
},
/obj/item/gun/projectile/shotgun/pump,
-/obj/item/storage/box/shotgunshells,
-/obj/item/storage/box/shotgunshells,
-/obj/item/storage/box/stunshells,
+/obj/item/storage/box/shells/buckshot,
+/obj/item/storage/box/shells/buckshot,
+/obj/item/storage/box/shells/stunshells,
/obj/item/gun/projectile/gauss,
/obj/item/ammo_magazine/gauss,
/obj/item/ammo_magazine/gauss,
diff --git a/maps/away/ships/coc/coc_surveyor/coc_surveyor.dmm b/maps/away/ships/coc/coc_surveyor/coc_surveyor.dmm
index 6c49bd0f4598..474f526080d6 100644
--- a/maps/away/ships/coc/coc_surveyor/coc_surveyor.dmm
+++ b/maps/away/ships/coc/coc_surveyor/coc_surveyor.dmm
@@ -2218,7 +2218,7 @@
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat,
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = -11
},
@@ -3005,10 +3005,10 @@
/obj/structure/closet/cabinet,
/obj/item/gun/energy/plasmacutter,
/obj/item/gun/projectile/shotgun/pump/combat,
-/obj/item/storage/box/shotgunshells,
-/obj/item/storage/box/shotgunshells,
-/obj/item/storage/box/shotgunshells,
-/obj/item/storage/box/shotgunshells,
+/obj/item/storage/box/shells/buckshot,
+/obj/item/storage/box/shells/buckshot,
+/obj/item/storage/box/shells/buckshot,
+/obj/item/storage/box/shells/buckshot,
/obj/item/clothing/head/softcap/himeo,
/obj/item/clothing/accessory/badge/passcard/himeo,
/obj/item/flame/lighter/zippo/himeo,
@@ -3387,8 +3387,8 @@
/obj/item/clothing/head/helmet/space/void/mining/himeo,
/obj/item/pickaxe/diamonddrill,
/obj/item/gun/projectile/shotgun/doublebarrel,
-/obj/item/storage/box/shotgunshells,
-/obj/item/storage/box/shotgunshells,
+/obj/item/storage/box/shells/buckshot,
+/obj/item/storage/box/shells/buckshot,
/obj/item/device/gps,
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/machinery/light{
@@ -4008,8 +4008,8 @@
/obj/item/clothing/head/helmet/space/void/mining/himeo,
/obj/item/pickaxe/diamonddrill,
/obj/item/gun/projectile/shotgun/doublebarrel,
-/obj/item/storage/box/shotgunshells,
-/obj/item/storage/box/shotgunshells,
+/obj/item/storage/box/shells/buckshot,
+/obj/item/storage/box/shells/buckshot,
/obj/item/device/gps,
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/item/device/suit_cooling_unit,
diff --git a/maps/away/ships/coc/gadpathur_patrol/gadpathur_patrol.dmm b/maps/away/ships/coc/gadpathur_patrol/gadpathur_patrol.dmm
index c5a4e75b6b0e..9abcaf36a440 100644
--- a/maps/away/ships/coc/gadpathur_patrol/gadpathur_patrol.dmm
+++ b/maps/away/ships/coc/gadpathur_patrol/gadpathur_patrol.dmm
@@ -2091,10 +2091,10 @@
/obj/item/reagent_containers/food/condiment/flour,
/obj/item/reagent_containers/food/condiment/sugar,
/obj/item/reagent_containers/food/condiment/sugar,
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_y = 6
},
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_y = 6
},
/obj/item/reagent_containers/food/snacks/meat/biogenerated,
diff --git a/maps/away/ships/dominia/dominian_corvette/dominian_corvette.dmm b/maps/away/ships/dominia/dominian_corvette/dominian_corvette.dmm
index f6166f9d798e..a72956bb0e0c 100644
--- a/maps/away/ships/dominia/dominian_corvette/dominian_corvette.dmm
+++ b/maps/away/ships/dominia/dominian_corvette/dominian_corvette.dmm
@@ -4392,10 +4392,10 @@
dir = 1;
level = 2
},
-/obj/item/storage/box/condiment{
+/obj/item/storage/box/large/condiment{
pixel_y = 2
},
-/obj/item/storage/box/condimentbottles{
+/obj/item/storage/box/large/condimentbottles{
pixel_y = 5
},
/obj/random/dirt_75,
@@ -6258,7 +6258,7 @@
pixel_x = 4;
pixel_y = 4
},
-/obj/item/storage/box/tea/tieguanyin{
+/obj/item/storage/box/unique/tea/tieguanyin{
desc = "A tin bearing the logo of a Dominian tea company located on Sun Reach. This one contains a bag of tieguanyin, a type of oolong tea.";
pixel_x = 14;
pixel_y = 3
@@ -7089,8 +7089,8 @@
"nhX" = (
/obj/effect/floor_decal/industrial/outline/service,
/obj/structure/closet/secure_closet/refrigerator,
-/obj/item/storage/box/produce,
-/obj/item/storage/box/produce,
+/obj/item/storage/box/large/produce,
+/obj/item/storage/box/large/produce,
/obj/item/storage/box/fancy/egg_box,
/obj/item/storage/box/fancy/egg_box,
/obj/item/reagent_containers/food/condiment/enzyme,
@@ -7721,7 +7721,7 @@
pixel_y = -14;
pixel_x = 10
},
-/obj/item/storage/box/sharps{
+/obj/item/storage/box/unique/sharps{
pixel_x = -6;
pixel_y = -14
},
diff --git a/maps/away/ships/dominia/dominian_science_vessel/dominian_science_vessel.dmm b/maps/away/ships/dominia/dominian_science_vessel/dominian_science_vessel.dmm
index 6728e67d36c6..eafa6f71b6a7 100644
--- a/maps/away/ships/dominia/dominian_science_vessel/dominian_science_vessel.dmm
+++ b/maps/away/ships/dominia/dominian_science_vessel/dominian_science_vessel.dmm
@@ -2580,7 +2580,7 @@
pixel_x = 6;
pixel_y = 2
},
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 2;
pixel_y = 9
},
@@ -4925,7 +4925,7 @@
/area/ship/dominian_science_vessel/hangar)
"oBB" = (
/obj/item/storage/belt/archaeology,
-/obj/item/storage/box/excavation,
+/obj/item/storage/box/unique/excavation,
/obj/item/device/flashlight/lantern,
/obj/item/device/ano_scanner,
/obj/item/device/depth_scanner,
@@ -8057,7 +8057,7 @@
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat,
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = -5
},
diff --git a/maps/away/ships/dominia/dominian_unathi_privateer/dominian_unathi_privateer_ghostroles.dm b/maps/away/ships/dominia/dominian_unathi_privateer/dominian_unathi_privateer_ghostroles.dm
index fa40d5703cd6..8bb69a447aef 100644
--- a/maps/away/ships/dominia/dominian_unathi_privateer/dominian_unathi_privateer_ghostroles.dm
+++ b/maps/away/ships/dominia/dominian_unathi_privateer/dominian_unathi_privateer_ghostroles.dm
@@ -30,7 +30,7 @@
backpack_contents = list(
/obj/item/storage/box/survival = 1,
- /obj/item/storage/box/donkpockets = 1,
+ /obj/item/storage/box/unique/donkpockets = 1,
/obj/item/device/versebook/tribunal = 1,
/obj/item/shield/energy/dominia = 1
)
diff --git a/maps/away/ships/dpra/hailstorm/hailstorm_ship.dmm b/maps/away/ships/dpra/hailstorm/hailstorm_ship.dmm
index a9244f852150..f39b79b33a42 100644
--- a/maps/away/ships/dpra/hailstorm/hailstorm_ship.dmm
+++ b/maps/away/ships/dpra/hailstorm/hailstorm_ship.dmm
@@ -2214,7 +2214,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 5
},
-/obj/item/storage/box/condiment{
+/obj/item/storage/box/large/condiment{
pixel_y = 4
},
/obj/random/dirt_75,
@@ -2861,8 +2861,8 @@
"sY" = (
/obj/effect/floor_decal/industrial/outline/service,
/obj/structure/closet/secure_closet/refrigerator,
-/obj/item/storage/box/produce,
-/obj/item/storage/box/produce,
+/obj/item/storage/box/large/produce,
+/obj/item/storage/box/large/produce,
/obj/item/storage/box/fancy/egg_box,
/obj/item/storage/box/fancy/egg_box,
/obj/item/reagent_containers/food/condiment/enzyme,
@@ -3951,8 +3951,8 @@
/obj/item/ammo_magazine/c762/dpra,
/obj/item/ammo_magazine/c762/dpra,
/obj/item/gun/projectile/shotgun/foldable,
-/obj/item/storage/box/shotgunshells,
-/obj/item/storage/box/shotgunshells,
+/obj/item/storage/box/shells/buckshot,
+/obj/item/storage/box/shells/buckshot,
/obj/effect/floor_decal/industrial/outline/red,
/obj/machinery/light/colored/decayed{
dir = 1
diff --git a/maps/away/ships/elyra/elyra_corvette/elyra_corvette.dmm b/maps/away/ships/elyra/elyra_corvette/elyra_corvette.dmm
index 0f5bcc68b3fc..faf127a759e7 100644
--- a/maps/away/ships/elyra/elyra_corvette/elyra_corvette.dmm
+++ b/maps/away/ships/elyra/elyra_corvette/elyra_corvette.dmm
@@ -2098,7 +2098,7 @@
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat,
-/obj/item/storage/box/produce,
+/obj/item/storage/box/large/produce,
/obj/item/storage/box/fancy/egg_box,
/obj/item/storage/box/fancy/egg_box,
/obj/item/reagent_containers/food/drinks/carton/milk,
@@ -8977,7 +8977,7 @@
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
},
-/obj/item/storage/box/sharps{
+/obj/item/storage/box/unique/sharps{
pixel_x = 8
},
/obj/item/reagent_containers/spray/cleaner{
diff --git a/maps/away/ships/freebooter/freebooter_salvager/freebooter_salvager.dmm b/maps/away/ships/freebooter/freebooter_salvager/freebooter_salvager.dmm
index 4a5b02af49e8..f3ec5258448b 100644
--- a/maps/away/ships/freebooter/freebooter_salvager/freebooter_salvager.dmm
+++ b/maps/away/ships/freebooter/freebooter_salvager/freebooter_salvager.dmm
@@ -4687,7 +4687,7 @@
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat,
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = -11
},
@@ -7847,7 +7847,7 @@
pixel_x = 10;
pixel_y = -2
},
-/obj/item/storage/box/condiment{
+/obj/item/storage/box/large/condiment{
pixel_y = 16;
pixel_x = 3
},
@@ -8537,7 +8537,7 @@
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat,
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = -11
},
diff --git a/maps/away/ships/freebooter/freebooter_ship/freebooter_ship_submaps.dmm b/maps/away/ships/freebooter/freebooter_ship/freebooter_ship_submaps.dmm
index 317037f8a6c4..e4a5fe39dc4c 100644
--- a/maps/away/ships/freebooter/freebooter_ship/freebooter_ship_submaps.dmm
+++ b/maps/away/ships/freebooter/freebooter_ship/freebooter_ship_submaps.dmm
@@ -1799,7 +1799,7 @@
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat,
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = -11
},
@@ -2011,7 +2011,7 @@
/obj/structure/closet/crate/miningcart,
/obj/item/reagent_containers/food/snacks/tastybread,
/obj/item/reagent_containers/food/snacks/tastybread,
-/obj/item/storage/box/produce,
+/obj/item/storage/box/large/produce,
/obj/effect/floor_decal/corner/dark_blue/full{
dir = 8
},
@@ -2152,7 +2152,7 @@
pixel_x = -5
},
/obj/item/reagent_containers/inhaler/space_drugs,
-/obj/item/storage/box/condiment{
+/obj/item/storage/box/large/condiment{
pixel_y = 16
},
/turf/simulated/floor/tiled/white,
diff --git a/maps/away/ships/golden_deep/golden_deep.dmm b/maps/away/ships/golden_deep/golden_deep.dmm
index 3048370cb499..45dd42b54a54 100644
--- a/maps/away/ships/golden_deep/golden_deep.dmm
+++ b/maps/away/ships/golden_deep/golden_deep.dmm
@@ -105,10 +105,10 @@
/obj/item/storage/belt/security/full/alt,
/obj/item/device/flashlight/maglight,
/obj/item/device/flashlight/maglight,
-/obj/item/storage/box/smokebombs,
-/obj/item/storage/box/flashbangs,
+/obj/item/storage/box/tactical/smokebombs,
+/obj/item/storage/box/tactical/flashbangs,
/obj/item/storage/box/handcuffs,
-/obj/item/storage/box/teargas,
+/obj/item/storage/box/tactical/teargas,
/obj/machinery/light/small,
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/item/storage/box/landmines/claymore,
@@ -9835,11 +9835,11 @@
},
/obj/item/gun/energy/rifle/laser,
/obj/item/gun/projectile/shotgun/pump/combat,
-/obj/item/storage/box/shotgunshells,
-/obj/item/storage/box/shotgunshells,
-/obj/item/storage/box/beanbags,
-/obj/item/storage/box/beanbags,
-/obj/item/storage/box/haywireshells,
+/obj/item/storage/box/shells/buckshot,
+/obj/item/storage/box/shells/buckshot,
+/obj/item/storage/box/shells/beanbags,
+/obj/item/storage/box/shells/beanbags,
+/obj/item/storage/box/shells/haywireshells,
/obj/item/melee/energy/glaive,
/obj/item/melee/energy/glaive,
/obj/machinery/button/remote/blast_door{
diff --git a/maps/away/ships/golden_deep/golden_deep_submaps.dmm b/maps/away/ships/golden_deep/golden_deep_submaps.dmm
index 3167945fc9d1..2d64656f6375 100644
--- a/maps/away/ships/golden_deep/golden_deep_submaps.dmm
+++ b/maps/away/ships/golden_deep/golden_deep_submaps.dmm
@@ -315,7 +315,7 @@
/obj/item/device/measuring_tape,
/obj/item/device/core_sampler,
/obj/item/device/depth_scanner,
-/obj/item/storage/box/excavation,
+/obj/item/storage/box/unique/excavation,
/obj/item/book/manual/excavation,
/obj/item/pickaxe/hand,
/obj/random/dirt_75,
@@ -792,10 +792,10 @@
/obj/item/gun/energy/net{
pixel_y = -4
},
-/obj/item/storage/box/tranquilizer{
+/obj/item/storage/box/shells/tranquilizer{
pixel_y = 14
},
-/obj/item/storage/box/tranquilizer{
+/obj/item/storage/box/shells/tranquilizer{
pixel_y = 14
},
/obj/item/gun/projectile/heavysniper/tranq{
diff --git a/maps/away/ships/hegemony/fishing_trawler/fishing_league_trawler.dmm b/maps/away/ships/hegemony/fishing_trawler/fishing_league_trawler.dmm
index 83d67f776b13..f233fb8ad65e 100644
--- a/maps/away/ships/hegemony/fishing_trawler/fishing_league_trawler.dmm
+++ b/maps/away/ships/hegemony/fishing_trawler/fishing_league_trawler.dmm
@@ -1686,11 +1686,11 @@
pixel_x = 6;
pixel_y = 10
},
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = 7
},
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = 1
},
diff --git a/maps/away/ships/hegemony/hegemony_corvette/hegemony_corvette.dmm b/maps/away/ships/hegemony/hegemony_corvette/hegemony_corvette.dmm
index e9a47bea0219..552b0f5f8c16 100644
--- a/maps/away/ships/hegemony/hegemony_corvette/hegemony_corvette.dmm
+++ b/maps/away/ships/hegemony/hegemony_corvette/hegemony_corvette.dmm
@@ -8928,10 +8928,10 @@
name = "wall cabinet";
pixel_x = -32
},
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_y = -3
},
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_y = 6
},
/obj/item/storage/box/fancy/egg_box{
diff --git a/maps/away/ships/hegemony/hegemony_corvette/hegemony_ghostroles.dm b/maps/away/ships/hegemony/hegemony_corvette/hegemony_ghostroles.dm
index 70a9a1755579..82143e491845 100644
--- a/maps/away/ships/hegemony/hegemony_corvette/hegemony_ghostroles.dm
+++ b/maps/away/ships/hegemony/hegemony_corvette/hegemony_ghostroles.dm
@@ -80,7 +80,7 @@
backpack_contents = list(
/obj/item/storage/box/survival = 1,
- /obj/item/storage/box/donkpockets = 1
+ /obj/item/storage/box/unique/donkpockets = 1
)
/obj/outfit/admin/izweski/get_id_access()
@@ -123,7 +123,7 @@
uniform = /obj/item/clothing/under/unathi/skakh/warrior
backpack_contents = list(
/obj/item/storage/box/survival = 1,
- /obj/item/storage/box/donkpockets = 1,
+ /obj/item/storage/box/unique/donkpockets = 1,
/obj/item/device/versebook/skakh = 1
)
diff --git a/maps/away/ships/hegemony/miners_guild/miners_guild_station.dmm b/maps/away/ships/hegemony/miners_guild/miners_guild_station.dmm
index dc778dac4173..e0f513167012 100644
--- a/maps/away/ships/hegemony/miners_guild/miners_guild_station.dmm
+++ b/maps/away/ships/hegemony/miners_guild/miners_guild_station.dmm
@@ -2179,9 +2179,9 @@
/obj/machinery/light{
dir = 1
},
-/obj/item/storage/box/produce,
-/obj/item/storage/box/produce,
-/obj/item/storage/box/produce,
+/obj/item/storage/box/large/produce,
+/obj/item/storage/box/large/produce,
+/obj/item/storage/box/large/produce,
/turf/simulated/floor/lino/diamond,
/area/miners_guild/canteen)
"qD" = (
diff --git a/maps/away/ships/heph/cyclops/cyclops.dmm b/maps/away/ships/heph/cyclops/cyclops.dmm
index 568014060a83..28b100e3ab7b 100644
--- a/maps/away/ships/heph/cyclops/cyclops.dmm
+++ b/maps/away/ships/heph/cyclops/cyclops.dmm
@@ -1483,7 +1483,7 @@
/obj/machinery/light{
dir = 4
},
-/obj/item/storage/box/produce,
+/obj/item/storage/box/large/produce,
/obj/item/reagent_containers/food/drinks/carton/milk,
/obj/item/reagent_containers/food/drinks/carton/milk,
/obj/item/reagent_containers/food/drinks/carton/soymilk,
diff --git a/maps/away/ships/heph/heph_security/heph_security.dmm b/maps/away/ships/heph/heph_security/heph_security.dmm
index 50eecb5e82c3..74fa5314c7c9 100644
--- a/maps/away/ships/heph/heph_security/heph_security.dmm
+++ b/maps/away/ships/heph/heph_security/heph_security.dmm
@@ -663,8 +663,8 @@
/obj/item/reagent_containers/food/drinks/carton/milk,
/obj/item/reagent_containers/food/drinks/carton/soymilk,
/obj/item/reagent_containers/food/drinks/carton/soymilk,
-/obj/item/storage/box/produce,
-/obj/item/storage/box/produce,
+/obj/item/storage/box/large/produce,
+/obj/item/storage/box/large/produce,
/turf/simulated/floor/tiled/freezer{
name = "cooled tiles";
temperature = 253.15
@@ -1572,9 +1572,9 @@
/obj/machinery/light,
/obj/item/clothing/accessory/storage/bandolier,
/obj/item/clothing/accessory/storage/bandolier,
-/obj/item/storage/box/shotgunammo,
-/obj/item/storage/box/shotgunshells,
-/obj/item/storage/box/shotgunshells,
+/obj/item/storage/box/shells/slugs,
+/obj/item/storage/box/shells/buckshot,
+/obj/item/storage/box/shells/buckshot,
/obj/item/ammo_magazine/mc9mmt,
/obj/item/ammo_magazine/mc9mmt,
/obj/item/ammo_magazine/mc9mmt,
@@ -4216,7 +4216,7 @@
/obj/item/shield/energy,
/obj/item/shield/energy,
/obj/item/shield/energy,
-/obj/item/storage/box/flashbangs,
+/obj/item/storage/box/tactical/flashbangs,
/obj/item/storage/box/handcuffs,
/obj/item/storage/box/handcuffs,
/obj/item/gun/energy/disruptorpistol,
diff --git a/maps/away/ships/himeo/himeo_patrol_ship.dmm b/maps/away/ships/himeo/himeo_patrol_ship.dmm
index b8fae7238848..c1400eff75cb 100644
--- a/maps/away/ships/himeo/himeo_patrol_ship.dmm
+++ b/maps/away/ships/himeo/himeo_patrol_ship.dmm
@@ -8634,7 +8634,7 @@
/obj/structure/closet/secure_closet/refrigerator,
/obj/random/kitchen_staples,
/obj/random/kitchen_staples,
-/obj/item/storage/box/produce,
+/obj/item/storage/box/large/produce,
/obj/effect/floor_decal/corner/red/diagonal,
/turf/simulated/floor/tiled/light,
/area/himeo_patrol_ship/messhall)
diff --git a/maps/away/ships/iac/iac_rescue_ship.dmm b/maps/away/ships/iac/iac_rescue_ship.dmm
index fd87cef4315e..58bc08e2f2e4 100644
--- a/maps/away/ships/iac/iac_rescue_ship.dmm
+++ b/maps/away/ships/iac/iac_rescue_ship.dmm
@@ -1148,7 +1148,7 @@
/obj/effect/floor_decal/corner_wide/paleblue{
dir = 10
},
-/obj/item/storage/box/sharps,
+/obj/item/storage/box/unique/sharps,
/obj/structure/table/reinforced/glass,
/turf/simulated/floor/tiled/white,
/area/ship/iac_rescue_ship/surgery)
@@ -1650,13 +1650,13 @@
},
/obj/item/gun/projectile/shotgun/pump,
/obj/item/gun/projectile/shotgun/pump,
-/obj/item/storage/box/shotgunshells,
-/obj/item/storage/box/shotgunshells,
-/obj/item/storage/box/beanbags{
+/obj/item/storage/box/shells/buckshot,
+/obj/item/storage/box/shells/buckshot,
+/obj/item/storage/box/shells/beanbags{
pixel_x = -4;
pixel_y = 4
},
-/obj/item/storage/box/beanbags{
+/obj/item/storage/box/shells/beanbags{
pixel_x = -4;
pixel_y = 4
},
@@ -2171,7 +2171,7 @@
/area/ship/iac_rescue_ship/bridge)
"emR" = (
/obj/structure/table/stone/marble,
-/obj/item/storage/box/condiment{
+/obj/item/storage/box/large/condiment{
pixel_y = 10;
pixel_x = 2
},
@@ -7441,7 +7441,7 @@
icon_state = "sterilesprayblue";
name = "surgery cleaner"
},
-/obj/item/storage/box/freezer/organcooler,
+/obj/item/storage/box/unique/freezer/organcooler,
/obj/structure/table/reinforced/glass,
/turf/simulated/floor/tiled/white,
/area/ship/iac_rescue_ship/surgery)
@@ -9783,10 +9783,10 @@
/area/space)
"xeu" = (
/obj/structure/table/stone/marble,
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_y = 9
},
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_y = 3
},
/obj/item/material/kitchen/rollingpin{
diff --git a/maps/away/ships/idris/idris_cruiser.dmm b/maps/away/ships/idris/idris_cruiser.dmm
index 5d2711de1e8e..12868450302d 100644
--- a/maps/away/ships/idris/idris_cruiser.dmm
+++ b/maps/away/ships/idris/idris_cruiser.dmm
@@ -4106,7 +4106,7 @@
"pl" = (
/obj/structure/table/stone/marble,
/obj/effect/floor_decal/corner/dark_green/diagonal,
-/obj/item/storage/box/condiment{
+/obj/item/storage/box/large/condiment{
pixel_y = 10;
pixel_x = 2
},
@@ -5628,10 +5628,10 @@
"ue" = (
/obj/effect/floor_decal/corner/dark_green/diagonal,
/obj/structure/table/stone/marble,
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_y = 9
},
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_y = 3
},
/obj/item/material/kitchen/rollingpin{
@@ -7226,7 +7226,7 @@
req_one_access = list(220)
},
/obj/structure/table/reinforced/steel,
-/obj/item/storage/box/flashbangs{
+/obj/item/storage/box/tactical/flashbangs{
pixel_y = 7;
pixel_x = 7
},
diff --git a/maps/away/ships/kataphracts/kataphract_ship.dmm b/maps/away/ships/kataphracts/kataphract_ship.dmm
index 41000a6a8822..88912ea88c71 100644
--- a/maps/away/ships/kataphracts/kataphract_ship.dmm
+++ b/maps/away/ships/kataphracts/kataphract_ship.dmm
@@ -4285,13 +4285,13 @@
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat,
-/obj/item/storage/box/produce,
-/obj/item/storage/box/condiment,
+/obj/item/storage/box/large/produce,
+/obj/item/storage/box/large/condiment,
/obj/item/storage/box/fancy/egg_box,
/obj/item/storage/box/fancy/egg_box,
/obj/item/storage/box/fancy/egg_box,
/obj/effect/floor_decal/corner_wide/grey/diagonal,
-/obj/item/storage/box/produce,
+/obj/item/storage/box/large/produce,
/obj/machinery/light,
/turf/simulated/floor/tiled/white,
/area/kataphract_chapter/mess)
diff --git a/maps/away/ships/kataphracts/kataphract_ship_ghostroles.dm b/maps/away/ships/kataphracts/kataphract_ship_ghostroles.dm
index 41a7e408aece..e1c972018a8e 100644
--- a/maps/away/ships/kataphracts/kataphract_ship_ghostroles.dm
+++ b/maps/away/ships/kataphracts/kataphract_ship_ghostroles.dm
@@ -82,7 +82,7 @@
l_ear = /obj/item/device/radio/headset/ship
backpack_contents = list(
- /obj/item/storage/box/donkpockets = 1
+ /obj/item/storage/box/unique/donkpockets = 1
)
/obj/outfit/admin/kataphract/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
diff --git a/maps/away/ships/konyang/ipc_refugee/ipc_refugee_ship.dmm b/maps/away/ships/konyang/ipc_refugee/ipc_refugee_ship.dmm
index 323339dbe322..a812b6f4ca84 100644
--- a/maps/away/ships/konyang/ipc_refugee/ipc_refugee_ship.dmm
+++ b/maps/away/ships/konyang/ipc_refugee/ipc_refugee_ship.dmm
@@ -2620,7 +2620,7 @@
/area/ship/ipc_refugee/forehall)
"ud" = (
/obj/structure/lattice,
-/obj/item/storage/box/sharps{
+/obj/item/storage/box/unique/sharps{
pixel_x = -5;
pixel_y = -5
},
diff --git a/maps/away/ships/konyang/kasf_ship/kasf_ship.dmm b/maps/away/ships/konyang/kasf_ship/kasf_ship.dmm
index affa6be6d064..86b8daea98fb 100644
--- a/maps/away/ships/konyang/kasf_ship/kasf_ship.dmm
+++ b/maps/away/ships/konyang/kasf_ship/kasf_ship.dmm
@@ -5485,7 +5485,7 @@
pixel_y = -6;
pixel_x = -6
},
-/obj/item/storage/box/sharps{
+/obj/item/storage/box/unique/sharps{
pixel_y = 6;
pixel_x = -6
},
@@ -5948,8 +5948,8 @@
/obj/item/reagent_containers/food/snacks/fish/fishfillet,
/obj/item/reagent_containers/food/snacks/meat/chicken,
/obj/item/reagent_containers/food/snacks/meat/chicken,
-/obj/item/storage/box/produce,
-/obj/item/storage/box/produce,
+/obj/item/storage/box/large/produce,
+/obj/item/storage/box/large/produce,
/obj/item/storage/box/fancy/egg_box,
/obj/item/storage/box/fancy/egg_box,
/obj/effect/decal/cleanable/dirt,
diff --git a/maps/away/ships/konyang/water_barge/water_barge.dmm b/maps/away/ships/konyang/water_barge/water_barge.dmm
index 5bfad74a9315..19d80664f987 100644
--- a/maps/away/ships/konyang/water_barge/water_barge.dmm
+++ b/maps/away/ships/konyang/water_barge/water_barge.dmm
@@ -752,8 +752,8 @@
/obj/item/reagent_containers/food/drinks/carton/milk,
/obj/item/reagent_containers/food/condiment/sugar,
/obj/item/reagent_containers/food/condiment/sugar,
-/obj/item/storage/box/produce,
-/obj/item/storage/box/produce,
+/obj/item/storage/box/large/produce,
+/obj/item/storage/box/large/produce,
/obj/effect/floor_decal/corner/grey/diagonal,
/turf/simulated/floor/tiled/white,
/area/water_barge/breakroom)
diff --git a/maps/away/ships/lone_spacer/lone_spacer.dmm b/maps/away/ships/lone_spacer/lone_spacer.dmm
index 9969d7880c9a..db2048a3418c 100644
--- a/maps/away/ships/lone_spacer/lone_spacer.dmm
+++ b/maps/away/ships/lone_spacer/lone_spacer.dmm
@@ -1101,9 +1101,9 @@
req_access = list(243)
},
/obj/random/civgun/rifle,
-/obj/item/storage/box/shotgunshells,
-/obj/item/storage/box/shotgunshells,
-/obj/item/storage/box/stunshells,
+/obj/item/storage/box/shells/buckshot,
+/obj/item/storage/box/shells/buckshot,
+/obj/item/storage/box/shells/stunshells,
/obj/item/gun/energy/pistol,
/obj/item/material/hatchet/machete/steel,
/obj/item/clothing/accessory/holster/utility/machete,
@@ -2519,7 +2519,7 @@
/obj/item/stack/medical/splint/full,
/obj/item/reagent_containers/blood/OMinus,
/obj/item/reagent_containers/blood/OMinus,
-/obj/item/storage/box/monkeycubes,
+/obj/item/storage/box/unique/monkeycubes,
/obj/item/reagent_containers/glass/bottle/toxin,
/obj/item/reagent_containers/glass/bottle/cryosilicate,
/obj/item/reagent_containers/glass/bottle/bicaridine,
@@ -2698,7 +2698,7 @@
/obj/item/device/measuring_tape,
/obj/item/device/core_sampler,
/obj/item/device/depth_scanner,
-/obj/item/storage/box/excavation,
+/obj/item/storage/box/unique/excavation,
/obj/item/book/manual/excavation,
/obj/item/pickaxe/hand,
/obj/effect/decal/cleanable/dirt,
diff --git a/maps/away/ships/lone_spacer/lone_spacer_submaps.dmm b/maps/away/ships/lone_spacer/lone_spacer_submaps.dmm
index 9d3331818711..e0836c0ce3cc 100644
--- a/maps/away/ships/lone_spacer/lone_spacer_submaps.dmm
+++ b/maps/away/ships/lone_spacer/lone_spacer_submaps.dmm
@@ -394,11 +394,11 @@
"P" = (
/obj/effect/floor_decal/industrial/outline/operations,
/obj/structure/table/rack/folding_table,
-/obj/item/storage/box/tranquilizer{
+/obj/item/storage/box/shells/tranquilizer{
pixel_y = 14
},
/obj/effect/map_effect/marker/mapmanip/submap/extract/lone_spacer/storage_2,
-/obj/item/storage/box/tranquilizer{
+/obj/item/storage/box/shells/tranquilizer{
pixel_y = 14
},
/obj/item/gun/projectile/heavysniper/tranq{
diff --git a/maps/away/ships/nka/nka_merchant/nka_merchant.dmm b/maps/away/ships/nka/nka_merchant/nka_merchant.dmm
index b9d23d9d892b..acb5dfaabab4 100644
--- a/maps/away/ships/nka/nka_merchant/nka_merchant.dmm
+++ b/maps/away/ships/nka/nka_merchant/nka_merchant.dmm
@@ -1038,7 +1038,7 @@
/area/nka_merchant/warehouse)
"dd" = (
/obj/structure/closet/secure_closet/kitchen_cabinet/standard,
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = -11
},
diff --git a/maps/away/ships/orion/orion_express_ship.dmm b/maps/away/ships/orion/orion_express_ship.dmm
index a17f69ca4fbb..2d3a673ef131 100644
--- a/maps/away/ships/orion/orion_express_ship.dmm
+++ b/maps/away/ships/orion/orion_express_ship.dmm
@@ -1879,7 +1879,7 @@
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat,
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = -11
},
@@ -1910,7 +1910,7 @@
},
/obj/item/reagent_containers/food/condiment/flour,
/obj/item/reagent_containers/food/condiment/flour,
-/obj/item/storage/box/condiment,
+/obj/item/storage/box/large/condiment,
/turf/simulated/floor/tiled/white,
/area/ship/orion/forehall)
"gsa" = (
diff --git a/maps/away/ships/pra/database_freighter/database_freighter.dmm b/maps/away/ships/pra/database_freighter/database_freighter.dmm
index e95d5adf2d31..eda19f31592b 100644
--- a/maps/away/ships/pra/database_freighter/database_freighter.dmm
+++ b/maps/away/ships/pra/database_freighter/database_freighter.dmm
@@ -1496,13 +1496,13 @@
/area/database_freighter)
"gm" = (
/obj/structure/table/rack,
-/obj/item/storage/box/monkeycubes/farwacubes{
+/obj/item/storage/box/unique/monkeycubes/farwacubes{
pixel_x = -5
},
-/obj/item/storage/box/monkeycubes/farwacubes{
+/obj/item/storage/box/unique/monkeycubes/farwacubes{
pixel_x = 5
},
-/obj/item/storage/box/monkeycubes/farwacubes,
+/obj/item/storage/box/unique/monkeycubes/farwacubes,
/obj/item/reagent_containers/spray/cleaner{
pixel_x = -4;
pixel_y = -3
diff --git a/maps/away/ships/pra/headmaster/headmaster_ship.dmm b/maps/away/ships/pra/headmaster/headmaster_ship.dmm
index d72a1fbf2db9..e82c1b4d29e8 100644
--- a/maps/away/ships/pra/headmaster/headmaster_ship.dmm
+++ b/maps/away/ships/pra/headmaster/headmaster_ship.dmm
@@ -8873,7 +8873,7 @@
/obj/item/storage/box/syringes{
pixel_x = -7
},
-/obj/item/storage/box/sharps{
+/obj/item/storage/box/unique/sharps{
pixel_x = 8
},
/obj/item/reagent_containers/spray/cleaner{
@@ -9495,18 +9495,18 @@
/obj/item/reagent_containers/food/drinks/carton/fatshouters,
/obj/item/reagent_containers/food/condiment/sugar,
/obj/item/reagent_containers/food/condiment/sugar,
-/obj/item/storage/box/produce,
-/obj/item/storage/box/produce,
+/obj/item/storage/box/large/produce,
+/obj/item/storage/box/large/produce,
/obj/item/storage/box/fancy/egg_box,
/obj/item/storage/box/fancy/egg_box,
/obj/item/reagent_containers/food/condiment/flour,
/obj/item/reagent_containers/food/condiment/flour,
/obj/structure/closet/secure_closet/refrigerator,
/obj/item/reagent_containers/food/condiment/enzyme,
-/obj/item/storage/box/condiment{
+/obj/item/storage/box/large/condiment{
pixel_y = 2
},
-/obj/item/storage/box/condimentbottles{
+/obj/item/storage/box/large/condimentbottles{
pixel_y = 5
},
/obj/machinery/atmospherics/unary/vent_scrubber/on,
diff --git a/maps/away/ships/sadar_scout/sadar_scout.dmm b/maps/away/ships/sadar_scout/sadar_scout.dmm
index 7fbbe5dc53df..da1b0cba4bb3 100644
--- a/maps/away/ships/sadar_scout/sadar_scout.dmm
+++ b/maps/away/ships/sadar_scout/sadar_scout.dmm
@@ -4940,8 +4940,8 @@
/obj/structure/table/rack,
/obj/effect/floor_decal/industrial/outline/operations,
/obj/effect/decal/cleanable/dirt,
-/obj/item/storage/box/shotgunshells,
-/obj/item/storage/box/shotgunshells,
+/obj/item/storage/box/shells/buckshot,
+/obj/item/storage/box/shells/buckshot,
/obj/item/ammo_magazine/c45uzi,
/obj/item/ammo_magazine/c45uzi,
/obj/item/ammo_magazine/boltaction,
@@ -6353,8 +6353,8 @@
/obj/item/reagent_containers/food/snacks/fish/fishfillet,
/obj/item/reagent_containers/food/snacks/fish/fishfillet,
/obj/item/reagent_containers/food/snacks/fish/fishfillet,
-/obj/item/storage/box/produce,
-/obj/item/storage/box/produce,
+/obj/item/storage/box/large/produce,
+/obj/item/storage/box/large/produce,
/obj/machinery/alarm/west{
req_one_access = null
},
@@ -6533,7 +6533,7 @@
/obj/effect/floor_decal/corner_wide/paleblue/full{
dir = 4
},
-/obj/item/storage/box/sharps{
+/obj/item/storage/box/unique/sharps{
pixel_x = 10
},
/obj/item/roller,
diff --git a/maps/away/ships/scc/scc_scout_ship.dmm b/maps/away/ships/scc/scc_scout_ship.dmm
index 3a8000860953..78e3b47ed1f8 100644
--- a/maps/away/ships/scc/scc_scout_ship.dmm
+++ b/maps/away/ships/scc/scc_scout_ship.dmm
@@ -2603,12 +2603,12 @@
/area/ship/scc_scout_ship/maint_power)
"oG" = (
/obj/structure/closet/crate/freezer,
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = -5
},
/obj/random/mre,
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = -5
},
@@ -2616,7 +2616,7 @@
/obj/random/mre,
/obj/item/reagent_containers/food/condiment/flour,
/obj/item/reagent_containers/food/condiment/flour,
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = -5
},
@@ -2624,12 +2624,12 @@
/obj/effect/floor_decal/industrial/outline/grey,
/obj/item/reagent_containers/food/condiment/flour,
/obj/item/reagent_containers/food/condiment/flour,
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = -5
},
/obj/item/reagent_containers/food/condiment/flour,
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = -5
},
@@ -4710,7 +4710,7 @@
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat,
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = -5
},
@@ -5499,7 +5499,7 @@
},
/obj/effect/floor_decal/corner/dark_blue,
/obj/structure/table/stone/marble,
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 2;
pixel_y = 9
},
@@ -6948,7 +6948,7 @@
pixel_y = 11;
pixel_x = 2
},
-/obj/item/storage/box/flares{
+/obj/item/storage/box/large/flares{
pixel_x = -7;
pixel_y = 2
},
@@ -7779,7 +7779,7 @@
/area/ship/scc_scout_ship/quarters)
"Xa" = (
/obj/item/storage/belt/archaeology,
-/obj/item/storage/box/excavation,
+/obj/item/storage/box/unique/excavation,
/obj/item/device/flashlight/lantern,
/obj/item/device/ano_scanner,
/obj/item/device/depth_scanner,
diff --git a/maps/away/ships/sol/sol_merc/fsf_patrol_ship.dmm b/maps/away/ships/sol/sol_merc/fsf_patrol_ship.dmm
index 24375106f847..40f583ccd3af 100644
--- a/maps/away/ships/sol/sol_merc/fsf_patrol_ship.dmm
+++ b/maps/away/ships/sol/sol_merc/fsf_patrol_ship.dmm
@@ -378,7 +378,7 @@
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat,
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = -11
},
@@ -2268,7 +2268,7 @@
/obj/item/gun/projectile/automatic/rifle/sol,
/obj/item/ammo_magazine/c762/sol,
/obj/item/gun/projectile/shotgun/pump/combat/sol,
-/obj/item/storage/box/shotgunshells,
+/obj/item/storage/box/shells/buckshot,
/obj/item/clothing/accessory/storage/bandolier,
/turf/simulated/floor,
/area/ship/fsf_patrol_ship/armory)
@@ -6173,8 +6173,8 @@
inserted_light = /obj/item/light/tube/colored/blue;
icon_state = "tube_empty"
},
-/obj/item/storage/box/flashbangs,
-/obj/item/storage/box/smokebombs,
+/obj/item/storage/box/tactical/flashbangs,
+/obj/item/storage/box/tactical/smokebombs,
/obj/item/gun/energy/taser,
/obj/item/gun/energy/taser,
/turf/simulated/floor,
diff --git a/maps/away/ships/sol/sol_pirate/sfa_patrol_ship.dmm b/maps/away/ships/sol/sol_pirate/sfa_patrol_ship.dmm
index 72dafcc808d5..c94785e4bcad 100644
--- a/maps/away/ships/sol/sol_pirate/sfa_patrol_ship.dmm
+++ b/maps/away/ships/sol/sol_pirate/sfa_patrol_ship.dmm
@@ -1493,7 +1493,7 @@
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat,
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = -11
},
@@ -1671,7 +1671,7 @@
/area/ship/sfa_patrol_ship)
"eOZ" = (
/obj/structure/closet/secure_closet/refrigerator,
-/obj/item/storage/box/freezer/organcooler,
+/obj/item/storage/box/unique/freezer/organcooler,
/turf/simulated/floor/tiled/freezer{
name = "cooled tiles";
temperature = 253.15
diff --git a/maps/away/ships/sol/sol_splf/splf_raider.dmm b/maps/away/ships/sol/sol_splf/splf_raider.dmm
index 2049ff8a71b4..bebd67511845 100644
--- a/maps/away/ships/sol/sol_splf/splf_raider.dmm
+++ b/maps/away/ships/sol/sol_splf/splf_raider.dmm
@@ -513,8 +513,8 @@
/obj/item/ammo_magazine/a556/carbine,
/obj/item/ammo_magazine/a556/carbine,
/obj/item/gun/projectile/shotgun/pump,
-/obj/item/storage/box/shotgunshells,
-/obj/item/storage/box/shotgunshells,
+/obj/item/storage/box/shells/buckshot,
+/obj/item/storage/box/shells/buckshot,
/obj/item/gun/projectile/automatic/c20r/sol,
/obj/item/gun/projectile/automatic/c20r/sol,
/obj/item/ammo_magazine/a10mm,
@@ -7567,8 +7567,8 @@
"RO" = (
/obj/effect/floor_decal/industrial/outline/service,
/obj/structure/closet/secure_closet/refrigerator,
-/obj/item/storage/box/produce,
-/obj/item/storage/box/produce,
+/obj/item/storage/box/large/produce,
+/obj/item/storage/box/large/produce,
/obj/item/storage/box/fancy/egg_box,
/obj/item/storage/box/fancy/egg_box,
/obj/item/reagent_containers/food/condiment/enzyme,
@@ -8297,7 +8297,7 @@
req_access = list(246)
},
/obj/structure/table/steel,
-/obj/item/storage/box/condiment{
+/obj/item/storage/box/large/condiment{
pixel_y = 14
},
/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/metal{
diff --git a/maps/away/ships/sol/sol_ssrm/ssrm_ship.dmm b/maps/away/ships/sol/sol_ssrm/ssrm_ship.dmm
index 7616651ae78d..6ddd4fe1495d 100644
--- a/maps/away/ships/sol/sol_ssrm/ssrm_ship.dmm
+++ b/maps/away/ships/sol/sol_ssrm/ssrm_ship.dmm
@@ -338,7 +338,7 @@
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat,
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = -11
},
@@ -708,7 +708,7 @@
pixel_y = 21
},
/obj/structure/table/stone/marble,
-/obj/item/storage/box/condiment,
+/obj/item/storage/box/large/condiment,
/obj/item/reagent_containers/food/drinks/drinkingglass/newglass/coffeecup/sol{
pixel_y = 13;
pixel_x = -4
@@ -5951,8 +5951,8 @@
/obj/item/ammo_magazine/c762/sol,
/obj/item/ammo_magazine/c762/sol,
/obj/item/gun/projectile/shotgun/pump/combat/sol,
-/obj/item/storage/box/shotgunshells,
-/obj/item/storage/box/shotgunshells,
+/obj/item/storage/box/shells/buckshot,
+/obj/item/storage/box/shells/buckshot,
/obj/item/grenade/frag,
/obj/item/grenade/frag,
/obj/machinery/light,
@@ -7843,7 +7843,7 @@
/obj/item/material/stool/chair/wheelchair,
/obj/item/cane/crutch,
/obj/item/cane/crutch,
-/obj/item/storage/box/monkeycubes,
+/obj/item/storage/box/unique/monkeycubes,
/obj/item/storage/box/autoinjectors,
/obj/item/storage/box/inhalers_auto,
/obj/item/storage/box/syringes,
@@ -8758,7 +8758,7 @@
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat,
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = -11
},
@@ -9593,7 +9593,7 @@
pixel_x = 5;
pixel_y = -4
},
-/obj/item/storage/box/sharps{
+/obj/item/storage/box/unique/sharps{
pixel_y = -14;
pixel_x = 5
},
@@ -9748,7 +9748,7 @@
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat,
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = -11
},
diff --git a/maps/away/ships/tajara/circus/adhomian_circus.dmm b/maps/away/ships/tajara/circus/adhomian_circus.dmm
index 6743e5c28aba..23d44e6ad423 100644
--- a/maps/away/ships/tajara/circus/adhomian_circus.dmm
+++ b/maps/away/ships/tajara/circus/adhomian_circus.dmm
@@ -617,7 +617,7 @@
},
/area/adhomian_circus/hangar)
"cUS" = (
-/obj/item/storage/box/monkeycubes/farwacubes,
+/obj/item/storage/box/unique/monkeycubes/farwacubes,
/obj/structure/closet/crate,
/obj/machinery/atmospherics/unary/vent_scrubber/on{
dir = 1
@@ -4412,9 +4412,9 @@
},
/area/adhomian_circus/starboard)
"xGS" = (
-/obj/item/storage/box/snappops,
+/obj/item/storage/box/unique/snappops,
/obj/structure/table/wood,
-/obj/item/storage/box/snappops,
+/obj/item/storage/box/unique/snappops,
/turf/simulated/floor/tiled{
temperature = 278.15
},
diff --git a/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler.dmm b/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler.dmm
index 93a7a9444fb8..ba82fd62383a 100644
--- a/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler.dmm
+++ b/maps/away/ships/tajara/taj_smuggler/tajaran_smuggler.dmm
@@ -3709,7 +3709,7 @@
/area/tajaran_smuggler/power)
"ttw" = (
/obj/structure/closet/secure_closet/kitchen_cabinet/standard,
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = -11
},
diff --git a/maps/away/ships/tirakqi_smuggler/tirakqi_smuggler.dmm b/maps/away/ships/tirakqi_smuggler/tirakqi_smuggler.dmm
index f79829c34edf..1061b4b5a8aa 100644
--- a/maps/away/ships/tirakqi_smuggler/tirakqi_smuggler.dmm
+++ b/maps/away/ships/tirakqi_smuggler/tirakqi_smuggler.dmm
@@ -4502,8 +4502,8 @@
/obj/item/reagent_containers/food/snacks/meat/neaera,
/obj/item/reagent_containers/food/snacks/meat/neaera,
/obj/item/reagent_containers/food/snacks/meat/neaera,
-/obj/item/storage/box/produce,
-/obj/item/storage/box/produce,
+/obj/item/storage/box/large/produce,
+/obj/item/storage/box/large/produce,
/obj/item/storage/box/fancy/egg_box,
/obj/item/reagent_containers/food/condiment/enzyme{
pixel_x = -9;
@@ -5770,7 +5770,7 @@
/obj/structure/closet/crate/freezer{
name = "Fridge"
},
-/obj/item/storage/box/freezer/organcooler,
+/obj/item/storage/box/unique/freezer/organcooler,
/obj/effect/floor_decal/industrial/outline/red,
/turf/simulated/floor/carpet/rubber,
/area/ship/tirakqi_smuggler/med)
@@ -6420,7 +6420,7 @@
dir = 8
},
/obj/structure/table/skrell,
-/obj/item/storage/box/sharps{
+/obj/item/storage/box/unique/sharps{
pixel_x = 4;
pixel_y = 8
},
diff --git a/maps/away/ships/tramp_freighter/tramp_freighter.dmm b/maps/away/ships/tramp_freighter/tramp_freighter.dmm
index eb4e709337bb..5687b77eb4c4 100644
--- a/maps/away/ships/tramp_freighter/tramp_freighter.dmm
+++ b/maps/away/ships/tramp_freighter/tramp_freighter.dmm
@@ -5783,7 +5783,7 @@
/area/shuttle/freighter_shuttle)
"Dh" = (
/obj/structure/table/stone/marble,
-/obj/item/storage/box/condiment{
+/obj/item/storage/box/large/condiment{
pixel_y = 9
},
/obj/item/reagent_containers/cooking_container/board/bowl{
@@ -7015,8 +7015,8 @@
/obj/item/reagent_containers/food/snacks/rawcutlet,
/obj/item/reagent_containers/food/snacks/rawcutlet,
/obj/item/reagent_containers/food/condiment/flour,
-/obj/item/storage/box/produce,
-/obj/item/storage/box/produce,
+/obj/item/storage/box/large/produce,
+/obj/item/storage/box/large/produce,
/turf/simulated/floor/marble,
/area/tramp_freighter/kitchen)
"KE" = (
diff --git a/maps/away/ships/unathi_pirate/izharshan/unathi_pirate_izharshan.dmm b/maps/away/ships/unathi_pirate/izharshan/unathi_pirate_izharshan.dmm
index f6a91deeda5a..92511de6edcc 100644
--- a/maps/away/ships/unathi_pirate/izharshan/unathi_pirate_izharshan.dmm
+++ b/maps/away/ships/unathi_pirate/izharshan/unathi_pirate_izharshan.dmm
@@ -2101,7 +2101,7 @@
/obj/machinery/light{
dir = 4
},
-/obj/item/storage/box/shotgunshells,
+/obj/item/storage/box/shells/buckshot,
/obj/machinery/light{
dir = 4
},
diff --git a/maps/away/ships/unathi_pirate/tarwa/unathi_pirate_tarwa.dmm b/maps/away/ships/unathi_pirate/tarwa/unathi_pirate_tarwa.dmm
index bc07981c89b9..d292e3c85d03 100644
--- a/maps/away/ships/unathi_pirate/tarwa/unathi_pirate_tarwa.dmm
+++ b/maps/away/ships/unathi_pirate/tarwa/unathi_pirate_tarwa.dmm
@@ -245,7 +245,7 @@
/obj/structure/table/rack,
/obj/item/gun/projectile/shotgun/pump/combat,
/obj/item/gun/projectile/pistol/super_heavy,
-/obj/item/storage/box/shotgunshells,
+/obj/item/storage/box/shells/buckshot,
/obj/item/ammo_magazine/super_heavy,
/turf/simulated/floor/diona,
/area/tarwa_ship/armory)
diff --git a/maps/away/ships/wildlands_militia/militia_ship.dmm b/maps/away/ships/wildlands_militia/militia_ship.dmm
index 4f017a8e56a4..6bce7911cd93 100644
--- a/maps/away/ships/wildlands_militia/militia_ship.dmm
+++ b/maps/away/ships/wildlands_militia/militia_ship.dmm
@@ -575,7 +575,7 @@
/obj/structure/extinguisher_cabinet/north,
/obj/item/material/knife/trench,
/obj/item/material/knife/trench,
-/obj/item/storage/box/shotgunshells,
+/obj/item/storage/box/shells/buckshot,
/obj/random/civgun/rifle,
/obj/random/civgun/rifle,
/obj/item/gun/projectile/shotgun/pump,
@@ -1148,7 +1148,7 @@
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat,
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = -11
},
diff --git a/maps/away/ships/xanu/xanu_frigate.dmm b/maps/away/ships/xanu/xanu_frigate.dmm
index 1001447c096d..252c3f80f49f 100644
--- a/maps/away/ships/xanu/xanu_frigate.dmm
+++ b/maps/away/ships/xanu/xanu_frigate.dmm
@@ -27,8 +27,8 @@
/obj/item/reagent_containers/blood/OMinus,
/obj/item/reagent_containers/blood/OMinus,
/obj/item/reagent_containers/blood/OMinus,
-/obj/item/storage/box/freezer/organcooler,
-/obj/item/storage/box/freezer/organcooler,
+/obj/item/storage/box/unique/freezer/organcooler,
+/obj/item/storage/box/unique/freezer/organcooler,
/turf/simulated/floor/tiled/gunmetal/full,
/area/ship/xanu_frigate/cargo_bay)
"ad" = (
@@ -5639,10 +5639,10 @@
"tz" = (
/obj/effect/floor_decal/corner/blue/diagonal,
/obj/structure/table/reinforced/steel,
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_y = 9
},
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_y = 3
},
/turf/simulated/floor/tiled/white,
@@ -6922,7 +6922,7 @@
/obj/item/reagent_containers/food/condiment/enzyme{
pixel_y = 12
},
-/obj/item/storage/box/condiment{
+/obj/item/storage/box/large/condiment{
pixel_y = 3
},
/obj/item/reagent_containers/spray/cleaner{
diff --git a/maps/away/ships/yacht_civ/yacht_civ.dmm b/maps/away/ships/yacht_civ/yacht_civ.dmm
index cfb2f07695bc..d6da447d033d 100644
--- a/maps/away/ships/yacht_civ/yacht_civ.dmm
+++ b/maps/away/ships/yacht_civ/yacht_civ.dmm
@@ -550,9 +550,9 @@
/area/ship/yacht_civ/hallway_mid)
"ff" = (
/obj/effect/floor_decal/corner/red/diagonal,
-/obj/item/storage/box/produce,
+/obj/item/storage/box/large/produce,
/obj/structure/closet/secure_closet/refrigerator/standard,
-/obj/item/storage/box/produce,
+/obj/item/storage/box/large/produce,
/obj/item/reagent_containers/food/condiment/flour,
/obj/item/reagent_containers/food/condiment/flour,
/obj/item/reagent_containers/food/condiment/flour,
@@ -1548,7 +1548,7 @@
/area/ship/yacht_civ/hallway_aft)
"om" = (
/obj/structure/table/steel,
-/obj/item/storage/box/flares{
+/obj/item/storage/box/large/flares{
pixel_x = 13;
pixel_y = 3
},
diff --git a/maps/dungeon_spawns/listening_post_unique.dmm b/maps/dungeon_spawns/listening_post_unique.dmm
index fb6b7f4db5a5..48b0552ef444 100644
--- a/maps/dungeon_spawns/listening_post_unique.dmm
+++ b/maps/dungeon_spawns/listening_post_unique.dmm
@@ -254,7 +254,7 @@
/area/dungeon/syndie_listening_post)
"aK" = (
/obj/structure/table/reinforced,
-/obj/item/storage/box/sinpockets,
+/obj/item/storage/box/unique/donkpockets/sinpockets,
/turf/simulated/floor/tiled/dark/airless,
/area/dungeon/syndie_listening_post)
"aL" = (
diff --git a/maps/dungeon_spawns/skrell_crash_unique.dmm b/maps/dungeon_spawns/skrell_crash_unique.dmm
index 3b0be81ed74f..d1fffd3c09dc 100644
--- a/maps/dungeon_spawns/skrell_crash_unique.dmm
+++ b/maps/dungeon_spawns/skrell_crash_unique.dmm
@@ -372,7 +372,7 @@
/turf/simulated/floor/shuttle/advanced,
/area/dungeon/skrell_ship)
"bp" = (
-/obj/item/storage/box/freezer/organcooler,
+/obj/item/storage/box/unique/freezer/organcooler,
/turf/simulated/floor/tiled/white,
/area/dungeon/skrell_ship)
"bq" = (
@@ -404,7 +404,7 @@
/area/dungeon/skrell_ship)
"bv" = (
/obj/structure/table/skrell,
-/obj/item/storage/box/sharps,
+/obj/item/storage/box/unique/sharps,
/turf/simulated/floor/tiled/white,
/area/dungeon/skrell_ship)
"bw" = (
diff --git a/maps/dungeon_spawns/vannatusk_unique.dmm b/maps/dungeon_spawns/vannatusk_unique.dmm
index 6f46ae453173..b9eb00b80864 100644
--- a/maps/dungeon_spawns/vannatusk_unique.dmm
+++ b/maps/dungeon_spawns/vannatusk_unique.dmm
@@ -15,7 +15,7 @@
"ae" = (
/obj/structure/table/standard,
/obj/item/surgery/scalpel/laser,
-/obj/item/storage/box/freezer/organcooler,
+/obj/item/storage/box/unique/freezer/organcooler,
/turf/simulated/floor/tiled/asteroid,
/area/dungeon/bluespace_outpost)
"af" = (
diff --git a/maps/event/generic_dock/generic_dock-1.dmm b/maps/event/generic_dock/generic_dock-1.dmm
index cf14790defe0..9cf62dd63812 100644
--- a/maps/event/generic_dock/generic_dock-1.dmm
+++ b/maps/event/generic_dock/generic_dock-1.dmm
@@ -4763,11 +4763,11 @@
/area/centcom/bar)
"eDp" = (
/obj/structure/table/rack,
-/obj/item/storage/box/teargas{
+/obj/item/storage/box/tactical/teargas{
pixel_x = -1;
pixel_y = -4
},
-/obj/item/storage/box/flashbangs{
+/obj/item/storage/box/tactical/flashbangs{
pixel_x = 4;
pixel_y = 4
},
@@ -5695,7 +5695,7 @@
pixel_x = -9;
pixel_y = -14
},
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = -11
},
diff --git a/maps/event/halloween/halloween.dmm b/maps/event/halloween/halloween.dmm
index c6f26133ef24..8c8bb2fd3db1 100644
--- a/maps/event/halloween/halloween.dmm
+++ b/maps/event/halloween/halloween.dmm
@@ -1012,9 +1012,9 @@
/obj/effect/floor_decal/spline/fancy/wood{
dir = 4
},
-/obj/item/storage/box/candy,
-/obj/item/storage/box/candy,
-/obj/item/storage/box/candy,
+/obj/item/storage/box/large/candy,
+/obj/item/storage/box/large/candy,
+/obj/item/storage/box/large/candy,
/turf/simulated/floor/wood,
/area/city/hallway)
"cU" = (
@@ -6258,11 +6258,11 @@
/turf/simulated/floor/cult,
/area/city/horrorhouse)
"Ac" = (
-/obj/item/storage/box/candy,
+/obj/item/storage/box/large/candy,
/obj/structure/table/wood,
-/obj/item/storage/box/candy,
-/obj/item/storage/box/candy,
-/obj/item/storage/box/candy,
+/obj/item/storage/box/large/candy,
+/obj/item/storage/box/large/candy,
+/obj/item/storage/box/large/candy,
/turf/simulated/floor/wood,
/area/city/hallway)
"Ae" = (
@@ -6702,9 +6702,9 @@
/area/city/medical)
"BX" = (
/obj/structure/table/wood,
-/obj/item/storage/box/candy,
-/obj/item/storage/box/candy,
-/obj/item/storage/box/candy,
+/obj/item/storage/box/large/candy,
+/obj/item/storage/box/large/candy,
+/obj/item/storage/box/large/candy,
/obj/effect/floor_decal/spline/fancy/wood{
dir = 7
},
@@ -9813,9 +9813,9 @@
/area/city/bar)
"NT" = (
/obj/structure/table/wood,
-/obj/item/storage/box/candy,
-/obj/item/storage/box/candy,
-/obj/item/storage/box/candy,
+/obj/item/storage/box/large/candy,
+/obj/item/storage/box/large/candy,
+/obj/item/storage/box/large/candy,
/obj/effect/floor_decal/spline/fancy/wood,
/obj/effect/floor_decal/spline/fancy/wood{
dir = 1
@@ -10211,8 +10211,8 @@
/area/city/hallway)
"Pv" = (
/obj/structure/table/wood,
-/obj/item/storage/box/candy,
-/obj/item/storage/box/candy,
+/obj/item/storage/box/large/candy,
+/obj/item/storage/box/large/candy,
/obj/effect/floor_decal/spline/fancy/wood{
dir = 7
},
@@ -11922,7 +11922,7 @@
/obj/item/material/knife{
pixel_x = -9
},
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = -5
},
@@ -11940,11 +11940,11 @@
pixel_x = 6;
pixel_y = 10
},
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = -5
},
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = -5
},
@@ -12055,8 +12055,8 @@
/turf/simulated/floor/tiled/full,
/area/city/security)
"UW" = (
-/obj/item/storage/box/candy,
-/obj/item/storage/box/candy,
+/obj/item/storage/box/large/candy,
+/obj/item/storage/box/large/candy,
/turf/simulated/floor/grass,
/area/city/hallway)
"UY" = (
@@ -13592,15 +13592,15 @@
/area/city/bar)
"ZR" = (
/obj/structure/table/stone/marble,
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = -5
},
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = -5
},
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = -5
},
diff --git a/maps/event/idris_cruise/idris_cruise-1.dmm b/maps/event/idris_cruise/idris_cruise-1.dmm
index e7c7d4eedcaf..8ef126b77849 100644
--- a/maps/event/idris_cruise/idris_cruise-1.dmm
+++ b/maps/event/idris_cruise/idris_cruise-1.dmm
@@ -11134,10 +11134,10 @@
/turf/template_noop,
/area/template_noop)
"jgQ" = (
-/obj/item/storage/box/frags,
-/obj/item/storage/box/frags,
-/obj/item/storage/box/frags,
-/obj/item/storage/box/frags,
+/obj/item/storage/box/tactical/frags,
+/obj/item/storage/box/tactical/frags,
+/obj/item/storage/box/tactical/frags,
+/obj/item/storage/box/tactical/frags,
/obj/structure/table/rack,
/turf/simulated/floor/reinforced,
/area/cruise/virtual_reality)
@@ -13822,67 +13822,67 @@
"lzR" = (
/obj/effect/floor_decal/corner/mauve/diagonal,
/obj/structure/table/stone/marble,
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = -5
},
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = 5
},
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = 5
},
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = 5
},
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = -5
},
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = -5
},
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = -5
},
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = -5
},
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = -5
},
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = 5
},
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = 5
},
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = 5
},
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = 5
},
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = 5
},
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = 5
},
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = 5
},
@@ -15557,43 +15557,43 @@
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat,
/obj/item/reagent_containers/food/snacks/meat,
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = -5
},
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = -5
},
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = -5
},
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = -5
},
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = 5
},
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = 5
},
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = 5
},
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = 5
},
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = 5
},
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = 5
},
@@ -15977,11 +15977,11 @@
/area/cruise/main_bar)
"ndw" = (
/obj/structure/table/rack,
-/obj/item/storage/box/flashbangs{
+/obj/item/storage/box/tactical/flashbangs{
pixel_x = 4;
pixel_y = 4
},
-/obj/item/storage/box/teargas{
+/obj/item/storage/box/tactical/teargas{
pixel_x = -1;
pixel_y = -4
},
@@ -28433,12 +28433,12 @@
/obj/item/gun/projectile/shotgun/pump/combat/sol,
/obj/item/gun/projectile/shotgun/pump/combat/sol,
/obj/item/gun/projectile/shotgun/pump/combat/sol,
-/obj/item/storage/box/incendiaryshells,
-/obj/item/storage/box/shotgunshells,
-/obj/item/storage/box/shotgunshells,
-/obj/item/storage/box/shotgunshells,
-/obj/item/storage/box/shotgunshells,
-/obj/item/storage/box/shotgunshells,
+/obj/item/storage/box/shells/incendiaryshells,
+/obj/item/storage/box/shells/buckshot,
+/obj/item/storage/box/shells/buckshot,
+/obj/item/storage/box/shells/buckshot,
+/obj/item/storage/box/shells/buckshot,
+/obj/item/storage/box/shells/buckshot,
/turf/simulated/floor/reinforced,
/area/cruise/virtual_reality)
"xOU" = (
diff --git a/maps/event/rooftop/rooftop-1.dmm b/maps/event/rooftop/rooftop-1.dmm
index dc249ec72dc7..9ec10d675f66 100644
--- a/maps/event/rooftop/rooftop-1.dmm
+++ b/maps/event/rooftop/rooftop-1.dmm
@@ -2455,12 +2455,12 @@
/obj/item/gun/projectile/shotgun/pump/combat/sol,
/obj/item/gun/projectile/shotgun/pump/combat/sol,
/obj/item/gun/projectile/shotgun/pump/combat/sol,
-/obj/item/storage/box/incendiaryshells,
-/obj/item/storage/box/shotgunshells,
-/obj/item/storage/box/shotgunshells,
-/obj/item/storage/box/shotgunshells,
-/obj/item/storage/box/shotgunshells,
-/obj/item/storage/box/shotgunshells,
+/obj/item/storage/box/shells/incendiaryshells,
+/obj/item/storage/box/shells/buckshot,
+/obj/item/storage/box/shells/buckshot,
+/obj/item/storage/box/shells/buckshot,
+/obj/item/storage/box/shells/buckshot,
+/obj/item/storage/box/shells/buckshot,
/turf/simulated/floor/reinforced,
/area/city/mendell)
"nY" = (
@@ -4166,10 +4166,10 @@
/turf/simulated/floor/tiled/dark,
/area/city/mendell/interior)
"xZ" = (
-/obj/item/storage/box/frags,
-/obj/item/storage/box/frags,
-/obj/item/storage/box/frags,
-/obj/item/storage/box/frags,
+/obj/item/storage/box/tactical/frags,
+/obj/item/storage/box/tactical/frags,
+/obj/item/storage/box/tactical/frags,
+/obj/item/storage/box/tactical/frags,
/turf/simulated/floor/reinforced,
/area/city/mendell)
"ya" = (
diff --git a/maps/helpers/event_shuttles/sccv_apollo_v1.dmm b/maps/helpers/event_shuttles/sccv_apollo_v1.dmm
index ab9a4af50782..1c09c8d7a58b 100644
--- a/maps/helpers/event_shuttles/sccv_apollo_v1.dmm
+++ b/maps/helpers/event_shuttles/sccv_apollo_v1.dmm
@@ -2436,7 +2436,7 @@
/obj/item/storage/belt/medical{
pixel_y = -13
},
-/obj/item/storage/box/freezer/organcooler{
+/obj/item/storage/box/unique/freezer/organcooler{
pixel_x = -1;
pixel_y = 17
},
diff --git a/maps/helpers/event_shuttles/sccv_apollo_v2.dmm b/maps/helpers/event_shuttles/sccv_apollo_v2.dmm
index 6741c1d7c4da..c2db0504f401 100644
--- a/maps/helpers/event_shuttles/sccv_apollo_v2.dmm
+++ b/maps/helpers/event_shuttles/sccv_apollo_v2.dmm
@@ -1617,7 +1617,7 @@
/obj/item/storage/belt/medical{
pixel_y = -13
},
-/obj/item/storage/box/freezer/organcooler{
+/obj/item/storage/box/unique/freezer/organcooler{
pixel_x = -1;
pixel_y = 17
},
diff --git a/maps/helpers/event_shuttles/sccv_apollo_v3.dmm b/maps/helpers/event_shuttles/sccv_apollo_v3.dmm
index a23e1ce027ee..39d90ae4e841 100644
--- a/maps/helpers/event_shuttles/sccv_apollo_v3.dmm
+++ b/maps/helpers/event_shuttles/sccv_apollo_v3.dmm
@@ -1370,7 +1370,7 @@
/obj/item/storage/belt/medical{
pixel_y = -13
},
-/obj/item/storage/box/freezer/organcooler{
+/obj/item/storage/box/unique/freezer/organcooler{
pixel_x = -1;
pixel_y = 17
},
diff --git a/maps/helpers/event_shuttles/sccv_artemis.dmm b/maps/helpers/event_shuttles/sccv_artemis.dmm
index 1de6e3f0fd09..aa6d74e062dc 100644
--- a/maps/helpers/event_shuttles/sccv_artemis.dmm
+++ b/maps/helpers/event_shuttles/sccv_artemis.dmm
@@ -2577,7 +2577,7 @@
/obj/item/storage/belt/medical{
pixel_y = -13
},
-/obj/item/storage/box/freezer/organcooler{
+/obj/item/storage/box/unique/freezer/organcooler{
pixel_x = -1;
pixel_y = 17
},
diff --git a/maps/helpers/event_shuttles/sccv_packrat.dmm b/maps/helpers/event_shuttles/sccv_packrat.dmm
index 5e48df9321a9..0a9e49331df3 100644
--- a/maps/helpers/event_shuttles/sccv_packrat.dmm
+++ b/maps/helpers/event_shuttles/sccv_packrat.dmm
@@ -940,7 +940,7 @@
/obj/item/reagent_containers/blood/OMinus,
/obj/item/reagent_containers/blood/OMinus,
/obj/item/reagent_containers/blood/OMinus,
-/obj/item/storage/box/freezer/organcooler,
+/obj/item/storage/box/unique/freezer/organcooler,
/obj/effect/floor_decal/industrial/outline/medical,
/turf/simulated/floor/tiled,
/area/scc_event_shuttle)
diff --git a/maps/helpers/pre_fabricated/massfab_armory_and_military.dmm b/maps/helpers/pre_fabricated/massfab_armory_and_military.dmm
index 71eb5984d580..df694ee92b71 100644
--- a/maps/helpers/pre_fabricated/massfab_armory_and_military.dmm
+++ b/maps/helpers/pre_fabricated/massfab_armory_and_military.dmm
@@ -1122,8 +1122,8 @@
pixel_y = 8
},
/obj/item/storage/box/fancy/donut,
-/obj/item/storage/box/flashbangs,
-/obj/item/storage/box/flashbangs,
+/obj/item/storage/box/tactical/flashbangs,
+/obj/item/storage/box/tactical/flashbangs,
/turf/simulated/floor/tiled/steel,
/area/space)
"QB" = (
diff --git a/maps/helpers/pre_fabricated/massfab_civilian_misc.dmm b/maps/helpers/pre_fabricated/massfab_civilian_misc.dmm
index eaaa4ffcd36c..0f690307cd54 100644
--- a/maps/helpers/pre_fabricated/massfab_civilian_misc.dmm
+++ b/maps/helpers/pre_fabricated/massfab_civilian_misc.dmm
@@ -837,8 +837,8 @@
/obj/item/reagent_containers/toothpaste,
/obj/item/device/quikpay,
/obj/item/storage/box/fancy/matches,
-/obj/item/storage/box/beanbags,
-/obj/item/storage/box/beanbags,
+/obj/item/storage/box/shells/beanbags,
+/obj/item/storage/box/shells/beanbags,
/obj/item/wrench,
/obj/machinery/light/small{
pixel_y = -22
@@ -1608,8 +1608,8 @@
/area/space)
"HP" = (
/obj/structure/table/rack/retail_shelf,
-/obj/item/storage/box/produce,
-/obj/item/storage/box/produce,
+/obj/item/storage/box/large/produce,
+/obj/item/storage/box/large/produce,
/turf/simulated/floor/exoplanet/tiled/white,
/area/space)
"HS" = (
@@ -2235,8 +2235,8 @@
/obj/item/reagent_containers/toothpaste,
/obj/item/device/quikpay,
/obj/item/storage/box/fancy/matches,
-/obj/item/storage/box/beanbags,
-/obj/item/storage/box/beanbags,
+/obj/item/storage/box/shells/beanbags,
+/obj/item/storage/box/shells/beanbags,
/obj/item/wrench,
/obj/machinery/light/small{
dir = 1;
diff --git a/maps/helpers/pre_fabricated/massfab_medical.dmm b/maps/helpers/pre_fabricated/massfab_medical.dmm
index 8553c98ef654..79e6230c2635 100644
--- a/maps/helpers/pre_fabricated/massfab_medical.dmm
+++ b/maps/helpers/pre_fabricated/massfab_medical.dmm
@@ -161,7 +161,7 @@
name = "adjusted light fixture"
},
/obj/structure/table/standard,
-/obj/item/storage/box/sharps{
+/obj/item/storage/box/unique/sharps{
pixel_x = -5
},
/obj/item/device/mass_spectrometer{
@@ -575,7 +575,7 @@
name = "adjusted light fixture"
},
/obj/structure/table/standard,
-/obj/item/storage/box/sharps{
+/obj/item/storage/box/unique/sharps{
pixel_x = -5
},
/obj/item/device/mass_spectrometer{
@@ -2141,7 +2141,7 @@
/area/space)
"JO" = (
/obj/structure/table/standard,
-/obj/item/storage/box/sharps{
+/obj/item/storage/box/unique/sharps{
pixel_x = -5
},
/obj/item/device/mass_spectrometer{
@@ -2411,7 +2411,7 @@
/area/space)
"MY" = (
/obj/structure/table/standard,
-/obj/item/storage/box/sharps{
+/obj/item/storage/box/unique/sharps{
pixel_x = -5
},
/obj/item/device/mass_spectrometer{
@@ -2593,7 +2593,7 @@
/obj/effect/floor_decal/spline/plain/green{
dir = 1
},
-/obj/item/storage/box/freezer/organcooler{
+/obj/item/storage/box/unique/freezer/organcooler{
pixel_x = -1;
pixel_y = 15
},
diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_archeology.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_archeology.dmm
index b2d30ada2552..8abeb6d803cb 100644
--- a/maps/random_ruins/exoplanets/adhomai/adhomai_archeology.dmm
+++ b/maps/random_ruins/exoplanets/adhomai/adhomai_archeology.dmm
@@ -157,9 +157,9 @@
/area/adhomai_archeology)
"F" = (
/obj/structure/closet/crate/secure/large,
-/obj/item/storage/box/dynamite,
-/obj/item/storage/box/dynamite,
-/obj/item/storage/box/dynamite,
+/obj/item/storage/box/unique/dynamite,
+/obj/item/storage/box/unique/dynamite,
+/obj/item/storage/box/unique/dynamite,
/turf/simulated/floor/exoplanet/carpet/rubber,
/area/adhomai_archeology)
"H" = (
diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_bar.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_bar.dmm
index 46048f630c3f..cd86abfe539b 100644
--- a/maps/random_ruins/exoplanets/adhomai/adhomai_bar.dmm
+++ b/maps/random_ruins/exoplanets/adhomai/adhomai_bar.dmm
@@ -174,7 +174,7 @@
/turf/simulated/floor/exoplanet/wood,
/area/adhomai_bar)
"lk" = (
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = -5
},
@@ -717,7 +717,7 @@
/area/exoplanet/adhomai)
"RR" = (
/obj/structure/closet/cabinet,
-/obj/item/storage/box/shotgunshells,
+/obj/item/storage/box/shells/buckshot,
/obj/item/storage/box/fancy/candle_box,
/obj/item/storage/box/fancy/candle_box,
/obj/item/flame/lighter/adhomai,
diff --git a/maps/random_ruins/exoplanets/adhomai/adhomai_village.dmm b/maps/random_ruins/exoplanets/adhomai/adhomai_village.dmm
index a2fa6f227f7c..9b26adedfcad 100644
--- a/maps/random_ruins/exoplanets/adhomai/adhomai_village.dmm
+++ b/maps/random_ruins/exoplanets/adhomai/adhomai_village.dmm
@@ -751,7 +751,7 @@
/area/adhomai_village)
"Pc" = (
/obj/structure/closet/secure_closet/kitchen_cabinet/standard,
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = -11
},
diff --git a/maps/random_ruins/exoplanets/adhomai/ala_cell.dmm b/maps/random_ruins/exoplanets/adhomai/ala_cell.dmm
index 692f57c3b3b7..cd77e4475cbc 100644
--- a/maps/random_ruins/exoplanets/adhomai/ala_cell.dmm
+++ b/maps/random_ruins/exoplanets/adhomai/ala_cell.dmm
@@ -164,7 +164,7 @@
/area/exoplanet/adhomai)
"W" = (
/obj/structure/closet/crate/weapon/alt,
-/obj/item/storage/box/dynamite,
+/obj/item/storage/box/unique/dynamite,
/obj/item/flame/lighter/adhomai,
/turf/simulated/floor/exoplanet/mineral/adhomai,
/area/exoplanet/adhomai)
diff --git a/maps/random_ruins/exoplanets/adhomai/north_pole_nka_expedition.dmm b/maps/random_ruins/exoplanets/adhomai/north_pole_nka_expedition.dmm
index 20b8afb38e76..9fdea363c254 100644
--- a/maps/random_ruins/exoplanets/adhomai/north_pole_nka_expedition.dmm
+++ b/maps/random_ruins/exoplanets/adhomai/north_pole_nka_expedition.dmm
@@ -116,8 +116,8 @@
name = "secure locker (shotgun)";
req_access = list(213)
},
-/obj/item/storage/box/shotgunammo,
-/obj/item/storage/box/shotgunshells,
+/obj/item/storage/box/shells/slugs,
+/obj/item/storage/box/shells/buckshot,
/obj/item/gun/projectile/shotgun/doublebarrel/pellet,
/obj/item/clothing/accessory/storage/bandolier,
/turf/simulated/floor/exoplanet/carpet/rubber,
@@ -173,9 +173,9 @@
/area/adhomai_archeology)
"A" = (
/obj/structure/closet/crate/secure/large,
-/obj/item/storage/box/dynamite,
-/obj/item/storage/box/dynamite,
-/obj/item/storage/box/dynamite,
+/obj/item/storage/box/unique/dynamite,
+/obj/item/storage/box/unique/dynamite,
+/obj/item/storage/box/unique/dynamite,
/turf/simulated/floor/exoplanet/carpet/rubber,
/area/adhomai_archeology)
"C" = (
diff --git a/maps/random_ruins/exoplanets/asteroid/abandoned_prison/abandoned_prison.dmm b/maps/random_ruins/exoplanets/asteroid/abandoned_prison/abandoned_prison.dmm
index 3ae16ae2a994..b5e9de116242 100644
--- a/maps/random_ruins/exoplanets/asteroid/abandoned_prison/abandoned_prison.dmm
+++ b/maps/random_ruins/exoplanets/asteroid/abandoned_prison/abandoned_prison.dmm
@@ -2011,7 +2011,7 @@
/area/abandoned_prison/hydroponics)
"zp" = (
/obj/structure/table/standard,
-/obj/item/storage/box/dynamite,
+/obj/item/storage/box/unique/dynamite,
/obj/effect/landmark/clear,
/turf/template_noop,
/area/space)
diff --git a/maps/random_ruins/exoplanets/asteroid/skrell_ship/skrell_crash_unique.dmm b/maps/random_ruins/exoplanets/asteroid/skrell_ship/skrell_crash_unique.dmm
index 1306816eb863..ead1074bce93 100644
--- a/maps/random_ruins/exoplanets/asteroid/skrell_ship/skrell_crash_unique.dmm
+++ b/maps/random_ruins/exoplanets/asteroid/skrell_ship/skrell_crash_unique.dmm
@@ -551,7 +551,7 @@
/turf/simulated/floor/tiled/dark,
/area/template_noop)
"bp" = (
-/obj/item/storage/box/freezer/organcooler{
+/obj/item/storage/box/unique/freezer/organcooler{
pixel_x = -10;
pixel_y = -1
},
@@ -606,7 +606,7 @@
/area/template_noop)
"bv" = (
/obj/structure/table/skrell,
-/obj/item/storage/box/sharps,
+/obj/item/storage/box/unique/sharps,
/obj/effect/floor_decal/corner/mauve/full{
dir = 1
},
diff --git a/maps/random_ruins/exoplanets/konyang/abandoned/abandoned_outpost.dmm b/maps/random_ruins/exoplanets/konyang/abandoned/abandoned_outpost.dmm
index 56209474c940..586f68f334fb 100644
--- a/maps/random_ruins/exoplanets/konyang/abandoned/abandoned_outpost.dmm
+++ b/maps/random_ruins/exoplanets/konyang/abandoned/abandoned_outpost.dmm
@@ -916,11 +916,11 @@
/area/konyang_telecomms_outpost)
"RB" = (
/obj/structure/table/stone/marble,
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = -5
},
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = 4
},
diff --git a/maps/random_ruins/exoplanets/konyang/abandoned/abandoned_village.dmm b/maps/random_ruins/exoplanets/konyang/abandoned/abandoned_village.dmm
index 2fc63b32bd08..e79ef3cf7025 100644
--- a/maps/random_ruins/exoplanets/konyang/abandoned/abandoned_village.dmm
+++ b/maps/random_ruins/exoplanets/konyang/abandoned/abandoned_village.dmm
@@ -1684,11 +1684,11 @@
/turf/simulated/floor/exoplanet/konyang,
/area/konyang_village)
"XH" = (
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = -5
},
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = 4
},
diff --git a/maps/random_ruins/exoplanets/konyang/abandoned/landing_zone.dmm b/maps/random_ruins/exoplanets/konyang/abandoned/landing_zone.dmm
index 5ae940ee3925..49cd5cae05ec 100644
--- a/maps/random_ruins/exoplanets/konyang/abandoned/landing_zone.dmm
+++ b/maps/random_ruins/exoplanets/konyang/abandoned/landing_zone.dmm
@@ -3291,10 +3291,10 @@
"Ob" = (
/obj/structure/table/stone/marble,
/obj/effect/floor_decal/corner/pink/diagonal,
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_y = -10
},
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_y = -18
},
/turf/simulated/floor/tiled/white,
diff --git a/maps/random_ruins/exoplanets/konyang/hivebot_burrows_1.dmm b/maps/random_ruins/exoplanets/konyang/hivebot_burrows_1.dmm
index 9aec15e5b24f..af73d75d15ca 100644
--- a/maps/random_ruins/exoplanets/konyang/hivebot_burrows_1.dmm
+++ b/maps/random_ruins/exoplanets/konyang/hivebot_burrows_1.dmm
@@ -2518,7 +2518,7 @@
/area/hivebot_burrows_1)
"Zu" = (
/obj/structure/table/rack,
-/obj/item/storage/box/dynamite{
+/obj/item/storage/box/unique/dynamite{
pixel_y = 4;
pixel_x = -4
},
@@ -2526,7 +2526,7 @@
name = "duckboard"
},
/obj/effect/decal/cleanable/dirt,
-/obj/item/storage/box/dynamite,
+/obj/item/storage/box/unique/dynamite,
/turf/simulated/floor/exoplanet/dirt_konyang/cave,
/area/hivebot_burrows_1)
"ZH" = (
diff --git a/maps/random_ruins/exoplanets/konyang/hivebot_burrows_2.dmm b/maps/random_ruins/exoplanets/konyang/hivebot_burrows_2.dmm
index 5132c2267050..fc83beb508cc 100644
--- a/maps/random_ruins/exoplanets/konyang/hivebot_burrows_2.dmm
+++ b/maps/random_ruins/exoplanets/konyang/hivebot_burrows_2.dmm
@@ -708,7 +708,7 @@
/area/hivebot_burrows_2)
"kp" = (
/obj/random/dirt_75,
-/obj/item/storage/box/excavation{
+/obj/item/storage/box/unique/excavation{
pixel_x = 12;
pixel_y = -6
},
@@ -2585,8 +2585,8 @@
/obj/item/reagent_containers/food/condiment/flour,
/obj/item/reagent_containers/food/condiment/flour,
/obj/item/reagent_containers/food/condiment/flour,
-/obj/item/storage/box/produce,
-/obj/item/storage/box/produce,
+/obj/item/storage/box/large/produce,
+/obj/item/storage/box/large/produce,
/obj/item/reagent_containers/food/condiment/enzyme,
/obj/effect/decal/cleanable/floor_damage/tiled_broken3,
/obj/random/dirt_75,
@@ -2621,7 +2621,7 @@
/area/hivebot_burrows_2)
"LM" = (
/obj/random/dirt_75,
-/obj/item/storage/box/excavation{
+/obj/item/storage/box/unique/excavation{
pixel_x = -4;
pixel_y = -6
},
diff --git a/maps/random_ruins/exoplanets/konyang/homestead.dmm b/maps/random_ruins/exoplanets/konyang/homestead.dmm
index 86286869d416..025458ae4821 100644
--- a/maps/random_ruins/exoplanets/konyang/homestead.dmm
+++ b/maps/random_ruins/exoplanets/konyang/homestead.dmm
@@ -813,8 +813,8 @@
/obj/item/seeds/wheatseed,
/obj/item/seeds/wheatseed,
/obj/item/seeds/wheatseed,
-/obj/item/storage/box/shotgunshells,
-/obj/item/storage/box/shotgunshells,
+/obj/item/storage/box/shells/buckshot,
+/obj/item/storage/box/shells/buckshot,
/obj/item/gun/projectile/shotgun/doublebarrel/pellet,
/turf/simulated/floor/exoplanet/dirt_konyang/cave,
/area/konyang_homestead)
diff --git a/maps/random_ruins/exoplanets/konyang/landing_zone.dmm b/maps/random_ruins/exoplanets/konyang/landing_zone.dmm
index 409308172c42..6a547f56069c 100644
--- a/maps/random_ruins/exoplanets/konyang/landing_zone.dmm
+++ b/maps/random_ruins/exoplanets/konyang/landing_zone.dmm
@@ -3210,10 +3210,10 @@
"Ob" = (
/obj/structure/table/stone/marble,
/obj/effect/floor_decal/corner/pink/diagonal,
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_y = -10
},
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_y = -18
},
/turf/simulated/floor/tiled/white,
diff --git a/maps/random_ruins/exoplanets/konyang/ocean/naval_landing_zone.dmm b/maps/random_ruins/exoplanets/konyang/ocean/naval_landing_zone.dmm
index b484058d0dc4..9fc32078175d 100644
--- a/maps/random_ruins/exoplanets/konyang/ocean/naval_landing_zone.dmm
+++ b/maps/random_ruins/exoplanets/konyang/ocean/naval_landing_zone.dmm
@@ -1338,10 +1338,10 @@
"rH" = (
/obj/structure/table/stone/marble,
/obj/effect/floor_decal/corner/pink/diagonal,
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_y = -10
},
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_y = -18
},
/turf/simulated/floor/tiled/white,
diff --git a/maps/random_ruins/exoplanets/konyang/pirate_moonshine.dmm b/maps/random_ruins/exoplanets/konyang/pirate_moonshine.dmm
index df2e6dfe6cfb..49c13882f37a 100644
--- a/maps/random_ruins/exoplanets/konyang/pirate_moonshine.dmm
+++ b/maps/random_ruins/exoplanets/konyang/pirate_moonshine.dmm
@@ -18,10 +18,10 @@
/area/konyang_pirate_moonshine)
"f" = (
/obj/structure/closet/secure_closet/refrigerator/standard,
-/obj/item/storage/box/donkpockets/gwok/takoyaki{
+/obj/item/storage/box/unique/donkpockets/gwok/takoyaki{
icon_state = "redbox"
},
-/obj/item/storage/box/donkpockets/gwok/takoyaki{
+/obj/item/storage/box/unique/donkpockets/gwok/takoyaki{
icon_state = "redbox"
},
/obj/item/reagent_containers/food/drinks/waterbottle,
diff --git a/maps/random_ruins/exoplanets/konyang/telecomms_outpost.dmm b/maps/random_ruins/exoplanets/konyang/telecomms_outpost.dmm
index aa920713bf73..c40913568eee 100644
--- a/maps/random_ruins/exoplanets/konyang/telecomms_outpost.dmm
+++ b/maps/random_ruins/exoplanets/konyang/telecomms_outpost.dmm
@@ -454,11 +454,11 @@
/area/konyang_telecomms_outpost)
"xB" = (
/obj/structure/table/stone/marble,
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = -5
},
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = 4
},
@@ -570,8 +570,8 @@
icon_state = "tube_empty";
dir = 4
},
-/obj/item/storage/box/flares,
-/obj/item/storage/box/flares,
+/obj/item/storage/box/large/flares,
+/obj/item/storage/box/large/flares,
/obj/item/device/gps,
/obj/item/device/gps,
/obj/item/device/flashlight/maglight,
diff --git a/maps/random_ruins/exoplanets/konyang/village.dmm b/maps/random_ruins/exoplanets/konyang/village.dmm
index 39912ee4efc8..afaaa583ac3b 100644
--- a/maps/random_ruins/exoplanets/konyang/village.dmm
+++ b/maps/random_ruins/exoplanets/konyang/village.dmm
@@ -1123,11 +1123,11 @@
/turf/simulated/floor/exoplanet/dirt_konyang,
/area/konyang_village)
"CJ" = (
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = -5
},
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = 4
},
diff --git a/maps/random_ruins/exoplanets/moghes/moghes_bar.dmm b/maps/random_ruins/exoplanets/moghes/moghes_bar.dmm
index 49ec4fc5335c..a8e2b7d44afe 100644
--- a/maps/random_ruins/exoplanets/moghes/moghes_bar.dmm
+++ b/maps/random_ruins/exoplanets/moghes/moghes_bar.dmm
@@ -120,7 +120,7 @@
"dg" = (
/obj/structure/closet/cabinet,
/obj/item/clothing/accessory/storage/bandolier,
-/obj/item/storage/box/shotgunshells,
+/obj/item/storage/box/shells/buckshot,
/obj/item/storage/box/fancy/candle_box,
/obj/item/flame/lighter/zippo,
/obj/item/stack/material/cardboard/full,
@@ -338,7 +338,7 @@
pixel_x = -9
},
/obj/item/reagent_containers/cooking_container/board/bowl,
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_y = 9
},
/turf/simulated/floor/exoplanet/tiled/white{
diff --git a/maps/random_ruins/exoplanets/moghes/moghes_diona_traders.dm b/maps/random_ruins/exoplanets/moghes/moghes_diona_traders.dm
index c62a1125b867..b22c2fe5bd7c 100644
--- a/maps/random_ruins/exoplanets/moghes/moghes_diona_traders.dm
+++ b/maps/random_ruins/exoplanets/moghes/moghes_diona_traders.dm
@@ -49,7 +49,7 @@
back = /obj/item/storage/backpack/satchel/leather
r_pocket = /obj/item/storage/wallet/random
backpack_contents = list(
- /obj/item/storage/box/donkpockets = 1
+ /obj/item/storage/box/unique/donkpockets = 1
)
l_ear = null
diff --git a/maps/random_ruins/exoplanets/moghes/moghes_gawgaryn_riders.dmm b/maps/random_ruins/exoplanets/moghes/moghes_gawgaryn_riders.dmm
index 79dc9dd607f2..2c6da7c7687c 100644
--- a/maps/random_ruins/exoplanets/moghes/moghes_gawgaryn_riders.dmm
+++ b/maps/random_ruins/exoplanets/moghes/moghes_gawgaryn_riders.dmm
@@ -72,7 +72,7 @@
/obj/item/gun/projectile/automatic/tempestsmg,
/obj/item/ammo_magazine/tempestsmg,
/obj/item/gun/projectile/shotgun/wallgun,
-/obj/item/storage/box/wallgunammo,
+/obj/item/storage/box/shells/wallgunammo,
/turf/simulated/floor/exoplanet/tiled{
temperature = 315.15
},
diff --git a/maps/random_ruins/exoplanets/moghes/moghes_untouched_village.dmm b/maps/random_ruins/exoplanets/moghes/moghes_untouched_village.dmm
index 1cbcf7b2c898..9870d94062a3 100644
--- a/maps/random_ruins/exoplanets/moghes/moghes_untouched_village.dmm
+++ b/maps/random_ruins/exoplanets/moghes/moghes_untouched_village.dmm
@@ -581,8 +581,8 @@
"HC" = (
/obj/structure/closet/cabinet,
/obj/item/gun/projectile/shotgun/doublebarrel,
-/obj/item/storage/box/shotgunshells,
-/obj/item/storage/box/shotgunshells,
+/obj/item/storage/box/shells/buckshot,
+/obj/item/storage/box/shells/buckshot,
/obj/item/clothing/accessory/storage/bandolier,
/turf/simulated/floor/exoplanet/wood/birch{
temperature = 303.15
diff --git a/maps/random_ruins/exoplanets/moghes/moghes_wasteland_klax.dmm b/maps/random_ruins/exoplanets/moghes/moghes_wasteland_klax.dmm
index 033c2d45abf8..6e76b8483337 100644
--- a/maps/random_ruins/exoplanets/moghes/moghes_wasteland_klax.dmm
+++ b/maps/random_ruins/exoplanets/moghes/moghes_wasteland_klax.dmm
@@ -40,7 +40,7 @@
/turf/simulated/floor/exoplanet/tiled/white,
/area/moghes_klax)
"cF" = (
-/obj/item/storage/box/freezer/organcooler,
+/obj/item/storage/box/unique/freezer/organcooler,
/obj/structure/closet/crate/freezer,
/obj/effect/floor_decal/corner/lime{
dir = 5
@@ -362,10 +362,10 @@
/obj/structure/closet/crate/large{
name = "Biological Subjects"
},
-/obj/item/storage/box/monkeycubes/vkrexicubes,
-/obj/item/storage/box/monkeycubes/vkrexicubes,
-/obj/item/storage/box/monkeycubes/stokcubes,
-/obj/item/storage/box/monkeycubes/stokcubes,
+/obj/item/storage/box/unique/monkeycubes/vkrexicubes,
+/obj/item/storage/box/unique/monkeycubes/vkrexicubes,
+/obj/item/storage/box/unique/monkeycubes/stokcubes,
+/obj/item/storage/box/unique/monkeycubes/stokcubes,
/obj/effect/floor_decal/corner/lime/full{
dir = 1
},
diff --git a/maps/random_ruins/exoplanets/moghes/moghes_wasteland_priests.dmm b/maps/random_ruins/exoplanets/moghes/moghes_wasteland_priests.dmm
index 9f0be0651996..180e3e51c3f2 100644
--- a/maps/random_ruins/exoplanets/moghes/moghes_wasteland_priests.dmm
+++ b/maps/random_ruins/exoplanets/moghes/moghes_wasteland_priests.dmm
@@ -18,7 +18,7 @@
/obj/item/reagent_containers/blood/OMinus,
/obj/item/reagent_containers/blood/OMinus,
/obj/structure/closet/crate/freezer,
-/obj/item/storage/box/freezer/organcooler,
+/obj/item/storage/box/unique/freezer/organcooler,
/obj/machinery/light/colored/decayed{
dir = 8
},
diff --git a/maps/random_ruins/exoplanets/moghes/moghes_wasteland_queendom.dmm b/maps/random_ruins/exoplanets/moghes/moghes_wasteland_queendom.dmm
index 00be871df891..d17cd93f6239 100644
--- a/maps/random_ruins/exoplanets/moghes/moghes_wasteland_queendom.dmm
+++ b/maps/random_ruins/exoplanets/moghes/moghes_wasteland_queendom.dmm
@@ -55,7 +55,7 @@
/obj/item/clothing/suit/armor/unathi,
/obj/item/gun/projectile/shotgun/pump/rifle/magazine_fed/crackrifle,
/obj/item/gun/projectile/shotgun/wallgun,
-/obj/item/storage/box/wallgunammo,
+/obj/item/storage/box/shells/wallgunammo,
/obj/item/gun/projectile/automatic/tempestsmg,
/obj/item/ammo_magazine/tempestsmg,
/obj/effect/floor_decal/spline/plain/blue,
diff --git a/maps/random_ruins/exoplanets/moghes/moghes_wasteland_vihnmes.dmm b/maps/random_ruins/exoplanets/moghes/moghes_wasteland_vihnmes.dmm
index 4a7c6ea99cf8..5eea7bb7ffcc 100644
--- a/maps/random_ruins/exoplanets/moghes/moghes_wasteland_vihnmes.dmm
+++ b/maps/random_ruins/exoplanets/moghes/moghes_wasteland_vihnmes.dmm
@@ -292,7 +292,7 @@
},
/area/moghes_vihnmes)
"nk" = (
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = -5
},
@@ -546,7 +546,7 @@
/area/exoplanet/moghes)
"wv" = (
/obj/structure/closet/cabinet,
-/obj/item/storage/box/shotgunshells,
+/obj/item/storage/box/shells/buckshot,
/obj/item/clothing/accessory/storage/bandolier,
/obj/item/clothing/suit/armor/unathi,
/obj/machinery/light/colored/decayed{
diff --git a/maps/random_ruins/exoplanets/moghes/moghes_wasteland_village.dmm b/maps/random_ruins/exoplanets/moghes/moghes_wasteland_village.dmm
index 763ac0ccbc74..05582535c6cb 100644
--- a/maps/random_ruins/exoplanets/moghes/moghes_wasteland_village.dmm
+++ b/maps/random_ruins/exoplanets/moghes/moghes_wasteland_village.dmm
@@ -371,8 +371,8 @@
"rY" = (
/obj/structure/closet/cabinet,
/obj/item/gun/projectile/shotgun/doublebarrel,
-/obj/item/storage/box/shotgunshells,
-/obj/item/storage/box/shotgunshells,
+/obj/item/storage/box/shells/buckshot,
+/obj/item/storage/box/shells/buckshot,
/obj/item/clothing/accessory/storage/bandolier,
/obj/effect/floor_decal/spline/fancy/wood{
dir = 5
diff --git a/maps/random_ruins/exoplanets/ouerea/ouerea_autakh.dmm b/maps/random_ruins/exoplanets/ouerea/ouerea_autakh.dmm
index 37ce0c32d5dc..5d788601e3f3 100644
--- a/maps/random_ruins/exoplanets/ouerea/ouerea_autakh.dmm
+++ b/maps/random_ruins/exoplanets/ouerea/ouerea_autakh.dmm
@@ -121,7 +121,7 @@
/obj/structure/closet/secure_closet/guncabinet{
req_access = list(228)
},
-/obj/item/storage/box/shotgunshells,
+/obj/item/storage/box/shells/buckshot,
/obj/item/gun/projectile/shotgun/doublebarrel,
/turf/simulated/floor/exoplanet/wood{
temperature = 298.15
diff --git a/maps/random_ruins/exoplanets/ouerea/ouerea_bar.dmm b/maps/random_ruins/exoplanets/ouerea/ouerea_bar.dmm
index b578db33256e..4beaf66463ee 100644
--- a/maps/random_ruins/exoplanets/ouerea/ouerea_bar.dmm
+++ b/maps/random_ruins/exoplanets/ouerea/ouerea_bar.dmm
@@ -465,7 +465,7 @@
/turf/simulated/floor/tiled/freezer,
/area/ouerea_bar)
"wR" = (
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = -5
},
@@ -1055,7 +1055,7 @@
"Yd" = (
/obj/structure/closet/cabinet,
/obj/item/clothing/accessory/storage/bandolier,
-/obj/item/storage/box/shotgunshells,
+/obj/item/storage/box/shells/buckshot,
/obj/item/storage/box/fancy/candle_box,
/obj/item/flame/lighter/zippo,
/turf/simulated/floor/exoplanet/wood{
diff --git a/maps/random_ruins/exoplanets/ouerea/ouerea_freewater.dmm b/maps/random_ruins/exoplanets/ouerea/ouerea_freewater.dmm
index b4cfc13f465d..e3b5b780bcb9 100644
--- a/maps/random_ruins/exoplanets/ouerea/ouerea_freewater.dmm
+++ b/maps/random_ruins/exoplanets/ouerea/ouerea_freewater.dmm
@@ -54,8 +54,8 @@
/obj/item/device/flashlight/maglight,
/obj/item/device/flashlight/maglight,
/obj/item/device/flashlight/maglight,
-/obj/item/storage/box/flashbangs,
-/obj/item/storage/box/teargas,
+/obj/item/storage/box/tactical/flashbangs,
+/obj/item/storage/box/tactical/teargas,
/obj/item/storage/box/handcuffs,
/obj/item/storage/box/handcuffs,
/turf/simulated/floor/exoplanet/wood{
diff --git a/maps/random_ruins/exoplanets/ouerea/ouerea_skrell_base.dmm b/maps/random_ruins/exoplanets/ouerea/ouerea_skrell_base.dmm
index 57d5340ed035..238efb9ae067 100644
--- a/maps/random_ruins/exoplanets/ouerea/ouerea_skrell_base.dmm
+++ b/maps/random_ruins/exoplanets/ouerea/ouerea_skrell_base.dmm
@@ -352,7 +352,7 @@
"xp" = (
/obj/structure/table/skrell,
/obj/item/clothing/glasses/safety/goggles/science,
-/obj/item/storage/box/monkeycubes/stokcubes,
+/obj/item/storage/box/unique/monkeycubes/stokcubes,
/obj/effect/floor_decal/corner/purple{
dir = 5
},
diff --git a/maps/random_ruins/exoplanets/ouerea/ouerea_village.dmm b/maps/random_ruins/exoplanets/ouerea/ouerea_village.dmm
index 0c8a50dbea9a..d28dae3a73b8 100644
--- a/maps/random_ruins/exoplanets/ouerea/ouerea_village.dmm
+++ b/maps/random_ruins/exoplanets/ouerea/ouerea_village.dmm
@@ -502,8 +502,8 @@
"Gv" = (
/obj/structure/closet/cabinet,
/obj/item/gun/projectile/shotgun/doublebarrel,
-/obj/item/storage/box/shotgunshells,
-/obj/item/storage/box/shotgunshells,
+/obj/item/storage/box/shells/buckshot,
+/obj/item/storage/box/shells/buckshot,
/obj/item/clothing/accessory/storage/bandolier,
/turf/simulated/floor/exoplanet/wood/birch{
temperature = 303.15
diff --git a/maps/random_ruins/exoplanets/raskara/raskara_okon.dmm b/maps/random_ruins/exoplanets/raskara/raskara_okon.dmm
index 2832de25b6df..57ac9244f3d7 100644
--- a/maps/random_ruins/exoplanets/raskara/raskara_okon.dmm
+++ b/maps/random_ruins/exoplanets/raskara/raskara_okon.dmm
@@ -1347,7 +1347,7 @@
pixel_y = -28
},
/obj/structure/closet/crate/freezer,
-/obj/item/storage/box/freezer/organcooler,
+/obj/item/storage/box/unique/freezer/organcooler,
/obj/machinery/atmospherics/unary/vent_pump/on{
dir = 1
},
@@ -2710,7 +2710,7 @@
/area/exoplanet/barren/raskara)
"Ic" = (
/obj/structure/closet/secure_closet/kitchen_cabinet/standard,
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = -11
},
@@ -2865,13 +2865,13 @@
/area/raskara_okon/mess_hall)
"KV" = (
/obj/structure/table/rack,
-/obj/item/storage/box/monkeycubes/farwacubes{
+/obj/item/storage/box/unique/monkeycubes/farwacubes{
pixel_x = -5
},
-/obj/item/storage/box/monkeycubes/farwacubes{
+/obj/item/storage/box/unique/monkeycubes/farwacubes{
pixel_x = 5
},
-/obj/item/storage/box/monkeycubes/farwacubes,
+/obj/item/storage/box/unique/monkeycubes/farwacubes,
/obj/item/reagent_containers/spray/cleaner{
pixel_x = -4;
pixel_y = -3
diff --git a/maps/random_ruins/exoplanets/uueoaesa/kazhkz_crash.dmm b/maps/random_ruins/exoplanets/uueoaesa/kazhkz_crash.dmm
index 1ae71fb2c643..744a1639d071 100644
--- a/maps/random_ruins/exoplanets/uueoaesa/kazhkz_crash.dmm
+++ b/maps/random_ruins/exoplanets/uueoaesa/kazhkz_crash.dmm
@@ -719,7 +719,7 @@
req_access = null
},
/obj/item/ammo_magazine/crackrifle,
-/obj/item/storage/box/wallgunammo,
+/obj/item/storage/box/shells/wallgunammo,
/obj/item/ammo_magazine/hookmg,
/obj/item/ammo_magazine/spitterpistol,
/obj/item/ammo_magazine/spitterpistol,
diff --git a/maps/random_ruins/exoplanets/uueoaesa/sol_listening_post.dmm b/maps/random_ruins/exoplanets/uueoaesa/sol_listening_post.dmm
index e4f4db715c1f..d0b2c8651caa 100644
--- a/maps/random_ruins/exoplanets/uueoaesa/sol_listening_post.dmm
+++ b/maps/random_ruins/exoplanets/uueoaesa/sol_listening_post.dmm
@@ -447,7 +447,7 @@
/obj/item/ammo_magazine/c762/sol,
/obj/item/ammo_magazine/mc9mm,
/obj/item/ammo_magazine/mc9mm,
-/obj/item/storage/box/shotgunammo,
+/obj/item/storage/box/shells/slugs,
/turf/simulated/floor/tiled,
/area/sol_listening_post)
"xP" = (
diff --git a/maps/runtime/runtime.dmm b/maps/runtime/runtime.dmm
index 1bb288626d11..cb0d294b060a 100644
--- a/maps/runtime/runtime.dmm
+++ b/maps/runtime/runtime.dmm
@@ -1757,7 +1757,7 @@
/obj/structure/railing/mapped{
dir = 4
},
-/obj/item/storage/box/monkeycubes,
+/obj/item/storage/box/unique/monkeycubes,
/turf/simulated/floor/tiled,
/area/construction/storage)
"iN" = (
diff --git a/maps/sccv_horizon/sccv_horizon.dmm b/maps/sccv_horizon/sccv_horizon.dmm
index 4df0aec7baf7..a6f859f5b661 100644
--- a/maps/sccv_horizon/sccv_horizon.dmm
+++ b/maps/sccv_horizon/sccv_horizon.dmm
@@ -3847,7 +3847,7 @@
/obj/item/target,
/obj/item/target,
/obj/structure/closet/crate,
-/obj/item/storage/box/monkeycubes,
+/obj/item/storage/box/unique/monkeycubes,
/turf/simulated/floor/tiled/white,
/area/horizon/rnd/test_range)
"axN" = (
@@ -15693,8 +15693,8 @@
/obj/structure/closet/secure_closet/guncabinet{
name = "Lethal Ammunitions"
},
-/obj/item/storage/box/shotgunshells,
-/obj/item/storage/box/shotgunshells,
+/obj/item/storage/box/shells/buckshot,
+/obj/item/storage/box/shells/buckshot,
/obj/effect/floor_decal/corner_wide/paleblue/full{
dir = 4
},
@@ -18240,7 +18240,7 @@
/obj/item/material/knife{
pixel_x = -9
},
-/obj/item/storage/box/produce,
+/obj/item/storage/box/large/produce,
/turf/simulated/floor/tiled/dark/full,
/area/horizon/service/kitchen)
"cBp" = (
@@ -18350,7 +18350,7 @@
/obj/item/material/knife{
pixel_x = -9
},
-/obj/item/storage/box/produce,
+/obj/item/storage/box/large/produce,
/turf/simulated/floor/tiled/dark/full,
/area/horizon/service/kitchen)
"cCi" = (
@@ -26826,11 +26826,11 @@
/obj/structure/table/rack/retail_shelf{
name = "storage shelf"
},
-/obj/item/storage/box/monkeycubes{
+/obj/item/storage/box/unique/monkeycubes{
pixel_x = -7;
pixel_y = -7
},
-/obj/item/storage/box/monkeycubes{
+/obj/item/storage/box/unique/monkeycubes{
pixel_x = -7;
pixel_y = -7
},
@@ -29693,7 +29693,7 @@
pixel_x = -6;
pixel_y = -6
},
-/obj/item/storage/box/trackimp{
+/obj/item/storage/box/tactical/trackimp{
pixel_x = -6;
pixel_y = 6
},
@@ -36461,11 +36461,11 @@
/obj/structure/closet/crate/freezer{
name = "Fridge"
},
-/obj/item/storage/box/freezer/organcooler,
+/obj/item/storage/box/unique/freezer/organcooler,
/obj/machinery/light/small,
/obj/machinery/alarm/cold/north,
/obj/effect/floor_decal/industrial/hatch/grey,
-/obj/item/storage/box/monkeycubes,
+/obj/item/storage/box/unique/monkeycubes,
/obj/machinery/firealarm/south,
/turf/simulated/floor/tiled/freezer{
name = "cold storage tiles";
@@ -40019,7 +40019,7 @@
pixel_x = 7;
pixel_y = 4
},
-/obj/item/storage/box/sharps,
+/obj/item/storage/box/unique/sharps,
/turf/simulated/floor/tiled/white,
/area/horizon/security/forensic_laboratory)
"fEA" = (
@@ -50387,14 +50387,14 @@
/obj/item/storage/bag/plasticbag,
/obj/item/storage/bag/plasticbag,
/obj/item/storage/box/plasticbag,
-/obj/item/storage/box/papersack,
-/obj/item/storage/box/papersack,
-/obj/item/storage/box/papersack,
-/obj/item/storage/box/papersack,
-/obj/item/storage/box/papersack,
-/obj/item/storage/box/papersack,
-/obj/item/storage/box/papersack,
-/obj/item/storage/box/papersack,
+/obj/item/storage/box/unique/papersack,
+/obj/item/storage/box/unique/papersack,
+/obj/item/storage/box/unique/papersack,
+/obj/item/storage/box/unique/papersack,
+/obj/item/storage/box/unique/papersack,
+/obj/item/storage/box/unique/papersack,
+/obj/item/storage/box/unique/papersack,
+/obj/item/storage/box/unique/papersack,
/turf/simulated/floor/plating,
/area/horizon/maintenance/deck_2/service/port)
"hbe" = (
@@ -55767,7 +55767,7 @@
/area/horizon/medical/reception)
"hNd" = (
/obj/structure/table/wood,
-/obj/item/storage/box/beanbags,
+/obj/item/storage/box/shells/beanbags,
/obj/item/wrench,
/obj/item/paper{
info = "This permit signifies that the Bartender is permitted to posess this firearm in the bar, and ONLY the bar. Failure to adhere to this permit will result in confiscation of the weapon and possibly arrest.";
@@ -57033,7 +57033,7 @@
pixel_x = -9;
pixel_y = -14
},
-/obj/item/storage/box/produce{
+/obj/item/storage/box/large/produce{
pixel_x = 3;
pixel_y = -11
},
@@ -57041,10 +57041,10 @@
/area/centcom/bar)
"hYP" = (
/obj/structure/table/rack,
-/obj/item/storage/box/monkeycubes,
-/obj/item/storage/box/monkeycubes,
-/obj/item/storage/box/monkeycubes,
-/obj/item/storage/box/monkeycubes,
+/obj/item/storage/box/unique/monkeycubes,
+/obj/item/storage/box/unique/monkeycubes,
+/obj/item/storage/box/unique/monkeycubes,
+/obj/item/storage/box/unique/monkeycubes,
/obj/machinery/alarm/east,
/turf/simulated/floor/tiled/dark,
/area/horizon/rnd/xenobiology)
@@ -72311,13 +72311,13 @@
/obj/machinery/chemical_dispenser/bar_alc/full{
pixel_y = 21
},
-/obj/item/storage/box/trackingslugs{
+/obj/item/storage/box/shells/trackingslugs{
pixel_x = 3
},
-/obj/item/storage/box/stunshells{
+/obj/item/storage/box/shells/stunshells{
pixel_x = 3
},
-/obj/item/storage/box/practiceshells{
+/obj/item/storage/box/shells/practiceshells{
pixel_x = 4
},
/obj/random/booze{
@@ -79348,17 +79348,17 @@
pixel_x = 12;
pixel_y = 6
},
-/obj/item/storage/box/teargas{
+/obj/item/storage/box/tactical/teargas{
pixel_y = -6
},
-/obj/item/storage/box/teargas{
+/obj/item/storage/box/tactical/teargas{
pixel_y = 6
},
-/obj/item/storage/box/flashbangs{
+/obj/item/storage/box/tactical/flashbangs{
pixel_x = -12;
pixel_y = -6
},
-/obj/item/storage/box/flashbangs{
+/obj/item/storage/box/tactical/flashbangs{
pixel_x = -12;
pixel_y = 6
},
@@ -85608,7 +85608,7 @@
pixel_x = 2;
pixel_y = 12
},
-/obj/item/storage/box/freezer/organcooler{
+/obj/item/storage/box/unique/freezer/organcooler{
pixel_x = -1;
pixel_y = 3
},
@@ -85928,7 +85928,7 @@
},
/obj/structure/table/standard,
/obj/effect/floor_decal/spline/plain,
-/obj/item/storage/box/donkpockets,
+/obj/item/storage/box/unique/donkpockets,
/turf/simulated/floor/tiled/white,
/area/horizon/operations/break_room)
"maQ" = (
@@ -88046,7 +88046,7 @@
/area/horizon/shuttle/intrepid/main_compartment)
"msj" = (
/obj/structure/table/wood/gamblingtable,
-/obj/item/storage/box/donkpockets{
+/obj/item/storage/box/unique/donkpockets{
pixel_x = 2;
pixel_y = 5
},
@@ -93112,7 +93112,7 @@
dir = 6
},
/obj/structure/table/reinforced,
-/obj/item/storage/box/donkpockets,
+/obj/item/storage/box/unique/donkpockets,
/turf/simulated/floor/tiled,
/area/horizon/security/brig)
"ngj" = (
@@ -95041,7 +95041,7 @@
},
/obj/effect/floor_decal/industrial/outline/grey,
/obj/structure/table/steel,
-/obj/item/storage/box/flares{
+/obj/item/storage/box/large/flares{
pixel_x = -6;
pixel_y = 11
},
@@ -95049,7 +95049,7 @@
pixel_x = 8;
pixel_y = 11
},
-/obj/item/storage/box/flares{
+/obj/item/storage/box/large/flares{
pixel_x = -6;
pixel_y = 2
},
@@ -97313,7 +97313,7 @@
},
/obj/machinery/firealarm/east,
/obj/structure/table/standard,
-/obj/item/storage/box/flares,
+/obj/item/storage/box/large/flares,
/turf/simulated/floor/tiled/dark,
/area/horizon/command/teleporter)
"nLy" = (
@@ -106262,9 +106262,9 @@
/obj/machinery/light{
dir = 4
},
-/obj/item/storage/box/produce/adhomai,
-/obj/item/storage/box/produce/moghes,
-/obj/item/storage/box/produce/nralakk,
+/obj/item/storage/box/large/produce/adhomai,
+/obj/item/storage/box/large/produce/moghes,
+/obj/item/storage/box/large/produce/nralakk,
/turf/simulated/floor/tiled/dark/full,
/area/horizon/service/kitchen)
"oYg" = (
@@ -106591,7 +106591,7 @@
dir = 4
},
/obj/structure/table/reinforced/steel,
-/obj/item/storage/box/donkpockets,
+/obj/item/storage/box/unique/donkpockets,
/turf/simulated/floor/carpet/rubber,
/area/horizon/engineering/bluespace_drive/monitoring)
"pbn" = (
@@ -108443,7 +108443,7 @@
/obj/machinery/light{
dir = 8
},
-/obj/item/storage/box/sharps{
+/obj/item/storage/box/unique/sharps{
pixel_y = 9
},
/obj/item/vitals_monitor,
@@ -110714,7 +110714,7 @@
},
/obj/machinery/power/apc/west,
/obj/structure/table/standard,
-/obj/item/storage/box/sharps,
+/obj/item/storage/box/unique/sharps,
/obj/structure/cable/green{
icon_state = "0-4"
},
@@ -114796,7 +114796,7 @@
},
/obj/structure/closet/crate/plastic,
/obj/item/storage/bag/inflatable,
-/obj/item/storage/box/flares,
+/obj/item/storage/box/large/flares,
/obj/item/stack/rods/full,
/obj/item/storage/toolbox/mechanical,
/obj/random/tool,
@@ -118423,7 +118423,7 @@
dir = 4
},
/obj/structure/table/standard,
-/obj/item/storage/box/sharps,
+/obj/item/storage/box/unique/sharps,
/turf/simulated/floor/tiled/white,
/area/horizon/medical/surgery)
"qQD" = (
@@ -122311,11 +122311,11 @@
/area/centcom/specops)
"rth" = (
/obj/structure/table/rack,
-/obj/item/storage/box/teargas{
+/obj/item/storage/box/tactical/teargas{
pixel_x = -1;
pixel_y = -4
},
-/obj/item/storage/box/flashbangs{
+/obj/item/storage/box/tactical/flashbangs{
pixel_x = 4;
pixel_y = 4
},
@@ -122388,7 +122388,7 @@
pixel_x = 6;
pixel_y = 2
},
-/obj/item/storage/box/sharps{
+/obj/item/storage/box/unique/sharps{
pixel_x = -5
},
/turf/simulated/floor/tiled/white,
@@ -123080,14 +123080,14 @@
dir = 5
},
/obj/structure/table/stone/marble,
-/obj/item/storage/box/tea{
+/obj/item/storage/box/unique/tea{
pixel_x = -9;
pixel_y = 8
},
-/obj/item/storage/box/tea/jaekseol{
+/obj/item/storage/box/unique/tea/jaekseol{
pixel_y = 8
},
-/obj/item/storage/box/tea/tieguanyin{
+/obj/item/storage/box/unique/tea/tieguanyin{
pixel_x = 10;
pixel_y = 8
},
@@ -124361,8 +124361,8 @@
"rIt" = (
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/structure/closet/crate/freezer/rations,
-/obj/item/storage/box/produce,
-/obj/item/storage/box/produce,
+/obj/item/storage/box/large/produce,
+/obj/item/storage/box/large/produce,
/obj/item/reagent_containers/food/snacks/koisbar_clean,
/obj/item/reagent_containers/food/snacks/koisbar_clean,
/obj/item/storage/box/fancy/egg_box,
@@ -129222,8 +129222,8 @@
/obj/item/roller{
pixel_y = 6
},
-/obj/item/storage/box/sharps,
-/obj/item/storage/box/sharps,
+/obj/item/storage/box/unique/sharps,
+/obj/item/storage/box/unique/sharps,
/turf/simulated/floor/tiled/dark,
/area/horizon/rnd/xenobiology/dissection)
"ssd" = (
@@ -130322,7 +130322,7 @@
pixel_x = 4;
pixel_y = 6
},
-/obj/item/storage/box/sharps,
+/obj/item/storage/box/unique/sharps,
/turf/simulated/floor/tiled/white,
/area/horizon/security/autopsy_laboratory)
"sAj" = (
@@ -132863,7 +132863,7 @@
/obj/machinery/appliance/cooker/microwave{
pixel_y = 12
},
-/obj/item/storage/box/donkpockets{
+/obj/item/storage/box/unique/donkpockets{
pixel_x = -11;
pixel_y = -5
},
@@ -133272,17 +133272,17 @@
dir = 8
},
/obj/structure/table/steel,
-/obj/item/storage/box/flares{
+/obj/item/storage/box/large/flares{
pixel_x = -6
},
-/obj/item/storage/box/flares{
+/obj/item/storage/box/large/flares{
pixel_x = -6
},
-/obj/item/storage/box/flares{
+/obj/item/storage/box/large/flares{
pixel_x = -7;
pixel_y = 11
},
-/obj/item/storage/box/flares{
+/obj/item/storage/box/large/flares{
pixel_x = -6;
pixel_y = 11
},
@@ -134248,7 +134248,7 @@
c_tag = "Engineering - Meeting Room";
dir = 1
},
-/obj/item/storage/box/donkpockets{
+/obj/item/storage/box/unique/donkpockets{
pixel_y = 5
},
/turf/simulated/floor/tiled/dark,
@@ -134760,7 +134760,7 @@
/obj/machinery/light{
dir = 4
},
-/obj/item/storage/box/donkpockets{
+/obj/item/storage/box/unique/donkpockets{
pixel_x = -2;
pixel_y = 5
},
@@ -138699,7 +138699,7 @@
"tGM" = (
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/structure/table/steel,
-/obj/item/storage/box/flares{
+/obj/item/storage/box/large/flares{
pixel_x = -6;
pixel_y = 11
},
@@ -138707,7 +138707,7 @@
pixel_x = 8;
pixel_y = 11
},
-/obj/item/storage/box/flares{
+/obj/item/storage/box/large/flares{
pixel_x = -6;
pixel_y = 2
},
@@ -148829,22 +148829,22 @@
dir = 10
},
/obj/effect/floor_decal/industrial/outline/yellow,
-/obj/item/storage/box/flashshells{
+/obj/item/storage/box/shells/flashshells{
pixel_x = -2;
pixel_y = 2
},
-/obj/item/storage/box/trackingslugs,
-/obj/item/storage/box/beanbags{
+/obj/item/storage/box/shells/trackingslugs,
+/obj/item/storage/box/shells/beanbags{
pixel_x = -4;
pixel_y = 4
},
-/obj/item/storage/box/beanbags{
+/obj/item/storage/box/shells/beanbags{
pixel_x = -4;
pixel_y = 4
},
-/obj/item/storage/box/stunshells,
-/obj/item/storage/box/beanbags,
-/obj/item/storage/box/beanbags,
+/obj/item/storage/box/shells/stunshells,
+/obj/item/storage/box/shells/beanbags,
+/obj/item/storage/box/shells/beanbags,
/obj/item/ammo_magazine/mc9mmt/rubber,
/obj/item/ammo_magazine/mc9mmt/rubber,
/obj/item/ammo_magazine/c45m/rubber,
@@ -149426,11 +149426,11 @@
/area/horizon/holodeck/source_picnicarea)
"vhK" = (
/obj/structure/table/rack,
-/obj/item/storage/box/smokebombs{
+/obj/item/storage/box/tactical/smokebombs{
pixel_x = 6;
pixel_y = 6
},
-/obj/item/storage/box/flashbangs,
+/obj/item/storage/box/tactical/flashbangs,
/obj/effect/floor_decal/industrial/outline/yellow,
/turf/unsimulated/floor,
/area/antag/mercenary)
@@ -150053,7 +150053,7 @@
/obj/item/device/flash,
/obj/item/device/flash,
/obj/item/device/flash,
-/obj/item/storage/box/teargas,
+/obj/item/storage/box/tactical/teargas,
/turf/unsimulated/floor,
/area/centcom/legion)
"vlV" = (
@@ -158128,10 +158128,10 @@
/obj/machinery/light,
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/structure/table/rack,
-/obj/item/storage/box/monkeycubes,
-/obj/item/storage/box/monkeycubes,
-/obj/item/storage/box/monkeycubes,
-/obj/item/storage/box/monkeycubes,
+/obj/item/storage/box/unique/monkeycubes,
+/obj/item/storage/box/unique/monkeycubes,
+/obj/item/storage/box/unique/monkeycubes,
+/obj/item/storage/box/unique/monkeycubes,
/obj/item/reagent_containers/spray/chemsprayer/xenobiology,
/obj/item/reagent_containers/spray/chemsprayer/xenobiology,
/obj/item/melee/baton/slime{
@@ -167134,9 +167134,9 @@
},
/obj/effect/floor_decal/industrial/outline/security,
/obj/item/device/radio/intercom/west,
-/obj/item/storage/box/practiceshells,
-/obj/item/storage/box/practiceshells,
-/obj/item/storage/box/practiceshells,
+/obj/item/storage/box/shells/practiceshells,
+/obj/item/storage/box/shells/practiceshells,
+/obj/item/storage/box/shells/practiceshells,
/obj/item/ammo_magazine/c45m/practice{
pixel_x = 4
},
@@ -170096,7 +170096,7 @@
/area/horizon/service/hydroponics)
"ybs" = (
/obj/structure/table/rack,
-/obj/item/storage/box/flashbangs{
+/obj/item/storage/box/tactical/flashbangs{
pixel_x = 2;
pixel_y = 4
},
@@ -170744,7 +170744,7 @@
/area/centcom/holding)
"yfd" = (
/obj/effect/floor_decal/corner/teal/diagonal,
-/obj/item/storage/box/condiment{
+/obj/item/storage/box/large/condiment{
pixel_y = 13
},
/obj/effect/decal/fake_object{
diff --git a/maps/sccv_horizon/submaps/ops_warehouse_small_storage.dmm b/maps/sccv_horizon/submaps/ops_warehouse_small_storage.dmm
index 13f47ec77f00..d065f825f78e 100644
--- a/maps/sccv_horizon/submaps/ops_warehouse_small_storage.dmm
+++ b/maps/sccv_horizon/submaps/ops_warehouse_small_storage.dmm
@@ -142,10 +142,10 @@
/area/template_noop)
"cQ" = (
/obj/structure/table/rack/folding_table,
-/obj/item/storage/box/donkpockets,
-/obj/item/storage/box/donkpockets,
-/obj/item/storage/box/donkpockets,
-/obj/item/storage/box/donkpockets,
+/obj/item/storage/box/unique/donkpockets,
+/obj/item/storage/box/unique/donkpockets,
+/obj/item/storage/box/unique/donkpockets,
+/obj/item/storage/box/unique/donkpockets,
/turf/template_noop,
/area/template_noop)
"cU" = (
@@ -679,8 +679,8 @@
/area/template_noop)
"pT" = (
/obj/structure/table/rack/folding_table,
-/obj/item/storage/box/candy,
-/obj/item/storage/box/candy,
+/obj/item/storage/box/large/candy,
+/obj/item/storage/box/large/candy,
/turf/template_noop,
/area/template_noop)
"qo" = (
@@ -981,10 +981,10 @@
"xg" = (
/obj/effect/map_effect/marker/mapmanip/submap/extract/sccv_horizon/ops_warehouse_small_storage,
/obj/structure/closet/crate/freezer,
-/obj/item/storage/box/produce,
-/obj/item/storage/box/produce,
-/obj/item/storage/box/produce,
-/obj/item/storage/box/produce,
+/obj/item/storage/box/large/produce,
+/obj/item/storage/box/large/produce,
+/obj/item/storage/box/large/produce,
+/obj/item/storage/box/large/produce,
/turf/template_noop,
/area/template_noop)
"xu" = (
@@ -1063,7 +1063,7 @@
/area/template_noop)
"zi" = (
/obj/structure/table/rack/no_cargo,
-/obj/item/storage/box/condimentbottles,
+/obj/item/storage/box/large/condimentbottles,
/obj/random/condiment,
/obj/random/condiment,
/obj/random/condiment,
@@ -1437,8 +1437,8 @@
/area/template_noop)
"KW" = (
/obj/structure/table/rack/no_cargo,
-/obj/item/storage/box/beanbags,
-/obj/item/storage/box/beanbags,
+/obj/item/storage/box/shells/beanbags,
+/obj/item/storage/box/shells/beanbags,
/turf/template_noop,
/area/template_noop)
"KX" = (