From 51d0a9c787acb477ca4b49fd39a4033bc7e79dd2 Mon Sep 17 00:00:00 2001 From: san7890 Date: Tue, 15 Nov 2022 01:42:36 -0700 Subject: [PATCH] Pickle Jars are now made of glass instead of cardboard and are now non-foldable. (#71172) ## About The Pull Request This is done by making it impossible to fold a jar. You can not fold the jar, clicking on the pickle jar will do nothing and you will be stuck right back where you were before you tried to fold the jar. Because: what the fuck? Folding a glass jar? Huh? ## Why It's Good For The Game Fixes #71083. Come on, _folding_ a jar? What the hell? The jar seems to use the rest of the fancy_box API, so I think it's fine to just have nulls be valid in this context. ## Changelog :cl: fix: You can no longer fold a glass pickle jar into cardboard. It will also no longer recycle into cardboard as well. /:cl: --- code/game/objects/items/storage/fancy.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm index 99e83d4b244..87b1ec8f393 100644 --- a/code/game/objects/items/storage/fancy.dm +++ b/code/game/objects/items/storage/fancy.dm @@ -59,6 +59,8 @@ . = ..() if(contents.len) return + if(!fold_result) + return new fold_result(user.drop_location()) balloon_alert(user, "folded") user.put_in_active_hand(fold_result) @@ -471,6 +473,8 @@ spawn_type = /obj/item/food/pickle spawn_count = 5 contents_tag = "pickle" + fold_result = null + custom_materials = list(/datum/material/glass = 2000) /obj/item/storage/fancy/pickles_jar/Initialize(mapload) . = ..()