diff --git a/code/modules/antagonists/traitor/syndicate_contract.dm b/code/modules/antagonists/traitor/syndicate_contract.dm index c22012fe87..20d07556c1 100644 --- a/code/modules/antagonists/traitor/syndicate_contract.dm +++ b/code/modules/antagonists/traitor/syndicate_contract.dm @@ -2,6 +2,7 @@ var/id = 0 var/status = CONTRACT_STATUS_INACTIVE var/datum/objective/contract/contract = new() + var/target_rank var/ransom = 0 var/payout_type = null var/list/victim_belongings = list() @@ -13,6 +14,11 @@ /datum/syndicate_contract/proc/generate(blacklist) contract.find_target(null, blacklist) + var/datum/data/record/record = find_record("name", contract.target.name, GLOB.data_core.general) + if(record) + target_rank = record.fields["rank"] + else + target_rank = "Unknown" if (payout_type == CONTRACT_PAYOUT_LARGE) contract.payout_bonus = rand(9,13) else if(payout_type == CONTRACT_PAYOUT_MEDIUM) diff --git a/code/modules/modular_computers/file_system/programs/antagonist/contract_uplink.dm b/code/modules/modular_computers/file_system/programs/antagonist/contract_uplink.dm index 42af956e2e..35470cdee9 100644 --- a/code/modules/modular_computers/file_system/programs/antagonist/contract_uplink.dm +++ b/code/modules/modular_computers/file_system/programs/antagonist/contract_uplink.dm @@ -129,16 +129,9 @@ "item_icon" = hub_item.item_icon )) for(var/datum/syndicate_contract/contract in traitor_data.contractor_hub.assigned_contracts) - var/target_rank = "" - if(contract.contract.target) - var/datum/data/record/record = find_record("name", contract.contract.target.current.real_name, GLOB.data_core.general) - if(record) - target_rank = record.fields["rank"] - else - target_rank = "Unknown" data["contracts"] += list(list( "target" = contract.contract.target, - "target_rank" = target_rank, + "target_rank" = contract.target_rank, "payout" = contract.contract.payout, "payout_bonus" = contract.contract.payout_bonus, "dropoff" = contract.contract.dropoff, diff --git a/icons/mob/inhands/weapons/melee_righthand.dmi b/icons/mob/inhands/weapons/melee_righthand.dmi index 7284f43e60..9c734fbb93 100644 Binary files a/icons/mob/inhands/weapons/melee_righthand.dmi and b/icons/mob/inhands/weapons/melee_righthand.dmi differ