From 6bb4265cdfa4c320d042fb730b751eeae439ab1b Mon Sep 17 00:00:00 2001 From: Sparky Date: Sat, 29 Jun 2024 12:11:35 +0100 Subject: [PATCH] Science Analysis Fixes (#19562) Fixes the compound microscope's sprite disappearing when slides are added, and the centrifuge & spectrophotometer sprites disappearing while working. --- code/game/objects/items/science_sampler.dm | 4 ++-- html/changelogs/analysis-fixes.yml | 6 ++++++ icons/obj/item/sampling.dmi | Bin 5239 -> 5557 bytes 3 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 html/changelogs/analysis-fixes.yml diff --git a/code/game/objects/items/science_sampler.dm b/code/game/objects/items/science_sampler.dm index 0c16e568006..8f82053082a 100644 --- a/code/game/objects/items/science_sampler.dm +++ b/code/game/objects/items/science_sampler.dm @@ -195,7 +195,7 @@ to_chat(user, SPAN_NOTICE("\The [src] begins to spin, separating the contents of the samples.")) - icon_state = "[initial(icon_state)]_working" + icon_state = "centrifuge_working" addtimer(CALLBACK(src, PROC_REF(process_samples)), 30 SECONDS) /obj/machinery/centrifuge/proc/process_samples() @@ -326,7 +326,7 @@ to_chat(user, SPAN_NOTICE("\The [src] begins to glow, shining light through its sample.")) - icon_state = "[initial(icon_state)]_working" + icon_state = "spectrophotometer_working" addtimer(CALLBACK(src, PROC_REF(process_sample)), 15 SECONDS) /** diff --git a/html/changelogs/analysis-fixes.yml b/html/changelogs/analysis-fixes.yml new file mode 100644 index 00000000000..926ad2c45e6 --- /dev/null +++ b/html/changelogs/analysis-fixes.yml @@ -0,0 +1,6 @@ +author: Sparky_hotdog + +delete-after: True + +changes: + - bugfix: "Fixed compound microscope, centrifuge and spectrophotometer sprites disappearing during use." diff --git a/icons/obj/item/sampling.dmi b/icons/obj/item/sampling.dmi index dedd3acf6b06bfc7a43b496d4845b16668ba8dc4..703082487e6d20e95ca835ce01cbebd9cfd9ec9a 100644 GIT binary patch literal 5557 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 K=u~PuMEnni0b%w4 literal 5239 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 s7L2ITCq2S}?r`Ss*~jLk`g92WsMe@h