shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into donoritemmodularization

Browse Source 
# Conflicts:
#	code/citadel/custom_loadout/custom_items.dm
#	code/datums/components/riding.dm
#	code/game/objects/items/implants/implantuplink.dm
#	icons/mob/neck.dmi
#	icons/obj/clothing/cloaks.dmi
This commit is contained in:
deathride58
2017-12-08 19:58:41 -05:00
parent 0fc1837c3a 99283df12b
commit 742d50b5e7
182 changed files with 2740 additions and 736 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/implants/implantuplink.dm
+1
View File
@@ -34,6 +34,7 @@
/obj/item/implant/uplink/activate()
GET_COMPONENT(hidden_uplink, /datum/component/uplink)
if(hidden_uplink)
hidden_uplink.locked = FALSE
hidden_uplink.interact(usr)
/obj/item/implanter/uplink