cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-07-15 09:57:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #575 from ArchieBeepBoop/aitarget2

Browse Source 
Functional Ai Target sanity check
This commit is contained in:
QuoteFox
2020-10-10 07:48:38 +01:00
committed by GitHub
parent 4f9dcf8a83 c69842819c
commit b97338a6b4
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/objective.dm
+9 -4
View File
@@ -416,9 +416,17 @@ GLOBAL_LIST_EMPTY(possible_items)
for(var/datum/mind/M in owners)
if(M.current.mind.assigned_role in possible_item.excludefromjob)
continue check_items
approved_targets += possible_item
if(extraSanityCheck(possible_item.targetitem))
approved_targets += possible_item
return set_target(safepick(approved_targets))
/datum/objective/steal/proc/extraSanityCheck(objectiveitem)
if(objectiveitem == /obj/item/aicard) //Is the item an AI card? (Steal a functional AI)
var/list/ais = active_ais() //Check if we have active AIs.
if(!ais.len)
return FALSE //No AIs, returns false, disallowing the AI card objective from being added to the approved target list
return TRUE //All checks successful, add this item to the approved target list
/datum/objective/steal/proc/set_target(datum/objective_item/item)
if(item)
targetinfo = item
@@ -875,6 +883,3 @@ GLOBAL_LIST_EMPTY(possible_items_special)
/datum/objective/changeling_team_objective/impersonate_department/impersonate_heads
explanation_text = "Have X or more heads of staff escape on the shuttle disguised as heads, while the real heads are dead"
command_staff_only = TRUE