From f92e189cc734d029f4074b1bd84d325f45f64006 Mon Sep 17 00:00:00 2001 From: MagmaRam Date: Sun, 5 Feb 2017 19:25:59 -0600 Subject: [PATCH] Fixes not being able to pick up sandwiches with a fork if they're at max size. --- code/modules/reagents/reagent_containers/food/sandwich.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/reagents/reagent_containers/food/sandwich.dm b/code/modules/reagents/reagent_containers/food/sandwich.dm index c853706ad5..48356172ca 100644 --- a/code/modules/reagents/reagent_containers/food/sandwich.dm +++ b/code/modules/reagents/reagent_containers/food/sandwich.dm @@ -22,16 +22,16 @@ if(istype(O,/obj/item/weapon/reagent_containers/food/snacks/breadslice)) sandwich_limit += 4 - if(src.contents.len > sandwich_limit) - user << "\red If you put anything else on \the [src] it's going to collapse." - return - else if(istype(W,/obj/item/weapon/material/shard)) + if(istype(W,/obj/item/weapon/material/shard)) user << "\blue You hide [W] in \the [src]." user.drop_item() W.loc = src update() return else if(istype(W,/obj/item/weapon/reagent_containers/food/snacks)) + if(src.contents.len > sandwich_limit) + user << "\red If you put anything else on \the [src] it's going to collapse." + return user << "\blue You layer [W] over \the [src]." var/obj/item/weapon/reagent_containers/F = W F.reagents.trans_to_obj(src, F.reagents.total_volume)