diff --git a/code/modules/antagonists/traitor/contractor/datums/contractor_hub_ui.dm b/code/modules/antagonists/traitor/contractor/datums/contractor_hub_ui.dm index f0c705f6523..cc7b733c743 100644 --- a/code/modules/antagonists/traitor/contractor/datums/contractor_hub_ui.dm +++ b/code/modules/antagonists/traitor/contractor/datums/contractor_hub_ui.dm @@ -65,7 +65,6 @@ switch(page) if(HUB_PAGE_CONTRACTS) - var/contract_target var/list/contracts_out = list() data["contracts"] = contracts_out for(var/c in contracts) @@ -100,7 +99,6 @@ contract_data["fail_reason"] = C.fail_reason if(C.contract.extraction_zone) - contract_target = C.contract.target?.current var/area/A = get_area(user) contract_data["objective"] = list( extraction_name = C.contract.extraction_zone.map_name, @@ -114,9 +112,7 @@ ) contracts_out += list(contract_data) - data["can_extract"] = FALSE - if(contract_target) - data["can_extract"] = current_contract?.contract.can_start_extraction_process(user, contract_target) + data["can_extract"] = current_contract?.contract.can_start_extraction_process(user) || FALSE if(HUB_PAGE_SHOP) var/list/buyables = list() diff --git a/code/modules/antagonists/traitor/contractor/datums/objective_contract.dm b/code/modules/antagonists/traitor/contractor/datums/objective_contract.dm index d2bd6de7567..171c1662cf9 100644 --- a/code/modules/antagonists/traitor/contractor/datums/objective_contract.dm +++ b/code/modules/antagonists/traitor/contractor/datums/objective_contract.dm @@ -237,8 +237,7 @@ * Returns whether the extraction process can be started. * * Arguments: - * * M - The contractor. - * * target - The target. + * * caller - The person trying to call the extraction. */ -/datum/objective/contract/proc/can_start_extraction_process(mob/living/carbon/human/M, mob/living/carbon/human/target) - return get_area(M) == extraction_zone && get_area(target) == extraction_zone +/datum/objective/contract/proc/can_start_extraction_process(mob/living/carbon/human/caller) + return get_area(caller) == extraction_zone && get_area(target.current) == extraction_zone