From a2a95383a881180a5340bcf80ce19207717e970c Mon Sep 17 00:00:00 2001 From: Mark van Alphen Date: Sun, 2 Jun 2019 03:24:38 +0200 Subject: [PATCH] Add some extra offstation checks --- code/game/gamemodes/autotraitor/autotraitor.dm | 2 +- code/game/gamemodes/objective.dm | 2 +- code/game/jobs/job_objective.dm | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/gamemodes/autotraitor/autotraitor.dm b/code/game/gamemodes/autotraitor/autotraitor.dm index 63f9d5fbaff..2137888d0b8 100644 --- a/code/game/gamemodes/autotraitor/autotraitor.dm +++ b/code/game/gamemodes/autotraitor/autotraitor.dm @@ -96,7 +96,7 @@ for(var/obj/item/implant/mindshield/I in H.contents) if(I && I.implanted) possible_traitors -= player - if(!H.job) //Golems, special events stuff, etc. + if(!H.job || H.mind.offstation_role) //Golems, special events stuff, etc. possible_traitors -= player //message_admins("Live Players: [playercount]") //message_admins("Live Traitors: [traitorcount]") diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index 5b06e09f5ba..ef68117e1c4 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -532,7 +532,7 @@ var/list/potential_theft_objectives = subtypesof(/datum/theft_objective) - /datu var/list/priority_targets = list() for(var/datum/mind/possible_target in SSticker.minds) - if(possible_target != owner && ishuman(possible_target.current) && (possible_target.current.stat != DEAD) && (possible_target.assigned_role != possible_target.special_role)) + if(possible_target != owner && ishuman(possible_target.current) && (possible_target.current.stat != DEAD) && (possible_target.assigned_role != possible_target.special_role) && !possible_target.offstation_role) possible_targets += possible_target for(var/role in roles) if(possible_target.assigned_role == role) diff --git a/code/game/jobs/job_objective.dm b/code/game/jobs/job_objective.dm index 4456bb571e5..48fa911bcf5 100644 --- a/code/game/jobs/job_objective.dm +++ b/code/game/jobs/job_objective.dm @@ -49,7 +49,7 @@ if(!employee.job_objectives.len)//If the employee had no objectives, don't need to process this. continue - if(employee.assigned_role == employee.special_role) //If the character is an offstation character, skip them. + if(employee.assigned_role == employee.special_role || employee.offstation_role) //If the character is an offstation character, skip them. continue var/tasks_completed=0