diff --git a/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm b/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm
index 046bdf1b18..aa8be02d07 100644
--- a/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_suit_vr.dm
@@ -8,12 +8,12 @@
 
 /datum/gear/suit/jacket_modular
 	display_name = "jacket, modular"
-	path = /obj/item/clothing/suit/storage/toggle/fluff/jacket
+	path = /obj/item/clothing/suit/storage/fluff/jacket
 
 /datum/gear/suit/jacket_modular/New()
 	..()
-	var/list/jackets = list()
-	for(var/jacket in typesof(/obj/item/clothing/suit/storage/toggle/fluff/jacket))
-		var/obj/item/clothing/suit/jacket_type = jacket
-		jackets[initial(jacket_type.name)] = jacket_type
-	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(jackets))
+	var/list/the_jackets = list()
+	for(var/the_jacket in typesof(/obj/item/clothing/suit/storage/fluff/jacket))
+		var/obj/item/clothing/suit/jacket_type = the_jacket
+		the_jackets[initial(jacket_type.name)] = jacket_type
+	gear_tweaks += new/datum/gear_tweak/path(sortAssoc(the_jackets))
diff --git a/code/modules/vore/fluffstuff/custom_clothes_vr.dm b/code/modules/vore/fluffstuff/custom_clothes_vr.dm
index ed416aeec4..6a4fb757d0 100644
--- a/code/modules/vore/fluffstuff/custom_clothes_vr.dm
+++ b/code/modules/vore/fluffstuff/custom_clothes_vr.dm
@@ -1592,7 +1592,7 @@ Departamental Swimsuits, for general use
 	item_state = "tesh_cloak_brg"
 
 //Jackets For General Use. Sprited by Joji.
-/obj/item/clothing/suit/storage/toggle/fluff/jacket
+/obj/item/clothing/suit/storage/fluff/jacket //Not the toggle version since it uses custom toggle code to update the on-mob icon.
 	name = "Field Jacket"
 	desc = "A standard Earth military field jacket made of comfortable cotton."
 
@@ -1601,11 +1601,33 @@ Departamental Swimsuits, for general use
 
 	icon_override = 'icons/vore/custom_clothes_vr.dmi'
 	item_state = "fjacket_mob"
+	var/unbuttoned = 0
 
-/obj/item/clothing/suit/storage/toggle/fluff/jacket/field //Just here so it can be seen and easily recognized under /spawn.
+	verb/toggle()
+		set name = "Toggle coat buttons"
+		set category = "Object"
+		set src in usr
+
+		if(!usr.canmove || usr.stat || usr.restrained())
+			return 0
+
+		switch(unbuttoned)
+			if(0)
+				icon_state = "[initial(icon_state)]_open"
+				item_state = "[initial(item_state)]_open"
+				unbuttoned = 1
+				usr << "You unbutton the coat."
+			if(1)
+				icon_state = "[initial(icon_state)]"
+				item_state = "[initial(item_state)]"
+				unbuttoned = 0
+				usr << "You button up the coat."
+		usr.update_inv_wear_suit()
+
+/obj/item/clothing/suit/storage/fluff/jacket/field //Just here so it can be seen and easily recognized under /spawn.
 	name = "Field Jacket"
 
-/obj/item/clothing/suit/storage/toggle/fluff/jacket/air_cavalry
+/obj/item/clothing/suit/storage/fluff/jacket/air_cavalry
 	name = "Air Cavalry Jacket"
 	desc = "A jacket worn by the 1st Cavalry Division on Earth."
 
@@ -1615,7 +1637,7 @@ Departamental Swimsuits, for general use
 	icon_override = 'icons/vore/custom_clothes_vr.dmi'
 	item_state = "acjacket_mob"
 
-/obj/item/clothing/suit/storage/toggle/fluff/jacket/air_force
+/obj/item/clothing/suit/storage/fluff/jacket/air_force
 	name = "Air Force Jacket"
 	desc = "A jacket worn by the Earth Air Force."
 
@@ -1625,7 +1647,7 @@ Departamental Swimsuits, for general use
 	icon_override = 'icons/vore/custom_clothes_vr.dmi'
 	item_state = "afjacket_mob"
 
-/obj/item/clothing/suit/storage/toggle/fluff/jacket/navy
+/obj/item/clothing/suit/storage/fluff/jacket/navy
 	name = "Navy Jacket"
 	desc = "A jacket worn by the Earth's Navy. It's adorned with reflective straps."
 
@@ -1635,7 +1657,7 @@ Departamental Swimsuits, for general use
 	icon_override = 'icons/vore/custom_clothes_vr.dmi'
 	item_state = "navyjacket_mob"
 
-/obj/item/clothing/suit/storage/toggle/fluff/jacket/special_forces
+/obj/item/clothing/suit/storage/fluff/jacket/special_forces
 	name = "Special Forces Jacket"
 	desc = "A durable jacket worn by the Earth's special forces."