space-wizards · Emisse · Feb 4, 2025 · Jan 8, 2025 · Jan 8, 2025 · Jan 8, 2025
diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml
@@ -178,7 +178,7 @@
       - id: FoodCondimentPacketKetchup
   - type: Sprite
     layers:
-      - state: box_olive
+      - state: box
       - state: writing
 
 - type: entity

diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/agrichemkit.png b/Resources/Textures/Objects/Storage/boxes.rsi/agrichemkit.png
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/beaker.png b/Resources/Textures/Objects/Storage/boxes.rsi/beaker.png
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/bodybags.png b/Resources/Textures/Objects/Storage/boxes.rsi/bodybags.png
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/bottle.png b/Resources/Textures/Objects/Storage/boxes.rsi/bottle.png
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/box.png b/Resources/Textures/Objects/Storage/boxes.rsi/box.png
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/box_hug.png b/Resources/Textures/Objects/Storage/boxes.rsi/box_hug.png
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/box_id.png b/Resources/Textures/Objects/Storage/boxes.rsi/box_id.png
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/box_of_doom.png b/Resources/Textures/Objects/Storage/boxes.rsi/box_of_doom.png
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/box_of_doom_big.png b/Resources/Textures/Objects/Storage/boxes.rsi/box_of_doom_big.png
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/box_olive.png b/Resources/Textures/Objects/Storage/boxes.rsi/box_olive.png
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/box_science.png b/Resources/Textures/Objects/Storage/boxes.rsi/box_science.png
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/box_security.png b/Resources/Textures/Objects/Storage/boxes.rsi/box_security.png
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/boxwide.png b/Resources/Textures/Objects/Storage/boxes.rsi/boxwide.png
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/boxwidetoy.png b/Resources/Textures/Objects/Storage/boxes.rsi/boxwidetoy.png
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/candle.png b/Resources/Textures/Objects/Storage/boxes.rsi/candle.png
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/circuit.png b/Resources/Textures/Objects/Storage/boxes.rsi/circuit.png
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/clown.png b/Resources/Textures/Objects/Storage/boxes.rsi/clown.png
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/darts.png b/Resources/Textures/Objects/Storage/boxes.rsi/darts.png
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/disk.png b/Resources/Textures/Objects/Storage/boxes.rsi/disk.png
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/emergencytank.png b/Resources/Textures/Objects/Storage/boxes.rsi/emergencytank.png
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/encryptokey.png b/Resources/Textures/Objects/Storage/boxes.rsi/encryptokey.png
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/envelope.png b/Resources/Textures/Objects/Storage/boxes.rsi/envelope.png
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/evidence_markers.png b/Resources/Textures/Objects/Storage/boxes.rsi/evidence_markers.png
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/extendedtank.png b/Resources/Textures/Objects/Storage/boxes.rsi/extendedtank.png
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/flare.png b/Resources/Textures/Objects/Storage/boxes.rsi/flare.png
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/flashbang.png b/Resources/Textures/Objects/Storage/boxes.rsi/flashbang.png
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/forensic.png b/Resources/Textures/Objects/Storage/boxes.rsi/forensic.png
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/france.png b/Resources/Textures/Objects/Storage/boxes.rsi/france.png
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/glasses.png b/Resources/Textures/Objects/Storage/boxes.rsi/glasses.png
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/handcuff.png b/Resources/Textures/Objects/Storage/boxes.rsi/handcuff.png
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/headset.png b/Resources/Textures/Objects/Storage/boxes.rsi/headset.png
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/heart.png b/Resources/Textures/Objects/Storage/boxes.rsi/heart.png
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/holo.png b/Resources/Textures/Objects/Storage/boxes.rsi/holo.png
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/implant.png b/Resources/Textures/Objects/Storage/boxes.rsi/implant.png
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/inflatable.png b/Resources/Textures/Objects/Storage/boxes.rsi/inflatable.png
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/internals.png b/Resources/Textures/Objects/Storage/boxes.rsi/internals.png
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/latex.png b/Resources/Textures/Objects/Storage/boxes.rsi/latex.png
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/light.png b/Resources/Textures/Objects/Storage/boxes.rsi/light.png
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/lightmixed.png b/Resources/Textures/Objects/Storage/boxes.rsi/lightmixed.png
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/lighttube.png b/Resources/Textures/Objects/Storage/boxes.rsi/lighttube.png
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/magazine.png b/Resources/Textures/Objects/Storage/boxes.rsi/magazine.png
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/meson.png b/Resources/Textures/Objects/Storage/boxes.rsi/meson.png
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/cc65477c04f7403ca8a457bd5bae69a01abadbf0, encryptokey was taken from Baystation12 at https://github.com/infinitystation/Baystation12/blob/073f678cdce92edb8fcd55f9ffc9f0523bf31506/icons/obj/radio.dmi and modified by lapatison. boxwidetoy, shelltoy, swab, flare, inflatable, trashbag, magazine, holo and forensic created by potato1234x (github) for ss14 based on toys.rsi, mouth_swab.rsi, flare.rsi, inflatable_wall.rsi, trashbag.rsi, caseless_pistol_mag.rsi, guardians.rsi and bureaucracy.rsi respectively, candle and darts created by TheShuEd for ss14, throwing_knives and vials was drawn by Ubaser, evidence_markers by moomoobeef, nitrogentank modified from extendedtank by Errant, agrichemkit by Cerol",
+  "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/ca674eff9d23e04357b7609ef7e07eadfc1a993f and modified by Flareguy (github), encryptokey was taken from Baystation12 at https://github.com/infinitystation/Baystation12/blob/073f678cdce92edb8fcd55f9ffc9f0523bf31506/icons/obj/radio.dmi and modified by lapatison. boxwidetoy, shelltoy, swab, flare, inflatable, trashbag, magazine, holo and forensic created by potato1234x (github) for ss14 based on toys.rsi, mouth_swab.rsi, flare.rsi, inflatable_wall.rsi, trashbag.rsi, caseless_pistol_mag.rsi, guardians.rsi and bureaucracy.rsi respectively, candle and darts created by TheShuEd for ss14, throwing_knives and vials was drawn by Ubaser, evidence_markers by moomoobeef, nitrogentank modified from extendedtank by Errant, agrichemkit by Cerol, modified by ps3moira (github)",
   "size": {
     "x": 32,
     "y": 32
@@ -52,9 +52,6 @@
         {
             "name": "box_hug"
         },
-        {
-            "name": "box_id"
-        },
         {
             "name": "box_of_doom"
         },
@@ -67,9 +64,6 @@
         {
             "name": "box_science"
         },
-        {
-            "name": "box_olive"
-        },
         {
             "name": "circuit"
         },

diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/mousetraps.png b/Resources/Textures/Objects/Storage/boxes.rsi/mousetraps.png
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/nitrile.png b/Resources/Textures/Objects/Storage/boxes.rsi/nitrile.png
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/nitrogentank.png b/Resources/Textures/Objects/Storage/boxes.rsi/nitrogentank.png
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/omegacart.png b/Resources/Textures/Objects/Storage/boxes.rsi/omegacart.png
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/pda.png b/Resources/Textures/Objects/Storage/boxes.rsi/pda.png
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/pillbox.png b/Resources/Textures/Objects/Storage/boxes.rsi/pillbox.png
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/sechud.png b/Resources/Textures/Objects/Storage/boxes.rsi/sechud.png
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/shelltoy.png b/Resources/Textures/Objects/Storage/boxes.rsi/shelltoy.png
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/solution_trays.png b/Resources/Textures/Objects/Storage/boxes.rsi/solution_trays.png
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/sterile.png b/Resources/Textures/Objects/Storage/boxes.rsi/sterile.png
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/swab.png b/Resources/Textures/Objects/Storage/boxes.rsi/swab.png
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/syringe.png b/Resources/Textures/Objects/Storage/boxes.rsi/syringe.png
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/throwing_knives.png b/Resources/Textures/Objects/Storage/boxes.rsi/throwing_knives.png
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/trashbag.png b/Resources/Textures/Objects/Storage/boxes.rsi/trashbag.png
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/vials.png b/Resources/Textures/Objects/Storage/boxes.rsi/vials.png
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/writing.png b/Resources/Textures/Objects/Storage/boxes.rsi/writing.png
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/writing_of_doom.png b/Resources/Textures/Objects/Storage/boxes.rsi/writing_of_doom.png
diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/ziptie.png b/Resources/Textures/Objects/Storage/boxes.rsi/ziptie.png
diff --git a/Resources/Textures/Objects/Storage/boxicons.rsi/beaker.png b/Resources/Textures/Objects/Storage/boxicons.rsi/beaker.png
diff --git a/Resources/Textures/Objects/Storage/boxicons.rsi/bodybags.png b/Resources/Textures/Objects/Storage/boxicons.rsi/bodybags.png
diff --git a/Resources/Textures/Objects/Storage/boxicons.rsi/box.png b/Resources/Textures/Objects/Storage/boxicons.rsi/box.png
diff --git a/Resources/Textures/Objects/Storage/boxicons.rsi/box_of_doom.png b/Resources/Textures/Objects/Storage/boxicons.rsi/box_of_doom.png
diff --git a/Resources/Textures/Objects/Storage/boxicons.rsi/circuit.png b/Resources/Textures/Objects/Storage/boxicons.rsi/circuit.png
diff --git a/Resources/Textures/Objects/Storage/boxicons.rsi/disk_kit.png b/Resources/Textures/Objects/Storage/boxicons.rsi/disk_kit.png
diff --git a/Resources/Textures/Objects/Storage/boxicons.rsi/donk_kit.png b/Resources/Textures/Objects/Storage/boxicons.rsi/donk_kit.png
diff --git a/Resources/Textures/Objects/Storage/boxicons.rsi/flashbang.png b/Resources/Textures/Objects/Storage/boxicons.rsi/flashbang.png
diff --git a/Resources/Textures/Objects/Storage/boxicons.rsi/glasses.png b/Resources/Textures/Objects/Storage/boxicons.rsi/glasses.png
diff --git a/Resources/Textures/Objects/Storage/boxicons.rsi/handcuff.png b/Resources/Textures/Objects/Storage/boxicons.rsi/handcuff.png
diff --git a/Resources/Textures/Objects/Storage/boxicons.rsi/implant.png b/Resources/Textures/Objects/Storage/boxicons.rsi/implant.png
diff --git a/Resources/Textures/Objects/Storage/boxicons.rsi/latex.png b/Resources/Textures/Objects/Storage/boxicons.rsi/latex.png
diff --git a/Resources/Textures/Objects/Storage/boxicons.rsi/light.png b/Resources/Textures/Objects/Storage/boxicons.rsi/light.png
diff --git a/Resources/Textures/Objects/Storage/boxicons.rsi/lightmixed.png b/Resources/Textures/Objects/Storage/boxicons.rsi/lightmixed.png
diff --git a/Resources/Textures/Objects/Storage/boxicons.rsi/lighttube.png b/Resources/Textures/Objects/Storage/boxicons.rsi/lighttube.png
diff --git a/Resources/Textures/Objects/Storage/boxicons.rsi/meson.png b/Resources/Textures/Objects/Storage/boxicons.rsi/meson.png
diff --git a/Resources/Textures/Objects/Storage/boxicons.rsi/meta.json b/Resources/Textures/Objects/Storage/boxicons.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from baystation at https://github.com/Baystation12/Baystation12/commit/bc9fbb1722530596e3aa7522ee407280b323ad43, throwing_knives and vials are drawn by Ubaser, tracks made by Fazansen(https://github.com/Fazansen).",
+  "copyright": "Taken from vgstation at commit https://github.com/vgstation-coders/vgstation13/commit/ca674eff9d23e04357b7609ef7e07eadfc1a993f and modified by Flareguy (github), throwing_knives and vials are drawn by Ubaser, tracks made by Fazansen(https://github.com/Fazansen), modified by ps3moira (github).",
   "size": {
     "x": 32,
     "y": 32

diff --git a/Resources/Textures/Objects/Storage/boxicons.rsi/mousetraps.png b/Resources/Textures/Objects/Storage/boxicons.rsi/mousetraps.png
diff --git a/Resources/Textures/Objects/Storage/boxicons.rsi/pda.png b/Resources/Textures/Objects/Storage/boxicons.rsi/pda.png
diff --git a/Resources/Textures/Objects/Storage/boxicons.rsi/pillbox.png b/Resources/Textures/Objects/Storage/boxicons.rsi/pillbox.png
diff --git a/Resources/Textures/Objects/Storage/boxicons.rsi/sechud.png b/Resources/Textures/Objects/Storage/boxicons.rsi/sechud.png
diff --git a/Resources/Textures/Objects/Storage/boxicons.rsi/solution_trays.png b/Resources/Textures/Objects/Storage/boxicons.rsi/solution_trays.png
diff --git a/Resources/Textures/Objects/Storage/boxicons.rsi/sterile.png b/Resources/Textures/Objects/Storage/boxicons.rsi/sterile.png
diff --git a/Resources/Textures/Objects/Storage/boxicons.rsi/syringe.png b/Resources/Textures/Objects/Storage/boxicons.rsi/syringe.png
diff --git a/Resources/Textures/Objects/Storage/boxicons.rsi/throwing_knives.png b/Resources/Textures/Objects/Storage/boxicons.rsi/throwing_knives.png
diff --git a/Resources/Textures/Objects/Storage/boxicons.rsi/tracks.png b/Resources/Textures/Objects/Storage/boxicons.rsi/tracks.png
diff --git a/Resources/Textures/Objects/Storage/boxicons.rsi/vials.png b/Resources/Textures/Objects/Storage/boxicons.rsi/vials.png
diff --git a/Resources/Textures/Objects/Storage/boxicons.rsi/ziptie.png b/Resources/Textures/Objects/Storage/boxicons.rsi/ziptie.png