Merge remote-tracking branch 'upstream/master' into arcade-carpets

code/modules/reagents/chemistry/machinery/smoke_machine.dm

@@ -32,14 +32,13 @@
 /obj/machinery/smoke_machine/Initialize()
 	. = ..()
 	create_reagents(REAGENTS_BASE_VOLUME)
-	// AddComponent(/datum/component/plumbing/simple_demand)
 	for(var/obj/item/stock_parts/matter_bin/B in component_parts)
 		reagents.maximum_volume += REAGENTS_BASE_VOLUME * B.rating
+	AddComponent(/datum/component/plumbing/simple_demand)
 
 /obj/machinery/smoke_machine/ComponentInitialize()
 	. = ..()
 	AddComponent(/datum/component/simple_rotation, ROTATION_ALTCLICK | ROTATION_CLOCKWISE | ROTATION_COUNTERCLOCKWISE | ROTATION_VERBS, null, CALLBACK(src, .proc/can_be_rotated))
-	AddComponent(/datum/component/plumbing/simple_demand) //this SURELY	 CANT' LEAD TO BAD THINGS HAPPENING.
 
 /obj/machinery/smoke_machine/proc/can_be_rotated(mob/user, rotation_type)
 	return !anchored

code/modules/reagents/chemistry/recipes/pyrotechnics.dm

@@ -114,12 +114,9 @@
 
 /datum/chemical_reaction/emp_pulse/on_reaction(datum/reagents/holder, multiplier)
 	var/location = get_turf(holder.my_atom)
-	// 100 multiplier = 4 heavy range & 7 light range. A few tiles smaller than traitor EMP grandes.
-	// 200 multiplier = 8 heavy range & 14 light range. 4 tiles larger than traitor EMP grenades.
-	empulse(location, round(multiplier / 12), round(multiplier / 7), 1)
+	empulse(location, multiplier)
 	holder.clear_reagents()
 
-
 /datum/chemical_reaction/beesplosion
 	name = "Bee Explosion"
 	id = "beesplosion"

code/modules/reagents/chemistry/recipes/slime_extracts.dm

@@ -296,7 +296,7 @@
 	required_other = TRUE
 
 /datum/chemical_reaction/slime/slimeoverload/on_reaction(datum/reagents/holder, multiplier)
-	empulse(get_turf(holder.my_atom), 3, 7)
+	empulse_using_range(get_turf(holder.my_atom), 10)
 	..()
 
 /datum/chemical_reaction/slime/slimecell