Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport (r4618)

Conflicts:
	baystation12.dme
	code/controllers/master_controller.dm
	code/defines/obj.dm
	code/game/gamemodes/events.dm
	code/game/machinery/newscaster.dm
	code/game/objects/items/blueprints.dm
	code/game/objects/items/stacks/sheets/sheet_types.dm
	code/game/objects/items/stacks/stack.dm
	code/game/objects/structures/stool_bed_chair_nest/bed.dm
	code/game/turfs/turf.dm
	code/modules/awaymissions/zlevel.dm
	code/modules/maps/fromdmp.dm
	code/modules/mob/living/silicon/ai/freelook/eye.dm
	code/modules/mob/living/silicon/ai/freelook/update_triggers.dm
	code/modules/mob/living/silicon/silicon.dm
	code/modules/mob/living/simple_animal/life.dm
	code/modules/mob/mob_movement.dm
	code/setup.dm
	icons/mob/uniform.dmi
	icons/obj/closet.dmi
	icons/obj/clothing/uniforms.dmi
	maps/RandomZLevels/assistantChamber.dmm
	maps/RandomZLevels/fileList.txt
	maps/tgstation.2.0.9.dmm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

code/modules/reagents/Chemistry-Reagents.dm

@@ -124,6 +124,7 @@ datum
 				if(!istype(T)) return
 				var/datum/reagent/blood/self = src
 				src = null
+				if(!(volume >= 3)) return
 				//var/datum/disease/D = self.data["virus"]
 				if(!self.data["donor"] || istype(self.data["donor"], /mob/living/carbon/human))
 					var/obj/effect/decal/cleanable/blood/blood_prop = locate() in T //find some blood here
@@ -262,15 +263,16 @@ datum
 			reaction_turf(var/turf/simulated/T, var/volume)
 				if (!istype(T)) return
 				src = null
-				if(T.wet >= 2) return
-				T.wet = 2
-				spawn(800)
-					if (!istype(T)) return
-					T.wet = 0
-					if(T.wet_overlay)
-						T.overlays -= T.wet_overlay
-						T.wet_overlay = null
-					return
+				if(volume >= 1)
+					if(T.wet >= 2) return
+					T.wet = 2
+					spawn(800)
+						if (!istype(T)) return
+						T.wet = 0
+						if(T.wet_overlay)
+							T.overlays -= T.wet_overlay
+							T.wet_overlay = null
+						return
 
 		anti_toxin
 			name = "Anti-Toxin (Dylovene)"
@@ -773,9 +775,10 @@ datum
 
 			reaction_turf(var/turf/T, var/volume)
 				src = null
-				if(!istype(T, /turf/space))
-					new /obj/effect/decal/cleanable/greenglow(T)
-					return
+				if(volume >= 3)
+					if(!istype(T, /turf/space))
+						new /obj/effect/decal/cleanable/greenglow(T)
+						return
 
 
 		ryetalyn
@@ -802,10 +805,17 @@ datum
 
 			reaction_turf(var/turf/T, var/volume)
 				src = null
-				if(istype(T, /turf/simulated/wall))
-					T:thermite = 1
-					T.overlays = null
-					T.overlays = image('icons/effects/effects.dmi',icon_state = "thermite")
+				if(volume >= 5)
+					if(istype(T, /turf/simulated/wall))
+						T:thermite = 1
+						T.overlays = null
+						T.overlays = image('icons/effects/effects.dmi',icon_state = "thermite")
+				return
+
+			on_mob_life(var/mob/living/M as mob)
+				if(!M) M = holder.my_atom
+				M.adjustFireLoss(1)
+				..()
 				return
 
 		mutagen
@@ -921,8 +931,9 @@ datum
 
 			reaction_turf(var/turf/T, var/volume)
 				src = null
-				if(!istype(T, /turf/space))
-					new /obj/effect/decal/cleanable/greenglow(T)
+				if(volume >= 3)
+					if(!istype(T, /turf/space))
+						new /obj/effect/decal/cleanable/greenglow(T)
 
 		aluminum
 			name = "Aluminum"
@@ -986,13 +997,14 @@ datum
 					if(O)
 						O.clean_blood()
 			reaction_turf(var/turf/T, var/volume)
-				T.overlays = null
-				T.clean_blood()
-				for(var/obj/effect/decal/cleanable/C in src)
-					del(C)
+				if(volume >= 1)
+					T.overlays = null
+					T.clean_blood()
+					for(var/obj/effect/decal/cleanable/C in src)
+						del(C)
 
-				for(var/mob/living/carbon/metroid/M in T)
-					M.adjustToxLoss(rand(5,10))
+					for(var/mob/living/carbon/metroid/M in T)
+						M.adjustToxLoss(rand(5,10))
 
 			reaction_mob(var/mob/M, var/method=TOUCH, var/volume)
 				if(iscarbon(M))
@@ -2626,8 +2638,9 @@ datum
 				return
 
 			reaction_turf(var/turf/simulated/T, var/volume)
-				if(!istype(T)) return
-				T.Bless()
+				if(volume >= 3)
+					if(!istype(T)) return
+					T.Bless()
 
 		tequilla
 			name = "Tequila"

code/modules/reagents/Chemistry-Recipes.dm

@@ -31,7 +31,20 @@ datum
 				var/datum/effect/effect/system/reagents_explosion/e = new()
 				e.set_up(round (created_volume/10, 1), location, 0, 0)
 				e.start()
+				holder.clear_reagents()
+				return
 
+		emp_pulse
+			name = "EMP Pulse"
+			id = "emp_pulse"
+			result = null
+			required_reagents = list("uranium" = 1, "iron" = 1) // Yes, laugh, it's the best recipe I could think of that makes a little bit of sense
+			result_amount = 2
+
+			on_reaction(var/datum/reagents/holder, var/created_volume)
+				var/location = get_turf(holder.my_atom)
+				// 100 created volume = 10 heavy range & 20 light range = same as normal EMP grenade
+				empulse(location, round(created_volume / 10), round(created_volume / 5), 1)
 				holder.clear_reagents()
 				return
 /*

code/modules/reagents/reagent_containers/food/drinks/bottle.dm

@@ -128,7 +128,9 @@
 	attack_verb = list("stabbed", "slashed", "attacked")
 	var/icon/broken_outline = icon('icons/obj/drinks.dmi', "broken")
 
-
+/obj/item/weapon/broken_bottle/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
+	playsound(loc, 'sound/weapons/bladeslice.ogg', 50, 1, -1)
+	return ..()
 
 
 /obj/item/weapon/reagent_containers/food/drinks/bottle/gin