cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11062 from MarinaGryphon/upgrade/sleeve-announce

Browse Source 
Synthetic resleeving notifications go to Science instead of Medical
This commit is contained in:
Aronai Sieyes
2021-07-14 14:38:51 -04:00
committed by Chompstation Bot
parent b246cfd374
commit a93e6cd14c
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
code/controllers/subsystems/transcore_vr.dm
View File

@@ -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)
@@ -295,4 +300,4 @@ SUBSYSTEM_DEF(transcore)
return disk.stored.len
#undef SSTRANSCORE_BACKUPS
#undef SSTRANSCORE_IMPLANTS
#undef SSTRANSCORE_IMPLANTS

2
code/modules/mob/dead/observer/observer_vr.dm
View File

@@ -73,7 +73,7 @@
else if((world.time - record.last_notification) < 5 MINUTES)
to_chat(src, "<span class='warning'>Too little time has passed since your last notification.</span>")
else
db.notify(record.mindname)
db.notify(record)
record.last_notification = world.time
to_chat(src, "<span class='notice'>New notification has been sent.</span>")
else