Merge pull request #5415 from Citadel-Station-13/upstream-merge-35235

[MIRROR] Mining sentience upgrade grants minebots a radio and ID
This commit is contained in:
CitadelStationBot
2018-02-11 07:38:14 -06:00
committed by GitHub
4 changed files with 25 additions and 6 deletions
@@ -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 = {"<b>Implant Specifications:</b><BR>
@@ -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
@@ -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)
+7
View File
@@ -256,5 +256,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
@@ -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)