From cc7a3fe4e5e6945f65867cddcfece240f4cd2794 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Sun, 30 Jan 2022 16:28:24 +0100 Subject: [PATCH] [MIRROR] Tweak CIMS to ignore Syndicate Owned crystal. [MDB IGNORE] (#11139) * Tweak CIMS to ignore Syndicate Owned crystal. (#64526) * Tweak CIMS to ignore Syndicate Owned crystal. Co-authored-by: Vire <66576896+Maurukas@users.noreply.github.com> --- .../file_system/programs/sm_monitor.dm | 14 +++++++------- code/modules/power/supermatter/supermatter.dm | 2 ++ .../ruins/lavalandruin_code/syndicate_base.dm | 1 + 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/code/modules/modular_computers/file_system/programs/sm_monitor.dm b/code/modules/modular_computers/file_system/programs/sm_monitor.dm index 4ce3e3a0853..8490eae2467 100644 --- a/code/modules/modular_computers/file_system/programs/sm_monitor.dm +++ b/code/modules/modular_computers/file_system/programs/sm_monitor.dm @@ -47,15 +47,15 @@ for(var/supermatter in supermatters) clear_supermatter(supermatter) supermatters = list() - var/turf/T = get_turf(ui_host()) - if(!T) + var/turf/user_turf = get_turf(ui_host()) + if(!user_turf) return - for(var/obj/machinery/power/supermatter_crystal/S in GLOB.machines) - // Delaminating, not within coverage, not on a tile. - if (!isturf(S.loc) || !(is_station_level(S.z) || is_mining_level(S.z) || S.z == T.z)) + for(var/obj/machinery/power/supermatter_crystal/crystal in GLOB.machines) + //Exclude Syndicate owned, Delaminating, not within coverage, not on a tile. + if (!crystal.include_in_cims || !isturf(crystal.loc) || !(is_station_level(crystal.z) || is_mining_level(crystal.z) || crystal.z == user_turf.z)) continue - supermatters.Add(S) - RegisterSignal(S, COMSIG_PARENT_QDELETING, .proc/react_to_del) + supermatters.Add(crystal) + RegisterSignal(crystal, COMSIG_PARENT_QDELETING, .proc/react_to_del) /datum/computer_file/program/supermatter_monitor/proc/get_status() . = SUPERMATTER_INACTIVE diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm index 7f73e2d125f..0fd5de05161 100644 --- a/code/modules/power/supermatter/supermatter.dm +++ b/code/modules/power/supermatter/supermatter.dm @@ -244,6 +244,8 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_crystal) var/processes = TRUE ///Stores the time of when the last zap occurred var/last_power_zap = 0 + ///Do we show this crystal in the CIMS modular program + var/include_in_cims = TRUE /obj/machinery/power/supermatter_crystal/Initialize(mapload) diff --git a/code/modules/ruins/lavalandruin_code/syndicate_base.dm b/code/modules/ruins/lavalandruin_code/syndicate_base.dm index 79cf3c8c00b..1fd36f7a7d1 100644 --- a/code/modules/ruins/lavalandruin_code/syndicate_base.dm +++ b/code/modules/ruins/lavalandruin_code/syndicate_base.dm @@ -53,6 +53,7 @@ radio_key = /obj/item/encryptionkey/syndicate engineering_channel = "Syndicate" common_channel = "Syndicate" + include_in_cims = FALSE /obj/machinery/power/supermatter_crystal/shard/syndicate/attackby(obj/item/item, mob/living/user, params) if(istype(item, /obj/item/scalpel/supermatter)) //You can already yoink the docs as a free objective win, another would be just gross