Merge pull request #9463 from Owai-Seek/minor-fixes

Updating Kinkmate item-list

code/modules/clothing/under/accessories.dm

@@ -355,6 +355,14 @@
 	above_suit = TRUE
 	armor = list("melee" = 5, "bullet" = 5, "laser" = 5, "energy" = 5, "bomb" = 20, "bio" = 20, "rad" = 5, "fire" = 0, "acid" = 25)
 
+/obj/item/clothing/accessory/skullcodpiece/fake
+	name = "false codpiece"
+	desc = "A plastic ornament, intended to protect the important things in life. It's not very good at it."
+	icon_state = "skull"
+	item_color = "skull"
+	above_suit = TRUE
+	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
+
 /////////////////////
 //Synda Accessories//
 /////////////////////

code/modules/reagents/reagent_containers/bottle.dm

@@ -404,3 +404,25 @@
 /obj/item/reagent_containers/glass/bottle/bromine
 	name = "bromine bottle"
 	list_reagents = list("bromine" = 30)
+
+//Lewd Stuff
+
+/obj/item/reagent_containers/glass/bottle/crocin
+	name = "Crocin bottle"
+	desc = "A bottle of mild aphrodisiac. Increases libido."
+	list_reagents = list("aphro" = 30)
+
+/obj/item/reagent_containers/glass/bottle/hexacrocin
+	name = "Hexacrocin bottle"
+	desc = "A bottle of strong aphrodisiac. Increases libido."
+	list_reagents = list("aphro+" = 30)
+
+/obj/item/reagent_containers/glass/bottle/camphor
+	name = "Camphor bottle"
+	desc = "A bottle of mild anaphrodisiac. Reduces libido."
+	list_reagents = list("anaphro" = 30)
+
+/obj/item/reagent_containers/glass/bottle/hexacamphor
+	name = "Hexacamphor bottle"
+	desc = "A bottle of strong anaphrodisiac. Reduces libido."
+	list_reagents = list("anaphro+" = 30)

modular_citadel/code/game/machinery/vending.dm

@@ -43,18 +43,33 @@
 	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,
-				/obj/item/dildo/custom = 5
-				)
-	contraband = list(/obj/item/restraints/handcuffs/fake/kinky = 5,
 				/obj/item/clothing/neck/petcollar = 5,
-				/obj/item/clothing/under/mankini = 1,
+				/obj/item/clothing/neck/petcollar/choker = 5,
-				/obj/item/dildo/flared/huge = 1
+				/obj/item/clothing/neck/petcollar/leather = 5,
+				/obj/item/restraints/handcuffs/fake/kinky = 5,
+				/obj/item/clothing/glasses/sunglasses/blindfold = 4,
+				/obj/item/clothing/mask/muzzle = 4,
+				/obj/item/clothing/under/stripper_pink = 3,
+				/obj/item/clothing/under/stripper_green = 3,
+				/obj/item/dildo/custom = 5,
+				/obj/item/electropack/shockcollar = 3,
+				/obj/item/assembly/signaler = 3
+				)
+	contraband = list(
+				/obj/item/clothing/neck/petcollar/locked = 2,
+				/obj/item/key/collar = 2,
+				/obj/item/clothing/head/kitty = 3,
+				/obj/item/clothing/head/rabbitears = 3,
+				/obj/item/clothing/under/mankini = 2,
+				/obj/item/clothing/under/jabroni = 2,
+				/obj/item/dildo/flared/huge = 3,
+				/obj/item/reagent_containers/glass/bottle/crocin = 5,
+				/obj/item/reagent_containers/glass/bottle/camphor = 5
 				)
 	premium = list(
-				/obj/item/electropack/shockcollar = 3,
+				/obj/item/clothing/accessory/skullcodpiece/fake = 3,
-				/obj/item/clothing/neck/petcollar/locked = 1
+				/obj/item/clothing/under/gear_harness = 10,
+				/obj/item/reagent_containers/glass/bottle/hexacrocin = 10
 				)
 	refill_canister = /obj/item/vending_refill/kink
 /*