cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Various Mail fixes (#10592)

Browse Source 
Co-authored-by: Guti <32563288+TheCaramelion@users.noreply.github.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-04-06 07:34:14 -07:00
committed by GitHub
parent 102cb59639
commit 2688d24510
3 changed files with 44 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/controllers/subsystems/mail.dm
View File

@@ -24,7 +24,7 @@ SUBSYSTEM_DEF(mail)
// Collect recipients
var/list/mail_recipients = list()
for(var/mob/living/carbon/human/player_human in player_list)
if(player_human.stat != DEAD && player_human.client && player_human.client.inactivity <= 10 MINUTES && player_human.job != JOB_OUTSIDER && player_human.job != JOB_ANOMALY && player_human.job != JOB_VR && !player_is_antag(player_human.mind)) // Only alive, active and NT employeers should be getting mail.
if(player_human.stat != DEAD && player_human.client && player_human.client.inactivity <= 10 MINUTES && player_human.job != JOB_OUTSIDER && player_human.job != JOB_ANOMALY && player_human.job != JOB_VR && !player_is_antag(player_human.mind) && !isbelly(player_human.loc)) // Only alive, active and NT employeers should be getting mail.
mail_recipients += player_human
// Creates mail for all the mail waiting to arrive, if there's nobody to receive it, it will be a chance of junk mail.
@@ -39,7 +39,7 @@ SUBSYSTEM_DEF(mail)
var/mob/living/carbon/human/mail_to
if(mail_recipients.len)
mail_to = pick(mail_recipients)
new_mail.initialize_for_recipient(mail_to)
new_mail.initialize_for_recipient(mail_to.mind)
mail_recipients -= mail_to
else
new_mail.junk_mail()