From 738c1b7b2ac4fc7ccaa5911a5c42e4cc4e100f0d Mon Sep 17 00:00:00 2001 From: deathride58 Date: Wed, 22 Nov 2017 17:57:43 -0500 Subject: [PATCH] Update implantuplink.dm --- .../objects/items/implants/implantuplink.dm | 45 ------------------- 1 file changed, 45 deletions(-) diff --git a/code/game/objects/items/implants/implantuplink.dm b/code/game/objects/items/implants/implantuplink.dm index 82555e12c4..4ef25c28a9 100644 --- a/code/game/objects/items/implants/implantuplink.dm +++ b/code/game/objects/items/implants/implantuplink.dm @@ -1,47 +1,3 @@ -<<<<<<< HEAD -/obj/item/implant/uplink - name = "uplink implant" - desc = "Sneeki breeki." - icon = 'icons/obj/radio.dmi' - icon_state = "radio" - lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi' - origin_tech = "materials=4;magnets=4;programming=4;biotech=4;syndicate=5;bluespace=5" - var/starting_tc = 0 - -/obj/item/implant/uplink/New() - hidden_uplink = new(src) - hidden_uplink.telecrystals = starting_tc - ..() - -/obj/item/implant/uplink/implant(mob/living/target, mob/user, silent = 0) - for(var/X in target.implants) - if(istype(X, type)) - var/obj/item/implant/imp_e = X - imp_e.hidden_uplink.telecrystals += hidden_uplink.telecrystals - qdel(src) - return 1 - - if(..()) - hidden_uplink.owner = "[user.key]" - return 1 - return 0 - -/obj/item/implant/uplink/activate() - if(hidden_uplink) - hidden_uplink.interact(usr) - -/obj/item/implanter/uplink - name = "implanter (uplink)" - imp_type = /obj/item/implant/uplink - -/obj/item/implanter/uplink/precharged - name = "implanter (precharged uplink)" - imp_type = /obj/item/implant/uplink/precharged - -/obj/item/implant/uplink/precharged - starting_tc = 10 -======= /obj/item/implant/uplink name = "uplink implant" desc = "Sneeki breeki." @@ -90,4 +46,3 @@ /obj/item/implant/uplink/precharged starting_tc = 10 ->>>>>>> ccd4981... Merge pull request #32624 from kevinz000/component_uplinks