From 8b040dddb2c59904e51f706bf1a8292aca65b780 Mon Sep 17 00:00:00 2001 From: vuonojenmustaturska Date: Mon, 9 Oct 2017 03:09:40 +0300 Subject: [PATCH] Prioritizes the PDA pen as a traitor uplink location when the pen is selected (#31434) * you too can be a commit * requested changes --- code/datums/mind.dm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/code/datums/mind.dm b/code/datums/mind.dm index 0e1b754fc9..8f33465a57 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -269,7 +269,12 @@ var/list/all_contents = traitor_mob.GetAllContents() var/obj/item/device/pda/PDA = locate() in all_contents var/obj/item/device/radio/R = locate() in all_contents - var/obj/item/pen/P = locate() in all_contents //including your PDA-pen! + var/obj/item/pen/P + + if (PDA) // Prioritize PDA pen, otherwise the pocket protector pens will be chosen, which causes numerous ahelps about missing uplink + P = locate() in PDA + if (!P) // If we couldn't find a pen in the PDA, or we didn't even have a PDA, do it the old way + P = locate() in all_contents var/obj/item/uplink_loc