This should resolve conflicts and not fail to compile woo woo

code/game/objects/effects/anomalies.dm

@@ -27,7 +27,7 @@
 
 
 /obj/effect/anomaly/proc/anomalyNeutralize()
-	PoolOrNew(/obj/effect/effect/smoke/bad, loc)
+	PoolOrNew(/obj/effect/particle_effect/smoke/bad, loc)
 
 	for(var/atom/movable/O in src)
 		O.loc = src.loc

code/game/objects/effects/decals/Cleanable/robots.dm

@@ -22,7 +22,7 @@
 				if (prob(40))
 					new /obj/effect/decal/cleanable/oil/streak(src.loc)
 				else if (prob(10))
-					var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
+					var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
 					s.set_up(3, 1, src)
 					s.start()
 			if (step_to(src, get_step(src, direction), 0))

code/game/objects/effects/effect_system/effect_system.dm

@@ -6,56 +6,67 @@ would spawn and follow the beaker, even if it is carried or thrown.
 */
 
 
-/obj/effect/effect
-	name = "effect"
+/obj/effect/particle_effect
+	name = "particle effect"
 	icon = 'icons/effects/effects.dmi'
 	mouse_opacity = 0
-	unacidable = 1//So effect are not targeted by alien acid.
+	unacidable = 1//So effects are not targeted by alien acid.
 	pass_flags = PASSTABLE | PASSGRILLE
 
-/obj/effect/effect/New()
+/obj/effect/particle_effect/New()
 	..()
 	if(ticker)
 		cameranet.updateVisibility(src)
 
-/obj/effect/effect/Destroy()
+/obj/effect/particle_effect/Destroy()
 	if(ticker)
 		cameranet.updateVisibility(src)
 	..()
 	return QDEL_HINT_PUTINPOOL
-/*
-/datum/effect/effect/proc/fadeOut(var/atom/A, var/frames = 16)
-	if(A.alpha == 0) //Handle already transparent case
-		return
-	if(frames == 0)
-		frames = 1 //We will just assume that by 0 frames, the coder meant "during one frame".
-	var/step = A.alpha / frames
-	for(var/i = 0, i < frames, i++)
-		A.alpha -= step
-		sleep(world.tick_lag)
-	return
-*/
-/datum/effect/effect/system
+
+/datum/effect_system
 	var/number = 3
 	var/cardinals = 0
 	var/turf/location
 	var/atom/holder
-	var/setup = 0
+	var/effect_type
+	var/total_effects = 0
 
-/datum/effect/effect/system/Destroy()
+/datum/effect_system/Destroy()
 	holder = null
 	location = null
 	return ..()
 
-/datum/effect/effect/system/proc/set_up(n = 3, c = 0, turf/loc)
+/datum/effect_system/proc/set_up(n = 3, c = 0, loca)
 	if(n > 10)
 		n = 10
 	number = n
 	cardinals = c
-	location = loc
-	setup = 1
+	if(isturf(loca))
+		location = loca
+	else
+		location = get_turf(loca)
 
-/datum/effect/effect/system/proc/attach(atom/atom)
+/datum/effect_system/proc/attach(atom/atom)
 	holder = atom
 
-/datum/effect/effect/system/proc/start()
+/datum/effect_system/proc/start()
+	for(var/i in 1 to number)
+		if(total_effects > 20)
+			return
+		spawn(0)
+			if(holder)
+				location = get_turf(holder)
+			var/obj/effect/E = PoolOrNew(effect_type, location)
+			total_effects++
+			var/direction
+			if(cardinals)
+				direction = pick(cardinal)
+			else
+				direction = pick(alldirs)
+			var/steps_amt = pick(1,2,3)
+			for(var/j in 1 to steps_amt)
+				sleep(5)
+				step(E,direction)
+			spawn(20)
+				total_effects--

code/game/objects/effects/effect_system/effects_explosion.dm

@@ -0,0 +1,57 @@
+/obj/effect/particle_effect/expl_particles
+	name = "fire"
+	icon_state = "explosion_particle"
+	opacity = 1
+	anchored = 1
+
+/obj/effect/particle_effect/expl_particles/New()
+	..()
+	spawn (15)
+		qdel(src)
+
+/datum/effect_system/expl_particles
+	number = 10
+
+/datum/effect_system/expl_particles/start()
+	for(var/i in 1 to number)
+		spawn(0)
+			var/obj/effect/particle_effect/expl_particles/expl = new /obj/effect/particle_effect/expl_particles(location)
+			var/direct = pick(alldirs)
+			var/steps_amt = pick(1;25,2;50,3,4;200)
+			for(var/j in 1 to steps_amt)
+				sleep(1)
+				step(expl,direct)
+
+/obj/effect/explosion
+	name = "fire"
+	icon = 'icons/effects/96x96.dmi'
+	icon_state = "explosion"
+	opacity = 1
+	anchored = 1
+	mouse_opacity = 0
+	pixel_x = -32
+	pixel_y = -32
+
+/obj/effect/explosion/New()
+	..()
+	spawn (10)
+		qdel(src)
+	return
+
+/datum/effect_system/explosion
+
+/datum/effect_system/explosion/set_up(loca)
+	if(isturf(loca))
+		location = loca
+	else
+		location = get_turf(loca)
+
+/datum/effect_system/explosion/start()
+	new/obj/effect/explosion( location )
+	var/datum/effect_system/expl_particles/P = new/datum/effect_system/expl_particles()
+	P.set_up(10, 0, location)
+	P.start()
+	spawn(5)
+		var/datum/effect_system/smoke_spread/S = new
+		S.set_up(2, location)
+		S.start()

code/game/objects/effects/effect_system/effects_foam.dm

@@ -1,7 +1,7 @@
 // Foam
 // Similar to smoke, but slower and mobs absorb its reagent through their exposed skin.
 
-/obj/effect/effect/foam
+/obj/effect/particle_effect/foam
 	name = "foam"
 	icon_state = "foam"
 	opacity = 0
@@ -15,29 +15,29 @@
 	var/lifetime = 6
 
 
-/obj/effect/effect/foam/metal
+/obj/effect/particle_effect/foam/metal
 	name = "aluminium foam"
 	metal = 1
 	icon_state = "mfoam"
 
 
-/obj/effect/effect/foam/metal/iron
+/obj/effect/particle_effect/foam/metal/iron
 	name = "iron foam"
 	metal = 2
 
 
-/obj/effect/effect/foam/New(loc)
+/obj/effect/particle_effect/foam/New(loc)
 	..(loc)
 	create_reagents(1000) //limited by the size of the reagent holder anyway.
 	SSobj.processing |= src
 	playsound(src, 'sound/effects/bubbles2.ogg', 80, 1, -3)
 
-/obj/effect/effect/foam/Destroy()
+/obj/effect/particle_effect/foam/Destroy()
 	SSobj.processing.Remove(src)
 	return ..()
 
 
-/obj/effect/effect/foam/proc/kill_foam()
+/obj/effect/particle_effect/foam/proc/kill_foam()
 	SSobj.processing.Remove(src)
 	if(metal)
 		var/obj/structure/foamedmetal/M = new(src.loc)
@@ -48,7 +48,7 @@
 		qdel(src)
 
 
-/obj/effect/effect/foam/process()
+/obj/effect/particle_effect/foam/process()
 	lifetime--
 	if(lifetime < 1)
 		kill_foam()
@@ -71,7 +71,7 @@
 		return
 	spread_foam()
 
-/obj/effect/effect/foam/proc/foam_mob(mob/living/L)
+/obj/effect/particle_effect/foam/proc/foam_mob(mob/living/L)
 	if(lifetime<1)
 		return 0
 	if(!istype(L))
@@ -81,66 +81,66 @@
 	lifetime--
 	return 1
 
-/obj/effect/effect/foam/Crossed(atom/movable/AM)
+/obj/effect/particle_effect/foam/Crossed(atom/movable/AM)
 	if(istype(AM, /mob/living/carbon))
 		var/mob/living/carbon/M = AM
 		M.slip(5, 2, src)
 
-/obj/effect/effect/foam/metal/Crossed(atom/movable/AM)
+/obj/effect/particle_effect/foam/metal/Crossed(atom/movable/AM)
 	return
 
 
-/obj/effect/effect/foam/proc/spread_foam()
+/obj/effect/particle_effect/foam/proc/spread_foam()
 	var/turf/t_loc = get_turf(src)
 	for(var/turf/T in t_loc.GetAtmosAdjacentTurfs())
-		var/obj/effect/effect/foam/foundfoam = locate() in T //Don't spread foam where there's already foam!
+		var/obj/effect/particle_effect/foam/foundfoam = locate() in T //Don't spread foam where there's already foam!
 		if(foundfoam)
 			continue
 
 		for(var/mob/living/L in T)
 			foam_mob(L)
-		var/obj/effect/effect/foam/F = PoolOrNew(src.type, T)
+		var/obj/effect/particle_effect/foam/F = PoolOrNew(src.type, T)
 		F.amount = amount
 		reagents.copy_to(F, (reagents.total_volume))
 		F.color = color
 		F.metal = metal
 
 
-/obj/effect/effect/foam/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
+/obj/effect/particle_effect/foam/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
 	if(prob(max(0, exposed_temperature - 475))) //foam dissolves when heated
 		kill_foam()
 
 
-/obj/effect/effect/foam/metal/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
+/obj/effect/particle_effect/foam/metal/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
 	return
 
 
 ///////////////////////////////////////////////
 //FOAM EFFECT DATUM
-/datum/effect/effect/system/foam_spread
+/datum/effect_system/foam_spread
 	var/amount = 10		// the size of the foam spread.
 	var/obj/chemholder
-	var/obj/effect/effect/foam/foamtype = /obj/effect/effect/foam
+	effect_type = /obj/effect/particle_effect/foam
 	var/metal = 0
 
 
-/datum/effect/effect/system/foam_spread/metal
-	foamtype = /obj/effect/effect/foam/metal
+/datum/effect_system/foam_spread/metal
+	effect_type = /obj/effect/particle_effect/foam/metal
 
 
-/datum/effect/effect/system/foam_spread/New()
+/datum/effect_system/foam_spread/New()
 	..()
 	chemholder = PoolOrNew(/obj)
 	var/datum/reagents/R = new/datum/reagents(1000)
 	chemholder.reagents = R
 	R.my_atom = chemholder
 
-/datum/effect/effect/system/foam_spread/Destroy()
+/datum/effect_system/foam_spread/Destroy()
 	qdel(chemholder)
 	chemholder = null
 	return ..()
 
-/datum/effect/effect/system/foam_spread/set_up(amt=5, loca, datum/reagents/carry = null)
+/datum/effect_system/foam_spread/set_up(amt=5, loca, datum/reagents/carry = null)
 	if(istype(loca, /turf/))
 		location = loca
 	else
@@ -149,16 +149,16 @@
 	amount = round(sqrt(amt / 2), 1)
 	carry.copy_to(chemholder, 4*carry.total_volume) //The foam holds 4 times the total reagents volume for balance purposes.
 
-/datum/effect/effect/system/foam_spread/metal/set_up(amt=5, loca, datum/reagents/carry = null, metaltype)
+/datum/effect_system/foam_spread/metal/set_up(amt=5, loca, datum/reagents/carry = null, metaltype)
 	..()
 	metal = metaltype
 
-/datum/effect/effect/system/foam_spread/start()
-	var/obj/effect/effect/foam/foundfoam = locate() in location
+/datum/effect_system/foam_spread/start()
+	var/obj/effect/particle_effect/foam/foundfoam = locate() in location
 	if(foundfoam)//If there was already foam where we start, we add our foaminess to it.
 		foundfoam.amount += amount
 	else
-		var/obj/effect/effect/foam/F = PoolOrNew(foamtype, location)
+		var/obj/effect/particle_effect/foam/F = PoolOrNew(effect_type, location)
 		var/foamcolor = mix_color_from_reagents(chemholder.reagents.reagent_list)
 		chemholder.reagents.copy_to(F, chemholder.reagents.total_volume/amount)
 		F.color = foamcolor

code/game/objects/effects/effect_system/effects_other.dm

@@ -1,83 +1,114 @@
 
 /////////////////////////////////////////////
-//////// Attach an Ion trail to any object, that spawns when it moves (like for the jetpack)
+//////// Attach a trail to any object, that spawns when it moves (like for the jetpack)
 /// just pass in the object to attach it to in set_up
 /// Then do start() to start it and stop() to stop it, obviously
 /// and don't call start() in a loop that will be repeated otherwise it'll get spammed!
 /////////////////////////////////////////////
 
-/obj/effect/effect/ion_trails
-	name = "ion trails"
-	icon_state = "ion_trails"
-	anchored = 1
-
-/datum/effect/effect/system/ion_trail_follow
+/datum/effect_system/trail_follow
 	var/turf/oldposition
 	var/processing = 1
 	var/on = 1
 
-/datum/effect/effect/system/ion_trail_follow/Destroy()
+/datum/effect_system/trail_follow/set_up(atom/atom)
+	attach(atom)
+	oldposition = get_turf(atom)
+
+/datum/effect_system/trail_follow/Destroy()
 	oldposition = null
 	return ..()
 
-/datum/effect/effect/system/ion_trail_follow/set_up(atom/atom)
-	attach(atom)
+/datum/effect_system/trail_follow/proc/stop()
+	processing = 0
+	on = 0
+	oldposition = null
 
+/datum/effect_system/trail_follow/steam
+	effect_type = /obj/effect/particle_effect/steam
 
-/datum/effect/effect/system/ion_trail_follow/start() //Whoever is responsible for this abomination of code should become an hero
-	if(!src.on)
-		src.on = 1
-		src.processing = 1
-	if(src.processing)
-		src.processing = 0
-		var/turf/T = get_turf(src.holder)
-		if(T != src.oldposition)
+/datum/effect_system/trail_follow/steam/start()
+	if(!on)
+		on = 1
+		processing = 1
+		if(!oldposition)
+			oldposition = get_turf(holder)
+	if(processing)
+		processing = 0
+		if(number < 3)
+			var/obj/effect/particle_effect/steam/I = PoolOrNew(/obj/effect/particle_effect/steam, oldposition)
+			number++
+			I.dir = holder.dir
+			oldposition = get_turf(holder)
+			spawn(10)
+				qdel(I)
+				number--
+		spawn(2)
+			if(on)
+				processing = 1
+				start()
+
+/obj/effect/particle_effect/ion_trails
+	name = "ion trails"
+	icon_state = "ion_trails"
+	anchored = 1
+
+/datum/effect_system/trail_follow/ion
+	effect_type = /obj/effect/particle_effect/ion_trails
+
+/datum/effect_system/trail_follow/ion/start() //Whoever is responsible for this abomination of code should become an hero
+	if(!on)
+		on = 1
+		processing = 1
+		if(!oldposition)
+			oldposition = get_turf(holder)
+	if(processing)
+		processing = 0
+		var/turf/T = get_turf(holder)
+		if(T != oldposition)
 			if(!has_gravity(T))
-				var/obj/effect/effect/ion_trails/I = PoolOrNew(/obj/effect/effect/ion_trails, oldposition)
-				I.dir = src.holder.dir
+				var/obj/effect/particle_effect/ion_trails/I = PoolOrNew(effect_type, oldposition)
+				I.dir = holder.dir
 				flick("ion_fade", I)
 				I.icon_state = ""
-				spawn( 20 )
+				spawn(20)
 					qdel(I)
-			src.oldposition = T
+			oldposition = T
 		spawn(2)
-			if(src.on)
-				src.processing = 1
-				src.start()
+			if(on)
+				processing = 1
+				start()
 
-/datum/effect/effect/system/ion_trail_follow/proc/stop()
-	src.processing = 0
-	src.on = 0
-	oldposition = null
 
 
 
 //Reagent-based explosion effect
-/datum/effect/effect/system/reagents_explosion
+
+/datum/effect_system/reagents_explosion
 	var/amount 						// TNT equivalent
 	var/flashing = 0			// does explosion creates flash effect?
 	var/flashing_factor = 0		// factor of how powerful the flash effect relatively to the explosion
 	var/explosion_message = 1				//whether we show a message to mobs.
 
-/datum/effect/effect/system/reagents_explosion/set_up (amt, loc, flash = 0, flash_fact = 0, message = 1)
+/datum/effect_system/reagents_explosion/set_up(amt, loca, flash = 0, flash_fact = 0, message = 1)
 	amount = amt
 	explosion_message = message
-	if(istype(loc, /turf/))
-		location = loc
+	if(isturf(loca))
+		location = loca
 	else
-		location = get_turf(loc)
+		location = get_turf(loca)
 
 	flashing = flash
 	flashing_factor = flash_fact
 
 	return
 
-/datum/effect/effect/system/reagents_explosion/start()
+/datum/effect_system/reagents_explosion/start()
 	if(explosion_message)
 		location.visible_message("<span class='danger'>The solution violently explodes!</span>", \
 								"<span class='italics'>You hear an explosion!</span>")
 	if (amount <= 2)
-		var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
+		var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
 		s.set_up(2, 1, location)
 		s.start()
 

code/game/objects/effects/effect_system/effects_smoke.dm

@@ -2,7 +2,7 @@
 //// SMOKE SYSTEMS
 /////////////////////////////////////////////
 
-/obj/effect/effect/smoke
+/obj/effect/particle_effect/smoke
 	name = "smoke"
 	icon = 'icons/effects/96x96.dmi'
 	icon_state = "smoke"
@@ -17,7 +17,7 @@
 	var/opaque = 1 //whether the smoke can block the view when in enough amount
 
 
-/obj/effect/effect/smoke/proc/fade_out(frames = 16)
+/obj/effect/particle_effect/smoke/proc/fade_out(frames = 16)
 	if(alpha == 0) //Handle already transparent case
 		return
 	if(frames == 0)
@@ -27,24 +27,24 @@
 		alpha -= step
 		sleep(world.tick_lag)
 
-/obj/effect/effect/smoke/New()
+/obj/effect/particle_effect/smoke/New()
 	..()
 	create_reagents(500)
 	SSobj.processing |= src
 
 
-/obj/effect/effect/smoke/Destroy()
+/obj/effect/particle_effect/smoke/Destroy()
 	SSobj.processing.Remove(src)
 	return ..()
 
-/obj/effect/effect/smoke/proc/kill_smoke()
+/obj/effect/particle_effect/smoke/proc/kill_smoke()
 	SSobj.processing.Remove(src)
 	spawn(0)
 		fade_out()
 	spawn(10)
 		qdel(src)
 
-/obj/effect/effect/smoke/process()
+/obj/effect/particle_effect/smoke/process()
 	lifetime--
 	if(lifetime < 1)
 		kill_smoke()
@@ -53,7 +53,7 @@
 		smoke_mob(L)
 	return 1
 
-/obj/effect/effect/smoke/proc/smoke_mob(mob/living/carbon/C)
+/obj/effect/particle_effect/smoke/proc/smoke_mob(mob/living/carbon/C)
 	if(!istype(C))
 		return 0
 	if(lifetime<1)
@@ -68,16 +68,16 @@
 			C.smoke_delay = 0
 	return 1
 
-/obj/effect/effect/smoke/proc/spread_smoke()
+/obj/effect/particle_effect/smoke/proc/spread_smoke()
 	var/turf/t_loc = get_turf(src)
 	var/list/newsmokes = list()
 	for(var/turf/T in t_loc.GetAtmosAdjacentTurfs())
-		var/obj/effect/effect/smoke/foundsmoke = locate() in T //Don't spread smoke where there's already smoke!
+		var/obj/effect/particle_effect/smoke/foundsmoke = locate() in T //Don't spread smoke where there's already smoke!
 		if(foundsmoke)
 			continue
 		for(var/mob/living/L in T)
 			smoke_mob(L)
-		var/obj/effect/effect/smoke/S = new type(T)
+		var/obj/effect/particle_effect/smoke/S = new type(T)
 		reagents.copy_to(S, reagents.total_volume)
 		S.dir = pick(cardinal)
 		S.amount = amount-1
@@ -90,25 +90,25 @@
 
 	if(newsmokes.len)
 		spawn(1) //the smoke spreads rapidly but not instantly
-			for(var/obj/effect/effect/smoke/SM in newsmokes)
+			for(var/obj/effect/particle_effect/smoke/SM in newsmokes)
 				SM.spread_smoke()
 
 
-/datum/effect/effect/system/smoke_spread
+/datum/effect_system/smoke_spread
 	var/amount = 10
-	var/smoke_type = /obj/effect/effect/smoke
+	effect_type = /obj/effect/particle_effect/smoke
 
-/datum/effect/effect/system/smoke_spread/set_up(radius = 5, loca)
+/datum/effect_system/smoke_spread/set_up(radius = 5, loca)
 	if(isturf(loca))
 		location = loca
 	else
 		location = get_turf(loca)
 	amount = radius
 
-/datum/effect/effect/system/smoke_spread/start()
+/datum/effect_system/smoke_spread/start()
 	if(holder)
 		location = get_turf(holder)
-	var/obj/effect/effect/smoke/S = new smoke_type(location)
+	var/obj/effect/particle_effect/smoke/S = new effect_type(location)
 	S.amount = amount
 	if(S.amount)
 		S.spread_smoke()
@@ -118,17 +118,17 @@
 // Bad smoke
 /////////////////////////////////////////////
 
-/obj/effect/effect/smoke/bad
+/obj/effect/particle_effect/smoke/bad
 	lifetime = 8
 
-/obj/effect/effect/smoke/bad/smoke_mob(mob/living/carbon/M)
+/obj/effect/particle_effect/smoke/bad/smoke_mob(mob/living/carbon/M)
 	if(..())
 		M.drop_item()
 		M.adjustOxyLoss(1)
 		M.emote("cough")
 		return 1
 
-/obj/effect/effect/smoke/bad/CanPass(atom/movable/mover, turf/target, height=0)
+/obj/effect/particle_effect/smoke/bad/CanPass(atom/movable/mover, turf/target, height=0)
 	if(height==0) return 1
 	if(istype(mover, /obj/item/projectile/beam))
 		var/obj/item/projectile/beam/B = mover
@@ -137,23 +137,23 @@
 
 
 
-/datum/effect/effect/system/smoke_spread/bad
-	smoke_type = /obj/effect/effect/smoke/bad
+/datum/effect_system/smoke_spread/bad
+	effect_type = /obj/effect/particle_effect/smoke/bad
 
 /////////////////////////////////////////////
 // Nanofrost smoke
 /////////////////////////////////////////////
 
-/obj/effect/effect/smoke/freezing
+/obj/effect/particle_effect/smoke/freezing
 	name = "nanofrost smoke"
 	color = "#B2FFFF"
 	opaque = 0
 
-/datum/effect/effect/system/smoke_spread/freezing
-	smoke_type = /obj/effect/effect/smoke/freezing
+/datum/effect_system/smoke_spread/freezing
+	effect_type = /obj/effect/particle_effect/smoke/freezing
 	var/blast = 0
 
-/datum/effect/effect/system/smoke_spread/freezing/proc/Chilled(atom/A)
+/datum/effect_system/smoke_spread/freezing/proc/Chilled(atom/A)
 	if(istype(A, /turf/simulated))
 		var/turf/simulated/T = A
 		if(T.air)
@@ -177,11 +177,11 @@
 			Item.extinguish()
 	return
 
-/datum/effect/effect/system/smoke_spread/freezing/set_up(radius = 5, loca, blasting = 0)
+/datum/effect_system/smoke_spread/freezing/set_up(radius = 5, loca, blasting = 0)
 	..()
 	blast = blasting
 
-/datum/effect/effect/system/smoke_spread/freezing/start()
+/datum/effect_system/smoke_spread/freezing/start()
 	if(blast)
 		for(var/turf/T in trange(2, location))
 			Chilled(T)
@@ -193,29 +193,29 @@
 // Sleep smoke
 /////////////////////////////////////////////
 
-/obj/effect/effect/smoke/sleeping
+/obj/effect/particle_effect/smoke/sleeping
 	color = "#9C3636"
 	lifetime = 10
 
-/obj/effect/effect/smoke/sleeping/smoke_mob(mob/living/carbon/M)
+/obj/effect/particle_effect/smoke/sleeping/smoke_mob(mob/living/carbon/M)
 	if(..())
 		M.drop_item()
 		M.sleeping = max(M.sleeping,10)
 		M.emote("cough")
 		return 1
 
-/datum/effect/effect/system/smoke_spread/sleeping
-	smoke_type = /obj/effect/effect/smoke/sleeping
+/datum/effect_system/smoke_spread/sleeping
+	effect_type = /obj/effect/particle_effect/smoke/sleeping
 
 /////////////////////////////////////////////
 // Chem smoke
 /////////////////////////////////////////////
 
-/obj/effect/effect/smoke/chem
+/obj/effect/particle_effect/smoke/chem
 	lifetime = 10
 
 
-/obj/effect/effect/smoke/chem/process()
+/obj/effect/particle_effect/smoke/chem/process()
 	if(..())
 		var/turf/T = get_turf(src)
 		var/fraction = 1/initial(lifetime)
@@ -227,7 +227,7 @@
 		reagents.reaction(T, TOUCH, fraction)
 		return 1
 
-/obj/effect/effect/smoke/chem/smoke_mob(mob/living/carbon/M)
+/obj/effect/particle_effect/smoke/chem/smoke_mob(mob/living/carbon/M)
 	if(lifetime<1)
 		return 0
 	if(!istype(M))
@@ -242,23 +242,23 @@
 
 
 
-/datum/effect/effect/system/smoke_spread/chem
+/datum/effect_system/smoke_spread/chem
 	var/obj/chemholder
-	smoke_type = /obj/effect/effect/smoke/chem
+	effect_type = /obj/effect/particle_effect/smoke/chem
 
-/datum/effect/effect/system/smoke_spread/chem/New()
+/datum/effect_system/smoke_spread/chem/New()
 	..()
 	chemholder = PoolOrNew(/obj)
 	var/datum/reagents/R = new/datum/reagents(500)
 	chemholder.reagents = R
 	R.my_atom = chemholder
 
-/datum/effect/effect/system/smoke_spread/chem/Destroy()
+/datum/effect_system/smoke_spread/chem/Destroy()
 	qdel(chemholder)
 	chemholder = null
 	return ..()
 
-/datum/effect/effect/system/smoke_spread/chem/set_up(datum/reagents/carry = null, radius = 1, loca, silent = 0)
+/datum/effect_system/smoke_spread/chem/set_up(datum/reagents/carry = null, radius = 1, loca, silent = 0)
 	if(istype(loca, /turf/))
 		location = loca
 	else
@@ -289,11 +289,11 @@
 			log_game("A chemical smoke reaction has taken place in ([where])[contained]. No associated key.")
 
 
-/datum/effect/effect/system/smoke_spread/chem/start()
+/datum/effect_system/smoke_spread/chem/start()
 	var/color = mix_color_from_reagents(chemholder.reagents.reagent_list)
 	if(holder)
 		location = get_turf(holder)
-	var/obj/effect/effect/smoke/chem/S = new smoke_type(location)
+	var/obj/effect/particle_effect/smoke/chem/S = new effect_type(location)
 
 	if(chemholder.reagents.total_volume > 1) // can't split 1 very well
 		chemholder.reagents.copy_to(S, chemholder.reagents.total_volume)

code/game/objects/effects/effect_system/effects_sparks.dm

@@ -5,110 +5,42 @@
 // will always spawn at the items location.
 /////////////////////////////////////////////
 
-/obj/effect/effect/sparks
+/obj/effect/particle_effect/sparks
 	name = "sparks"
 	icon_state = "sparks"
-	var/amount = 6
 	anchored = 1
-	mouse_opacity = 0
 
-/obj/effect/effect/sparks/New()
+/obj/effect/particle_effect/sparks/New()
 	..()
 	flick("sparks", src) // replay the animation
 	playsound(src.loc, "sparks", 100, 1)
 	var/turf/T = src.loc
 	if (istype(T, /turf))
 		T.hotspot_expose(1000,100)
-	spawn (100)
+	spawn(20)
 		qdel(src)
 
-/obj/effect/effect/sparks/Destroy()
+/obj/effect/particle_effect/sparks/Destroy()
 	var/turf/T = src.loc
 	if (istype(T, /turf))
 		T.hotspot_expose(1000,100)
 	return ..()
 
-/obj/effect/effect/sparks/Move()
+/obj/effect/particle_effect/sparks/Move()
 	..()
 	var/turf/T = src.loc
-	if (istype(T, /turf))
+	if(isturf(T))
 		T.hotspot_expose(1000,100)
-	return
 
-/datum/effect/effect/system/spark_spread
-	var/total_sparks = 0 // To stop it being spammed and lagging!
-
-/datum/effect/effect/system/spark_spread/set_up(n = 3, c = 0, loca)
-	if(n > 10)
-		n = 10
-	number = n
-	cardinals = c
-	if(istype(loca, /turf/))
-		location = loca
-	else
-		location = get_turf(loca)
-
-/datum/effect/effect/system/spark_spread/start()
-	var/i = 0
-	for(i=0, i<src.number, i++)
-		if(src.total_sparks > 20)
-			return
-		spawn(0)
-			if(holder)
-				src.location = get_turf(holder)
-			var/obj/effect/effect/sparks/sparks = PoolOrNew(/obj/effect/effect/sparks, location)
-			src.total_sparks++
-			var/direction
-			if(src.cardinals)
-				direction = pick(cardinal)
-			else
-				direction = pick(alldirs)
-			for(i=0, i<pick(1,2,3), i++)
-				sleep(5)
-				step(sparks,direction)
-			spawn(20)
-				qdel(sparks)
-				src.total_sparks--
+/datum/effect_system/spark_spread
+	effect_type = /obj/effect/particle_effect/sparks
 
 
+//electricity
 
-
-
-/obj/effect/effect/sparks/electricity
+/obj/effect/particle_effect/sparks/electricity
 	name = "lightning"
 	icon_state = "electricity"
 
-/datum/effect/effect/system/lightning_spread
-	var/total_sparks = 0 // To stop it being spammed and lagging!
-
-/datum/effect/effect/system/lightning_spread/set_up(n = 3, c = 0, loca)
-	if(n > 10)
-		n = 10
-	number = n
-	cardinals = c
-	if(istype(loca, /turf/))
-		location = loca
-	else
-		location = get_turf(loca)
-
-/datum/effect/effect/system/lightning_spread/start()
-	var/i = 0
-	for(i=0, i<src.number, i++)
-		if(src.total_sparks > 20)
-			return
-		spawn(0)
-			if(holder)
-				src.location = get_turf(holder)
-			var/obj/effect/effect/sparks/electricity/sparks = PoolOrNew(/obj/effect/effect/sparks/electricity, location)
-			src.total_sparks++
-			var/direction
-			if(src.cardinals)
-				direction = pick(cardinal)
-			else
-				direction = pick(alldirs)
-			for(i=0, i<pick(1,2,3), i++)
-				sleep(5)
-				step(sparks,direction)
-			spawn(20)
-				qdel(sparks)
-				src.total_sparks--
+/datum/effect_system/lightning_spread
+	effect_type = /obj/effect/particle_effect/sparks/electricity

code/game/objects/effects/effect_system/effects_water.dm

@@ -1,6 +1,6 @@
 //WATER EFFECTS
 
-/obj/effect/effect/water
+/obj/effect/particle_effect/water
 	name = "water"
 	icon = 'icons/effects/effects.dmi'
 	icon_state = "extinguish"
@@ -8,12 +8,12 @@
 	mouse_opacity = 0
 
 
-/obj/effect/effect/water/New()
+/obj/effect/particle_effect/water/New()
 	..()
 	spawn( 70 )
 		qdel(src)
 
-/obj/effect/effect/water/Move(turf/newloc)
+/obj/effect/particle_effect/water/Move(turf/newloc)
 	if (--src.life < 1)
 		qdel(src)
 		return 0
@@ -21,7 +21,7 @@
 		return 0
 	.=..()
 
-/obj/effect/effect/water/Bump(atom/A)
+/obj/effect/particle_effect/water/Bump(atom/A)
 	if(reagents)
 		reagents.reaction(A)
 	return ..()
@@ -36,85 +36,22 @@
 // will always spawn at the items location, even if it's moved.
 
 /* Example:
-var/datum/effect/system/steam_spread/steam = new /datum/effect/system/steam_spread() -- creates new system
+var/datum/effect_system/steam_spread/steam = new /datum/effect_system/steam_spread() -- creates new system
 steam.set_up(5, 0, mob.loc) -- sets up variables
 OPTIONAL: steam.attach(mob)
 steam.start() -- spawns the effect
 */
 /////////////////////////////////////////////
-/obj/effect/effect/steam
+/obj/effect/particle_effect/steam
 	name = "steam"
 	icon = 'icons/effects/effects.dmi'
 	icon_state = "extinguish"
 	density = 0
 
-/datum/effect/effect/system/steam_spread
+/obj/effect/particle_effect/steam/New()
+	..()
+	spawn(20)
+		qdel(src)
 
-/datum/effect/effect/system/steam_spread/set_up(n = 3, c = 0, turf/loc)
-	if(n > 10)
-		n = 10
-	number = n
-	cardinals = c
-	location = loc
-
-/datum/effect/effect/system/steam_spread/start()
-	var/i = 0
-	for(i=0, i<src.number, i++)
-		spawn(0)
-			if(holder)
-				src.location = get_turf(holder)
-			var/obj/effect/effect/steam/steam = PoolOrNew(/obj/effect/effect/steam, location)
-			var/direction
-			if(src.cardinals)
-				direction = pick(cardinal)
-			else
-				direction = pick(alldirs)
-			for(i=0, i<pick(1,2,3), i++)
-				sleep(5)
-				step(steam,direction)
-			spawn(20)
-				qdel(steam)
-
-
-/////////////////////////////////////////////
-//////// Attach a steam trail to an object (eg. a reacting beaker) that will follow it
-// even if it's carried of thrown.
-/////////////////////////////////////////////
-
-/datum/effect/effect/system/steam_trail_follow
-	var/turf/oldposition
-	var/processing = 1
-	var/on = 1
-
-/datum/effect/effect/system/steam_trail_follow/set_up(atom/atom)
-	attach(atom)
-	oldposition = get_turf(atom)
-
-/datum/effect/effect/system/steam_trail_follow/start()
-	if(!src.on)
-		src.on = 1
-		src.processing = 1
-	if(src.processing)
-		src.processing = 0
-		spawn(0)
-			if(src.number < 3)
-				var/obj/effect/effect/steam/I = PoolOrNew(/obj/effect/effect/steam, oldposition)
-				src.number++
-				src.oldposition = get_turf(holder)
-				I.dir = src.holder.dir
-				spawn(10)
-					qdel(I)
-					src.number--
-				spawn(2)
-					if(src.on)
-						src.processing = 1
-						src.start()
-			else
-				spawn(2)
-					if(src.on)
-						src.processing = 1
-						src.start()
-
-/datum/effect/effect/system/steam_trail_follow/proc/stop()
-	src.processing = 0
-	src.on = 0
+/datum/effect_system/steam_spread
+	effect_type = /obj/effect/particle_effect/steam

code/game/objects/effects/explosion_particles.dm

@@ -1,70 +0,0 @@
-/obj/effect/expl_particles
-	name = "fire"
-	icon = 'icons/effects/effects.dmi'
-	icon_state = "explosion_particle"
-	opacity = 1
-	anchored = 1
-	mouse_opacity = 0
-
-/obj/effect/expl_particles/New()
-	..()
-	spawn (15)
-		qdel(src)
-	return
-
-/obj/effect/expl_particles/Move()
-	..()
-	return
-
-/datum/effect/system/expl_particles
-	var/number = 10
-	var/turf/location
-	var/total_particles = 0
-
-/datum/effect/system/expl_particles/proc/set_up(n = 10, loca)
-	number = n
-	if(istype(loca, /turf/)) location = loca
-	else location = get_turf(loca)
-
-/datum/effect/system/expl_particles/proc/start()
-	var/i = 0
-	for(i=0, i<src.number, i++)
-		spawn(0)
-			var/obj/effect/expl_particles/expl = new /obj/effect/expl_particles(src.location)
-			var/direct = pick(alldirs)
-			for(i=0, i<pick(1;25,2;50,3,4;200), i++)
-				sleep(1)
-				step(expl,direct)
-
-/obj/effect/explosion
-	name = "fire"
-	icon = 'icons/effects/96x96.dmi'
-	icon_state = "explosion"
-	opacity = 1
-	anchored = 1
-	mouse_opacity = 0
-	pixel_x = -32
-	pixel_y = -32
-
-/obj/effect/explosion/New()
-	..()
-	spawn (10)
-		qdel(src)
-	return
-
-/datum/effect/system/explosion
-	var/turf/location
-
-/datum/effect/system/explosion/proc/set_up(loca)
-	if(istype(loca, /turf/)) location = loca
-	else location = get_turf(loca)
-
-/datum/effect/system/explosion/proc/start()
-	new/obj/effect/explosion( location )
-	var/datum/effect/system/expl_particles/P = new/datum/effect/system/expl_particles()
-	P.set_up(10,location)
-	P.start()
-	spawn(5)
-		var/datum/effect/effect/system/smoke_spread/S = new
-		S.set_up(2,location)
-		S.start()

code/game/objects/effects/gibs.dm

@@ -30,7 +30,7 @@
 	var/obj/effect/decal/cleanable/blood/gibs/gib = null
 
 	if(sparks)
-		var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
+		var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
 		s.set_up(2, 1, location)
 		s.start()
 

code/game/objects/effects/mines.dm

@@ -23,7 +23,7 @@
 	if(triggered)
 		return
 	visible_message("<span class='danger'>[victim] sets off \icon[src] [src]!</span>")
-	var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
+	var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
 	s.set_up(3, 1, src)
 	s.start()
 	mineEffect(victim)

code/game/objects/effects/portals.dm

@@ -1,3 +1,6 @@
+
+/obj/effect
+
 /obj/effect/portal
 	name = "portal"
 	desc = "Looks unstable. Best to test it with the clown."

code/game/objects/effects/step_triggers.dm

@@ -144,20 +144,20 @@
 	M.Move(dest)
 
 	if(entersparks)
-		var/datum/effect/effect/system/spark_spread/s = new
+		var/datum/effect_system/spark_spread/s = new
 		s.set_up(4, 1, src)
 		s.start()
 	if(exitsparks)
-		var/datum/effect/effect/system/spark_spread/s = new
+		var/datum/effect_system/spark_spread/s = new
 		s.set_up(4, 1, dest)
 		s.start()
 
 	if(entersmoke)
-		var/datum/effect/effect/system/smoke_spread/s = new
+		var/datum/effect_system/smoke_spread/s = new
 		s.set_up(4, 1, src, 0)
 		s.start()
 	if(exitsmoke)
-		var/datum/effect/effect/system/smoke_spread/s = new
+		var/datum/effect_system/smoke_spread/s = new
 		s.set_up(4, 1, dest, 0)
 		s.start()
 

code/game/objects/explosion.dm

@@ -74,7 +74,7 @@
 		SSmachine.postpone(postponeCycles)
 
 		if(heavy_impact_range > 1)
-			var/datum/effect/system/explosion/E = new/datum/effect/system/explosion()
+			var/datum/effect_system/explosion/E = new/datum/effect_system/explosion()
 			E.set_up(epicenter)
 			E.start()
 

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

@@ -67,7 +67,7 @@
 
 /obj/item/device/chameleon/proc/disrupt(delete_dummy = 1)
 	if(active_dummy)
-		var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread
+		var/datum/effect_system/spark_spread/spark_system = new /datum/effect_system/spark_spread
 		spark_system.set_up(5, 0, src)
 		spark_system.attach(src)
 		spark_system.start()

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

@@ -0,0 +1,150 @@
+#define RAD_LEVEL_NORMAL 10
+#define RAD_LEVEL_MODERATE 30
+#define RAD_LEVEL_HIGH 75
+#define RAD_LEVEL_VERY_HIGH 125
+#define RAD_LEVEL_CRITICAL 200
+
+/obj/item/device/geiger_counter //DISCLAIMER: I know nothing about how real-life Geiger counters work. This will not be realistic. ~Xhuis
+	name = "geiger counter"
+	desc = "A handheld device used for detecting and measuring radiation pulses."
+	icon_state = "geiger_off"
+	item_state = "multitool"
+	w_class = 2
+	slot_flags = SLOT_BELT
+	materials = list(MAT_METAL = 150, MAT_GLASS = 150)
+	var/scanning = 0
+	var/radiation_count = 0
+	var/emagged = 0
+
+/obj/item/device/geiger_counter/New()
+	..()
+	SSobj.processing |= src
+
+/obj/item/device/geiger_counter/Destroy()
+	SSobj.processing.Remove(src)
+	..()
+
+/obj/item/device/geiger_counter/process()
+	if(emagged)
+		if(radiation_count < 20)
+			radiation_count++
+		return 0
+	if(radiation_count > 0)
+		radiation_count--
+		update_icon()
+
+/obj/item/device/geiger_counter/examine(mob/user)
+	..()
+	if(!scanning)
+		return 1
+	user << "<span class='info'>Alt-click it to clear stored radiation levels.</span>"
+	if(emagged)
+		user << "<span class='warning'>The display seems to be flickering at random radiation levels.</span>"
+		return 1
+	switch(radiation_count)
+		if(-INFINITY to RAD_LEVEL_NORMAL)
+			user << "<span class='notice'>Ambient radiation level count reports that all is well.</span>"
+		if(RAD_LEVEL_NORMAL + 1 to RAD_LEVEL_MODERATE)
+			user << "<span class='disarm'>Ambient radiation levels slightly above average.</span>"
+		if(RAD_LEVEL_MODERATE + 1 to RAD_LEVEL_HIGH)
+			user << "<span class='warning'>Ambient radiation levels above average.</span>"
+		if(RAD_LEVEL_HIGH + 1 to RAD_LEVEL_VERY_HIGH)
+			user << "<span class='danger'>Ambient radiation levels highly above average.</span>"
+		if(RAD_LEVEL_VERY_HIGH + 1 to RAD_LEVEL_CRITICAL)
+			user << "<span class='suicide'>Ambient radiation levels nearing critical level.</span>"
+		if(RAD_LEVEL_CRITICAL + 1 to INFINITY)
+			user << "<span class='boldannounce'>Ambient radiation levels above critical level!</span>"
+
+/obj/item/device/geiger_counter/update_icon()
+	if(!scanning)
+		icon_state = "geiger_off"
+		return 1
+	if(emagged)
+		icon_state = "geiger_on_emag"
+		return 1
+	switch(radiation_count)
+		if(-INFINITY to RAD_LEVEL_NORMAL)
+			icon_state = "geiger_on_1"
+		if(RAD_LEVEL_NORMAL + 1 to RAD_LEVEL_MODERATE)
+			icon_state = "geiger_on_2"
+		if(RAD_LEVEL_MODERATE + 1 to RAD_LEVEL_HIGH)
+			icon_state = "geiger_on_3"
+		if(RAD_LEVEL_HIGH + 1 to RAD_LEVEL_VERY_HIGH)
+			icon_state = "geiger_on_4"
+		if(RAD_LEVEL_VERY_HIGH + 1 to RAD_LEVEL_CRITICAL)
+			icon_state = "geiger_on_4"
+		if(RAD_LEVEL_CRITICAL + 1 to INFINITY)
+			icon_state = "geiger_on_5"
+	..()
+
+/obj/item/device/geiger_counter/rad_act(amount)
+	if(!amount && scanning)
+		return 0
+	radiation_count += amount
+	if(isliving(loc))
+		var/mob/living/M = loc
+		M << "<span class='boldannounce'>\icon[src] RADIATION PULSE DETECTED.</span>"
+		M << "<span class='boldannounce'>\icon[src] Severity: [amount]</span>"
+	update_icon()
+
+/obj/item/device/geiger_counter/attack_self(mob/user)
+	scanning = !scanning
+	update_icon()
+	user << "<span class='notice'>\icon[src] You switch [scanning ? "on" : "off"] [src].</span>"
+
+/obj/item/device/geiger_counter/attack(mob/living/M, mob/user)
+	if(user.a_intent == "help")
+		if(!emagged)
+			user.visible_message("<span class='notice'>[user] scans [M] with [src].</span>", "<span class='notice'>You scan [M]'s radiation levels with [src]...</span>")
+			if(!M.radiation)
+				user << "<span class='notice'>\icon[src] Radiation levels within normal boundaries.</span>"
+				return 1
+			else
+				user << "<span class='boldannounce'>\icon[src] Subject is irradiated. Radiation levels: [M.radiation].</span>"
+				return 1
+		else
+			user.visible_message("<span class='notice'>[user] scans [M] with [src].</span>", "<span class='danger'>You project [src]'s stored radiation into [M]'s body!</span>")
+			M.rad_act(radiation_count)
+			radiation_count = 0
+		return 1
+	..()
+
+/obj/item/device/geiger_counter/attackby(obj/item/I, mob/user, params)
+	if(istype(I, /obj/item/weapon/screwdriver) && emagged)
+		if(scanning)
+			user << "<span class='warning'>Turn off [src] before you perform this action!</span>"
+			return 0
+		user.visible_message("<span class='notice'>[user] unscrews [src]'s maintenance panel and begins fiddling with its innards...</span>", "<span class='notice'>You begin resetting [src]...</span>")
+		playsound(user, 'sound/items/Screwdriver.ogg', 50, 1)
+		if(!do_after(user, 40, target = user))
+			return 0
+		user.visible_message("<span class='notice'>[user] refastens [src]'s maintenance panel!</span>", "<span class='notice'>You reset [src] to its factory settings!</span>")
+		playsound(user, 'sound/items/Screwdriver2.ogg', 50, 1)
+		emagged = 0
+		radiation_count = 0
+		update_icon()
+		return 1
+	..()
+
+/obj/item/device/geiger_counter/AltClick()
+	..()
+	if(!scanning)
+		usr << "<span class='warning'>[src] must be on to reset its radiation level!</span>"
+		return 0
+	radiation_count = 0
+	usr << "<span class='notice'>You flush [src]'s radiation counts, resetting it to normal.</span>"
+	update_icon()
+
+/obj/item/device/geiger_counter/emag_act(mob/user)
+	if(!emagged)
+		if(scanning)
+			user << "<span class='warning'>Turn off [src] before you perform this action!</span>"
+			return 0
+		user << "<span class='warning'>You override [src]'s radiation storing protocols. It will now generate small doses of radiation, and stored rads are now projected into creatures you scan.</span>"
+		emagged = 1
+
+#undef RAD_LEVEL_NORMAL
+#undef RAD_LEVEL_MODERATE
+#undef RAD_LEVEL_HIGH
+#undef RAD_LEVEL_VERY_HIGH
+#undef RAD_LEVEL_CRITICAL

code/game/objects/items/devices/radio/electropack.dm

@@ -111,7 +111,7 @@
 		step(M, pick(cardinal))
 
 		M << "<span class='danger'>You feel a sharp shock!</span>"
-		var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
+		var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
 		s.set_up(3, 1, M)
 		s.start()
 

code/game/objects/items/toys.dm

@@ -516,7 +516,7 @@
 	w_class = 1
 
 /obj/item/toy/snappop/proc/pop_burst()
-	var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
+	var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
 	s.set_up(3, 1, src)
 	s.start()
 	new /obj/effect/decal/cleanable/ash(loc)
@@ -539,7 +539,7 @@
 		if(M.m_intent == "run")
 			M << "<span class='danger'>You step on the snap pop!</span>"
 
-			var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
+			var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
 			s.set_up(2, 0, src)
 			s.start()
 			new /obj/effect/decal/cleanable/ash(src.loc)

code/game/objects/items/weapons/RCD.dm

@@ -21,7 +21,7 @@ RCD
 	materials = list(MAT_METAL=100000)
 	origin_tech = "engineering=4;materials=2"
 	req_access_txt = "11"
-	var/datum/effect/effect/system/spark_spread/spark_system
+	var/datum/effect_system/spark_spread/spark_system
 	var/matter = 0
 	var/max_matter = 160
 	var/working = 0
@@ -229,8 +229,9 @@ RCD
 
 
 /obj/item/weapon/rcd/New()
+	..()
 	desc = "An RCD. It currently holds [matter]/[max_matter] matter-units."
-	src.spark_system = new /datum/effect/effect/system/spark_spread
+	src.spark_system = new /datum/effect_system/spark_spread
 	spark_system.set_up(5, 0, src)
 	spark_system.attach(src)
 	rcd_list += src

code/game/objects/items/weapons/RPD.dm

@@ -136,7 +136,7 @@ var/global/list/RPD_recipes=list(
 	w_class = 3
 	materials = list(MAT_METAL=75000, MAT_GLASS=37500)
 	origin_tech = "engineering=4;materials=2"
-	var/datum/effect/effect/system/spark_spread/spark_system
+	var/datum/effect_system/spark_spread/spark_system
 	var/working = 0
 	var/p_type = 0
 	var/p_conntype = 0
@@ -158,7 +158,7 @@ var/global/list/RPD_recipes=list(
 
 /obj/item/weapon/pipe_dispenser/New()
 	. = ..()
-	spark_system = new /datum/effect/effect/system/spark_spread
+	spark_system = new /datum/effect_system/spark_spread
 	spark_system.set_up(5, 0, src)
 	spark_system.attach(src)
 

code/game/objects/items/weapons/cigs_lighters.dm

@@ -174,7 +174,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 		damtype = "fire"
 		force = 4
 		if(reagents.get_reagent_amount("plasma")) // the plasma explodes when exposed to fire
-			var/datum/effect/effect/system/reagents_explosion/e = new()
+			var/datum/effect_system/reagents_explosion/e = new()
 			e.set_up(round(reagents.get_reagent_amount("plasma") / 2.5, 1), get_turf(src), 0, 0)
 			e.start()
 			if(ismob(loc))
@@ -183,7 +183,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 			qdel(src)
 			return
 		if(reagents.get_reagent_amount("welding_fuel")) // the fuel explodes, too, but much less violently
-			var/datum/effect/effect/system/reagents_explosion/e = new()
+			var/datum/effect_system/reagents_explosion/e = new()
 			e.set_up(round(reagents.get_reagent_amount("welding_fuel") / 5, 1), get_turf(src), 0, 0)
 			e.start()
 			if(ismob(loc))

code/game/objects/items/weapons/clown_items.dm

@@ -43,7 +43,7 @@
 /obj/item/weapon/soap/suicide_act(mob/user)
 	user.say(";FFFFFFFFFFFFFFFFUUUUUUUDGE!!")
 	user.visible_message("<span class='suicide'>[user] lifts the [src.name] to their mouth and gnaws on it furiously, producing a thick froth! They'll never get that BB gun now!")
-	PoolOrNew(/obj/effect/effect/foam, loc)
+	PoolOrNew(/obj/effect/particle_effect/foam, loc)
 	return (TOXLOSS)
 
 /obj/item/weapon/soap/Crossed(AM as mob|obj)

code/game/objects/items/weapons/extinguisher.dm

@@ -131,7 +131,7 @@
 
 		for(var/a=0, a<5, a++)
 			spawn(0)
-				var/obj/effect/effect/water/W = PoolOrNew( /obj/effect/effect/water, get_turf(src) )
+				var/obj/effect/particle_effect/water/W = PoolOrNew( /obj/effect/particle_effect/water, get_turf(src) )
 				var/turf/my_target = pick(the_targets)
 				if(precision)
 					the_targets -= my_target

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

@@ -183,7 +183,7 @@
 	mix_reagents()
 
 	if(reagents.total_volume)	//The possible reactions didnt use up all reagents, so we spread it around.
-		var/datum/effect/effect/system/steam_spread/steam = new /datum/effect/effect/system/steam_spread()
+		var/datum/effect_system/steam_spread/steam = new /datum/effect_system/steam_spread()
 		steam.set_up(10, 0, get_turf(src))
 		steam.attach(src)
 		steam.start()

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

@@ -5,11 +5,11 @@
 	det_time = 20
 	item_state = "flashbang"
 	slot_flags = SLOT_BELT
-	var/datum/effect/effect/system/smoke_spread/bad/smoke
+	var/datum/effect_system/smoke_spread/bad/smoke
 
 /obj/item/weapon/grenade/smokebomb/New()
 	..()
-	src.smoke = new /datum/effect/effect/system/smoke_spread/bad
+	src.smoke = new /datum/effect_system/smoke_spread/bad
 	src.smoke.attach(src)
 
 /obj/item/weapon/grenade/smokebomb/Destroy()

code/game/objects/items/weapons/handcuffs.dm

@@ -246,7 +246,7 @@
 	..()
 	spawn(100)
 		if(!istype(loc, /mob))
-			var/datum/effect/effect/system/spark_spread/sparks = new /datum/effect/effect/system/spark_spread
+			var/datum/effect_system/spark_spread/sparks = new /datum/effect_system/spark_spread
 			sparks.set_up(1, 1, src)
 			sparks.start()
 			qdel(src)

code/game/objects/items/weapons/melee/energy.dm

@@ -205,11 +205,11 @@
 	throw_range = 1
 	w_class = 4//So you can't hide it in your pocket or some such.
 	flags = NOSHIELD
-	var/datum/effect/effect/system/spark_spread/spark_system
+	var/datum/effect_system/spark_spread/spark_system
 
 //Most of the other special functions are handled in their own files. aka special snowflake code so kewl
 /obj/item/weapon/melee/energy/blade/New()
-	spark_system = new /datum/effect/effect/system/spark_spread()
+	spark_system = new /datum/effect_system/spark_spread()
 	spark_system.set_up(5, 0, src)
 	spark_system.attach(src)
 

code/game/objects/items/weapons/pneumaticCannon.dm

@@ -132,7 +132,7 @@
 	desc = "A gas-powered, object-firing cannon made out of common parts."
 	force = 5
 	w_class = 3
-	maxWeightClass = 10
+	maxWeightClass = 7
 	gasPerThrow = 5
 
 /datum/table_recipe/improvised_pneumatic_cannon //Pretty easy to obtain but

code/game/objects/items/weapons/scrolls.dm

@@ -58,7 +58,7 @@
 	if(!((user == loc || (in_range(src, user) && istype(src.loc, /turf)))))
 		return
 
-	var/datum/effect/effect/system/smoke_spread/smoke = new
+	var/datum/effect_system/smoke_spread/smoke = new
 	smoke.set_up(2, user.loc)
 	smoke.attach(user)
 	smoke.start()

code/game/objects/items/weapons/singularityhammer.dm

@@ -86,7 +86,7 @@
 	origin_tech = "combat=5;powerstorage=5"
 
 /obj/item/weapon/twohanded/mjollnir/proc/shock(mob/living/target)
-	var/datum/effect/effect/system/lightning_spread/s = new /datum/effect/effect/system/lightning_spread
+	var/datum/effect_system/lightning_spread/s = new /datum/effect_system/lightning_spread
 	s.set_up(5, 1, target.loc)
 	s.start()
 	target.take_organ_damage(0,30)

code/game/objects/items/weapons/tanks/jetpack.dm

@@ -6,14 +6,14 @@
 	item_state = "jetpack"
 	distribute_pressure = ONE_ATMOSPHERE * O2STANDARD
 	action_button_name = "Toggle Jetpack"
-	var/datum/effect/effect/system/ion_trail_follow/ion_trail
+	var/datum/effect_system/trail_follow/ion/ion_trail
 	var/on = 0
 	var/stabilization_on = 0
 	var/volume_rate = 500              //Needed for borg jetpack transfer
 
 /obj/item/weapon/tank/jetpack/New()
 	..()
-	ion_trail = new /datum/effect/effect/system/ion_trail_follow()
+	ion_trail = new /datum/effect_system/trail_follow/ion()
 	ion_trail.set_up(src)
 
 
@@ -104,7 +104,7 @@
 
 /obj/item/weapon/tank/jetpack/carbondioxide/New()
 	..()
-	ion_trail = new /datum/effect/effect/system/ion_trail_follow()
+	ion_trail = new /datum/effect_system/trail_follow/ion()
 	ion_trail.set_up(src)
 	air_contents.carbon_dioxide = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
 

code/game/objects/items/weapons/tanks/tank_types.dm

@@ -15,6 +15,7 @@
 	desc = "A tank of oxygen."
 	icon_state = "oxygen"
 	distribute_pressure = ONE_ATMOSPHERE*O2STANDARD
+	force = 10
 
 
 /obj/item/weapon/tank/internals/oxygen/New()
@@ -40,6 +41,7 @@
 	desc = "A tank with an N2O/O2 gas mix."
 	icon_state = "anesthetic"
 	item_state = "an_tank"
+	force = 10
 
 /obj/item/weapon/tank/internals/anesthetic/New()
 	..()
@@ -59,6 +61,7 @@
 	name = "air tank"
 	desc = "Mixed anyone?"
 	icon_state = "oxygen"
+	force = 10
 
 
 /obj/item/weapon/tank/internals/air/New()
@@ -78,6 +81,7 @@
 	icon_state = "plasma"
 	flags = CONDUCT
 	slot_flags = null	//they have no straps!
+	force = 8
 
 
 /obj/item/weapon/tank/internals/plasma/New()
@@ -112,6 +116,7 @@
 /obj/item/weapon/tank/internals/plasmaman
 	icon_state = "plasmaman_tank"
 	item_state = "plasmaman_tank"
+	force = 10
 
 /obj/item/weapon/tank/internals/plasmaman/New()
 	..()
@@ -130,6 +135,7 @@
 	icon_state = "plasmaman_tank_belt"
 	item_state = "plasmaman_tank_belt"
 	slot_flags = SLOT_BELT
+	force = 5
 
 /obj/item/weapon/tank/internals/plasmaman/belt/full/New()
 	..()

code/game/objects/items/weapons/tanks/watertank.dm

@@ -293,7 +293,7 @@
 		if(!Adj|| !istype(target, /turf))
 			return
 		if(metal_synthesis_cooldown < 5)
-			var/obj/effect/effect/foam/metal/F = PoolOrNew(/obj/effect/effect/foam/metal, get_turf(target))
+			var/obj/effect/particle_effect/foam/metal/F = PoolOrNew(/obj/effect/particle_effect/foam/metal, get_turf(target))
 			F.amount = 0
 			metal_synthesis_cooldown++
 			spawn(100)
@@ -311,7 +311,7 @@
 	pass_flags = PASSTABLE
 
 /obj/effect/nanofrost_container/proc/Smoke()
-	var/datum/effect/effect/system/smoke_spread/freezing/S = new
+	var/datum/effect_system/smoke_spread/freezing/S = new
 	S.set_up(2, src.loc, blasting=1)
 	S.start()
 	var/obj/effect/decal/cleanable/flour/F = new /obj/effect/decal/cleanable/flour(src.loc)

code/game/objects/items/weapons/twohanded.dm

@@ -369,3 +369,4 @@
 		qdel(C4)
 		explosive = C42
 		desc = "A makeshift spear with [C42] attached to it. Alt+click on the spear to set your war cry!"
+	update_icon()

code/game/objects/radiation.dm

@@ -34,3 +34,5 @@
 	if(amount)
 		var/blocked = run_armor_check(null, "rad", "Your clothes feel warm.", "Your clothes feel warm.")
 		apply_effect(amount, IRRADIATE, blocked)
+		for(var/obj/I in src) //Radiation is also applied to items held by the mob
+			I.rad_act(amount)

code/game/objects/structures/crates_lockers/closets/cardboardbox.dm

@@ -4,6 +4,7 @@
 	icon_state = "cardboard"
 	health = 10
 	mob_storage_capacity = 1
+	burn_state = 0 //Burnable
 	burntime = 20
 	can_weld_shut = 0
 	cutting_tool = /obj/item/weapon/wirecutters

code/game/objects/structures/crates_lockers/closets/l3closet.dm

@@ -17,7 +17,7 @@
 	contents = list()
 	new /obj/item/clothing/suit/bio_suit/virology( src )
 	new /obj/item/clothing/head/bio_hood/virology( src )
-
+	new /obj/item/weapon/storage/bag/bio( src )
 
 /obj/structure/closet/l3closet/security
 	icon_state = "bio_sec"
@@ -46,4 +46,5 @@
 	..()
 	contents = list()
 	new /obj/item/clothing/suit/bio_suit/scientist( src )
-	new /obj/item/clothing/head/bio_hood/scientist( src )
+	new /obj/item/clothing/head/bio_hood/scientist( src )
+	new /obj/item/weapon/storage/bag/bio( src )

code/game/objects/structures/crates_lockers/closets/utility_closets.dm

@@ -133,6 +133,7 @@
 
 /obj/structure/closet/radiation/New()
 	..()
+	new /obj/item/device/geiger_counter(src)
 	new /obj/item/clothing/suit/radiation(src)
 	new /obj/item/clothing/head/radiation(src)
 

code/game/objects/structures/crates_lockers/crates.dm

@@ -215,7 +215,7 @@
 			if(isliving(user))
 				var/mob/living/L = user
 				if(L.electrocute_act(17, src))
-					var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
+					var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
 					s.set_up(5, 1, src)
 					s.start()
 					return

code/game/objects/structures/electricchair.dm

@@ -44,7 +44,7 @@
 	A.updateicon()
 
 	flick("echair1", src)
-	var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
+	var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
 	s.set_up(12, 1, src)
 	s.start()
 	if(buckled_mob)

code/game/objects/structures/grille.dm

@@ -237,7 +237,7 @@
 	var/obj/structure/cable/C = T.get_cable_node()
 	if(C)
 		if(electrocute_mob(user, C, src))
-			var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
+			var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
 			s.set_up(3, 1, src)
 			s.start()
 			return 1

code/game/objects/structures/hivebot.dm

@@ -10,7 +10,7 @@
 
 /obj/structure/hivebot_beacon/New()
 	..()
-	var/datum/effect/effect/system/smoke_spread/smoke = new
+	var/datum/effect_system/smoke_spread/smoke = new
 	smoke.set_up(2, loc)
 	smoke.start()
 	visible_message("<span class='boldannounce'>The [src] warps in!</span>")

code/game/objects/structures/mirror.dm

@@ -10,7 +10,8 @@
 
 
 /obj/structure/mirror/attack_hand(mob/user)
-	if(shattered)	return
+	if(shattered)
+		return
 
 	if(ishuman(user))
 		var/mob/living/carbon/human/H = user
@@ -23,7 +24,8 @@
 		//handle facial hair (if necessary)
 		if(H.gender == MALE)
 			var/new_style = input(user, "Select a facial hair style", "Grooming")  as null|anything in facial_hair_styles_list
-			if(userloc != H.loc) return	//no tele-grooming
+			if(userloc != H.loc)
+				return	//no tele-grooming
 			if(new_style)
 				H.facial_hair_style = new_style
 		else
@@ -31,7 +33,8 @@
 
 		//handle normal hair
 		var/new_style = input(user, "Select a hair style", "Grooming")  as null|anything in hair_styles_list
-		if(userloc != H.loc) return	//no tele-grooming
+		if(userloc != H.loc)
+			return	//no tele-grooming
 		if(new_style)
 			H.hair_style = new_style
 
@@ -39,7 +42,8 @@
 
 
 /obj/structure/mirror/proc/shatter()
-	if(shattered)	return
+	if(shattered)
+		return
 	shattered = 1
 	icon_state = "mirror_broke"
 	playsound(src, "shatter", 70, 1)
@@ -61,6 +65,19 @@
 	if(I.damtype == STAMINA)
 		return
 	if(shattered)
+		if(istype(I, /obj/item/weapon/weldingtool))
+			var/obj/item/weapon/weldingtool/WT = I
+			if(WT.remove_fuel(0, user))
+				user << "<span class='notice'>You begin repairing [src]...</span>"
+				playsound(src, 'sound/items/Welder.ogg', 100, 1)
+				if(do_after(user, 10, target = src))
+					if(!user || !WT || !WT.isOn())
+						return
+					user << "<span class='notice'>You repair [src].</span>"
+					shattered = 0
+					icon_state = initial(icon_state)
+					desc = initial(desc)
+				return
 		playsound(src.loc, 'sound/effects/hit_on_shattered_glass.ogg', 70, 1)
 		return
 
@@ -74,7 +91,8 @@
 
 /obj/structure/mirror/attack_alien(mob/living/user)
 	user.do_attack_animation(src)
-	if(islarva(user)) return
+	if(islarva(user))
+		return
 	if(shattered)
 		playsound(src.loc, 'sound/effects/hit_on_shattered_glass.ogg', 70, 1)
 		return
@@ -83,9 +101,11 @@
 
 
 /obj/structure/mirror/attack_animal(mob/living/user)
-	if(!isanimal(user)) return
+	if(!isanimal(user))
+		return
 	var/mob/living/simple_animal/M = user
-	if(M.melee_damage_upper <= 0) return
+	if(M.melee_damage_upper <= 0)
+		return
 	M.do_attack_animation(src)
 	if(shattered)
 		playsound(src.loc, 'sound/effects/hit_on_shattered_glass.ogg', 70, 1)

code/game/objects/structures/signs.dm

@@ -160,12 +160,12 @@
 
 /obj/structure/sign/bluecross
 	name = "medbay"
-	desc = "The Intergalactic symbol of Medical institutions. You'll probably get help here.'"
+	desc = "The Intergalactic symbol of Medical institutions. You'll probably get help here."
 	icon_state = "bluecross"
 
 /obj/structure/sign/bluecross_2
 	name = "medbay"
-	desc = "The Intergalactic symbol of Medical institutions. You'll probably get help here.'"
+	desc = "The Intergalactic symbol of Medical institutions. You'll probably get help here."
 	icon_state = "bluecross2"
 
 /obj/structure/sign/goldenplaque