From e4160263a6190ff5d4e8776ce7efa2702fb7bae7 Mon Sep 17 00:00:00 2001
From: Winter Flare <7543955+Owai-Seek@users.noreply.github.com>
Date: Fri, 23 Apr 2021 16:45:29 -0400
Subject: [PATCH] Makes Gear Harness craftable. Adds Loincloth to Dorm Vend.
 (#5103)

* Dorm Vend Tweaks

Adds Dorm Vendor Repack to Cargo
Adds Loincloth to Vendor
Adds Gear Harness to Leather Crafting

* Fixed Sheetcrafting
---
 code/game/objects/items/stacks/sheets/leather.dm     |  5 ++++-
 modular_skyrat/modules/cargo/code/packs.dm           | 12 ++++++++++++
 .../modules/nsfw/vendors/code/naughty_vendor.dm      |  5 +++--
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/code/game/objects/items/stacks/sheets/leather.dm b/code/game/objects/items/stacks/sheets/leather.dm
index 90adf946bf0..09f218364be 100644
--- a/code/game/objects/items/stacks/sheets/leather.dm
+++ b/code/game/objects/items/stacks/sheets/leather.dm
@@ -183,7 +183,10 @@ GLOBAL_LIST_INIT(leather_recipes, list ( \
 	new/datum/stack_recipe("leather shoes", /obj/item/clothing/shoes/laceup, 2), \
 	new/datum/stack_recipe("leather overcoat", /obj/item/clothing/suit/jacket/leather/overcoat, 10), \
 	new/datum/stack_recipe("saddle", /obj/item/saddle, 5), \
-	new/datum/stack_recipe("loincloth", /obj/item/clothing/under/costume/loincloth, 2)	//SKYRAT EDIT ADDITION
+	//SKYRAT EDIT ADDITION BEGIN
+	new/datum/stack_recipe("gear harness", /obj/item/clothing/under/misc/gear_harness, 6), \
+	new/datum/stack_recipe("loincloth", /obj/item/clothing/under/costume/loincloth, 2)
+	//SKYRAT EDIT ADDITION END
 ))
 
 /obj/item/stack/sheet/leather/get_main_recipes()
diff --git a/modular_skyrat/modules/cargo/code/packs.dm b/modular_skyrat/modules/cargo/code/packs.dm
index b2b0580feb0..9e07acdd1f2 100644
--- a/modular_skyrat/modules/cargo/code/packs.dm
+++ b/modular_skyrat/modules/cargo/code/packs.dm
@@ -447,11 +447,23 @@
 		new /obj/item/grown/log(.)
 
 
+//////////////////////////////////////////////////////////////////////////////
+///////////////////////////// Vending Restocks ///////////////////////////////
+//////////////////////////////////////////////////////////////////////////////
+
+
 //////////////////////////////////////////////////////////////////////////////
 //////////////////////////// Temporarily Disabled ////////////////////////////
 //////////////////////////////////////////////////////////////////////////////
 
 /*
+/datum/supply_pack/vending/wardrobes/dormtime //Disabled because the dorm vendor/kinkmate is only half finished and I don't have time to fix it atm.
+	name = "Dorms-Time Restock"
+	desc = "This crate contains a refill for the Droms-Time Vendor."
+	cost = CARGO_CRATE_VALUE * 1.5
+	contains = list(/obj/item/vending_refill/kink)
+	crate_name = "dorms-time restock"
+
 /datum/supply_pack/service/wrapping_paper
 	name = "Cargo Packaging Crate"
 	desc = "Want to mail your loved ones gift-wrapped chocolates, stuffed animals, or the Clown's severed head? You can do all that, with this crate full of festive (and normal) wrapping paper. Also contains a hand labeler and a destination tagger for easy shipping!"
diff --git a/modular_skyrat/modules/nsfw/vendors/code/naughty_vendor.dm b/modular_skyrat/modules/nsfw/vendors/code/naughty_vendor.dm
index 2eab0c2855d..02b8079773b 100644
--- a/modular_skyrat/modules/nsfw/vendors/code/naughty_vendor.dm
+++ b/modular_skyrat/modules/nsfw/vendors/code/naughty_vendor.dm
@@ -8,12 +8,13 @@
 	light_mask = "kink-light-mask"
 
 	products = list( //Relatively normal to have, I GUESS
-		/obj/item/clothing/under/misc/stripper/mankini = 4,
 		/obj/item/clothing/under/costume/maid = 8,
 		/obj/item/clothing/under/rank/civilian/janitor/maid = 8,
+		/obj/item/clothing/under/misc/gear_harness = 6,
+		/obj/item/clothing/under/costume/loincloth = 4,
 		/obj/item/clothing/under/misc/stripper = 4,
 		/obj/item/clothing/under/misc/stripper/green = 4,
-		/obj/item/clothing/under/misc/gear_harness = 4,
+		/obj/item/clothing/under/misc/stripper/mankini = 4,
 		/obj/item/clothing/under/shorts/polychromic/pantsu = 4,
 		/obj/item/clothing/under/misc/poly_bottomless = 4,
 		/obj/item/clothing/under/misc/poly_tanktop = 4,