finish making smoke OOP, compiles

code/game/objects/effects/anomalies.dm

@@ -33,7 +33,7 @@
 /obj/effect/anomaly/proc/anomalyNeutralize()
 	var/turf/T = get_turf(src)
 
-	new /obj/effect/effect/bad_smoke(T)
+	new /obj/effect/effect/smoke/bad(T)
 
 	if(aSignal)
 		aSignal.forceMove(T)

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

@@ -15,7 +15,7 @@
 	mouse_opacity = 0
 	var/time_to_live = 100
 
-/datum/effect/effect/smoke/proc/fade_out(frames = 16)
+/obj/effect/effect/smoke/proc/fade_out(frames = 16)
 	if(alpha == 0) //Handle already transparent case
 		return
 	if(frames == 0)
@@ -68,7 +68,7 @@
 		spawn(0)
 			if(holder)
 				location = get_turf(holder)
-			var/obj/effect/effect/harmless_smoke/smoke = new /obj/effect/effect/harmless_smoke(location)
+			var/obj/effect/effect/smoke/S = new smoke_type(location)
 			total_smoke++
 			var/direction = src.direction
 			if(!direction)
@@ -78,13 +78,13 @@
 					direction = pick(alldirs)
 			for(i=0, i<pick(0,1,1,1,2,2,2,3), i++)
 				sleep(10)
-				step(smoke,direction)
-			spawn(smoke.time_to_live*0.75+rand(10,30))
-				if(smoke)
+				step(S,direction)
+			spawn(S.time_to_live*0.75+rand(10,30))
+				if(S)
 					spawn(0)
-						smoke.fade_out()
+						S.fade_out()
 					spawn(10)
-						smoke.delete()
+						S.delete()
 				total_smoke--
 
 /////////////////////////////////////////////
@@ -92,7 +92,7 @@
 /////////////////////////////////////////////
 
 /obj/effect/effect/smoke/bad
-	time_to_live = 200+rand(10,30)
+	time_to_live = 200
 
 /obj/effect/effect/smoke/bad/Move()
 	..()
@@ -107,7 +107,7 @@
 		B.damage = (B.damage/2)
 	return 1
 
-/obj/effect/effect/smoke/bad/smoke_mob(mob/living/carbon/C)
+/obj/effect/effect/smoke/bad/smoke_mob(mob/living/carbon/M)
 	if(..())
 		M.drop_item()
 		M.adjustOxyLoss(1)
@@ -162,7 +162,7 @@
 
 /datum/effect/system/smoke_spread/freezing/start()
 	if(blast)
-		for(var/turf/T in trange(2, location))
+		for(var/turf/T in RANGE_TURFS(2, location))
 			Chilled(T)
 	..()
 
@@ -172,13 +172,14 @@
 
 /obj/effect/effect/smoke/sleeping
 	color = "#9C3636"
+	time_to_live = 200
 
 /obj/effect/effect/smoke/sleeping/Move()
 	..()
 	for(var/mob/living/carbon/M in get_turf(src))
 		smoke_mob(M)
 
-/obj/effect/effect/smoke/sleeping/smoke_mob()
+/obj/effect/effect/smoke/sleeping/smoke_mob(mob/living/carbon/M)
 	if(..())
 		M.drop_item()
 		M.AdjustSleeping(5)
@@ -199,12 +200,10 @@
 /obj/effect/effect/smoke/chem
 	icon = 'icons/effects/chemsmoke.dmi'
 	opacity = 0
-	time_to_live = 200+rand(10,30)
+	time_to_live = 200
 
 /datum/effect/system/smoke_spread/chem
 	smoke_type = /obj/effect/effect/smoke/chem
-	var/total_smoke = 0 // To stop it being spammed and lagging!
-	var/direction
 	var/obj/chemholder
 
 /datum/effect/system/smoke_spread/chem/New()

code/game/objects/effects/explosion_particles.dm

@@ -63,6 +63,6 @@
 /datum/effect/system/explosion/smoke/start()
 	..()
 	spawn(5)
-		var/datum/effect/system/harmless_smoke_spread/S = new/datum/effect/system/harmless_smoke_spread()
+		var/datum/effect/system/smoke_spread/S = new
 		S.set_up(5,0,location,null)
 		S.start()

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

@@ -40,7 +40,7 @@
 			to_chat(user, "<span class='notice'>\The [src] is full.</span>")
 			return
 	reagents.remove_reagent(25,"water")
-	var/datum/effect/system/bad_smoke_spread/smoke = new /datum/effect/system/bad_smoke_spread()
+	var/datum/effect/system/smoke_spread/bad/smoke = new
 	smoke.set_up(5, 0, user.loc)
 	smoke.start()
 	playsound(user.loc, 'sound/effects/bamf.ogg', 50, 2)

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

@@ -6,11 +6,11 @@
 	det_time = 20
 	item_state = "flashbang"
 	slot_flags = SLOT_BELT
-	var/datum/effect/system/bad_smoke_spread/smoke
+	var/datum/effect/system/smoke_spread/bad/smoke
 
 	New()
 		..()
-		src.smoke = new /datum/effect/system/bad_smoke_spread
+		src.smoke = new /datum/effect/system/smoke_spread/bad
 		src.smoke.attach(src)
 
 	Destroy()

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

@@ -59,7 +59,7 @@
 		to_chat(user, "A mysterious force disrupts your arcane spell matrix, and you remain where you are.")
 		return
 
-	var/datum/effect/system/harmless_smoke_spread/smoke = new /datum/effect/system/harmless_smoke_spread()
+	var/datum/effect/system/smoke_spread/smoke = new
 	smoke.set_up(5, 0, user.loc)
 	smoke.attach(user)
 	smoke.start()