From 0286970144ffd43283bfc7f8517ab3caf6057076 Mon Sep 17 00:00:00 2001 From: MarinaGryphon Date: Tue, 13 Jul 2021 13:08:00 -0500 Subject: [PATCH 1/2] Synthetic resleeving notifications go to Science instead of Medical --- code/controllers/subsystems/transcore_vr.dm | 15 ++++++++++----- code/modules/mob/dead/observer/observer_vr.dm | 2 +- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/code/controllers/subsystems/transcore_vr.dm b/code/controllers/subsystems/transcore_vr.dm index ebf47439d68..86ffac6b06a 100644 --- a/code/controllers/subsystems/transcore_vr.dm +++ b/code/controllers/subsystems/transcore_vr.dm @@ -114,7 +114,7 @@ SUBSYSTEM_DEF(transcore) else if(curr_MR.dead_state != MR_DEAD) //First time switching to dead if(curr_MR.do_notify) - db.notify(curr_MR.mindname) + db.notify(curr_MR) curr_MR.last_notification = world.time curr_MR.dead_state = MR_DEAD @@ -250,10 +250,15 @@ SUBSYSTEM_DEF(transcore) return 1 -// Send a past-due notification to the medical radio channel. -/datum/transcore_db/proc/notify(var/name) - ASSERT(name) - global_announcer.autosay("[name] is past-due for a mind backup.", "TransCore Oversight", "Medical") +// Send a past-due notification to the proper radio channel. +/datum/transcore_db/proc/notify(var/datum/transhuman/mind_record/MR) + ASSERT(MR) + var/datum/transcore_db/db = SStranscore.db_by_mind_name(MR.mindname) + var/datum/transhuman/body_record/BR = db.body_scans[MR.mindname] + if(!BR) + global_announcer.autosay("[MR.mindname] is past-due for a mind backup, but lacks a corresponding body record." "TransCore Oversight", "Medical") + return + global_announcer.autosay("[MR.mindname] is past-due for a mind backup.", "TransCore Oversight", BR.synthetic ? "Science" : "Medical") // Called from mind_record to add itself to the transcore. /datum/transcore_db/proc/add_backup(var/datum/transhuman/mind_record/MR) diff --git a/code/modules/mob/dead/observer/observer_vr.dm b/code/modules/mob/dead/observer/observer_vr.dm index df68f41851c..1fb9d913c94 100644 --- a/code/modules/mob/dead/observer/observer_vr.dm +++ b/code/modules/mob/dead/observer/observer_vr.dm @@ -73,7 +73,7 @@ else if((world.time - record.last_notification) < 5 MINUTES) to_chat(src, "Too little time has passed since your last notification.") else - db.notify(record.mindname) + db.notify(record) record.last_notification = world.time to_chat(src, "New notification has been sent.") else From 79b272d28b04a966c1f47afca3dfbdc0476ad6bc Mon Sep 17 00:00:00 2001 From: Aronai Sieyes Date: Wed, 14 Jul 2021 14:14:10 -0400 Subject: [PATCH 2/2] Update code/controllers/subsystems/transcore_vr.dm --- code/controllers/subsystems/transcore_vr.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/controllers/subsystems/transcore_vr.dm b/code/controllers/subsystems/transcore_vr.dm index 86ffac6b06a..6b0815999b4 100644 --- a/code/controllers/subsystems/transcore_vr.dm +++ b/code/controllers/subsystems/transcore_vr.dm @@ -256,7 +256,7 @@ SUBSYSTEM_DEF(transcore) var/datum/transcore_db/db = SStranscore.db_by_mind_name(MR.mindname) var/datum/transhuman/body_record/BR = db.body_scans[MR.mindname] if(!BR) - global_announcer.autosay("[MR.mindname] is past-due for a mind backup, but lacks a corresponding body record." "TransCore Oversight", "Medical") + global_announcer.autosay("[MR.mindname] is past-due for a mind backup, but lacks a corresponding body record.", "TransCore Oversight", "Medical") return global_announcer.autosay("[MR.mindname] is past-due for a mind backup.", "TransCore Oversight", BR.synthetic ? "Science" : "Medical") @@ -300,4 +300,4 @@ SUBSYSTEM_DEF(transcore) return disk.stored.len #undef SSTRANSCORE_BACKUPS -#undef SSTRANSCORE_IMPLANTS \ No newline at end of file +#undef SSTRANSCORE_IMPLANTS