diff --git a/_maps/map_files/TgStation/tgstation.2.1.3.dmm b/_maps/map_files/TgStation/tgstation.2.1.3.dmm
index dd0107abd5..ccd433998c 100644
--- a/_maps/map_files/TgStation/tgstation.2.1.3.dmm
+++ b/_maps/map_files/TgStation/tgstation.2.1.3.dmm
@@ -46352,11 +46352,7 @@
 /turf/open/floor/wood,
 /area/maintenance/bar)
 "bXJ" = (
-/obj/machinery/computer/arcade,
-/obj/item/weapon/paper{
-	info = "We're processing your order for that new vending machine. We need to ship it from some star system on the other side of the galaxy so it might take a few weeks, two months tops, to deliver it.  -Cargo Bay";
-	 name = "Order Confirmation"
-	},
+/obj/machinery/vending/kink,
 /turf/open/floor/wood,
 /area/maintenance/bar)
 "bXK" = (
diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm
index 254cc188bc..ab7154acd6 100644
--- a/code/game/machinery/vending.dm
+++ b/code/game/machinery/vending.dm
@@ -623,7 +623,6 @@
  */
 
 /*
-
 /obj/machinery/vending/[vendors name here]   // --vending machine template   :)
 	name = ""
 	desc = ""
@@ -632,7 +631,6 @@
 	products = list()
 	contraband = list()
 	premium = list()
-
 IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY CANISTER CHARGES in vending_items.dm
 */
 
@@ -1098,6 +1096,18 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
 	premium = list(/obj/item/clothing/under/suit_jacket/checkered=1,/obj/item/clothing/head/mailman=1,/obj/item/clothing/under/rank/mailman=1,/obj/item/clothing/suit/jacket/leather=1,/obj/item/clothing/suit/jacket/leather/overcoat=1,/obj/item/clothing/under/pants/mustangjeans=1,/obj/item/clothing/neck/necklace/dope=3,/obj/item/clothing/suit/jacket/letterman_nanotrasen=1)
 	refill_canister = /obj/item/weapon/vending_refill/clothing
 
+/obj/machinery/vending/kink
+	name = "KinkMate"
+	desc = "A vending machine for all your unmentionable desires."
+	icon_state = "kink"
+	product_slogans = "Kinky!;Sexy!;Check me out, big boy!"
+	vend_reply = "Have fun, you shameless pervert!"
+	products = list(/obj/item/clothing/under/maid = 5, /obj/item/clothing/under/stripper_pink = 5, /obj/item/clothing/under/stripper_green = 5)
+	contraband = list(/obj/item/weapon/restraints/handcuffs/fake/kinky = 5, /obj/item/clothing/neck/petcollar=5, /obj/item/clothing/under/mankini = 1)
+	premium = list()
+	refill_canister = /obj/item/weapon/vending_refill/kink
+
+
 #undef STANDARD_CHARGE
 #undef CONTRABAND_CHARGE
 #undef COIN_CHARGE
diff --git a/code/game/objects/items/weapons/vending_items.dm b/code/game/objects/items/weapons/vending_items.dm
index 30ad6c0af4..7677d9005d 100644
--- a/code/game/objects/items/weapons/vending_items.dm
+++ b/code/game/objects/items/weapons/vending_items.dm
@@ -71,3 +71,9 @@
 	icon_state = "refill_clothes"
 	charges = list(35, 13, 4)// of 101 standard, 12 contraband, 10 premium(?)
 	init_charges = list(35, 13, 4)
+
+/obj/item/weapon/vending_refill/kink
+	machine_name 	= "KinkMate"
+	icon_state 		= "refill_kink"
+	charges 		= list(6, 4, 0)// of 30 standard, 0 contraband, 15 premium
+	init_charges 	= list(6, 4, 0)
\ No newline at end of file
diff --git a/icons/obj/vending.dmi b/icons/obj/vending.dmi
index b6ca3266ad..962dc31b45 100644
Binary files a/icons/obj/vending.dmi and b/icons/obj/vending.dmi differ