From 1ad2e7e035b744a61452ee0dd8344df8e418e9db Mon Sep 17 00:00:00 2001
From: DynaJ0ule <117537167+DynaJ0ule@users.noreply.github.com>
Date: Tue, 22 Nov 2022 03:38:55 -0500
Subject: [PATCH] allows for building a meal vendor with fixes
---
code/_globalvars/lists/vending.dm | 2 +-
.../circuitboards/machine_circuitboards.dm | 17 +++++++++++++----
2 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/code/_globalvars/lists/vending.dm b/code/_globalvars/lists/vending.dm
index 65ee4b99..c90d5398 100644
--- a/code/_globalvars/lists/vending.dm
+++ b/code/_globalvars/lists/vending.dm
@@ -39,7 +39,7 @@ GLOBAL_VAR_INIT(vending_m_choices, list(
"Meal Vendor" = image(icon = 'icons/obj/vending.dmi', icon_state = "mealdor"),
"GATO Vending Machine" = image(icon = 'icons/obj/vending.dmi', icon_state = "cola_black"),
))
-// This GLOBAL list is just here to be here.
+// This GLOBAL list is used in the vending machine circuit board code.
GLOBAL_VAR_INIT(vending_machines, list(
/obj/machinery/vending/boozeomat,
/obj/machinery/vending/coffee,
diff --git a/code/game/objects/items/circuitboards/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machine_circuitboards.dm
index 1a2dd434..8ccc62ae 100644
--- a/code/game/objects/items/circuitboards/machine_circuitboards.dm
+++ b/code/game/objects/items/circuitboards/machine_circuitboards.dm
@@ -246,6 +246,14 @@
/obj/machinery/vending/cigarette = "ShadyCigs Deluxe",
/obj/machinery/vending/games = "\improper Good Clean Fun",
/obj/machinery/vending/autodrobe = "AutoDrobe",
+ /obj/machinery/vending/assist = "Vendomat",
+ /obj/machinery/vending/engivend = "Engi-Vend",
+ /obj/machinery/vending/tool ="YouTool",
+ /obj/machinery/vending/sustenance = "Sustenance Vendor",
+ /obj/machinery/vending/dinnerware = "Plasteel Chef's Dinnerware Vendor",
+ /obj/machinery/vending/cart = "PTech",
+ /obj/machinery/vending/hydronutrients = "NutriMax",
+ /obj/machinery/vending/hydroseeds = "MegaSeed Servitor",
/obj/machinery/vending/wardrobe/sec_wardrobe = "SecDrobe",
/obj/machinery/vending/wardrobe/medi_wardrobe = "MediDrobe",
/obj/machinery/vending/wardrobe/engi_wardrobe = "EngiDrobe",
@@ -266,7 +274,9 @@
/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/kink = "\improper KinkMate",
+ /obj/machinery/vending/mealdor = "Meal Vendor",
+ /obj/machinery/vending/gato = "GATO Vending Machine")
/obj/item/circuitboard/machine/vendor/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/screwdriver))
@@ -278,9 +288,8 @@
if(!choiceposition)
return
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]]\".")
+ to_chat(user, "You set the board to \"[choice]\".")
else
return ..()
@@ -1022,4 +1031,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