Merge pull request #35 from eyespy2222/testbranch

Eyespy made latejoining as cyborg possible, also moved virus files where  they make the virus functional

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,

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, "<span class='notice'>You set the board to \"[vending_names_paths[namepath]]\".</span>")
+		to_chat(user, "<span class='notice'>You set the board to \"[choice]\".</span>")
 	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
+		/obj/item/reagent_containers/glass/beaker = 6) //So it can hold lots of chems

code/modules/cargo/packs/service.dm

@@ -335,3 +335,10 @@
 	cost = 1500
 	contains = list(/obj/item/vending_refill/cola)
 	crate_name = "soft drinks supply crate"
+
+/datum/supply_pack/service/vending/mealdor
+	name = "Meal Vendor Supply Crate"
+	desc = "Suprising one to order. If you need a refill for the meal vendor, someone's immobile somewhere. And since you managed to make it to cargo... Well it's not our job to say no!"
+	cost = 10000
+	contains = list(/obj/item/vending_refill/mealdor)
+	crate_name = "meal vendor supply crate"

code/modules/jobs/job_types/silicon.dm

@@ -74,7 +74,7 @@ Cyborg
 	flag = CYBORG
 	department_flag = ENGSEC
 	faction = "Station"
-	total_positions = 0
+	total_positions = 1
 	spawn_positions = 1
 	supervisors = "your laws and the AI"	//Nodrak
 	selection_color = "#ddffdd"