From 7992256bcbc9b65cfebb2142ac96c832f5d34dc2 Mon Sep 17 00:00:00 2001 From: Dax Dupont Date: Sun, 11 Feb 2018 01:08:52 +0100 Subject: [PATCH 1/2] Grabbers can now only contain things smaller than the assembly. (#35462) * Grabbers can now only contain things smaller than the assembly * Good suggestion buggy * fucking github broke --- .../integrated_electronics/subtypes/manipulation.dm | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/code/modules/integrated_electronics/subtypes/manipulation.dm b/code/modules/integrated_electronics/subtypes/manipulation.dm index c14278bd19..047df39e70 100644 --- a/code/modules/integrated_electronics/subtypes/manipulation.dm +++ b/code/modules/integrated_electronics/subtypes/manipulation.dm @@ -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)