cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1396 from yogstation13/upstream-merge-38621

Browse Source 
[MIRROR] Prevents grabbers from holding circuit assemblies.
This commit is contained in:
Nich
2018-06-21 10:10:49 +02:00
committed by GitHub
parent 3dabd97ca5 076dafb11e
commit bc089bdc3e
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/integrated_electronics/subtypes/manipulation.dm
View File

@@ -367,7 +367,7 @@
var/atom/movable/acting_object = get_object()
var/turf/T = get_turf(acting_object)
var/obj/item/AM = get_pin_data_as_type(IC_INPUT, 1, /obj/item)
if(AM)
if(!QDELETED(AM) && !istype(AM, /obj/item/electronic_assembly))
var/mode = get_pin_data(IC_INPUT, 2)
if(mode == 1)
if(check_target(AM))