cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 03:27:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Possibly fix being unable to call extraction (#16586)

Browse Source
This commit is contained in:
dearmochi
2021-08-31 12:37:04 +01:00
committed by GitHub
parent f26eb0824d
commit 9d9c592de7
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/antagonists/traitor/contractor/datums/contractor_hub_ui.dm
+1 -5
View File
@@ -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()
code/modules/antagonists/traitor/contractor/datums/objective_contract.dm
+3 -4
View File
@@ -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