From cf1588441fa2b61f8a3aca4559a2da40dcfa0bb1 Mon Sep 17 00:00:00 2001 From: Neerti Date: Sun, 28 Apr 2019 20:11:08 -0400 Subject: [PATCH 1/2] Merge pull request #6139 from Mechoid/FixACTDStuff Fixes Access Code Transmission Device oversight. --- .../mob/living/silicon/robot/robot_items.dm | 25 +++++++++++++++++++ .../silicon/robot/robot_modules/syndicate.dm | 2 +- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/silicon/robot/robot_items.dm b/code/modules/mob/living/silicon/robot/robot_items.dm index c87fa7d88c..b622f8fde5 100644 --- a/code/modules/mob/living/silicon/robot/robot_items.dm +++ b/code/modules/mob/living/silicon/robot/robot_items.dm @@ -104,6 +104,31 @@ desc = "A circuit grafted onto the bottom of an ID card. It is used to transmit access codes into other robot chassis, \ allowing you to lock and unlock other robots' panels." + var/dummy_card = null + var/dummy_card_type = /obj/item/weapon/card/id/science/roboticist/dummy_cyborg + +/obj/item/weapon/card/robot/Initialize() + ..() + dummy_card = new dummy_card_type(src) + +/obj/item/weapon/card/robot/Destroy() + qdel(dummy_card) + dummy_card = null + ..() + +/obj/item/weapon/card/robot/GetID() + return dummy_card + +/obj/item/weapon/card/robot/syndi + dummy_card_type = /obj/item/weapon/card/id/syndicate/dummy_cyborg + +/obj/item/weapon/card/id/science/roboticist/dummy_cyborg + access = list(access_robotics) + +/obj/item/weapon/card/id/syndicate/dummy_cyborg/Initialize() + ..() + access |= access_robotics + //A harvest item for serviceborgs. /obj/item/weapon/robot_harvester name = "auto harvester" diff --git a/code/modules/mob/living/silicon/robot/robot_modules/syndicate.dm b/code/modules/mob/living/silicon/robot/robot_modules/syndicate.dm index 662e2e1d89..7c6f22d6b9 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules/syndicate.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules/syndicate.dm @@ -93,7 +93,7 @@ src.modules += new /obj/item/weapon/gripper/no_use/organ/robotics(src) // Hacking other things. - src.modules += new /obj/item/weapon/card/robot(src) + src.modules += new /obj/item/weapon/card/robot/syndi(src) src.modules += new /obj/item/weapon/card/emag(src) // Materials.