cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-18 03:26:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Tweak CIMS to ignore Syndicate Owned crystal. [MDB IGNORE] (#11139)

Browse Source 
* 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>
This commit is contained in:
SkyratBot
2022-01-30 16:28:24 +01:00
committed by GitHub
parent 922acfe99c
commit cc7a3fe4e5
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/modular_computers/file_system/programs/sm_monitor.dm
+7 -7
View File
@@ -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
code/modules/power/supermatter/supermatter.dm
+2
View File
@@ -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)
code/modules/ruins/lavalandruin_code/syndicate_base.dm
+1
View File
@@ -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