Merge pull request #10899 from Trilbyspaceclone/vender-hate

Almost all venders now can be restocked

code/game/objects/items/circuitboards/machine_circuitboards.dm

@@ -238,6 +238,14 @@
 		/obj/machinery/vending/cigarette = "ShadyCigs Deluxe",
 		/obj/machinery/vending/games = "\improper Good Clean Fun",
 		/obj/machinery/vending/autodrobe = "AutoDrobe",
+		/obj/machinery/vending/assist = "\improper Vendomat",
+		/obj/machinery/vending/engivend = "\improper Engi-Vend",
+		/obj/machinery/vending/engivend = "\improper YouTool",
+		/obj/machinery/vending/sustenance = "\improper Sustenance Vendor",
+		/obj/machinery/vending/dinnerware = "\improper Plasteel Chef's Dinnerware Vendor",
+		/obj/machinery/vending/cart = "\improper PTech",
+		/obj/machinery/vending/hydronutrients = "\improper NutriMax",
+		/obj/machinery/vending/hydroseeds = "\improper MegaSeed Servitor",
 		/obj/machinery/vending/wardrobe/sec_wardrobe = "SecDrobe",
 		/obj/machinery/vending/wardrobe/medi_wardrobe = "MediDrobe",
 		/obj/machinery/vending/wardrobe/engi_wardrobe = "EngiDrobe",

code/modules/cargo/packs/vending.dm

@@ -22,6 +22,14 @@
 					/obj/item/book/granter/action/drink_fling)
 	crate_name = "bartending supply crate"
 
+/datum/supply_pack/vending/hydro
+	name = "Cartridge Supply Crate"
+	desc = "Restock you cartridges for PDAs. Contains a PTech vending machine refill."
+	cost = 5000
+	contains = list(/obj/item/vending_refill/cart)
+	crate_name = "hydroponics supply crate"
+	crate_type = /obj/structure/closet/crate
+
 /datum/supply_pack/vending/cigarette
 	name = "Cigarette Supply Crate"
 	desc = "Don't believe the reports - smoke today! Contains a cigarette vending machine refill."
@@ -30,6 +38,25 @@
 	crate_name = "cigarette supply crate"
 	crate_type = /obj/structure/closet/crate
 
+/datum/supply_pack/vending/dinner
+	name = "Dinnerware Supply Crate"
+	desc = "Use a plate and have some utensils! Contains a dinnerware and sustenance vending machine refill."
+	cost = 2500
+	contains = list(/obj/item/vending_refill/sustenance,
+					/obj/item/vending_refill/dinnerware)
+	crate_name = "dinnerware supply crate"
+	crate_type = /obj/structure/closet/crate
+
+/datum/supply_pack/vending/dinner
+	name = "Engineering Supply Crate"
+	desc = "Packs of tools waiting to be used for repairing. Contains a tool and engineering vending machine refill. Requires CE access."
+	cost = 5500 //Powerfull
+	access = ACCESS_CE
+	contains = list(/obj/item/vending_refill/tool,
+					/obj/item/vending_refill/engivend)
+	crate_name = "engineering supply crate"
+	crate_type = /obj/structure/closet/crate/secure/engineering
+
 /datum/supply_pack/vending/games
 	name = "Games Supply Crate"
 	desc = "Get your game on with this game vending machine refill."
@@ -38,8 +65,18 @@
 	crate_name = "games supply crate"
 	crate_type = /obj/structure/closet/crate
 
+/datum/supply_pack/vending/hydro
+	name = "Hydroponics Supply Crate"
+	desc = "Arnt you glad you dont have to do it the natural way? Contains a megaseed and nutrimax vending machine refill."
+	cost = 5000
+	contains = list(/obj/item/vending_refill/hydroseeds,
+					/obj/item/vending_refill/hydronutrients)
+	crate_name = "hydroponics supply crate"
+	crate_type = /obj/structure/closet/crate
+
 /datum/supply_pack/vending/kinkmate
 	name = "Kinkmate Supply and Construction Kit"
+	desc = "A fun way to spend the shift. Contains unmentionable desires."
 	cost = 2000
 	contraband = TRUE
 	contains = list(/obj/item/vending_refill/kink, /obj/item/circuitboard/machine/kinkmate)
@@ -77,6 +114,13 @@
 	contains = list(/obj/item/vending_refill/cola)
 	crate_name = "soft drinks supply crate"
 
+/datum/supply_pack/vending/vendomat
+	name = "Vendomat Supply Crate"
+	desc = "Contains a Vendomat restock unit!"
+	cost = 1200
+	contains = list(/obj/item/vending_refill/assist)
+	crate_name = "vendomat supply crate"
+
 //////////////////////////////////////////////////////////////////////////////
 //////////////////////////// Wardrobe Vendors ////////////////////////////////
 //////////////////////////////////////////////////////////////////////////////

code/modules/vending/assist.dm

@@ -17,4 +17,8 @@
 					/obj/item/beacon = 2)
 	product_ads = "Only the finest!;Have some tools.;The most robust equipment.;The finest gear in space!"
 	armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
+	refill_canister = /obj/item/vending_refill/assist
 	resistance_flags = FIRE_PROOF
+
+/obj/item/vending_refill/assist
+	icon_state = "refill_engi"

code/modules/vending/cartridge.dm

@@ -14,4 +14,8 @@
 					/obj/item/cartridge/captain = 3,
 					/obj/item/cartridge/quartermaster = 10)
 	armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
+	refill_canister = /obj/item/vending_refill/cart
 	resistance_flags = FIRE_PROOF
+
+/obj/item/vending_refill/cart
+	icon_state = "refill_pda"

code/modules/vending/drinnerware.dm

@@ -27,4 +27,8 @@
 					/obj/item/reagent_containers/food/condiment/enzyme = 1,
 					/obj/item/reagent_containers/glass/bottle/cryoxadone = 2) // Bartender can literally make this with upgraded parts, or it gets stolen from medical.
 	armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
+	refill_canister = /obj/item/vending_refill/dinnerware
 	resistance_flags = FIRE_PROOF
+
+/obj/item/vending_refill/dinnerware
+	icon_state = "refill_cook"

code/modules/vending/engivend.dm

@@ -28,4 +28,8 @@
 					/obj/item/rcd_ammo/large = 5
 					)
 	armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
+	refill_canister = /obj/item/vending_refill/engivend
 	resistance_flags = FIRE_PROOF
+
+/obj/item/vending_refill/engivend
+	icon_state = "refill_engi"

code/modules/vending/kinkmate.dm

@@ -1,7 +1,6 @@
 /obj/machinery/vending/kink
 	name = "KinkMate"
 	desc = "A vending machine for all your unmentionable desires."
-	icon = 'icons/obj/citvending.dmi'
 	icon_state = "kink"
 	circuit = /obj/item/circuitboard/machine/kinkmate
 	product_slogans = "Kinky!;Sexy!;Check me out, big boy!"
@@ -44,5 +43,4 @@
 
 /obj/item/vending_refill/kink
 	machine_name 	= "KinkMate"
-	icon			= 'modular_citadel/icons/vending_restock.dmi'
 	icon_state 		= "refill_kink"

code/modules/vending/megaseed.dm

@@ -55,4 +55,8 @@
 					/obj/item/seeds/random = 2)
 	premium = list(/obj/item/reagent_containers/spray/waterflower = 1)
 	armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
+	refill_canister = /obj/item/vending_refill/hydroseeds
 	resistance_flags = FIRE_PROOF
+
+/obj/item/vending_refill/hydroseeds
+	icon_state = "refill_hydro"

code/modules/vending/nutrimax.dm

@@ -17,4 +17,8 @@
 	contraband = list(/obj/item/reagent_containers/glass/bottle/ammonia = 10,
 					/obj/item/reagent_containers/glass/bottle/diethylamine = 5)
 	armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
+	refill_canister = /obj/item/vending_refill/hydronutrients
 	resistance_flags = FIRE_PROOF
+
+/obj/item/vending_refill/hydronutrients
+	icon_state = "refill_hydro"

code/modules/vending/security.dm

@@ -36,4 +36,4 @@
 		F.update_brightness()
 
 /obj/item/vending_refill/security
-	icon_state = "snackorange"
+	icon_state = "refill_games"

code/modules/vending/sovietvend.dm

@@ -1,7 +1,6 @@
 /obj/machinery/vending/sovietvend
 	name = "KomradeVendtink"
 	desc = "Rodina-mat' zovyot!"
-	icon = 'icons/obj/citvending.dmi'
 	icon_state = "soviet"
 	vend_reply = "The fascist and capitalist svin'ya shall fall, komrade!"
 	product_slogans = "Quality worth waiting in line for!; Get Hammer and Sickled!; Sosvietsky soyuz above all!; With capitalist pigsky, you would have paid a fortunetink! ; Craftink in Motherland herself!"

code/modules/vending/sustenance.dm

@@ -12,4 +12,8 @@
 					/obj/item/tank/internals/emergency_oxygen = 6,
 					/obj/item/clothing/mask/breath = 6)
 	armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
+	refill_canister = /obj/item/vending_refill/sustenance
 	resistance_flags = FIRE_PROOF
+
+/obj/item/vending_refill/sustenance
+	icon_state = "refill_cook"

code/modules/vending/youtool.dm

@@ -19,4 +19,8 @@
 	premium = list(/obj/item/clothing/gloves/color/yellow = 2,
 					/obj/item/weldingtool/hugetank = 2)
 	armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 70)
+	refill_canister = /obj/item/vending_refill/tool
 	resistance_flags = FIRE_PROOF
+
+/obj/item/vending_refill/tool
+	icon_state = "refill_engi"