From 12701327989f7e89b4427dc6ea8fdfa8e3e6c5e1 Mon Sep 17 00:00:00 2001 From: KorPhaeron Date: Sat, 10 Feb 2018 17:39:58 -0600 Subject: [PATCH] Mining sentience upgrade grants minebots a radio and ID (#35235) * Minebots get mining radio+ID card * Updates radio implant paths --- .../objects/items/implants/implant_misc.dm | 20 +++++++++++++++---- .../game/objects/items/storage/uplink_kits.dm | 2 +- code/modules/mining/minebot.dm | 7 +++++++ .../research/xenobiology/xenobiology.dm | 2 +- 4 files changed, 25 insertions(+), 6 deletions(-) diff --git a/code/game/objects/items/implants/implant_misc.dm b/code/game/objects/items/implants/implant_misc.dm index 2141fba7e89..3641ee9f663 100644 --- a/code/game/objects/items/implants/implant_misc.dm +++ b/code/game/objects/items/implants/implant_misc.dm @@ -80,10 +80,10 @@ /obj/item/implant/radio name = "internal radio implant" - desc = "Are you there God? It's me, Syndicate Comms Agent." activated = TRUE var/obj/item/device/radio/radio - var/radio_key = /obj/item/device/encryptionkey/syndicate + var/radio_key + var/subspace_transmission = FALSE icon = 'icons/obj/radio.dmi' icon_state = "walkietalkie" @@ -98,11 +98,19 @@ // almost like an internal headset, but without the // "must be in ears to hear" restriction. radio.name = "internal radio" - radio.subspace_transmission = TRUE + radio.subspace_transmission = subspace_transmission radio.canhear_range = 0 - radio.keyslot = new radio_key + if(radio_key) + radio.keyslot = new radio_key radio.recalculateChannels() +/obj/item/implant/radio/mining + radio_key = /obj/item/device/encryptionkey/headset_cargo + +/obj/item/implant/radio/syndicate + desc = "Are you there God? It's me, Syndicate Comms Agent." + radio_key = /obj/item/device/encryptionkey/syndicate + subspace_transmission = TRUE /obj/item/implant/radio/get_data() var/dat = {"Implant Specifications:
@@ -114,3 +122,7 @@ /obj/item/implanter/radio name = "implanter (internal radio)" imp_type = /obj/item/implant/radio + +/obj/item/implanter/radio/syndicate + name = "implanter (internal syndicate radio)" + imp_type = /obj/item/implant/radio/syndicate diff --git a/code/game/objects/items/storage/uplink_kits.dm b/code/game/objects/items/storage/uplink_kits.dm index f2fe0bd4754..74ffcd044a8 100644 --- a/code/game/objects/items/storage/uplink_kits.dm +++ b/code/game/objects/items/storage/uplink_kits.dm @@ -307,7 +307,7 @@ new /obj/item/spellbook/oneuse/mimery_guns(src) /obj/item/storage/box/syndie_kit/imp_radio/PopulateContents() - new /obj/item/implanter/radio(src) + new /obj/item/implanter/radio/syndicate(src) /obj/item/storage/box/syndie_kit/centcom_costume/PopulateContents() new /obj/item/clothing/under/rank/centcom_officer(src) diff --git a/code/modules/mining/minebot.dm b/code/modules/mining/minebot.dm index 25f558c1595..3ab7b2dc5cf 100644 --- a/code/modules/mining/minebot.dm +++ b/code/modules/mining/minebot.dm @@ -259,5 +259,12 @@ icon = 'icons/obj/module.dmi' sentience_type = SENTIENCE_MINEBOT +/obj/item/slimepotion/slime/sentience/mining/after_success(mob/living/user, mob/living/simple_animal/SM) + var/obj/item/implant/radio/mining/imp = new(src) + imp.implant(SM, user) + + SM.access_card = new /obj/item/card/id/mining(SM) + SM.access_card.flags_1 |= NODROP_1 + #undef MINEDRONE_COLLECT #undef MINEDRONE_ATTACK diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm index f26a1325ff5..c781b4286d2 100644 --- a/code/modules/research/xenobiology/xenobiology.dm +++ b/code/modules/research/xenobiology/xenobiology.dm @@ -616,7 +616,7 @@ desc = "A miraculous chemical mix that grants human like intelligence to living beings. It has been modified with Syndicate technology to also grant an internal radio implant to the target and authenticate with identification systems." /obj/item/slimepotion/slime/sentience/nuclear/after_success(mob/living/user, mob/living/simple_animal/SM) - var/obj/item/implant/radio/imp = new(src) + var/obj/item/implant/radio/syndicate/imp = new(src) imp.implant(SM, user) SM.access_card = new /obj/item/card/id/syndicate(SM)