diff --git a/code/datums/uplink/gear loadout.dm b/code/datums/uplink/gear loadout.dm
index ed4eca5a066..285b1bd8c62 100644
--- a/code/datums/uplink/gear loadout.dm	
+++ b/code/datums/uplink/gear loadout.dm	
@@ -157,3 +157,14 @@
 	desc = "A crate containing gear for a single individual. The hardsuit is only usable by humans and skrell."
 	path = /obj/structure/closet/crate/gear_loadout/nanotrasen/single
 	telecrystal_cost = 15
+
+/datum/uplink_item/item/gear_loadout/hammertail
+	name = "Hammertail Smiths Assets (Group)"
+	desc = "A crate containing gear for a group. The voidsuits are are only usable by humans."
+	path = /obj/structure/closet/crate/secure/gear_loadout/hammertail
+
+/datum/uplink_item/item/gear_loadout/hammertail_single
+	name = "Hammertail Smiths Assets (Single)"
+	desc = "A crate containing gear for a single individual. The voidsuit is only usable by humans."
+	path = /obj/structure/closet/crate/secure/gear_loadout/hammertail/single
+	telecrystal_cost = 10
diff --git a/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm b/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm
index 896aaeda0fd..b7c8500f1ea 100644
--- a/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm
+++ b/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm
@@ -807,6 +807,36 @@
 	new /obj/item/gun/energy/pistol(src)
 	new /obj/item/shield/riot/tact(src)
 
+
+/obj/structure/closet/crate/secure/gear_loadout/hammertail/fill()
+	var/i
+	for(i=0, i<6, i++) //6 outfits
+		new /obj/item/clothing/under/syndicate/hammertail(src)
+	for(i=0, i<4, i++) //4 voidsuits w/helmets
+		new /obj/item/clothing/head/helmet/space/void/merc(src)
+		new /obj/item/clothing/suit/space/void/merc(src)
+	for(i=0, i<4, i++) //4 e-swords
+		new /obj/item/melee/energy/sword(src)
+	for(i=0, i<4, i++) //4 heavy pistols w/spare magazines
+		new /obj/item/gun/projectile/pistol/super_heavy(src)
+		new /obj/item/ammo_magazine/super_heavy(src)
+	for(i=0, i<4, i++) //4 tungsten slug guns w/spare magazines
+		new /obj/item/gun/projectile/gauss(src)
+		new /obj/item/ammo_magazine/gauss(src)
+	for(i=0, i<2, i++) //2 assault rifles w/spare magazines
+		new /obj/item/gun/projectile/automatic/rifle/sts35(src)
+		new /obj/item/ammo_magazine/c762(src)
+
+/obj/structure/closet/crate/secure/gear_loadout/hammertail/single/fill()
+	new /obj/item/clothing/under/syndicate/hammertail(src) //1 outfit
+	new /obj/item/clothing/head/helmet/space/void/merc(src) //1 voidsuit w/helmet
+	new /obj/item/clothing/suit/space/void/merc(src)
+	new /obj/item/melee/energy/sword(src) //1 e-sword
+	new /obj/item/gun/projectile/revolver(src) //1 .357 pistol w/spare speedloader
+	new /obj/item/ammo_magazine/a357(src)
+	new /obj/item/gun/projectile/gauss(src) //1 tungsten slug gun w/spare magazine
+	new /obj/item/ammo_magazine/gauss(src)
+
 //ninja stuff
 /obj/structure/closet/crate/secure/gear_loadout/ninja
 	var/associated_hardsuit = /obj/item/rig/light/ninja
diff --git a/code/modules/clothing/under/syndicate.dm b/code/modules/clothing/under/syndicate.dm
index e8eeec9e953..0eb041f7703 100644
--- a/code/modules/clothing/under/syndicate.dm
+++ b/code/modules/clothing/under/syndicate.dm
@@ -37,3 +37,14 @@
 	icon_state = "ninja"
 	item_state = "ninja"
 	worn_state = "ninja"
+
+/obj/item/clothing/under/syndicate/hammertail
+	name = "\improper crimson jumpsuit"
+	desc = "A blood-red jumpsuit with purple shoulder patches and a thick black apron tied around the front. The patches are cut in the shape of two energy swords."
+	desc_extended = "While black markets may be common, the concept of a “black factory” is much rarer, the idea of an entire industry producing and selling in \
+	illegality, generally to other criminal elements. The Hammertail Smiths are just that, an organization of engineers, scientists, machinists, and industrial workers \
+	whose ingenuity, and occasionally deranged inspiration, is fueled and funded by eager clients, from pirate fleets and other Unathi criminal organizations to \
+	individual actors, may they be in the Hegemony, or on the other side of the spur."
+	icon_state = "hammertail"
+	item_state = "hammertail"
+	worn_state = "hammertail"
diff --git a/html/changelogs/hammertail_gear.yml b/html/changelogs/hammertail_gear.yml
new file mode 100644
index 00000000000..be232917cf2
--- /dev/null
+++ b/html/changelogs/hammertail_gear.yml
@@ -0,0 +1,7 @@
+author: Dessysalta (sprites), Sparky_hotdog (code)
+
+delete-after: True
+
+changes:
+  - rscadd: "Adds a Hammertail Smiths jumpsuit."
+  - rscadd: "Adds new Hammertail Smiths gear crates to the uplink."
diff --git a/icons/obj/item/clothing/under/hammertail.dmi b/icons/obj/item/clothing/under/hammertail.dmi
new file mode 100644
index 00000000000..279541d976f
Binary files /dev/null and b/icons/obj/item/clothing/under/hammertail.dmi differ