From 2bce423ec316b6ac34411d2d3e5a860433aa1c50 Mon Sep 17 00:00:00 2001 From: Winter Flare <7543955+Owai-Seek@users.noreply.github.com> Date: Thu, 10 Oct 2019 14:08:14 -0400 Subject: [PATCH 1/5] Added a -ton- of stuff to the Kinkmate --- code/modules/clothing/under/accessories.dm | 8 +++++ .../reagents/reagent_containers/bottle.dm | 22 +++++++++++++ .../code/game/machinery/vending.dm | 31 +++++++++++++------ 3 files changed, 52 insertions(+), 9 deletions(-) diff --git a/code/modules/clothing/under/accessories.dm b/code/modules/clothing/under/accessories.dm index 878030bc5d..6dd6164d79 100644 --- a/code/modules/clothing/under/accessories.dm +++ b/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// ///////////////////// diff --git a/code/modules/reagents/reagent_containers/bottle.dm b/code/modules/reagents/reagent_containers/bottle.dm index 249ed56d20..afe48ab3fb 100644 --- a/code/modules/reagents/reagent_containers/bottle.dm +++ b/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) \ No newline at end of file diff --git a/modular_citadel/code/game/machinery/vending.dm b/modular_citadel/code/game/machinery/vending.dm index 2de98a3171..be4b71ce1d 100755 --- a/modular_citadel/code/game/machinery/vending.dm +++ b/modular_citadel/code/game/machinery/vending.dm @@ -43,18 +43,31 @@ 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/dildo/flared/huge = 1 + /obj/item/clothing/neck/petcollar/choker = 5, + /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/under/mankini = 2, + /obj/item/clothing/under/jabroni = 2, + /obj/item/dildo/flared/huge = 1, + /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/neck/petcollar/locked = 1 + /obj/item/clothing/accessory/skullcodpiece/fake = 1, + /obj/item/reagent_containers/glass/bottle/hexacrocin = 5 ) refill_canister = /obj/item/vending_refill/kink /* From 3afbc5733cc7e62a5c2392d8fd6a743b7754a17c Mon Sep 17 00:00:00 2001 From: Winter Flare <7543955+Owai-Seek@users.noreply.github.com> Date: Fri, 11 Oct 2019 01:14:09 -0400 Subject: [PATCH 2/5] Update vending.dm --- modular_citadel/code/game/machinery/vending.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/modular_citadel/code/game/machinery/vending.dm b/modular_citadel/code/game/machinery/vending.dm index be4b71ce1d..1bfd46ca53 100755 --- a/modular_citadel/code/game/machinery/vending.dm +++ b/modular_citadel/code/game/machinery/vending.dm @@ -59,6 +59,7 @@ /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 = 1, From 7a454e448a16817feb4170c61b4c6ad5cdd35b84 Mon Sep 17 00:00:00 2001 From: Winter Flare <7543955+Owai-Seek@users.noreply.github.com> Date: Fri, 11 Oct 2019 02:54:23 -0400 Subject: [PATCH 3/5] I forgot the one item I wanted to add. --- modular_citadel/code/game/machinery/vending.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modular_citadel/code/game/machinery/vending.dm b/modular_citadel/code/game/machinery/vending.dm index 1bfd46ca53..9d3f4a8975 100755 --- a/modular_citadel/code/game/machinery/vending.dm +++ b/modular_citadel/code/game/machinery/vending.dm @@ -68,7 +68,8 @@ ) premium = list( /obj/item/clothing/accessory/skullcodpiece/fake = 1, - /obj/item/reagent_containers/glass/bottle/hexacrocin = 5 + /obj/item/clothing/under/gear_harness = 10, + /obj/item/reagent_containers/glass/bottle/hexacrocin = 10 ) refill_canister = /obj/item/vending_refill/kink /* From 2c54e7390d00b3440b5944a8bee3da02ab2581a3 Mon Sep 17 00:00:00 2001 From: Winter Flare <7543955+Owai-Seek@users.noreply.github.com> Date: Fri, 11 Oct 2019 02:54:44 -0400 Subject: [PATCH 4/5] Update vending.dm --- modular_citadel/code/game/machinery/vending.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_citadel/code/game/machinery/vending.dm b/modular_citadel/code/game/machinery/vending.dm index 9d3f4a8975..100d628c0e 100755 --- a/modular_citadel/code/game/machinery/vending.dm +++ b/modular_citadel/code/game/machinery/vending.dm @@ -67,7 +67,7 @@ /obj/item/reagent_containers/glass/bottle/camphor = 5 ) premium = list( - /obj/item/clothing/accessory/skullcodpiece/fake = 1, + /obj/item/clothing/accessory/skullcodpiece/fake = 3, /obj/item/clothing/under/gear_harness = 10, /obj/item/reagent_containers/glass/bottle/hexacrocin = 10 ) From 6709dbd161cc1aa248598dda9af850a778c67001 Mon Sep 17 00:00:00 2001 From: Winter Flare <7543955+Owai-Seek@users.noreply.github.com> Date: Fri, 11 Oct 2019 13:25:23 -0400 Subject: [PATCH 5/5] Requested Change --- modular_citadel/code/game/machinery/vending.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modular_citadel/code/game/machinery/vending.dm b/modular_citadel/code/game/machinery/vending.dm index 100d628c0e..6a91810173 100755 --- a/modular_citadel/code/game/machinery/vending.dm +++ b/modular_citadel/code/game/machinery/vending.dm @@ -62,7 +62,7 @@ /obj/item/clothing/head/rabbitears = 3, /obj/item/clothing/under/mankini = 2, /obj/item/clothing/under/jabroni = 2, - /obj/item/dildo/flared/huge = 1, + /obj/item/dildo/flared/huge = 3, /obj/item/reagent_containers/glass/bottle/crocin = 5, /obj/item/reagent_containers/glass/bottle/camphor = 5 )