Adds steam to the coffeemaker + fix (#69505)

Co-authored-by: tattle <article.disaster@gmail.com>

code/game/objects/effects/particles/smoke.dm

@@ -0,0 +1,24 @@
+/particles/smoke
+	icon = 'icons/effects/particles/smoke.dmi'
+	icon_state = list("smoke_1" = 1, "smoke_2" = 1, "smoke_3" = 2)
+	width = 100
+	height = 100
+	count = 1000
+	spawning = 4
+	lifespan = 1.5 SECONDS
+	fade = 1 SECONDS
+	velocity = list(0, 0.4, 0)
+	position = list(6, 0, 0)
+	drift = generator("sphere", 0, 2, NORMAL_RAND)
+	friction = 0.2
+	gravity = list(0, 0.95)
+	grow = 0.05
+
+/particles/smoke/steam
+	icon_state = list("steam_1" = 1, "steam_2" = 1, "steam_3" = 2)
+	fade = 1.5 SECONDS
+
+/particles/smoke/steam/mild
+	spawning = 1
+	velocity = list(0, 0.3, 0)
+	friction = 0.25

code/modules/food_and_drinks/machinery/coffeemaker.dm

@@ -2,7 +2,7 @@
 	name = "coffeemaker"
 	desc = "A Modello 3 Coffeemaker that brews coffee and holds it at the perfect temperature of 176 fahrenheit. Made by Piccionaia Home Appliances."
 	icon = 'icons/obj/medical/chemical.dmi'
-	icon_state = "coffeemaker11"
+	icon_state = "coffeemaker_nopot_nocart"
 	base_icon_state = "coffeemaker"
 	resistance_flags = FIRE_PROOF | ACID_PROOF
 	circuit = /obj/item/circuitboard/machine/coffeemaker
@@ -309,15 +309,24 @@
 	user.put_in_hands(new_pack)
 	creamer_packs--
 
+///Updates the smoke state to something else, setting particles if relevant
+/obj/machinery/coffeemaker/proc/toggle_steam()
+	QDEL_NULL(particles)
+	if(brewing)
+		particles = new /particles/smoke/steam/mild()
+		particles.position = list(-6, 0, 0)
+
 /obj/machinery/coffeemaker/proc/operate_for(time, silent = FALSE)
 	brewing = TRUE
 	if(!silent)
 		playsound(src, 'sound/machines/coffeemaker_brew.ogg', 20, vary = TRUE)
+	toggle_steam()
 	use_power(active_power_usage * time * 0.1) // .1 needed here to convert time (in deciseconds) to seconds such that watts * seconds = joules
 	addtimer(CALLBACK(src, .proc/stop_operating), time / speed)
 
 /obj/machinery/coffeemaker/proc/stop_operating()
 	brewing = FALSE
+	toggle_steam()
 
 /obj/machinery/coffeemaker/proc/brew()
 	power_change()

code/modules/food_and_drinks/machinery/oven.dm

@@ -182,34 +182,6 @@
 	icon_state = "oven_tray"
 	max_items = 6
 
-
-/particles/smoke
-	icon = 'icons/effects/particles/smoke.dmi'
-	icon_state = list("smoke_1" = 1, "smoke_2" = 1, "smoke_3" = 2)
-	width = 100
-	height = 100
-	count = 1000
-	spawning = 4
-	lifespan = 1.5 SECONDS
-	fade = 1 SECONDS
-	velocity = list(0, 0.4, 0)
-	position = list(6, 0, 0)
-	drift = generator("sphere", 0, 2, NORMAL_RAND)
-	friction = 0.2
-	gravity = list(0, 0.95)
-	grow = 0.05
-
-/particles/smoke/steam/mild
-	spawning = 1
-	velocity = list(0, 0.3, 0)
-	friction = 0.25
-
-
-/particles/smoke/steam
-	icon_state = list("steam_1" = 1, "steam_2" = 1, "steam_3" = 2)
-	fade = 1.5 SECONDS
-
-
 #undef OVEN_SMOKE_STATE_NONE
 #undef OVEN_SMOKE_STATE_GOOD
 #undef OVEN_SMOKE_STATE_NEUTRAL

tgstation.dme

@@ -1491,6 +1491,7 @@
 #include "code\game\objects\effects\effect_system\fluid_spread\_fluid_spread.dm"
 #include "code\game\objects\effects\effect_system\fluid_spread\effects_foam.dm"
 #include "code\game\objects\effects\effect_system\fluid_spread\effects_smoke.dm"
+#include "code\game\objects\effects\particles\smoke.dm"
 #include "code\game\objects\effects\spawners\bombspawner.dm"
 #include "code\game\objects\effects\spawners\costume.dm"
 #include "code\game\objects\effects\spawners\gibspawner.dm"
@@ -2969,17 +2970,18 @@
 #include "code\modules\flufftext\Dreaming.dm"
 #include "code\modules\food_and_drinks\pizzabox.dm"
 #include "code\modules\food_and_drinks\plate.dm"
-#include "code\modules\food_and_drinks\kitchen_machinery\deep_fryer.dm"
-#include "code\modules\food_and_drinks\kitchen_machinery\food_cart.dm"
-#include "code\modules\food_and_drinks\kitchen_machinery\gibber.dm"
-#include "code\modules\food_and_drinks\kitchen_machinery\griddle.dm"
-#include "code\modules\food_and_drinks\kitchen_machinery\grill.dm"
-#include "code\modules\food_and_drinks\kitchen_machinery\icecream_vat.dm"
-#include "code\modules\food_and_drinks\kitchen_machinery\microwave.dm"
-#include "code\modules\food_and_drinks\kitchen_machinery\monkeyrecycler.dm"
-#include "code\modules\food_and_drinks\kitchen_machinery\oven.dm"
-#include "code\modules\food_and_drinks\kitchen_machinery\processor.dm"
-#include "code\modules\food_and_drinks\kitchen_machinery\smartfridge.dm"
+#include "code\modules\food_and_drinks\machinery\coffeemaker.dm"
+#include "code\modules\food_and_drinks\machinery\deep_fryer.dm"
+#include "code\modules\food_and_drinks\machinery\food_cart.dm"
+#include "code\modules\food_and_drinks\machinery\gibber.dm"
+#include "code\modules\food_and_drinks\machinery\griddle.dm"
+#include "code\modules\food_and_drinks\machinery\grill.dm"
+#include "code\modules\food_and_drinks\machinery\icecream_vat.dm"
+#include "code\modules\food_and_drinks\machinery\microwave.dm"
+#include "code\modules\food_and_drinks\machinery\monkeyrecycler.dm"
+#include "code\modules\food_and_drinks\machinery\oven.dm"
+#include "code\modules\food_and_drinks\machinery\processor.dm"
+#include "code\modules\food_and_drinks\machinery\smartfridge.dm"
 #include "code\modules\food_and_drinks\recipes\food_mixtures.dm"
 #include "code\modules\food_and_drinks\recipes\processor_recipes.dm"
 #include "code\modules\food_and_drinks\recipes\drinks\drinks_alcoholic.dm"
@@ -4093,7 +4095,6 @@
 #include "code\modules\reagents\chemistry\machinery\chem_master.dm"
 #include "code\modules\reagents\chemistry\machinery\chem_recipe_debug.dm"
 #include "code\modules\reagents\chemistry\machinery\chem_synthesizer.dm"
-#include "code\modules\reagents\chemistry\machinery\coffeemaker.dm"
 #include "code\modules\reagents\chemistry\machinery\pandemic.dm"
 #include "code\modules\reagents\chemistry\machinery\reagentgrinder.dm"
 #include "code\modules\reagents\chemistry\machinery\smoke_machine.dm"