cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-21 19:17:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes Captain being contractor target, contractor batons not stunning silicon (#15096)

Browse Source
This commit is contained in:
dearmochi
2020-12-12 16:25:25 +00:00
committed by GitHub
parent 5ccbbf1192
commit d2e034d80d
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/antagonists/traitor/contractor/datums/objective_contract.dm
+2 -2
View File
@@ -7,7 +7,7 @@
// Settings
/// Jobs that cannot be the kidnapping target.
var/static/list/forbidden_jobs = list(
/datum/job/captain,
"Captain",
)
/// Static whitelist of area names that can be used as an extraction zone, structured by difficulty.
/// An area's difficulty should be measured in how crowded it generally is, how out of the way it is and so on.
@@ -185,7 +185,7 @@
return ..()
/datum/objective/contract/is_invalid_target(datum/mind/possible_target)
if((possible_target.assigned_job in forbidden_jobs) || (target_blacklist && (possible_target in target_blacklist)))
if((possible_target.assigned_role in forbidden_jobs) || (target_blacklist && (possible_target in target_blacklist)))
return TARGET_INVALID_BLACKLISTED
return ..()