cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-28 23:58:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge Conflict Fix

Browse Source
This commit is contained in:
Firecage
2016-01-20 14:07:14 +02:00
parent d1327d4076 02a6c6cdef
commit d2bd6871d5
65 changed files with 1590 additions and 1531 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/implants/implantuplink.dm
+6 -7
View File
@@ -1,24 +1,24 @@
/obj/item/weapon/implant/uplink
name = "uplink implant"
desc = "Summon things."
desc = "Sneeki breeki."
icon = 'icons/obj/radio.dmi'
icon_state = "radio"
origin_tech = "materials=2;magnets=4;programming=4;biotech=4;syndicate=8;bluespace=5"
/obj/item/weapon/implant/uplink/New()
hidden_uplink = new(src)
hidden_uplink.uses = 10
hidden_uplink.telecrystals = 10
..()
/obj/item/weapon/implant/uplink/implant(mob/source)
var/obj/item/weapon/implant/imp_e = locate(src.type) in source
/obj/item/weapon/implant/uplink/implant(mob/user)
var/obj/item/weapon/implant/imp_e = locate(src.type) in user
if(imp_e && imp_e != src)
imp_e.hidden_uplink.uses += hidden_uplink.uses
imp_e.hidden_uplink.telecrystals += hidden_uplink.telecrystals
qdel(src)
return 1
if(..())
hidden_uplink.uplink_owner="[source.key]"
hidden_uplink.owner = "[user.key]"
return 1
return 0
@@ -26,7 +26,6 @@
if(hidden_uplink)
hidden_uplink.interact(usr)
/obj/item/weapon/implanter/uplink
name = "implanter (uplink)"