cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-21 20:13:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #19095 (#19096)

Browse Source 
* fixxy fixxy

* uses is_invalid_target instead

* aa review, consistency

* wowee!

* Revert "wowee!"

This reverts commit cf1905092c.
This commit is contained in:
Contrabang
2022-09-25 12:37:53 -04:00
committed by GitHub
parent 157940350b
commit 096cdafce5
2 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/objective.dm
+8 -5
View File
@@ -30,11 +30,7 @@ GLOBAL_LIST_INIT(potential_theft_objectives, (subtypesof(/datum/theft_objective)
/datum/objective/proc/check_completion()
return completed
/datum/objective/proc/is_invalid_target(datum/mind/possible_target)
if(possible_target == owner)
return TARGET_INVALID_IS_OWNER
if(possible_target in owner.targets)
return TARGET_INVALID_IS_TARGET
/datum/proc/is_invalid_target(datum/mind/possible_target) // Originally an Objective proc. Changed to a datum proc to allow for the proc to be run on minds, before the objective is created
if(!ishuman(possible_target.current))
return TARGET_INVALID_NOT_HUMAN
if(possible_target.current.stat == DEAD)
@@ -50,6 +46,13 @@ GLOBAL_LIST_INIT(potential_theft_objectives, (subtypesof(/datum/theft_objective)
if(possible_target.offstation_role)
return TARGET_INVALID_EVENT
/datum/objective/is_invalid_target(datum/mind/possible_target)
if(possible_target == owner)
return TARGET_INVALID_IS_OWNER
if(possible_target in owner.targets)
return TARGET_INVALID_IS_TARGET
return ..()
/datum/objective/proc/find_target()
if(!needs_target)