diff --git a/code/__defines/mobs.dm b/code/__defines/mobs.dm
index 5acd09f3ea2..66be057d7a3 100644
--- a/code/__defines/mobs.dm
+++ b/code/__defines/mobs.dm
@@ -176,6 +176,7 @@
 #define BP_AUG_CORRECTIVE_LENS "corrective lenses"
 #define BP_AUG_GLARE_DAMPENER "glare dampeners"
 #define BP_AUG_ACC_CORDS       "modified synthetic vocal cords"
+#define BP_AUG_MAGBOOT		   "integrated mag-claws"
 
 //Organ defines
 #define PROCESS_ACCURACY 10
diff --git a/code/game/objects/items/weapons/vaurca_items.dm b/code/game/objects/items/weapons/vaurca_items.dm
index 6dfeb6b3038..9d3896f2c33 100644
--- a/code/game/objects/items/weapons/vaurca_items.dm
+++ b/code/game/objects/items/weapons/vaurca_items.dm
@@ -263,13 +263,33 @@
 	contained_sprite = 1
 	icon = 'icons/obj/vaurca_items.dmi'
 
-	species_restricted = list(BODYTYPE_VAURCA,BODYTYPE_VAURCA_WARFORM)
+	species_restricted = list(BODYTYPE_VAURCA, BODYTYPE_VAURCA_WARFORM, BODYTYPE_VAURCA_BULWARK)
 	sprite_sheets = list(
-		BODYTYPE_VAURCA_WARFORM = 'icons/mob/species/warriorform/shoes.dmi'
+		BODYTYPE_VAURCA_WARFORM = 'icons/mob/species/warriorform/shoes.dmi',
+		BODYTYPE_VAURCA_BULWARK = 'icons/mob/species/bulwark/shoes.dmi'
 	)
 
 	action_button_name = "Toggle the magclaws"
 
+/obj/item/clothing/shoes/magboots/vaurca/aug
+	name = "integrated mag-claws"
+	desc = "A magnetic-grip system similar to a set of magboots integrated into a Vaurca's leg chitin."
+	magpulse = 1
+	slowdown = 3
+	action_button_name = null
+	item_flags = THICKMATERIAL|AIRTIGHT|INJECTIONPORT|NOSLIP
+	canremove = FALSE
+
+/obj/item/clothing/shoes/magboots/vaurca/aug/throw_at()
+	usr.drop_from_inventory(src)
+
+/obj/item/clothing/shoes/magboots/vaurca/aug/dropped()
+	. = ..()
+	qdel(src)
+
+/obj/item/clothing/shoes/magboots/vaurca/aug/negates_gravity()
+	return TRUE
+
 /obj/item/clothing/suit/space/void/scout
 	name = "scout armor"
 	contained_sprite = 1
diff --git a/code/modules/client/preference_setup/loadout/items/xeno/vaurca.dm b/code/modules/client/preference_setup/loadout/items/xeno/vaurca.dm
index d69993d7510..633456b866f 100644
--- a/code/modules/client/preference_setup/loadout/items/xeno/vaurca.dm
+++ b/code/modules/client/preference_setup/loadout/items/xeno/vaurca.dm
@@ -251,3 +251,12 @@
 	augs["vaurca integrated toolset, right hand"] = /obj/item/organ/internal/augment/tool/combitool/vaurca
 	augs["vaurca integrated toolset, left hand"] = /obj/item/organ/internal/augment/tool/combitool/vaurca/left
 	gear_tweaks += new /datum/gear_tweak/path(augs)
+
+/datum/gear/augment/vaurcamag
+	display_name = "vaurca integrated mag-claws"
+	description = "An integrated magnetic grip system, designed for Vaurcae without easy access to magboots."
+	cost = 2
+	path = /obj/item/organ/internal/augment/tool/vaurcamag
+	sort_category = "Xenowear - Vaurca"
+	whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK)
+	allowed_roles = list("Shaft Miner", "Engineer", "Atmospheric Technician", "Engineering Apprentice", "Xenoarchaeologist")
diff --git a/code/modules/organs/subtypes/vaurca.dm b/code/modules/organs/subtypes/vaurca.dm
index fbf8b734321..82ec8c7053f 100644
--- a/code/modules/organs/subtypes/vaurca.dm
+++ b/code/modules/organs/subtypes/vaurca.dm
@@ -115,6 +115,17 @@
 		"wirecutters"
 		)
 
+/obj/item/organ/internal/augment/tool/vaurcamag
+	name = "integrated mag-claws"
+	desc = "An integrated magnetic grip system, designed for Vaurcae without easy access to magboots."
+	icon_state = "suspension"
+	item_state = "suspension"
+	action_button_name = "Deploy Mag-Claws"
+	action_button_icon = "magclaws"
+	augment_type = /obj/item/clothing/shoes/magboots/vaurca/aug
+	parent_organ = BP_GROIN
+	organ_tag = BP_AUG_MAGBOOT
+	aug_slot = slot_shoes
 
 /obj/item/organ/internal/vaurca/preserve
 	icon = 'icons/obj/organs/vaurca_organs.dmi'
diff --git a/html/changelogs/RustingWithYou - bugtimbs.yml b/html/changelogs/RustingWithYou - bugtimbs.yml
new file mode 100644
index 00000000000..cb442502c72
--- /dev/null
+++ b/html/changelogs/RustingWithYou - bugtimbs.yml	
@@ -0,0 +1,41 @@
+################################
+# 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
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.
+author: RustingWithYou
+
+# 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, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - rscadd: "Adds an integrated magboot augment for Vaurca."
diff --git a/icons/mob/species/bulwark/shoes.dmi b/icons/mob/species/bulwark/shoes.dmi
index 10161e2ca5b..bd64298d87a 100644
Binary files a/icons/mob/species/bulwark/shoes.dmi and b/icons/mob/species/bulwark/shoes.dmi differ
diff --git a/icons/obj/action_buttons/organs.dmi b/icons/obj/action_buttons/organs.dmi
index d5162296ad8..4c19dd9012b 100644
Binary files a/icons/obj/action_buttons/organs.dmi and b/icons/obj/action_buttons/organs.dmi differ