diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm
index 0c890e8c8e..e8a8e21810 100644
--- a/_maps/map_files/BoxStation/BoxStation.dmm
+++ b/_maps/map_files/BoxStation/BoxStation.dmm
@@ -24585,9 +24585,7 @@
 	icon_state = "0-2";
 	d2 = 2
 	},
-/mob/living/simple_animal/bot/cleanbot{
-	name = "C.L.E.A.N."
-	},
+/obj/machinery/smoke_machine,
 /turf/open/floor/plasteel/white,
 /area/medical/chemistry)
 "bha" = (
@@ -27828,6 +27826,9 @@
 	pixel_x = 30
 	},
 /obj/machinery/light,
+/mob/living/simple_animal/bot/cleanbot{
+	name = "C.L.E.A.N."
+	},
 /turf/open/floor/plasteel/white,
 /area/medical/medbay/central)
 "bok" = (
diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm
index 1b784a678b..ff9147ce22 100644
--- a/_maps/map_files/Deltastation/DeltaStation2.dmm
+++ b/_maps/map_files/Deltastation/DeltaStation2.dmm
@@ -79324,6 +79324,7 @@
 	pixel_y = 7;
 	req_access_txt = "33"
 	},
+/obj/machinery/smoke_machine,
 /turf/open/floor/plasteel/whiteyellow/corner{
 	dir = 8
 	},
diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm
index 1db625b12e..7a1d624abd 100644
--- a/_maps/map_files/MetaStation/MetaStation.dmm
+++ b/_maps/map_files/MetaStation/MetaStation.dmm
@@ -59050,6 +59050,7 @@
 /turf/open/floor/plasteel/white,
 /area/medical/chemistry)
 "cjV" = (
+/obj/machinery/smoke_machine,
 /turf/open/floor/plasteel/whiteyellow/side{
 	dir = 4
 	},
diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm
index a63a533f30..51dd61f255 100644
--- a/_maps/map_files/PubbyStation/PubbyStation.dmm
+++ b/_maps/map_files/PubbyStation/PubbyStation.dmm
@@ -54062,6 +54062,10 @@
 	},
 /turf/open/space/basic,
 /area/space)
+"YXH" = (
+/obj/machinery/smoke_machine,
+/turf/open/floor/plasteel/white,
+/area/medical/chemistry)
 
 (1,1,1) = {"
 aaa
@@ -85295,8 +85299,8 @@ bpX
 brl
 bsL
 bul
-bsK
 bwU
+YXH
 bsK
 bAg
 bpY
diff --git a/code/modules/reagents/chemistry/machinery/smoke_machine.dm b/code/modules/reagents/chemistry/machinery/smoke_machine.dm
index 1fb167662e..921312a69e 100644
--- a/code/modules/reagents/chemistry/machinery/smoke_machine.dm
+++ b/code/modules/reagents/chemistry/machinery/smoke_machine.dm
@@ -1,5 +1,6 @@
 /obj/machinery/smoke_machine
 	name = "Smoke Machine"
+	desc = "Seriously man?"
 	icon = 'icons/obj/chemical.dmi'
 	icon_state = "smoke0"
 	density = TRUE
@@ -20,6 +21,11 @@
 	carry.remove_any(setting * 16 / efficiency)
 	location = loc
 
+/datum/effect_system/smoke_spread/chem/smoke_machine
+	effect_type = /obj/effect/particle_effect/smoke/transparent
+
+
+
 /obj/machinery/smoke_machine/Initialize()
 	. = ..()
 	create_reagents(volume)
@@ -64,7 +70,8 @@
 			to_chat(user, "<span class='notice'>You transfer [units] units of the solution to [src].</span>")
 			add_logs(usr, src, "has added [english_list(RC.reagents.reagent_list)] to [src]")
 			return
-	if(default_unfasten_wrench(user, I))
+	if(default_unfasten_wrench(user, I, 40))
+		on = FALSE
 		return
 	return ..()
 
diff --git a/icons/obj/chemical.dmi b/icons/obj/chemical.dmi
index ddfc782467..bd8426d696 100644
Binary files a/icons/obj/chemical.dmi and b/icons/obj/chemical.dmi differ