Prioritizes the PDA pen as a traitor uplink location when the pen is selected (#31434)

* you too can be a commit * requested changes
2017-10-09 03:09:40 +03:00
parent 1f349aeccc
commit 8b040dddb2
1 changed files with 6 additions and 1 deletions
@@ -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