From edda5a3198ae5289675c60e3b35ce97fc63b0071 Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Thu, 5 Aug 2021 16:30:15 -0400 Subject: [PATCH] Merge pull request #11328 from VOREStation/Icons/fieldgen Skyrat field generator sprites --- .../power/singularity/containment_field.dm | 2 +- icons/obj/machines/field_generator.dmi | Bin 2104 -> 1968 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/power/singularity/containment_field.dm b/code/modules/power/singularity/containment_field.dm index c47352e09d..58f8ee0275 100644 --- a/code/modules/power/singularity/containment_field.dm +++ b/code/modules/power/singularity/containment_field.dm @@ -3,7 +3,7 @@ /obj/machinery/containment_field name = "Containment Field" desc = "An energy field." - icon = 'icons/obj/singularity.dmi' + icon = 'icons/obj/machines/field_generator.dmi' icon_state = "Contain_F" anchored = TRUE density = FALSE diff --git a/icons/obj/machines/field_generator.dmi b/icons/obj/machines/field_generator.dmi index fcb083f8467326cbb1795f20b9fae570affb1de2..45aa7d209cb2e17be37a14d6e6b03893ca02656a 100644 GIT binary patch literal 1968 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 gU=JMpPXduC4#BDa0F1BI761SM