From 8ae2cae804a9cccc66dac7c646cd7e454ba18316 Mon Sep 17 00:00:00 2001 From: Mechoid Date: Wed, 7 Aug 2019 21:40:05 -0700 Subject: [PATCH] Fixfix some last minute things. --- .../reagents/distilling/Distilling-Recipes.dm | 4 +++ .../modules/reagents/distilling/distilling.dm | 26 ++++++++++++------- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/code/modules/reagents/distilling/Distilling-Recipes.dm b/code/modules/reagents/distilling/Distilling-Recipes.dm index 47b747b581..f7fae18178 100644 --- a/code/modules/reagents/distilling/Distilling-Recipes.dm +++ b/code/modules/reagents/distilling/Distilling-Recipes.dm @@ -141,6 +141,8 @@ temp_shift = 4 /datum/chemical_reaction/distilling/berserkjuice/on_reaction(var/datum/reagents/holder, var/created_volume) + ..() + if(prob(1)) var/turf/T = get_turf(holder.my_atom) explosion(T, -1, rand(-1, 1), rand(1,2), rand(3,5)) @@ -158,6 +160,8 @@ temp_shift = 20 /datum/chemical_reaction/distilling/cryogel/on_reaction(var/datum/reagents/holder, var/created_volume) + ..() + if(prob(1)) var/turf/T = get_turf(holder.my_atom) var/datum/effect/effect/system/smoke_spread/frost/F = new (holder.my_atom) diff --git a/code/modules/reagents/distilling/distilling.dm b/code/modules/reagents/distilling/distilling.dm index fecc44dab5..b86bcc7435 100644 --- a/code/modules/reagents/distilling/distilling.dm +++ b/code/modules/reagents/distilling/distilling.dm @@ -10,7 +10,7 @@ icon = 'icons/obj/machines/reagent.dmi' icon_state = "distiller" - var/base_state = "distiller" + var/base_state // The string var used in update icon for overlays, either set manually or initialized. power_rating = 3000 power_losses = 240 @@ -79,14 +79,22 @@ Reservoir = new (src) Reservoir.Master = src - overlay_output_beaker = image(icon = src.icon, icon_state = "[icon_state]-output") - overlay_input_beaker = image(icon = src.icon, icon_state = "[icon_state]-input") - overlay_off = image(icon = src.icon, icon_state = "[icon_state]-bad") - overlay_ready = image(icon = src.icon, icon_state = "[icon_state]-good") - overlay_cooling = image(icon = src.icon, icon_state = "[icon_state]-cool") - overlay_heating = image(icon = src.icon, icon_state = "[icon_state]-heat") - overlay_dumping = image(icon = src.icon, icon_state = "[icon_state]-dump") - overlay_connected = image(icon = src.icon, icon_state = "[icon_state]-connector") + if(!base_state) + base_state = icon_state + + setup_overlay_vars() + + update_icon() + +/obj/machinery/portable_atmospherics/powered/reagent_distillery/proc/setup_overlay_vars() + overlay_output_beaker = image(icon = src.icon, icon_state = "[base_state]-output") + overlay_input_beaker = image(icon = src.icon, icon_state = "[base_state]-input") + overlay_off = image(icon = src.icon, icon_state = "[base_state]-bad") + overlay_ready = image(icon = src.icon, icon_state = "[base_state]-good") + overlay_cooling = image(icon = src.icon, icon_state = "[base_state]-cool") + overlay_heating = image(icon = src.icon, icon_state = "[base_state]-heat") + overlay_dumping = image(icon = src.icon, icon_state = "[base_state]-dump") + overlay_connected = image(icon = src.icon, icon_state = "[base_state]-connector") /obj/machinery/portable_atmospherics/powered/reagent_distillery/Destroy() qdel(Reservoir)