cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-26 05:27:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge resolution, master into dev.

Browse Source
This commit is contained in:
Zuhayr
2014-08-21 12:01:38 +09:30
parent 0397ce5f1a ec791bd81c
commit b47d91b612
680 changed files with 3896 additions and 3904 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/implants/implanter.dm
+3 -1
View File
@@ -112,7 +112,9 @@
return
..()
/obj/item/weapon/implanter/compressed/afterattack(atom/A, mob/user as mob)
/obj/item/weapon/implanter/compressed/afterattack(atom/A, mob/user as mob, proximity)
if(!proximity)
return
if(istype(A,/obj/item) && imp)
var/obj/item/weapon/implant/compressed/c = imp
if (c.scanned)