Merge branch 'master' into bso

oldschoolgg · Dec 18, 2024 · e04ad29 · e04ad29
2 parents d1198bc + 5bf883d
commit e04ad29
Show file tree

Hide file tree

Showing 24 changed files with 1,053 additions and 1,011 deletions.
diff --git a/data/bso_items.json b/data/bso_items.json
@@ -1648,8 +1648,29 @@
 	"73278": "Zombie hween mask",
 	"73279": "Heirloom pumpkin",
 	"73280": "Mortimer cape",
+	"73281": "Skippers",
+	"73282": "Shrimpy",
+	"73283": "Cinnamon doughnut-ball",
+	"73284": "Christmas choc-stocking",
+	"73285": "Atlantis jumper",
+	"73286": "BSO Santa hat",
+	"73287": "OSB earmuffs",
+	"73288": "BSO earmuffs",
+	"73289": "BSO socks",
+	"73290": "White beanie",
+	"73291": "OSB beanie",
+	"73292": "BSO beanie",
+	"73293": "Green beanie",
+	"73294": "Orange beanie",
+	"73295": "Jolly beanie",
+	"73296": "Aquatic beanie",
+	"73297": "Dark beanie",
+	"73298": "Frosticle top",
+	"73299": "Frozen crate (s8)",
+	"73300": "Frozen crate key (s8)",
 	"73301": "Spookling token",
 	"73302": "Miniature pumpkin head",
+	"73303": "Snow leopard plushie",
 	"88888": "Bucket of dung",
 	"88889": "Polterpup",
 	"121234": "Burnt celebratory cake",

diff --git a/src/lib/resources/images/bso_icons/73281.png b/src/lib/resources/images/bso_icons/73281.png
diff --git a/src/lib/resources/images/bso_icons/73282.png b/src/lib/resources/images/bso_icons/73282.png
diff --git a/src/lib/resources/images/bso_icons/73283.png b/src/lib/resources/images/bso_icons/73283.png
diff --git a/src/lib/resources/images/bso_icons/73284.png b/src/lib/resources/images/bso_icons/73284.png
diff --git a/src/lib/resources/images/bso_icons/73285.png b/src/lib/resources/images/bso_icons/73285.png
diff --git a/src/lib/resources/images/bso_icons/73286.png b/src/lib/resources/images/bso_icons/73286.png
diff --git a/src/lib/resources/images/bso_icons/73287.png b/src/lib/resources/images/bso_icons/73287.png
diff --git a/src/lib/resources/images/bso_icons/73288.png b/src/lib/resources/images/bso_icons/73288.png
diff --git a/src/lib/resources/images/bso_icons/73289.png b/src/lib/resources/images/bso_icons/73289.png
diff --git a/src/lib/resources/images/bso_icons/73290.png b/src/lib/resources/images/bso_icons/73290.png
diff --git a/src/lib/resources/images/bso_icons/73291.png b/src/lib/resources/images/bso_icons/73291.png
diff --git a/src/lib/resources/images/bso_icons/73292.png b/src/lib/resources/images/bso_icons/73292.png
diff --git a/src/lib/resources/images/bso_icons/73293.png b/src/lib/resources/images/bso_icons/73293.png
diff --git a/src/lib/resources/images/bso_icons/73294.png b/src/lib/resources/images/bso_icons/73294.png
diff --git a/src/lib/resources/images/bso_icons/73295.png b/src/lib/resources/images/bso_icons/73295.png
diff --git a/src/lib/resources/images/bso_icons/73296.png b/src/lib/resources/images/bso_icons/73296.png
diff --git a/src/lib/resources/images/bso_icons/73297.png b/src/lib/resources/images/bso_icons/73297.png
diff --git a/src/lib/resources/images/bso_icons/73298.png b/src/lib/resources/images/bso_icons/73298.png
diff --git a/src/lib/resources/images/bso_icons/73299.png b/src/lib/resources/images/bso_icons/73299.png
diff --git a/src/lib/resources/images/bso_icons/73300.png b/src/lib/resources/images/bso_icons/73300.png
diff --git a/src/lib/resources/images/bso_icons/73303.png b/src/lib/resources/images/bso_icons/73303.png