Fixes-Tweakes

code/game/machinery/autolathe.dm

@@ -67,9 +67,9 @@ var/global/list/autolathe_recipes_hidden = list( \
 		new /obj/item/ammo_box/c9mm(), \
 		new /obj/item/ammo_casing/shotgun(), \
 		new /obj/item/ammo_casing/shotgun/buckshot(), \
+		new /obj/item/ammo_casing/shotgun/dart(), \
 		new /obj/item/ammo_casing/shotgun/incendiary(), \
-		/*new /obj/item/ammo_casing/shotgun/dart(), \
-		new /obj/item/weapon/shield/riot(), */ \
+/*	 	new /obj/item/weapon/shield/riot(),*/ \
 	)
 /obj/machinery/autolathe
 	name = "autolathe"

code/game/machinery/bots/medbot.dm

@@ -50,8 +50,8 @@
 	treatment_oxy = "dexalin"
 	treatment_brute = "bicaridine"
 	treatment_fire = "kelotane"
-	treatment_tox = "anti_toxin"	
-	
+	treatment_tox = "anti_toxin"
+
 /obj/machinery/bot/medbot/mysterious
 	name = "\improper Mysterious Medibot"
 	desc = "International Medibot of mystery."
@@ -327,12 +327,17 @@
 		return
 
 	//Patient has moved away from us!
-	else if(patient && path && path.len && (get_dist(patient,path[path.len]) > 2))
+	else if(patient && path.len && (get_dist(patient,path[path.len]) > 2))
 		path = list()
 		mode = BOT_IDLE
 		last_found = world.time
 
-	if(!stationary_mode && patient && path.len == 0 && (get_dist(src,patient) > 1))
+	else if(stationary_mode && patient)
+		patient = null
+		mode = BOT_IDLE
+		last_found = world.time
+		return
+	if(patient && path.len == 0 && (get_dist(src,patient) > 1))
 		spawn(0)
 			path = AStar(loc, get_turf(patient), /turf/proc/CardinalTurfsWithAccess, /turf/proc/Distance_cardinal, 0, 30,id=botcard)
 			if(!path)
@@ -368,10 +373,10 @@
 
 	if(emagged == 2) //Everyone needs our medicine. (Our medicine is toxins)
 		return 1
-		
+
 	if((skin == "bezerk") && (!("syndicate" in C.faction)))
 		return 0
-		
+
 	if(declare_crit && C.health <= 0) //Critical condition! Call for help!
 		declare(C)
 
@@ -394,7 +399,7 @@
 	if((C.getToxLoss() >= heal_threshold) && (!C.reagents.has_reagent(treatment_tox)))
 		return 1
 
-	if((C.virus2.len) && (!C.reagents.has_reagent(treatment_virus)))		
+	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
@@ -423,20 +428,20 @@
 	var/reagent_id = null
 
 	if(emagged == 2) //Emagged! Time to poison everybody.
-		reagent_id = "toxin"	
-		
+		reagent_id = "toxin"
+
 	else
 		if(treat_virus)
 			var/virus = 0
-			if(C:virus2.len)		
+			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	
-						
+						virus = 1
+
 			if (!reagent_id && (virus))
 				if(!C.reagents.has_reagent(treatment_virus))
-					reagent_id = treatment_virus	
-				
+					reagent_id = treatment_virus
+
 		if (!reagent_id && (C.getBruteLoss() >= heal_threshold))
 			if(!C.reagents.has_reagent(treatment_brute))
 				reagent_id = treatment_brute
@@ -529,7 +534,7 @@
 	speak("Medical emergency! [crit_patient ? "<b>[crit_patient]</b>" : "A patient"] is in critical condition at [location]!",radio_frequency, radio_name)
 	declare_cooldown = 1
 	spawn(200) //Twenty seconds
-	declare_cooldown = 0
+		declare_cooldown = 0
 
 /*
  *	Medbot Assembly -- Can be made out of all three medkits.

code/game/mecha/equipment/tools/tools.dm

@@ -732,7 +732,7 @@
 	name = "Energy Relay"
 	desc = "Wirelessly drains energy from any available power channel in area. The performance index is quite low."
 	icon_state = "tesla"
-	origin_tech = "magnets=4;syndicate=2"
+	origin_tech = "magnets=4;powerstorage=3"
 	equip_cooldown = 10
 	energy_drain = 0
 	range = 0

code/game/objects/effects/decals/misc.dm

@@ -17,6 +17,11 @@
 	anchored = 1
 	layer = 50
 
+/obj/effect/decal/chempuff
+	name = "chemicals"
+	icon = 'icons/obj/chempuff.dmi'
+	pass_flags = PASSTABLE | PASSGRILLE
+
 /obj/effect/decal/snow
 	name="snow"
 	density=0

code/game/objects/items/devices/flash.dm

@@ -18,7 +18,6 @@
 /obj/item/device/flash/proc/clown_check(mob/user)
 	if(user && (M_CLUMSY in user.mutations) && prob(50))
 		flash_carbon(user, user, 15, 0)
-		user.visible_message("<span class='disarm'>[user] blinds [user] with the flash!</span>")
 		return 0
 	return 1
 
@@ -42,7 +41,7 @@
 	times_used = max(0, times_used) //sanity
 
 
-/obj/item/device/flash/proc/try_use_flash(var/mob/user)
+/obj/item/device/flash/proc/try_use_flash(var/mob/user = null)
 	flash_recharge(user)
 
 	if(broken)
@@ -67,6 +66,11 @@
 		if(user && convert)
 			terrible_conversion_proc(M, user)
 			M.Stun(1)
+		user.visible_message("<span class='disarm'>[user] blinds [M] with the flash!</span>")
+		return 1
+	else
+		user.visible_message("<span class='disarm'>[user] fails to blind [M] with the flash!</span>")
+		return 0
 
 /obj/item/device/flash/attack(mob/living/M, mob/user)
 	if(!try_use_flash(user))
@@ -74,7 +78,6 @@
 
 	if(iscarbon(M))
 		flash_carbon(M, user, 5, 1)
-		user.visible_message("<span class='disarm'>[user] blinds [M] with the flash!</span>")
 		return 1
 
 	else if(issilicon(M))

code/game/objects/items/weapons/grenades/chem_grenade.dm

@@ -417,7 +417,7 @@
 		B1.reagents.add_reagent("fuel",20)
 		B2.reagents.add_reagent("plasma", 15)
 		B2.reagents.add_reagent("sacid", 15)
-		B1.reagents.add_reagent("fuel",20)
+		B1.reagents.add_reagent("incendiaryfuel",20)
 
 		beakers += B1
 		beakers += B2