cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes mercenary mode not listing bought items.

Browse Source 
The mercenary leader now spawns with the uplink, as is set as its owner.
This commit is contained in:
PsiOmega
2015-09-06 10:07:39 +02:00
parent d99c4ffaaa
commit cc960624b9
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
code/game/antagonist/outsider/mercenary.dm
View File

@@ -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

2
code/game/objects/items/devices/uplinks.dm
View File

@@ -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()