From cc960624b97107355f876e63efbd34692fcf68f7 Mon Sep 17 00:00:00 2001 From: PsiOmega Date: Sun, 6 Sep 2015 10:07:39 +0200 Subject: [PATCH] Fixes mercenary mode not listing bought items. The mercenary leader now spawns with the uplink, as is set as its owner. --- code/game/antagonist/outsider/mercenary.dm | 15 +++++++-------- code/game/objects/items/devices/uplinks.dm | 2 +- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/code/game/antagonist/outsider/mercenary.dm b/code/game/antagonist/outsider/mercenary.dm index a8b03e605d6..f703818e471 100644 --- a/code/game/antagonist/outsider/mercenary.dm +++ b/code/game/antagonist/outsider/mercenary.dm @@ -43,16 +43,15 @@ var/datum/antagonist/mercenary/mercs if(player.backbag == 4) player.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(player), slot_back) player.equip_to_slot_or_del(new /obj/item/weapon/storage/box/engineer(player.back), slot_in_backpack) player.equip_to_slot_or_del(new /obj/item/weapon/reagent_containers/pill/cyanide(player), slot_in_backpack) + + if (player.mind == leader) + var/obj/item/device/radio/uplink/U = new(player.loc) + U.hidden_uplink.uplink_owner = player.mind + U.hidden_uplink.uses = 40 + player.put_in_hands(U) + player.update_icons() create_id("Mercenary", player) create_radio(SYND_FREQ, player) return 1 - -/datum/antagonist/mercenary/create_nuke() - ..() - // Create the radio. - var/obj/effect/landmark/uplinkdevice = locate("landmark*Syndicate-Uplink") - if(uplinkdevice) - var/obj/item/device/radio/uplink/U = new(uplinkdevice.loc) - U.hidden_uplink.uses = 40 \ No newline at end of file diff --git a/code/game/objects/items/devices/uplinks.dm b/code/game/objects/items/devices/uplinks.dm index 96874bd946b..45db522463e 100644 --- a/code/game/objects/items/devices/uplinks.dm +++ b/code/game/objects/items/devices/uplinks.dm @@ -50,7 +50,7 @@ datum/nano_item_lists var/list/nanoui_data = new // Additional data for NanoUI use var/list/purchase_log = new - var/uplink_owner = null//text-only + var/datum/mind/uplink_owner = null var/used_TC = 0 /obj/item/device/uplink/nano_host()