cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-10 22:54:32 +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/datums/mind.dm
+9 -3
View File
@@ -606,9 +606,12 @@
var/objective_type = "[objective_type_capital][objective_type_text]"//Add them together into a text string.
var/list/possible_targets = list()
var/list/possible_targets_random = list()
for(var/datum/mind/possible_target in SSticker.minds)
if((possible_target != src) && istype(possible_target.current, /mob/living/carbon/human))
possible_targets += possible_target.current
possible_targets += possible_target.current // Allows for admins to pick off station roles
if(!is_invalid_target(possible_target))
possible_targets_random += possible_target.current // For random picking, only valid targets
var/mob/def_target = null
var/objective_list[] = list(/datum/objective/assassinate, /datum/objective/protect, /datum/objective/debrain)
@@ -617,12 +620,15 @@
possible_targets = sortAtom(possible_targets)
var/new_target
if(length(possible_targets) > 0)
if(length(possible_targets))
if(alert(usr, "Do you want to pick the objective yourself? No will randomise it", "Pick objective", "Yes", "No") == "Yes")
possible_targets += "Free objective"
new_target = input("Select target:", "Objective target", def_target) as null|anything in possible_targets
else
new_target = pick(possible_targets)
if(!length(possible_targets_random))
to_chat(usr, "<span class='warning'>No random target found. Pick one manually.</span>")
return
new_target = pick(possible_targets_random)
if(!new_target)
return
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)