Merge pull request #2058 from Fox-McCloud/cluster-grenade-cleanup

Cluster Grenade Cleanup

code/modules/reagents/oldchem/reagents/reagents_flammable.dm

@@ -40,38 +40,6 @@
 		M.adjustBruteLoss(2)
 	holder.remove_reagent(src.id, 1)
 
-
-/datum/reagent/incendiary_fuel //copy-pasta of welding fuel; allow incendiary grenades to function better without the headache of people spraying fuel everywhere with regular welding fuel.
-	name = "Incendiary fuel"
-	id = "incendiaryfuel"
-	description = "A highly flammable compound used in incendiary grenades."
-	reagent_state = LIQUID
-	color = "#660000" // rgb: 102, 0, 0
-
-/datum/reagent/incendiary_fuel/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume)//Splashing people with welding fuel to make them easy to ignite!
-	if(!istype(M, /mob/living))
-		return
-	if(method == TOUCH)
-		M.adjust_fire_stacks(volume / 10)
-	return
-
-/datum/reagent/incendiary_fuel/reaction_obj(var/obj/O, var/volume)
-	var/turf/the_turf = get_turf(O)
-	if(!the_turf)
-		return //No sense trying to start a fire if you don't have a turf to set on fire. --NEO
-	new /obj/effect/decal/cleanable/liquid_fuel(the_turf, volume)
-
-/datum/reagent/incendiary_fuel/reaction_turf(var/turf/T, var/volume)
-	new /obj/effect/decal/cleanable/liquid_fuel(T, volume)
-	return
-
-/datum/reagent/incendiary_fuel/on_mob_life(var/mob/living/M as mob)
-	if(!M) M = holder.my_atom
-	M.adjustToxLoss(1)
-	..()
-	return
-
-
 /datum/reagent/plasma
 	name = "Plasma"
 	id = "plasma"

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

@@ -9,12 +9,12 @@
 	item_state = "beaker"
 	New()
 		..()
-		reagents.add_reagent("slime", 50)
+		reagents.add_reagent("slimejelly", 50)
 
 	on_reagent_change()
 		if (reagents.reagent_list.len > 0)
 			switch(reagents.get_master_reagent_id())
-				if("slime")
+				if("slimejelly")
 					icon_state = "jar_slime"
 					name = "slime jam"
 					desc = "A jar of slime jam. Delicious!"