Bot fixes, disease runtime fix, vending menu fix

code/game/machinery/bots/cleanbot.dm

@@ -206,8 +206,10 @@ text("<A href='?src=\ref[src];power=1'>[on ? "On" : "Off"]</A>"))
 
 	target_types += /obj/effect/decal/cleanable/oil
 	target_types += /obj/effect/decal/cleanable/vomit
+	target_types += /obj/effect/decal/cleanable/poop
 	target_types += /obj/effect/decal/cleanable/robot_debris
 	target_types += /obj/effect/decal/cleanable/crayon
+	target_types += /obj/effect/decal/cleanable/liquid_fuel
 	target_types += /obj/effect/decal/cleanable/molten_item
 	target_types += /obj/effect/decal/cleanable/tomato_smudge
 	target_types += /obj/effect/decal/cleanable/egg_smudge
@@ -216,12 +218,16 @@ text("<A href='?src=\ref[src];power=1'>[on ? "On" : "Off"]</A>"))
 	target_types += /obj/effect/decal/cleanable/ash
 	target_types += /obj/effect/decal/cleanable/greenglow
 	target_types += /obj/effect/decal/cleanable/dirt
+	target_types += /obj/effect/decal/cleanable/mucus
 
 	if(blood)
 		target_types += /obj/effect/decal/cleanable/xenoblood/
 		target_types += /obj/effect/decal/cleanable/xenoblood/xgibs
 		target_types += /obj/effect/decal/cleanable/blood/
 		target_types += /obj/effect/decal/cleanable/blood/gibs/
+		target_types += /obj/effect/decal/cleanable/blood/green
+		target_types += /obj/effect/decal/cleanable/blood/tracks
+		target_types += /obj/effect/decal/cleanable/dirt
 
 /obj/machinery/bot/cleanbot/proc/clean(var/obj/effect/decal/cleanable/target)
 	anchored = 1

code/game/machinery/bots/ed209bot.dm

@@ -43,7 +43,8 @@
 		/obj/item/weapon/gun/energy/laser/redtag,\
 		/obj/item/weapon/gun/energy/laser/practice,\
 		/obj/item/weapon/melee/telebaton,\
-		/obj/item/weapon/gun/energy/kinetic_accelerator)
+		/obj/item/weapon/gun/energy/kinetic_accelerator,\
+		/obj/item/weapon/melee/baton/loaded/ntcane)
 
 
 /obj/item/weapon/ed209_assembly

code/game/machinery/bots/medbot.dm

@@ -37,7 +37,7 @@
 	var/treatment_fire = "tricordrazine"
 	var/treatment_tox = "tricordrazine"
 	var/treatment_virus = "spaceacillin"
-	var/treat_virus = 0 //If on, the bot will attempt to treat viral infections, curing them if possible.
+	var/treat_virus = 1 //If on, the bot will attempt to treat viral infections, curing them if possible.
 	var/shut_up = 0 //self explanatory :)
 	bot_type = MED_BOT
 	bot_filter = RADIO_MEDBOT
@@ -393,6 +393,10 @@
 	if((C.getToxLoss() >= heal_threshold) && (!C.reagents.has_reagent(treatment_tox)))
 		return 1
 
+	if((C.virus2.len) && (!C.reagents.has_reagent(treatment_virus)))		
+		for (var/ID in C.virus2)
+			if (ID in virusDB) // If the virus is known, the medbot is aware of it
+				return 1
 	return 0
 
 /obj/machinery/bot/medbot/proc/medicate_patient(mob/living/carbon/C as mob)
@@ -420,6 +424,17 @@
 	if(emagged == 2) //Emagged! Time to poison everybody.
 		reagent_id = "toxin"
 
+	if(treat_virus)
+		var/virus = 0
+		if(C:virus2.len)		
+			for (var/ID in C.virus2)
+				if (ID in virusDB) // If the virus is known, the medbot is aware of it and will try to cure it
+					virus = 1	
+					
+		if (!reagent_id && (virus))
+			if(!C.reagents.has_reagent(treatment_virus))
+				reagent_id = treatment_virus		
+		
 	else
 		if (!reagent_id && (C.getBruteLoss() >= heal_threshold))
 			if(!C.reagents.has_reagent(treatment_brute))

code/game/machinery/bots/secbot.dm

@@ -33,12 +33,13 @@
 		/obj/item/weapon/gun/energy/laser/redtag,\
 		/obj/item/weapon/gun/energy/laser/practice,\
 		/obj/item/weapon/melee/telebaton,\
-		/obj/item/weapon/gun/energy/kinetic_accelerator)
+		/obj/item/weapon/gun/energy/kinetic_accelerator,\
+		/obj/item/weapon/melee/baton/loaded/ntcane)
 
 
 /obj/machinery/bot/secbot/beepsky
-	name = "Officer Beep O'sky"
-	desc = "It's Officer Beep O'sky! Powered by a potato and a shot of whiskey."
+	name = "Officer Beepsky"
+	desc = "It's Officer Beepsky! Powered by a potato and a shot of whiskey."
 	idcheck = 0
 	weaponscheck = 0
 	auto_patrol = 1

code/game/machinery/vending.dm

@@ -283,6 +283,7 @@
 					// Vend the item
 					src.vend(src.currently_vending, usr)
 					currently_vending = null
+					src.updateUsrDialog()
 				else
 					usr << "\icon[src]<span class='warning'>You don't have that much money!</span>"
 			else