diff --git a/code/game/objects/items/circuitboards/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machine_circuitboards.dm index 1a2dd4343..c01ff42cb 100644 --- a/code/game/objects/items/circuitboards/machine_circuitboards.dm +++ b/code/game/objects/items/circuitboards/machine_circuitboards.dm @@ -245,6 +245,7 @@ /obj/machinery/vending/cola = "Robust Softdrinks", /obj/machinery/vending/cigarette = "ShadyCigs Deluxe", /obj/machinery/vending/games = "\improper Good Clean Fun", + /obj/machinery/vending/kink = "KinkMate", /obj/machinery/vending/autodrobe = "AutoDrobe", /obj/machinery/vending/wardrobe/sec_wardrobe = "SecDrobe", /obj/machinery/vending/wardrobe/medi_wardrobe = "MediDrobe", @@ -266,7 +267,18 @@ /obj/machinery/vending/clothing = "ClothesMate", /obj/machinery/vending/medical = "NanoMed Plus", /obj/machinery/vending/wallmed = "NanoMed", - /obj/machinery/vending/kink = "\improper KinkMate") + /obj/machinery/vending/assist = "Vendomat", + /obj/machinery/vending/engivend = "Engi-Vend", + /obj/machinery/vending/tool = "YouTool", + /obj/machinery/vending/hydronutrients = "NutriMax", + /obj/machinery/vending/hydroseeds = "MegaSeed Servitor", + /obj/machinery/vending/sustenance = "Sustenance Vendor", + /obj/machinery/vending/dinnerware = "Plasteel Chef's Dinnerware Vendor", + /obj/machinery/vending/cart = "PTech", + /obj/machinery/vending/robotics = "Robotech Deluxe", + /obj/machinery/vending/engineering = "Robco Tool Maker", + /obj/machinery/vending/sovietsoda = "BODA", + /obj/machinery/vending/security = "SecTech") /obj/item/circuitboard/machine/vendor/attackby(obj/item/I, mob/user, params) if(istype(I, /obj/item/screwdriver)) @@ -280,7 +292,6 @@ var/typepath = GLOB.vending_machines[choiceposition] var/namepath = vending_names_paths[choiceposition] set_type(typepath) - to_chat(user, "You set the board to \"[vending_names_paths[namepath]]\".") else return ..() @@ -1022,4 +1033,4 @@ /obj/item/stack/sheet/glass = 2, /obj/item/stock_parts/capacitor = 1, /obj/item/stack/cable_coil = 5, - /obj/item/reagent_containers/glass/beaker = 6) //So it can hold lots of chems \ No newline at end of file + /obj/item/reagent_containers/glass/beaker = 6) //So it can hold lots of chems diff --git a/code/modules/vending/cartridge.dm b/code/modules/vending/cartridge.dm index 990c494d4..9f401f69c 100644 --- a/code/modules/vending/cartridge.dm +++ b/code/modules/vending/cartridge.dm @@ -14,4 +14,5 @@ /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