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

Merge pull request #5410 from Citadel-Station-13/upstream-merge-35462

Browse Source 
[MIRROR] Grabbers can now only contain things smaller than the assembly.
This commit is contained in:
CitadelStationBot
2018-02-11 05:37:06 -06:00
committed by GitHub
parent 7f7bea7468 c08e884199
commit f4f9906cc5
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/integrated_electronics/subtypes/manipulation.dm
+3 -9
View File
@@ -315,16 +315,10 @@
if(mode == 1)
if(check_target(AM))
var/weightcheck = FALSE
if ((!istype(AM,/obj/item/device/electronic_assembly/)) && (!istype(AM,/obj/item/device/transfer_valve)))
if (AM.w_class <= max_w_class)
weightcheck = TRUE
else
weightcheck = FALSE
if (AM.w_class < max_w_class)
weightcheck = TRUE
else
if (AM.w_class < max_w_class)
weightcheck = TRUE
else
weightcheck = FALSE
weightcheck = FALSE
if((contents.len < max_items) && (weightcheck))
AM.forceMove(src)
if(mode == 0)