Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into shadowling

Conflicts:
	code/modules/mob/living/carbon/human/human.dm
	code/setup.dm

code/modules/reagents/Chemistry-Holder.dm

@@ -352,7 +352,7 @@ datum
 											ME2.name = "used slime extract"
 											ME2.desc = "This extract has been used up."
 
-								playsound(get_turf(my_atom), 'sound/effects/bubbles.ogg', 80, 1)
+								playsound(get_turf(my_atom), C.mix_sound, 80, 1)
 
 								C.on_reaction(src, created_volume)
 								reaction_occured = 1

code/modules/reagents/Chemistry-Machinery.dm

@@ -177,6 +177,10 @@
 
 			R.add_reagent(href_list["dispense"], min(amount, energy * 10, space))
 			energy = max(energy - min(amount, energy * 10, space) / 10, 0)
+			overlays.Cut()
+			icon_beaker = image('icons/obj/chemical.dmi', src, "disp_beaker") //randomize beaker overlay position.
+			icon_beaker.pixel_x = rand(-10,5)
+			overlays += icon_beaker
 
 	if(href_list["remove"])
 		if(beaker)

code/modules/reagents/Chemistry-Reagents.dm

@@ -268,6 +268,10 @@ datum
 					var/obj/item/weapon/reagent_containers/food/snacks/monkeycube/cube = O
 					if(!cube.wrapped)
 						cube.Expand()
+				// Dehydrated carp
+				if(istype(O,/obj/item/toy/carpplushie/dehy_carp))
+					var/obj/item/toy/carpplushie/dehy_carp/dehy = O
+					dehy.Swell() // Makes a carp
 				return
 
 		hellwater
@@ -355,16 +359,17 @@ datum
 				if(!M) M = holder.my_atom
 				if(ishuman(M))
 					var/mob/living/carbon/human/human = M
-					if(human.dna.mutantrace == null)
+					if(human.species.name != "Shadow")
 						M << "\red Your flesh rapidly mutates!"
 						M << "<b>You are now a Shadow Person, a mutant race of darkness-dwelling humanoids.</b>"
 						M << "\red Your body reacts violently to light. \green However, it naturally heals in darkness."
 						M << "Aside from your new traits, you are mentally unchanged and retain your prior obligations."
-						human.dna.mutantrace = "shadow"
-						human.update_mutantrace()
+						human.set_species("Shadow")
 				..()
 				return
 
+
+
 		aslimetoxin
 			name = "Advanced Mutation Toxin"
 			id = "amutationtoxin"
@@ -1075,6 +1080,11 @@ datum
 			reaction_mob(var/mob/M, var/method=TOUCH, var/volume)
 				if(iscarbon(M))
 					var/mob/living/carbon/C = M
+					if(istype(M,/mob/living/carbon/human))
+						var/mob/living/carbon/human/H = M
+						if(H.lip_style)
+							H.lip_style = null
+							H.update_body()
 					if(C.r_hand)
 						C.r_hand.clean_blood()
 					if(C.l_hand)
@@ -1119,23 +1129,6 @@ datum
 					M.adjust_fire_stacks(volume / 5)
 					..()
 					return
-
-		cryptobiolin
-			name = "Cryptobiolin"
-			id = "cryptobiolin"
-			description = "Cryptobiolin causes confusion and dizzyness."
-			reagent_state = LIQUID
-			color = "#FFD1DC" // rgb: 255, 209, 220
-
-			on_mob_life(var/mob/living/M as mob)
-				if(!M) M = holder.my_atom
-				M.Dizzy(1)
-				if(!M.confused) M.confused = 1
-				M.confused = max(M.confused, 20)
-				holder.remove_reagent(src.id, 0.5 * REAGENTS_METABOLISM)
-				..()
-				return
-
 		lexorin
 			name = "Lexorin"
 			id = "lexorin"
@@ -1317,9 +1310,9 @@ datum
 		spaceacillin
 			name = "Spaceacillin"
 			id = "spaceacillin"
-			description = "An all-purpose antiviral agent."
+			description = "An all-purpose antibiotic agent extracted from space fungus."
 			reagent_state = LIQUID
-			color = "#228B22" // rgb: 34, 139, 34
+			color = "#0AB478"
 
 			on_mob_life(var/mob/living/M as mob)
 				..()
@@ -1351,12 +1344,12 @@ datum
 				data = max(data - 1, 3)
 				..()
 
-		mindbreaker
-			name = "Mindbreaker Toxin"
-			id = "mindbreaker"
-			description = "A powerful hallucinogen. Not a thing to be messed with."
+		lsd
+			name = "Lysergic acid diethylamide"
+			id = "lsd"
+			description = "A highly potent hallucinogenic substance. Far out, maaaan."
 			reagent_state = LIQUID
-			color = "#B31008" // rgb: 139, 166, 233
+			color = "#0000D8"
 
 			on_mob_life(var/mob/living/M)
 				if(!M) M = holder.my_atom
@@ -2384,10 +2377,12 @@ datum
 			reagent_state = LIQUID
 			nutriment_factor = 0 //So alcohol can fill you up! If they want to.
 			color = "#404030" // rgb: 64, 64, 48
+			var/datum/martial_art/drunk_brawling/F = new
 			var/dizzy_adj = 3
 			var/slurr_adj = 3
 			var/confused_adj = 2
 			var/slur_start = 65			//amount absorbed after which mob starts slurring
+			var/brawl_start = 75		//amount absorbed after which mob switches to drunken brawling as a fighting style
 			var/confused_start = 130	//amount absorbed after which mob starts confusing directions
 			var/vomit_start = 180	//amount absorbed after which mob starts vomitting
 			var/blur_start = 260	//amount absorbed after which mob starts getting blurred vision
@@ -2417,6 +2412,12 @@ datum
 				if(d >= slur_start && d < pass_out)
 					if (!M:slurring) M:slurring = 1
 					M:slurring += slurr_adj/sober_str
+				if(d >= brawl_start && ishuman(M))
+					var/mob/living/carbon/human/H = M
+					F.teach(H,1)
+					if(src.volume < 3)
+						if(H.martial_art == F)
+							F.remove(H)
 				if(d >= confused_start && prob(33))
 					if (!M:confused) M:confused = 1
 					M.confused = max(M:confused+(confused_adj/sober_str),0)
@@ -2490,6 +2491,7 @@ datum
 				description = "Just when you thought regular station whiskey was good... This silky, amber goodness has to come along and ruin everything."
 				color = "#664300" // rgb: 102, 67, 0
 				slur_start = 30		//amount absorbed after which mob starts slurring
+				brawl_start = 40
 
 			gin
 				name = "Gin"
@@ -2506,6 +2508,7 @@ datum
 				overdose_threshold = 30
 				dizzy_adj = 5
 				slur_start = 25
+				brawl_start = 40
 				confused_start = 100
 
 				//copy paste from LSD... shoot me
@@ -2583,6 +2586,7 @@ datum
 				slurr_adj = 20
 				confused_adj = 3
 				slur_start = 15
+				brawl_start = 25
 				confused_start = 40
 				blur_start = 60
 				pass_out = 80

code/modules/reagents/Chemistry-Recipes.dm

@@ -16,6 +16,7 @@ datum
 		var/list/secondary_results = list()		//additional reagents produced by the reaction
 		var/required_temp = 0
 		var/mix_message = "The solution begins to bubble."
+		var/mix_sound = 'sound/effects/bubbles.ogg'
 
 
 		proc
@@ -30,6 +31,8 @@ datum
 			result = null
 			required_reagents = list("water" = 1, "potassium" = 1)
 			result_amount = 2
+			mix_message = "The mixture explodes!"
+
 			on_reaction(var/datum/reagents/holder, var/created_volume)
 				var/datum/effect/effect/system/reagents_explosion/e = new()
 				e.set_up(round (created_volume/10, 1), holder.my_atom, 0, 0)
@@ -120,13 +123,6 @@ datum
 			result_amount = 3
 			mix_message = "The water somehow seems purified. Or maybe defiled."
 
-		cryptobiolin
-			name = "Cryptobiolin"
-			id = "cryptobiolin"
-			result = "cryptobiolin"
-			required_reagents = list("potassium" = 1, "oxygen" = 1, "sugar" = 1)
-			result_amount = 3
-
 		cryoxadone
 			name = "Cryoxadone"
 			id = "cryoxadone"
@@ -147,8 +143,9 @@ datum
 			name = "Spaceacillin"
 			id = "spaceacillin"
 			result = "spaceacillin"
-			required_reagents = list("cryptobiolin" = 1, "epinephrine" = 1)
+			required_reagents = list("fungus" = 1, "ethanol" = 1)
 			result_amount = 2
+			mix_message = "The solvent extracts an antibiotic compound from the fungus."
 
 		Audioline
 			name = "Audioline"
@@ -190,15 +187,16 @@ datum
 			name = "Rezadone"
 			id = "rezadone"
 			result = "rezadone"
-			required_reagents = list("carpotoxin" = 1, "cryptobiolin" = 1, "copper" = 1)
+			required_reagents = list("carpotoxin" = 1, "spaceacillin" = 1, "copper" = 1)
 			result_amount = 3
 
-		mindbreaker
-			name = "Mindbreaker Toxin"
-			id = "mindbreaker"
-			result = "mindbreaker"
-			required_reagents = list("silicon" = 1, "hydrogen" = 1, "charcoal" = 1)
-			result_amount = 5
+		lsd
+			name = "Lysergic acid diethylamide"
+			id = "lsd"
+			result = "lsd"
+			required_reagents = list("diethylamine" = 1, "fungus" = 1)
+			result_amount = 3
+			mix_message = "The mixture turns a rather unassuming color and settles."
 
 		plastication
 			name = "Plastic"
@@ -487,23 +485,8 @@ datum
 			required_other = 1
 			on_reaction(var/datum/reagents/holder)
 
-				var/blocked = list(/mob/living/simple_animal/hostile,
-					/mob/living/simple_animal/hostile/pirate,
-					/mob/living/simple_animal/hostile/pirate/ranged,
-					/mob/living/simple_animal/hostile/russian,
-					/mob/living/simple_animal/hostile/russian/ranged,
-					/mob/living/simple_animal/hostile/syndicate,
-					/mob/living/simple_animal/hostile/syndicate/melee,
-					/mob/living/simple_animal/hostile/syndicate/melee/space,
-					/mob/living/simple_animal/hostile/syndicate/ranged,
-					/mob/living/simple_animal/hostile/syndicate/ranged/space,
-					/mob/living/simple_animal/hostile/alien/queen/large,
-					/mob/living/simple_animal/hostile/faithless,
-					/mob/living/simple_animal/hostile/panther,
-					/mob/living/simple_animal/hostile/snake,
-					/mob/living/simple_animal/hostile/retaliate,
-					/mob/living/simple_animal/hostile/retaliate/clown
-					)//exclusion list for things you don't want the reaction to create.
+				var/blocked = blocked_mobs //global variable of blocked mobs
+
 				var/list/critters = typesof(/mob/living/simple_animal/hostile) - blocked // list of possible hostile mobs
 
 				playsound(get_turf_loc(holder.my_atom), 'sound/effects/phasein.ogg', 100, 1)
@@ -535,34 +518,13 @@ datum
 			on_reaction(var/datum/reagents/holder)
 				feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
 				for(var/mob/O in viewers(get_turf(holder.my_atom), null))
-					O.show_message(text("<span class='danger'>The slime extract begins to vibrate violently !</span>"), 1)
+					O.show_message(text("<span class='danger'>The slime extract begins to vibrate violently!</span>"), 1)
 				spawn(50)
 
 				if(holder && holder.my_atom)
 
-					var/blocked = list(/mob/living/simple_animal/hostile,
-						/mob/living/simple_animal/hostile/pirate,
-						/mob/living/simple_animal/hostile/pirate/ranged,
-						/mob/living/simple_animal/hostile/russian,
-						/mob/living/simple_animal/hostile/russian/ranged,
-						/mob/living/simple_animal/hostile/syndicate,
-						/mob/living/simple_animal/hostile/syndicate/melee,
-						/mob/living/simple_animal/hostile/syndicate/melee/space,
-						/mob/living/simple_animal/hostile/syndicate/ranged,
-						/mob/living/simple_animal/hostile/syndicate/ranged/space,
-						/mob/living/simple_animal/hostile/alien/queen/large,
-						/mob/living/simple_animal/hostile/retaliate,
-						/mob/living/simple_animal/hostile/retaliate/clown,
-						/mob/living/simple_animal/hostile/mushroom,
-						/mob/living/simple_animal/hostile/asteroid,
-						/mob/living/simple_animal/hostile/asteroid/basilisk,
-						/mob/living/simple_animal/hostile/asteroid/goldgrub,
-						/mob/living/simple_animal/hostile/asteroid/goliath,
-						/mob/living/simple_animal/hostile/asteroid/hivelord,
-						/mob/living/simple_animal/hostile/asteroid/hivelordbrood,
-						/mob/living/simple_animal/hostile/carp/holocarp,
-						/mob/living/simple_animal/hostile/mining_drone
-						)//exclusion list for things you don't want the reaction to create.
+					var/blocked = blocked_mobs
+
 					var/list/critters = typesof(/mob/living/simple_animal/hostile) - blocked // list of possible hostile mobs
 
 					playsound(get_turf(holder.my_atom), 'sound/effects/phasein.ogg', 100, 1)

code/modules/reagents/dartgun.dm

@@ -180,7 +180,7 @@
 						M.attack_log += "\[[time_stamp()]\] <b>[user]/[user.ckey]</b> shot <b>[M]/[M.ckey]</b> with a <b>dartgun</b> ([R])"
 						user.attack_log += "\[[time_stamp()]\] <b>[user]/[user.ckey]</b> shot <b>[M]/[M.ckey]</b> with a <b>dartgun</b> ([R])"
 						if(M.ckey)
-							msg_admin_attack("[user] ([user.ckey]) shot [M] ([M.ckey]) with a dartgun ([R]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
+							msg_admin_attack("[user] ([user.ckey])[isAntag(user) ? "(ANTAG)" : ""] shot [M] ([M.ckey]) with a dartgun ([R]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
 						if(!iscarbon(user))
 							M.LAssailant = null
 						else

code/modules/reagents/newchem/food.dm

@@ -407,6 +407,7 @@ datum/reagent/ectoplasm/reaction_turf(var/turf/T, var/volume)
 	required_reagents = list("corn_starch" = 1, "blood" = 1)
 	result_amount = 2
 	mix_message = "The mixture congeals into a bloody mass."
+	mix_sound = 'sound/effects/blobattack.ogg'
 
 /datum/reagent/mashedpotatoes
 	name = "Mashed potatoes"
@@ -457,6 +458,7 @@ datum/reagent/ectoplasm/reaction_turf(var/turf/T, var/volume)
 	required_reagents = list("hydrogenated_soybeanoil" = 2, "meatslurry" = 1, "plasma" = 1)
 	result_amount = 4
 	mix_message = "The mixture solidifies, taking a crystalline appearance."
+	mix_sound = 'sound/effects/blobattack.ogg'
 
 /datum/reagent/pepperoni
 	name = "Pepperoni"
@@ -493,4 +495,5 @@ datum/reagent/pepperoni/reaction_mob(var/mob/living/M, var/method=TOUCH, var/vol
 	result = "pepperoni"
 	required_reagents = list("beff" = 1, "saltpetre" = 1, "synthflesh" = 1)
 	result_amount = 2
-	mix_message = "The beff and the synthflesh combine to form a smoky red log."
+	mix_message = "The beff and the synthflesh combine to form a smoky red log."
+	mix_sound = 'sound/effects/blobattack.ogg'

code/modules/reagents/newchem/medicine.dm

@@ -148,6 +148,7 @@ datum/reagent/charcoal/on_mob_life(var/mob/living/M as mob)
 	required_reagents = list("blood" = 1, "carbon" = 1, "styptic_powder" = 1)
 	result_amount = 3
 	mix_message = "The mixture knits together into a fibrous, bloody mass."
+	mix_sound = 'sound/effects/blobattack.ogg'
 
 /datum/chemical_reaction/styptic_powder
 	name = "Styptic Powder"
@@ -693,30 +694,8 @@ datum/reagent/life
 
 proc/chemical_mob_spawn(var/datum/reagents/holder, var/amount_to_spawn, var/reaction_name, var/mob_faction = "chemicalsummon")
 	if(holder && holder.my_atom)
-		var/blocked = list(/mob/living/simple_animal/hostile,
-			/mob/living/simple_animal/hostile/pirate,
-			/mob/living/simple_animal/hostile/pirate/ranged,
-			/mob/living/simple_animal/hostile/russian,
-			/mob/living/simple_animal/hostile/russian/ranged,
-			/mob/living/simple_animal/hostile/syndicate,
-			/mob/living/simple_animal/hostile/syndicate/melee,
-			/mob/living/simple_animal/hostile/syndicate/melee/space,
-			/mob/living/simple_animal/hostile/syndicate/ranged,
-			/mob/living/simple_animal/hostile/syndicate/ranged/space,
-			/mob/living/simple_animal/hostile/alien/queen/large,
-			/mob/living/simple_animal/hostile/retaliate,
-			/mob/living/simple_animal/hostile/retaliate/clown,
-			/mob/living/simple_animal/hostile/mushroom,
-			/mob/living/simple_animal/hostile/asteroid,
-			/mob/living/simple_animal/hostile/asteroid/basilisk,
-			/mob/living/simple_animal/hostile/asteroid/goldgrub,
-			/mob/living/simple_animal/hostile/asteroid/goliath,
-			/mob/living/simple_animal/hostile/asteroid/hivelord,
-			/mob/living/simple_animal/hostile/asteroid/hivelordbrood,
-			/mob/living/simple_animal/hostile/carp/holocarp,
-			/mob/living/simple_animal/hostile/mining_drone,
-			/mob/living/simple_animal/hostile/spaceWorm
-			)//exclusion list for things you don't want the reaction to create.
+		var/blocked =  blocked_mobs //global variable for blocked mobs
+
 		var/list/critters = typesof(/mob/living/simple_animal/hostile) - blocked // list of possible hostile mobs
 		var/atom/A = holder.my_atom
 		var/turf/T = get_turf(A)
@@ -905,15 +884,15 @@ datum/reagent/haloperidol
 
 datum/reagent/haloperidol/on_mob_life(var/mob/living/M as mob)
 	if(!M) M = holder.my_atom
-	M.reagents.remove_reagent("crank",5)
-	M.reagents.remove_reagent("methamphetamine",5)
-	M.reagents.remove_reagent("space_drugs",5)
-	M.reagents.remove_reagent("psilocybin",5)
-	M.reagents.remove_reagent("ephedrine",5)
-	M.reagents.remove_reagent("epinephrine",5)
-	M.reagents.remove_reagent("stimulants",5)
-	M.reagents.remove_reagent("bath_salts",5)
-	M.reagents.remove_reagent("mindbreaker",5)
+	M.reagents.remove_reagent("crank", 5)
+	M.reagents.remove_reagent("methamphetamine", 5)
+	M.reagents.remove_reagent("space_drugs", 5)
+	M.reagents.remove_reagent("psilocybin", 5)
+	M.reagents.remove_reagent("ephedrine", 5)
+	M.reagents.remove_reagent("epinephrine", 5)
+	M.reagents.remove_reagent("stimulants", 5)
+	M.reagents.remove_reagent("bath_salts", 5)
+	M.reagents.remove_reagent("lsd", 5)
 	M.druggy -= 5
 	M.hallucination -= 5
 	M.jitteriness -= 5

code/modules/reagents/newchem/other.dm

@@ -73,7 +73,7 @@ datum/reagent/acetone
 	name = "carpet"
 	id = "carpet"
 	result = "carpet"
-	required_reagents = list("space_drugs" = 1, "blood" = 1)
+	required_reagents = list("fungus" = 1, "blood" = 1)
 	result_amount = 2
 	mix_message = "The substance turns thick and stiff, yet soft."
 
@@ -101,6 +101,7 @@ datum/reagent/acetone
 	required_reagents = list("oil" = 1)
 	result_amount = 0.5
 	required_temp = 480
+	mix_sound = null
 
 datum/reagent/colorful_reagent
 	name = "Colorful Reagent"
@@ -117,6 +118,12 @@ datum/reagent/colorful_reagent
 	result_amount = 6
 	mix_message = "The substance flashes multiple colors and emits the smell of a pocket protector."
 
+datum/reagent/colorful_reagent/reaction_mob(var/mob/living/simple_animal/M, var/method=TOUCH, var/volume)
+    if(M)
+        M.color = pick(random_color_list)
+    ..()
+    return
+
 datum/reagent/colorful_reagent/reaction_obj(var/obj/O, var/volume)
 	if(O)
 		O.color = pick(random_color_list)
@@ -157,6 +164,7 @@ datum/reagent/corgium
 	required_reagents = list("egg" = 1, "colorful_reagent" = 1, "chicken_soup" = 1, "strange_reagent" = 1, "blood" = 1)
 	result_amount = 5
 	required_temp = 374
+	mix_message = "The substance turns an airy sky-blue and foams up into a new shape."
 
 /datum/chemical_reaction/flaptonium/on_reaction(var/datum/reagents/holder, var/created_volume)
 	var/location = get_turf(holder.my_atom)
@@ -287,4 +295,42 @@ datum/reagent/fartonium/on_mob_life(var/mob/living/M as mob)
 					M << "<span class = 'danger'>THE PAIN!"
 					M.adjustBruteLoss(1)
 	..()
-	return
+	return
+
+
+///Alchemical Reagents
+
+datum/reagent/eyenewt
+	name = "Eye of newt"
+	id = "eyenewt"
+	description = "A potent alchemic ingredient."
+	reagent_state = LIQUID
+	color = "#050519"
+
+datum/reagent/toefrog
+	name = "Toe of frog"
+	id = "toefrog"
+	description = "A potent alchemic ingredient."
+	reagent_state = LIQUID
+	color = "#092D09"
+
+datum/reagent/woolbat
+	name = "Wool of bat"
+	id = "woolbat"
+	description = "A potent alchemic ingredient."
+	reagent_state = LIQUID
+	color = "#080808"
+
+datum/reagent/tonguedog
+	name = "Tongue of dog"
+	id = "tonguedog"
+	description = "A potent alchemic ingredient."
+	reagent_state = LIQUID
+	color = "#2D0909"
+
+datum/reagent/triplepiss
+	name = "Triplepiss"
+	id = "triplepiss"
+	description = "Ewwwwwwwww."
+	reagent_state = LIQUID
+	color = "#857400"

code/modules/reagents/newchem/pyro.dm

@@ -32,7 +32,7 @@
 	id = "clf3"
 	result = "clf3"
 	required_reagents = list("chlorine" = 1, "fluorine" = 3)
-	result_amount = 4
+	result_amount = 2
 	required_temp = 424
 
 /datum/reagent/clf3/on_mob_life(var/mob/living/M as mob)
@@ -46,7 +46,6 @@
 	var/turf/T = get_turf(holder.my_atom)
 	for(var/turf/turf in range(1,T))
 		new /obj/fire(turf)
-	holder.chem_temp = 1000 // hot as shit
 	return
 
 /datum/reagent/clf3/reaction_turf(var/turf/simulated/T, var/volume)
@@ -70,7 +69,7 @@
 	if(method == TOUCH && isliving(M))
 		M.adjust_fire_stacks(5)
 		M.IgniteMob()
-		new /obj/fire(M.loc)
+		M.bodytemperature += 30
 		return
 
 /datum/reagent/sorium
@@ -145,9 +144,11 @@
 		if(istype(X, /atom/movable))
 			if((X) && !X.anchored)
 				if(setting_type)
+					playsound(T, 'sound/effects/bang.ogg', 25, 1)
 					for(var/i = 0, i < pull_times, i++)
 						step_away(X,T)
 				else
+					playsound(T, 'sound/effects/whoosh.ogg', 25, 1) //credit to Robinhood76 of Freesound.org for this.
 					for(var/i = 0, i < pull_times, i++)
 						step_towards(X,T)
 
@@ -175,28 +176,38 @@
 	result_amount = 1
 	required_temp = 474
 	mix_message = "sparks start flying about."
+	mix_sound = null
+
+datum/reagent/blackpowder/reaction_turf(var/turf/T, var/volume) //oh shit
+	src = null
+	if(volume >= 5)
+		if(!locate(/obj/effect/decal/cleanable/dirt/blackpowder) in get_turf(T)) //let's not have hundreds of decals of black powder on the same turf
+			new /obj/effect/decal/cleanable/dirt/blackpowder(T)
+			return
 
 /datum/chemical_reaction/blackpowder_explosion/on_reaction(var/datum/reagents/holder, var/created_volume)
 	var/location = get_turf(holder.my_atom)
 	var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
 	s.set_up(2, 1, location)
 	s.start()
-	sleep(rand(30,50))
+	sleep(rand(20,30))
 	blackpowder_detonate(holder, created_volume)
 	return
 
 /datum/reagent/blackpowder/on_ex_act()
 	blackpowder_detonate(holder, volume)
+	holder.remove_reagent("blackpowder", volume)
 	return
 
 /proc/blackpowder_detonate(var/datum/reagents/holder, var/created_volume)
 	var/turf/simulated/T = get_turf(holder.my_atom)
 	var/ex_severe = round(created_volume / 100)
 	var/ex_heavy = round(created_volume / 42)
-	var/ex_light = round(created_volume / 21)
+	var/ex_light = round(created_volume / 20)
 	var/ex_flash = round(created_volume / 8)
 	explosion(T,ex_severe,ex_heavy,ex_light,ex_flash, 1)
 	return
+
 /datum/reagent/flash_powder
 	name = "Flash Powder"
 	id = "flash_powder"
@@ -208,7 +219,7 @@
 	name = "Flash powder"
 	id = "flash_powder"
 	result = "flash_powder"
-	required_reagents = list("aluminum" = 1, "potassium" = 1, "sulfur" = 1 )
+	required_reagents = list("aluminum" = 1, "potassium" = 1, "sulfur" = 1, "chlorine" = 1)
 	result_amount = 3
 
 /datum/chemical_reaction/flash_powder_flash
@@ -261,7 +272,7 @@
 	id = "smoke_powder"
 	result = "smoke_powder"
 	required_reagents = list("stabilizing_agent" = 1, "potassium" = 1, "sugar" = 1, "phosphorus" = 1)
-	result_amount = 1
+	result_amount = 3
 	mix_message = "The mixture sets into a greyish powder!"
 
 /datum/chemical_reaction/smoke
@@ -297,6 +308,7 @@
 	secondary = 1
 	result_amount = 1
 	forbidden_reagents = list()
+	mix_sound = null
 
 /datum/reagent/sonic_powder
 	name = "Sonic Powder"

code/modules/reagents/newchem/toxins.dm

@@ -142,6 +142,7 @@ datum/reagent/neurotoxin2/on_mob_life(var/mob/living/M as mob)
 	required_reagents = list("space_drugs" = 1)
 	result_amount = 1
 	required_temp = 674
+	mix_sound = null
 
 datum/reagent/cyanide
 	name = "Cyanide"
@@ -206,9 +207,10 @@ datum/reagent/itching_powder/on_mob_life(var/mob/living/M as mob)
 	name = "Itching Powder"
 	id = "itching_powder"
 	result = "itching_powder"
-	required_reagents = list("fuel" = 1, "ammonia" = 1, "charcoal" = 1)
+	required_reagents = list("fuel" = 1, "ammonia" = 1, "fungus" = 1)
 	result_amount = 3
 	mix_message = "The mixture congeals and dries up, leaving behind an abrasive powder."
+	mix_sound = 'sound/effects/blobattack.ogg'
 
 datum/reagent/facid/on_mob_life(var/mob/living/M as mob)
 	if(!M) M = holder.my_atom
@@ -602,7 +604,7 @@ datum/reagent/atrazine/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volu
 		if(ismonkey(M))
 			var/mob/living/carbon/monkey/MO = M
 			if(MO.dna)
-				if(MO.dna.mutantrace == "plant") //plantmen monkeys (diona) take EVEN MORE damage
+				if(istype(MO,/mob/living/carbon/monkey/diona)) //plantmen monkeys (diona) take EVEN MORE damage
 					MO.adjustToxLoss(100)
 					..()
 					return

code/modules/reagents/reagent_containers/dropper.dm

@@ -73,7 +73,7 @@
 				M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been squirted with [src.name] by [user.name] ([user.ckey]). Reagents: [contained]</font>")
 				user.attack_log += text("\[[time_stamp()]\] <font color='red'>Used the [src.name] to squirt [M.name] ([M.key]). Reagents: [contained]</font>")
 				if(M.ckey)
-					msg_admin_attack("[user.name] ([user.ckey]) squirted [M.name] ([M.key]) with [src.name]. Reagents: [contained] (INTENT: [uppertext(user.a_intent)]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
+					msg_admin_attack("[user.name] ([user.ckey])[isAntag(user) ? "(ANTAG)" : ""] squirted [M.name] ([M.key]) with [src.name]. Reagents: [contained] (INTENT: [uppertext(user.a_intent)]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
 				if(!iscarbon(user))
 					M.LAssailant = null
 				else

code/modules/reagents/reagent_containers/food/cans.dm

@@ -44,7 +44,7 @@
 
 			M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been fed [src.name] by [user.name] ([user.ckey]) Reagents: [reagentlist(src)]</font>")
 			user.attack_log += text("\[[time_stamp()]\] <font color='red'>Fed [M.name] by [M.name] ([M.ckey]) Reagents: [reagentlist(src)]</font>")
-			msg_admin_attack("[key_name(user)] fed [key_name(M)] with [src.name] Reagents: [reagentlist(src)] (INTENT: [uppertext(user.a_intent)]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
+			msg_admin_attack("[key_name(user)][isAntag(user) ? "(ANTAG)" : ""] fed [key_name(M)] with [src.name] Reagents: [reagentlist(src)] (INTENT: [uppertext(user.a_intent)]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
 
 			if(reagents.total_volume)
 				reagents.trans_to_ingest(M, gulp_size)
@@ -318,3 +318,96 @@
 	New()
 		..()
 		reagents.add_reagent("sodawater", 50)
+
+//Donk Co. Cola//
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/pubber
+	name = "Dr. Pubber"
+	desc = "The beverage of an original crowd. Tastes like an industrial tranquilizer."
+	icon_state = "dr_gibb"
+	New()
+		..()
+		reagents.add_reagent("haloperidol", 4)
+		reagents.add_reagent("morphine", 4)
+		reagents.add_reagent("vhfcs", 10)
+		reagents.add_reagent("cola", 12)
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/robust
+	name = "Robust-Eeze"
+	desc = "A carbonated robustness tonic. It has quite a kick."
+	icon_state = "cola"
+	New()
+		..()
+		reagents.add_reagent("methamphetamine", 3)
+		reagents.add_reagent("vhfcs", 10)
+		reagents.add_reagent("cola", 17)
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/grifeo
+	name = "Grife-O"
+	desc = "The carbonated beverage of a space generation. Contains actual space dust!"
+	icon_state = "griefo"
+	New()
+		..()
+		reagents.add_reagent("radium", 3)
+		reagents.add_reagent("ephedrine", 6)
+		reagents.add_reagent("vhfcs", 10)
+		reagents.add_reagent("cola", 11)
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/orangeaid
+	name = "Orange-Aid"
+	desc = "A vitamin tonic that promotes good eyesight and health."
+	icon_state = "starkist"
+	New()
+		..()
+		reagents.add_reagent("orangejuice", 20)
+		reagents.add_reagent("oculine", 20)
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/limeaid
+	name = "Lime-Aid"
+	desc = "Antihol mixed with lime juice. A well-known cure for hangovers."
+	icon_state = "space-up"
+	New()
+		..()
+		reagents.add_reagent("limejuice", 20)
+		reagents.add_reagent("antihol", 20)
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/runoff
+	name = "Spooky Dan's Runoffa Cola"
+	desc = "A spoooky cola for Halloween!  Rumors that Runoff Cola contains actual industrial runoff are unsubstantiated."
+	icon_state = "purple_can"
+	New()
+		..()
+		reagents.add_reagent("chlorine", 5)
+		reagents.add_reagent("phosphorus", 5)
+		reagents.add_reagent("mercury", 5)
+		reagents.add_reagent("vhfcs", 10)
+		reagents.add_reagent("cola", 15)
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/horror
+	name = "Spooky Dan's Horrortastic Cola"
+	desc = "A terrifying Halloween soda.  It's especially frightening if you're diabetic."
+	icon_state = "glowingbeer"
+	New()
+		..()
+		reagents.add_reagent("ectoplasm", 10)
+		reagents.add_reagent("sulfur", 5)
+		reagents.add_reagent("vhfcs", 5)
+		reagents.add_reagent("cola", 20)
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/grones
+	name = "Grones Soda"
+	desc = "Bursting with 10 different flavors!"
+	icon_state = "grones"
+	New()
+		..()
+		reagents.add_reagent("cola", 20)
+		reagents.add_reagent(pick("atropine","serotrotium","lithium","mercury","charcoal","diphenhydramine","spaceacillin","hairgrownium","ephedrine","capsaicin"), 10)
+
+/obj/item/weapon/reagent_containers/food/drinks/cans/decirprevo
+	name = "Decirprevo Bottled Water"
+	desc = "Bottled from our cool natural springs on Europa."
+	icon_state = "waterbottle"
+	New()
+		..()
+		reagents.add_reagent("water", 45)
+		reagents.add_reagent("iodine", 5)

code/modules/reagents/reagent_containers/food/condiment.dm

@@ -51,7 +51,7 @@
 		M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been fed [src.name] by [user.name] ([user.ckey]) Reagents: [reagentlist(src)]</font>")
 		user.attack_log += text("\[[time_stamp()]\] <font color='red'>Fed [src.name] by [M.name] ([M.ckey]) Reagents: [reagentlist(src)]</font>")
 		if(M.ckey)
-			msg_admin_attack("[user.name] ([user.ckey]) fed [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
+			msg_admin_attack("[user.name] ([user.ckey])[isAntag(user) ? "(ANTAG)" : ""] fed [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
 		if(!iscarbon(user))
 			M.LAssailant = null
 		else

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

@@ -235,8 +235,6 @@
 	New()
 		..()
 		reagents.add_reagent("tea", 30)
-		if(prob(10))
-			reagents.add_reagent("mugwort", 3)
 		src.pixel_x = rand(-10.0, 10)
 		src.pixel_y = rand(-10.0, 10)
 
@@ -272,6 +270,30 @@
 		src.pixel_x = rand(-10.0, 10)
 		src.pixel_y = rand(-10.0, 10)
 
+/obj/item/weapon/reagent_containers/food/drinks/chocolate
+	name = "Hot Chocolate"
+	desc = "Made in Space Switzerland."
+	icon_state = "hot_coco"
+	item_state = "coffee"
+	New()
+		..()
+		reagents.add_reagent("chocolate", 45)
+		src.pixel_x = rand(-10.0, 10)
+		src.pixel_y = rand(-10.0, 10)
+
+/obj/item/weapon/reagent_containers/food/drinks/weightloss
+	name = "Weight-Loss Shake"
+	desc = "A shake designed to cause weight loss.  The package proudly proclaims that it is 'tapeworm free.'"
+	icon_state = "coffee"
+	item_state = "coffee"
+	New()
+		..()
+		reagents.add_reagent("lipolicide", 30)
+		reagents.add_reagent("chocolate", 5)
+		src.pixel_x = rand(-10.0, 10)
+		src.pixel_y = rand(-10.0, 10)
+
+
 /obj/item/weapon/reagent_containers/food/drinks/dry_ramen
 	name = "Cup Ramen"
 	desc = "Just add 10ml water, self heats! A taste that reminds you of your school years."
@@ -279,8 +301,6 @@
 	New()
 		..()
 		reagents.add_reagent("dry_ramen", 30)
-		if(prob(10))
-			reagents.add_reagent("enzyme", 3)
 		src.pixel_x = rand(-10.0, 10)
 		src.pixel_y = rand(-10.0, 10)
 
@@ -345,3 +365,211 @@
 	desc = "A cup with the british flag emblazoned on it."
 	icon_state = "britcup"
 	volume = 30
+
+////Stinkeye///   Holy buns don't ever drink this -Fox
+
+/obj/item/weapon/reagent_containers/food/drinks/stinkeye
+	name = "Stinkeye's Special Reserve"
+	desc = "An old bottle labelled 'The Good Stuff'. This probably has enough kick to knock an elephant on its ass."
+	icon_state = "whiskeybottle"
+	volume = 250
+	New()
+		..()
+		reagents.add_reagent("beer", 30)
+		reagents.add_reagent("wine", 30)
+		reagents.add_reagent("cider", 30)
+		reagents.add_reagent("vodka", 30)
+		reagents.add_reagent("ethanol", 30)
+		reagents.add_reagent("eyenewt", 30)
+
+////Discount Dan's Soup//////       May God have mercy on your souls---and stomachs.    -Fox
+
+
+/obj/item/weapon/reagent_containers/food/drinks/dansoup
+	name = "Discount Dan's Quik-Noodles"
+	desc = "A self-heating cup of noodles. There's enough sodium in these to put the Dead Sea to shame."
+	icon_state = "dansoup"
+	volume = 65
+	var/selfheat = 0
+
+/obj/item/weapon/reagent_containers/food/drinks/dansoup/attack_self(mob/user as mob) //self-heating action!
+	if(selfheat)
+		return
+	else
+		selfheat = 1
+		user << "<span class='notice'>You twist the bottom of the cup. The cup emits a soft clack as the heater triggers.</span>"
+		reagents.add_reagent("pyrosium", 2)
+		reagents.add_reagent("oxygen", 2)
+
+/obj/item/weapon/reagent_containers/food/drinks/dansoup/random
+	New()
+		..()
+		var/list/list = typesof(/obj/item/weapon/reagent_containers/food/drinks/dansoup) - list(/obj/item/weapon/reagent_containers/food/drinks/dansoup,/obj/item/weapon/reagent_containers/food/drinks/dansoup/random)
+		var/T = pick(list)
+		new T(loc)
+		spawn(0)
+			del src
+
+/obj/item/weapon/reagent_containers/food/drinks/dansoup/bbq
+	name = "Devil Dan's Quik-Noodles - Brimstone BBQ Flavor"
+	New()
+		..()
+		reagents.add_reagent("chicken_soup", 10)
+		reagents.add_reagent("soybeanoil", 1)
+		reagents.add_reagent("msg", 9)
+		reagents.add_reagent("sodiumchloride", 10)
+		reagents.add_reagent("nicotine", 8)
+		reagents.add_reagent("sulfur", 5)
+		reagents.add_reagent("beff", 5)
+//		reagents.add_reagent("ghostchili", 5)      uncomment once ghost chili juice is added
+
+/obj/item/weapon/reagent_containers/food/drinks/dansoup/macaroni
+	name = "Discount Dan's Quik-Noodles - Macaroni and Imitation Processed Cheese Product Flavor"
+	New()
+		..()
+		reagents.add_reagent("chicken_soup", 10)
+		reagents.add_reagent("soybeanoil", 9)
+		reagents.add_reagent("msg", 9)
+		reagents.add_reagent("sodiumchloride", 10)
+		reagents.add_reagent("nicotine", 8)
+		reagents.add_reagent("fake_cheese", 2)
+
+/obj/item/weapon/reagent_containers/food/drinks/dansoup/beef
+	name = "Comrade Dan's Quik-Noodles - Beef Perestroikanoff Flavor"
+	New()
+		..()
+		reagents.add_reagent("chicken_soup", 10)
+		reagents.add_reagent("soybeanoil", 1)
+		reagents.add_reagent("msg", 9)
+		reagents.add_reagent("sodiumchloride", 10)
+		reagents.add_reagent("nicotine", 8)
+		reagents.add_reagent("milk", 3)
+		reagents.add_reagent("enzyme", 3)
+		reagents.add_reagent("beff", 4)
+
+/obj/item/weapon/reagent_containers/food/drinks/dansoup/teriyaki
+	name = "Discount Deng's Quik-Noodles - Teriyaki TVP Flavor"
+	New()
+		..()
+		reagents.add_reagent("chicken_soup", 10)
+		reagents.add_reagent("hydrogenated_soybeanoil", 1)
+		reagents.add_reagent("msg", 14)
+		reagents.add_reagent("sodiumchloride", 10)
+		reagents.add_reagent("nicotine", 8)
+		reagents.add_reagent("synthflesh", 5)
+
+/obj/item/weapon/reagent_containers/food/drinks/dansoup/gamer
+	name = "Dan's Quik-Noodles - Gamer Grubs Flavor"
+	New()
+		..()
+		reagents.add_reagent("chicken_soup", 10)
+		reagents.add_reagent("soybeanoil", 1)
+		reagents.add_reagent("msg", 9)
+		reagents.add_reagent("sodiumchloride", 10)
+		reagents.add_reagent("nicotine", 8)
+		reagents.add_reagent("????", 10)
+		reagents.add_reagent("potassium", 5)
+
+/obj/item/weapon/reagent_containers/food/drinks/dansoup/mushroom
+	name = "Frycook Dan's Quik-Noodles - Mushroom-Swiss Burger-Bake Flavor"
+	New()
+		..()
+		reagents.add_reagent("chicken_soup", 10)
+		reagents.add_reagent("soybeanoil", 1)
+		reagents.add_reagent("msg", 9)
+		reagents.add_reagent("sodiumchloride", 10)
+		reagents.add_reagent("nicotine", 8)
+		reagents.add_reagent("beff", 2)
+		reagents.add_reagent("weird_cheese", 2)
+		reagents.add_reagent("psilocybin", 6)
+
+/obj/item/weapon/reagent_containers/food/drinks/dansoup/ketchup
+	name = "Frycook Dan's Quik-Noodles - Curly Fry Ketchup Hoedown Flavor"
+	New()
+		..()
+		reagents.add_reagent("chicken_soup", 10)
+		reagents.add_reagent("hydrogenated_soybeanoil", 1)
+		reagents.add_reagent("msg", 9)
+		reagents.add_reagent("sodiumchloride", 10)
+		reagents.add_reagent("nicotine", 8)
+		reagents.add_reagent("tomatojuice", 4)
+		reagents.add_reagent("mugwort", 3)
+		reagents.add_reagent("capsaicin", 3)
+
+/obj/item/weapon/reagent_containers/food/drinks/dansoup/sundae
+	name = "Dessert Dan's Quik-Noodles - Sweet Sundae Noodle Flavor"
+	New()
+		..()
+		reagents.add_reagent("chicken_soup", 10)
+		reagents.add_reagent("soybeanoil", 1)
+		reagents.add_reagent("msg", 9)
+		reagents.add_reagent("sodiumchloride", 10)
+		reagents.add_reagent("nicotine", 8)
+		reagents.add_reagent("vhfcs", 10)
+		reagents.add_reagent("chocolate", 2)
+		reagents.add_reagent("cream", 2)
+		reagents.add_reagent("chocolate_milk", 6)
+
+/obj/item/weapon/reagent_containers/food/drinks/dansoup/tuna
+	name = "Descuento Danito's Quik-Noodles - Tuna Melt Taco Fiesta Flavor"
+	New()
+		..()
+		reagents.add_reagent("chicken_soup", 10)
+		reagents.add_reagent("soybeanoil", 1)
+		reagents.add_reagent("msg", 9)
+		reagents.add_reagent("sodiumchloride", 10)
+		reagents.add_reagent("nicotine", 8)
+		reagents.add_reagent("fake_cheese", 3)
+		reagents.add_reagent("mercury", 3)
+		reagents.add_reagent("capsaicin", 4)
+
+/obj/item/weapon/reagent_containers/food/drinks/dansoup/lomein
+	name = "Discount Deng's Quik-Noodles - Sweet and Sour Lo Mein Flavor"
+	New()
+		..()
+		reagents.add_reagent("chicken_soup", 10)
+		reagents.add_reagent("soybeanoil", 1)
+		reagents.add_reagent("msg", 9)
+		reagents.add_reagent("sodiumchloride", 10)
+		reagents.add_reagent("nicotine", 8)
+		reagents.add_reagent("sacid", 3)
+		reagents.add_reagent("vhfcs", 7)
+
+/obj/item/weapon/reagent_containers/food/drinks/dansoup/crab
+	name = "Pirate Dan's Quik-Noodles - Spicy Imitation Crab Meat Paste Flavor"
+	New()
+		..()
+		reagents.add_reagent("chicken_soup", 10)
+		reagents.add_reagent("soybeanoil", 1)
+		reagents.add_reagent("msg", 9)
+		reagents.add_reagent("sodiumchloride", 10)
+		reagents.add_reagent("nicotine", 8)
+		reagents.add_reagent("synthflesh", 3)
+		reagents.add_reagent("saltpetre", 3)
+		reagents.add_reagent("capsaicin", 14)
+
+/obj/item/weapon/reagent_containers/food/drinks/dansoup/sausage
+	name = "Morning Dan's Quik-Noodles - Mechanically Reclaimed Sausage Biscuit Flavor"
+	New()
+		..()
+		reagents.add_reagent("chicken_soup", 10)
+		reagents.add_reagent("hydrogenated_soybeanoil", 4)
+		reagents.add_reagent("msg", 9)
+		reagents.add_reagent("sodiumchloride", 10)
+		reagents.add_reagent("nicotine", 8)
+		reagents.add_reagent("ammonia", 3)
+		reagents.add_reagent("gravy", 4)
+		reagents.add_reagent("coffee", 3)
+
+/obj/item/weapon/reagent_containers/food/drinks/dansoup/italian
+	name = "Sconto Danilo's Quik-Noodles - Italian Strozzapreti Lunare Flavor"
+	New()
+		..()
+		reagents.add_reagent("chicken_soup", 10)
+		reagents.add_reagent("soybeanoil", 1)
+		reagents.add_reagent("msg", 9)
+		reagents.add_reagent("sodiumchloride", 10)
+		reagents.add_reagent("nicotine", 8)
+		reagents.add_reagent("tomatojuice", 4)
+		reagents.add_reagent("wine", 2)
+		reagents.add_reagent("water", 2)

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

@@ -100,7 +100,7 @@
 	user.attack_log += text("\[[time_stamp()]\] <font color='red'>Has attacked [target.name] ([target.ckey]) with a bottle!</font>")
 	target.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been smashed with a bottle by [user.name] ([user.ckey])</font>")
 	if(target.ckey)
-		msg_admin_attack("[user.name] ([user.ckey]) attacked [target.name] ([target.ckey]) with a bottle. (INTENT: [uppertext(user.a_intent)]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
+		msg_admin_attack("[user.name] ([user.ckey])[isAntag(user) ? "(ANTAG)" : ""] attacked [target.name] ([target.ckey]) with a bottle. (INTENT: [uppertext(user.a_intent)]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
 	if(!iscarbon(user))
 		target.LAssailant = null
 	else

code/modules/reagents/reagent_containers/food/snacks.dm

@@ -799,14 +799,15 @@
 		..()
 		reagents.add_reagent("nutriment", 4)
 
-	var/warm = 0
-	proc/cooltime() //Not working, derp?
-		if (src.warm)
-			spawn( 4200 )
-				src.warm = 0
-				src.reagents.del_reagent("omnizine")
-				src.name = "donk-pocket"
-		return
+/obj/item/weapon/reagent_containers/food/snacks/warmdonkpocket
+	name = "Warm Donk-pocket"
+	desc = "The food of choice for the seasoned traitor."
+	icon_state = "donkpocket"
+	filling_color = "#DEDEAB"
+	New()
+		..()
+		reagents.add_reagent("nutriment", 4)
+		reagents.add_reagent("omnizine", 4)
 
 /obj/item/weapon/reagent_containers/food/snacks/syndidonkpocket
 	name = "Donk-pocket"
@@ -2578,7 +2579,7 @@
 	New()
 		..()
 		reagents.add_reagent("nutriment", 20)
-		reagents.add_reagent("fake_cheese", 5)
+		reagents.add_reagent("cheese", 20)
 		bitesize = 2
 
 /obj/item/weapon/reagent_containers/food/snacks/cheesewedge
@@ -2597,7 +2598,7 @@
 	New()
 		..()
 		reagents.add_reagent("mercury", 5)
-		reagents.add_reagent("mindbreaker", 5)
+		reagents.add_reagent("lsd", 5)
 		reagents.add_reagent("ethanol", 5)
 		reagents.add_reagent("weird_cheese", 5)
 
@@ -3367,4 +3368,119 @@
 	icon_state = "ectoplasm"
 	New()
 		..()
-		reagents.add_reagent("ectoplasm", 10)
+		reagents.add_reagent("ectoplasm", 10)
+
+////Discount Dan's Burritos//////       May God have mercy on your souls---and stomachs.    -Fox
+
+/obj/item/weapon/reagent_containers/food/snacks/danburrito
+	name = "Discount Dan's Burrito"
+	desc = "Quite possibly the worst burrito in all of space."
+	icon_state = "danburrito"
+	bitesize = 10
+	var/selfheat = 0
+
+/obj/item/weapon/reagent_containers/food/snacks/danburrito/attack_self(mob/user as mob) //self-heating action!
+	if(selfheat)
+		return
+	else
+		selfheat = 1
+		user << "<span class='notice'>You crack the burrito like a glow stick, activating the heater mechanism.</span>"
+		reagents.add_reagent("pyrosium", 2)
+		reagents.add_reagent("oxygen", 2)
+
+/obj/item/weapon/reagent_containers/food/snacks/danburrito/random
+	New()
+		..()
+		var/list/list = typesof(/obj/item/weapon/reagent_containers/food/snacks/danburrito) - list(/obj/item/weapon/reagent_containers/food/snacks/danburrito,/obj/item/weapon/reagent_containers/food/snacks/danburrito/random)
+		var/T = pick(list)
+		new T(loc)
+		spawn(0)
+			del src
+
+/obj/item/weapon/reagent_containers/food/snacks/danburrito/pizza
+	name = "Sconto Danilo's Burritos - 50% Real Mozzarella Pepperoni Pizza Party Flavor"
+	desc = "A self-heating pizza burrito."
+	New()
+		..()
+		reagents.add_reagent("soybeanoil", 3)
+		reagents.add_reagent("msg", 9)
+		reagents.add_reagent("fake_cheese", 3)
+		reagents.add_reagent("cheese", 3)
+		reagents.add_reagent("pepperoni", 3)
+
+/obj/item/weapon/reagent_containers/food/snacks/danburrito/pancake
+	name = "Descuento Danito's Burritos - Pancake Sausage Brunch Flavor"
+	desc = "A self-heating breakfast burrito with a buttermilk pancake in lieu of a tortilla. A little frightening."
+	New()
+		..()
+		reagents.add_reagent("hydrogenated_soybeanoil", 3)
+		reagents.add_reagent("msg", 9)
+		reagents.add_reagent("porktonium", 4)
+		reagents.add_reagent("vhfcs", 2)
+		reagents.add_reagent("coffee", 4)
+
+/obj/item/weapon/reagent_containers/food/snacks/danburrito/beans
+	name = "Descuento Danito's Burritos - Spicy Beans and Wieners Ole! Flavor"
+	desc = "A self-heating convenience reinterpretation of Mexican cuisine. The exact mechanism used to heat it is probably best left to speculation."
+	New()
+		..()
+		reagents.add_reagent("soybeanoil", 3)
+		reagents.add_reagent("msg", 9)
+		reagents.add_reagent("lithium", 4)
+		reagents.add_reagent("capsaicin", 6)
+		reagents.add_reagent("beans", 10)
+
+/obj/item/weapon/reagent_containers/food/snacks/danburrito/homestyle
+	name = "Descuento Danito's Burritos - Homestyle Comfort Flavor"
+	desc = "A self-heating burrito just like Mom used to make, if your mother was a souless, automated burrito production line."
+	New()
+		..()
+		reagents.add_reagent("soybeanoil", 3)
+		reagents.add_reagent("msg", 9)
+		reagents.add_reagent("mashedpotatoes", 5)
+		reagents.add_reagent("gravy", 3)
+		reagents.add_reagent("diethylamine", 2)
+
+/obj/item/weapon/reagent_containers/food/snacks/danburrito/texas
+	name = "Spooky Dan's BOO-ritos - Texas Toast Chainsaw Massacre Flavor"
+	desc = "A self-heating burrito.  Isn't that concept scary enough on its own?"
+	New()
+		..()
+		reagents.add_reagent("soybeanoil", 3)
+		reagents.add_reagent("msg", 9)
+		reagents.add_reagent("fake_cheese", 3)
+		reagents.add_reagent("space_drugs", 3)
+//		reagents.add_reagent("cblood", 4)   uncomment once actual changeling blood is added
+
+/obj/item/weapon/reagent_containers/food/snacks/danburrito/beff
+	name = "Descuento Danito's Burritos - Beff and Bean Flavor"
+	desc = "A self-heating convenience reinterpretation of Mexican cuisine. The exact mechanism used to heat it is probably best left to speculation."
+	New()
+		..()
+		reagents.add_reagent("hydrogenated_soybeanoil", 3)
+		reagents.add_reagent("msg", 9)
+		reagents.add_reagent("uranium", 2)
+		reagents.add_reagent("beff", 4)
+		reagents.add_reagent("fake_cheese", 4)
+		reagents.add_reagent("beans", 10)
+
+/obj/item/weapon/reagent_containers/food/snacks/danburrito/nightmare
+	name = "Spooky Dan's BOO-ritos - Nightmare on Elm Meat Flavor"
+	desc = "A self-heating burrito that purports to contain elm-smoked meat. Of some sort. Probably from an animal."
+	New()
+		..()
+		reagents.add_reagent("soybeanoil", 3)
+		reagents.add_reagent("msg", 9)
+		reagents.add_reagent("beff", 3)
+		reagents.add_reagent("synthflesh", 2)
+		reagents.add_reagent("tonguedog", 9)
+
+/obj/item/weapon/reagent_containers/food/snacks/danburrito/strawberry
+	name = "Descuento Danito's Burritos - Strawberrito Churro Flavor"
+	desc = "There is no way anyone could possibly justify this."
+	New()
+		..()
+		reagents.add_reagent("soybeanoil", 3)
+		reagents.add_reagent("msg", 9)
+		reagents.add_reagent("vhfcs", 8)
+		reagents.add_reagent("oil", 2)

code/modules/reagents/reagent_containers/food/snacks/candy.dm

@@ -718,7 +718,7 @@
 
 	New()
 		..()
-		reagents.add_reagent("lexorin", 20)
+		reagents.add_reagent("sulfonal", 20)
 		reagents.del_reagent("sugar")
 		reagents.update_total()
 		bitesize = 4

code/modules/reagents/reagent_containers/glass_containers.dm

@@ -88,7 +88,7 @@
 			M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been splashed with [src.name] by [user.name] ([user.ckey]). Reagents: [contained]</font>")
 			user.attack_log += text("\[[time_stamp()]\] <font color='red'>Used the [src.name] to splash [M.name] ([M.key]). Reagents: [contained]</font>")
 			if(M.ckey)
-				msg_admin_attack("[user.name] ([user.ckey]) splashed [M.name] ([M.key]) with [src.name]. Reagents: [contained] (INTENT: [uppertext(user.a_intent)]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
+				msg_admin_attack("[user.name] ([user.ckey])[isAntag(user) ? "(ANTAG)" : ""] splashed [M.name] ([M.key]) with [src.name]. Reagents: [contained] (INTENT: [uppertext(user.a_intent)]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
 			if(!iscarbon(user))
 				M.LAssailant = null
 			else
@@ -148,6 +148,9 @@
 		else if(istype(target, /obj/machinery/radiocarbon_spectrometer))
 			return
 
+		else if(istype(target, /obj/effect/decal/cleanable)) //stops splashing while scooping up fluids
+			return
+
 		else if(reagents.total_volume)
 			user << "\blue You splash the solution onto [target]."
 			src.reagents.reaction(target, TOUCH)

code/modules/reagents/reagent_containers/hypospray.dm

@@ -40,7 +40,7 @@
 			M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been injected with [src.name] by [user.name] ([user.ckey]). Reagents: [contained]</font>")
 			user.attack_log += text("\[[time_stamp()]\] <font color='red'>Used the [src.name] to inject [M.name] ([M.key]). Reagents: [contained]</font>")
 			if(M.ckey)
-				msg_admin_attack("[user.name] ([user.ckey]) injected [M.name] ([M.key]) with [src.name]. Reagents: [contained] (INTENT: [uppertext(user.a_intent)]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
+				msg_admin_attack("[user.name] ([user.ckey])[isAntag(user) ? "(ANTAG)" : ""] injected [M.name] ([M.key]) with [src.name]. Reagents: [contained] (INTENT: [uppertext(user.a_intent)]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
 			if(!iscarbon(user))
 				M.LAssailant = null
 			else

code/modules/reagents/reagent_containers/pill.dm

@@ -46,7 +46,7 @@
 			M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been fed [src.name] by [user.name] ([user.ckey]) Reagents: [reagentlist(src)]</font>")
 			user.attack_log += text("\[[time_stamp()]\] <font color='red'>Fed [M.name] by [M.name] ([M.ckey]) Reagents: [reagentlist(src)]</font>")
 			if(M.ckey)
-				msg_admin_attack("[user.name] ([user.ckey]) fed [M.name] ([M.ckey]) with [src.name] Reagents: [reagentlist(src)] (INTENT: [uppertext(user.a_intent)]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
+				msg_admin_attack("[user.name] ([user.ckey])[isAntag(user) ? "(ANTAG)" : ""] fed [M.name] ([M.ckey]) with [src.name] Reagents: [reagentlist(src)] (INTENT: [uppertext(user.a_intent)]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
 			if(!iscarbon(user))
 				M.LAssailant = null
 			else

code/modules/reagents/reagent_containers/robodropper.dm

@@ -81,7 +81,7 @@
 				M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been squirted with [src.name] by [user.name] ([user.ckey]). Reagents: [contained]</font>")
 				user.attack_log += text("\[[time_stamp()]\] <font color='red'>Used the [src.name] to squirt [M.name] ([M.key]). Reagents: [contained]</font>")
 				if(M.ckey)
-					msg_admin_attack("[user.name] ([user.ckey]) squirted [M.name] ([M.key]) with [src.name]. Reagents: [contained] (INTENT: [uppertext(user.a_intent)]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
+					msg_admin_attack("[user.name] ([user.ckey])[isAntag(user) ? "(ANTAG)" : ""] squirted [M.name] ([M.key]) with [src.name]. Reagents: [contained] (INTENT: [uppertext(user.a_intent)]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
 				if(!iscarbon(user))
 					M.LAssailant = null
 				else

code/modules/reagents/reagent_containers/syringes.dm

@@ -189,7 +189,7 @@
 						M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been injected with [src.name] by [user.name] ([user.ckey]). Reagents: [contained]</font>")
 						user.attack_log += text("\[[time_stamp()]\] <font color='red'>Used the [src.name] to inject [M.name] ([M.key]). Reagents: [contained]</font>")
 						if(M.ckey)
-							msg_admin_attack("[user.name] ([user.ckey]) injected [M.name] ([M.key]) with [src.name]. Reagents: [contained] (INTENT: [uppertext(user.a_intent)]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
+							msg_admin_attack("[user.name] ([user.ckey])[isAntag(user) ? "(ANTAG)" : ""] injected [M.name] ([M.key]) with [src.name]. Reagents: [contained] (INTENT: [uppertext(user.a_intent)]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
 						if(!iscarbon(user))
 							M.LAssailant = null
 						else
@@ -274,7 +274,7 @@
 		user.attack_log += "\[[time_stamp()]\]<font color='red'> Attacked [target.name] ([target.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)])</font>"
 		target.attack_log += "\[[time_stamp()]\]<font color='orange'> Attacked by [user.name] ([user.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)])</font>"
 		if(target.ckey)
-			msg_admin_attack("[user.name] ([user.ckey]) attacked [target.name] ([target.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
+			msg_admin_attack("[user.name] ([user.ckey])[isAntag(user) ? "(ANTAG)" : ""] attacked [target.name] ([target.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
 		if(!iscarbon(user))
 			target.LAssailant = null
 		else

code/modules/reagents/reagent_dispenser.dm

@@ -135,7 +135,7 @@
 
 			var/obj/item/device/assembly_holder/H = W
 			if (istype(H.a_left,/obj/item/device/assembly/igniter) || istype(H.a_right,/obj/item/device/assembly/igniter))
-				msg_admin_attack("[key_name_admin(user)] rigged fueltank at ([loc.x],[loc.y],[loc.z]) for explosion.")
+				msg_admin_attack("[key_name_admin(user)][isAntag(user) ? "(ANTAG)" : ""] rigged fueltank at ([loc.x],[loc.y],[loc.z]) for explosion.")
 				log_game("[key_name(user)] rigged fueltank at ([loc.x],[loc.y],[loc.z]) for explosion.")
 
 				rig = W