diff --git a/code/__DEFINES/spawner/_spawner.dm b/code/__DEFINES/spawner/_spawner.dm
index aba0bd0d71c..54646eb9275 100644
--- a/code/__DEFINES/spawner/_spawner.dm
+++ b/code/__DEFINES/spawner/_spawner.dm
@@ -366,10 +366,11 @@
 
 // ITEM - STOCK PARTS   and os_tech
 #define SPAWN_STOCK_PARTS "stock_parts"
+#define SPAWN_STOCK_PARTS_OS "stock_parts_os"
 
 #define SPAWN_TAG_STOCK_PARTS SPAWN_TAG_ITEM+";"+SPAWN_STOCK_PARTS
 #define SPAWN_TAG_STOCK_PARTS_TIER_2 SPAWN_TAG_STOCK_PARTS+";"+SPAWN_SCIENCE
-#define SPAWN_TAG_STOCK_PARTS_OS SPAWN_TAG_STOCK_PARTS+";"+SPAWN_TAG_TECH_OS+";stock_parts_os"
+#define SPAWN_TAG_STOCK_PARTS_OS SPAWN_TAG_STOCK_PARTS+";"+SPAWN_TAG_TECH_OS+";"+SPAWN_STOCK_PARTS_OS
 
 // ITEM - device
 #define SPAWN_DEVICE "device"
diff --git a/code/game/objects/random/packs.dm b/code/game/objects/random/packs.dm
index dbdd63d1efa..c7cdaba0a7c 100644
--- a/code/game/objects/random/packs.dm
+++ b/code/game/objects/random/packs.dm
@@ -53,13 +53,18 @@ They generally give more random result and can provide more divercity in spawn.
 	icon_state = "tool-red-low"
 	spawn_nothing_percentage = 70
 
-
 /obj/spawner/pack/tech_loot/onestar
 	name = "Random technical One Star loot"
 	icon_state = "tool-red"
 	desc = "This is a random technical loot."
-	allow_blacklist = TRUE
-	tags_to_spawn = list(SPAWN_TECH_OS)
+
+/obj/spawner/pack/tech_loot/onestar/item_to_spawn()
+	return pickweight(list(
+					/obj/spawner/tool_upgrade/rare/onestar = 10,
+					/obj/spawner/tool/advanced/onestar = 5,
+					/obj/spawner/techpart/onestar = 10
+				))
+
 
 //This will be spawned in rare closets
 /obj/spawner/pack/gun_loot
diff --git a/code/game/objects/random/techparts.dm b/code/game/objects/random/techparts.dm
index 0b62cdbc164..535162d84d8 100644
--- a/code/game/objects/random/techparts.dm
+++ b/code/game/objects/random/techparts.dm
@@ -7,3 +7,9 @@
 	name = "low chance random techpart"
 	icon_state = "tech-orange-low"
 	spawn_nothing_percentage = 60
+
+/obj/spawner/techpart/onestar
+	name = "random onestar techpart"
+	icon_state = "tech-orange"
+	allow_blacklist = TRUE
+	tags_to_spawn = list(SPAWN_STOCK_PARTS_OS)