From d742eddbcff628ab4014b1cf3086b31ee82e4f86 Mon Sep 17 00:00:00 2001 From: PsiOmegaDelta Date: Fri, 29 Jan 2016 22:11:55 +0100 Subject: [PATCH] Fixes traitors being unable to be marked as owners of agent ids. Removes a unnecessary check during owner-assignment, allowing even id cards that have been spawned on floors to find a new owner. --- code/game/objects/items/weapons/cards_ids_syndicate.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/weapons/cards_ids_syndicate.dm b/code/game/objects/items/weapons/cards_ids_syndicate.dm index cce578cc0ec..531967e67cf 100644 --- a/code/game/objects/items/weapons/cards_ids_syndicate.dm +++ b/code/game/objects/items/weapons/cards_ids_syndicate.dm @@ -11,7 +11,7 @@ access = syndicate_access.Copy() /obj/item/weapon/card/id/syndicate/Destroy() - registered_user = null + unset_registered_user(registered_user) return ..() /obj/item/weapon/card/id/syndicate/prevent_tracking() @@ -27,7 +27,7 @@ /obj/item/weapon/card/id/syndicate/attack_self(mob/user as mob) // We use the fact that registered_name is not unset should the owner be vaporized, to ensure the id doesn't magically become unlocked. - if(!registered_user && !registered_name && register_user(user)) + if(!registered_user && register_user(user)) user << "The microscanner marks you as its owner, preventing others from accessing its internals." if(registered_user == user) switch(alert("Would you like edit the ID, or show it?","Show or Edit?", "Edit","Show"))