From 7801c2dc3bf96cd07dc1960d299c33efb797c6c8 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Wed, 2 Dec 2015 20:11:31 +1030 Subject: [PATCH] Minor runtime fixes. --- code/game/objects/items/weapons/cards_ids_syndicate.dm | 4 ++-- code/modules/clothing/spacesuits/rig/rig.dm | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/weapons/cards_ids_syndicate.dm b/code/game/objects/items/weapons/cards_ids_syndicate.dm index 42b359d390..eaedc09212 100644 --- a/code/game/objects/items/weapons/cards_ids_syndicate.dm +++ b/code/game/objects/items/weapons/cards_ids_syndicate.dm @@ -1,4 +1,4 @@ -var/global/list/syndicate_ids = list() +var/list/syndicate_ids = list() /obj/item/weapon/card/id/syndicate name = "agent card" @@ -9,8 +9,8 @@ var/global/list/syndicate_ids = list() var/registered_user = null /obj/item/weapon/card/id/syndicate/New(mob/user as mob) - syndicate_ids += src ..() + syndicate_ids += src access = syndicate_access.Copy() /obj/item/weapon/card/id/syndicate/Destroy() diff --git a/code/modules/clothing/spacesuits/rig/rig.dm b/code/modules/clothing/spacesuits/rig/rig.dm index 426b133fff..b3d59aaf7d 100644 --- a/code/modules/clothing/spacesuits/rig/rig.dm +++ b/code/modules/clothing/spacesuits/rig/rig.dm @@ -680,7 +680,8 @@ ..() for(var/piece in list("helmet","gauntlets","chest","boots")) toggle_piece(piece, user, ONLY_RETRACT) - wearer.wearing_rig = null + if(wearer && wearer.wearing_rig == src) + wearer.wearing_rig = null wearer = null //Todo