From 2899db2fda0b34131497c737eb0328ec5bd15924 Mon Sep 17 00:00:00 2001 From: ReinaCoder <83892995+ReinaCoder@users.noreply.github.com> Date: Wed, 18 May 2022 16:10:02 +0000 Subject: [PATCH] Fixes spray cans and pipes fitting inside of tablets. (#67057) They were subtypes of crayons and cigarettes which allowed them to be fit inside. To fix this, the tablet can only hold tiny items and spray cans and pipes have been changed from tiny items to small. --- code/game/objects/items/cigs_lighters.dm | 1 + code/game/objects/items/crayons.dm | 1 + code/modules/modular_computers/computers/item/tablet.dm | 2 ++ 3 files changed, 4 insertions(+) diff --git a/code/game/objects/items/cigs_lighters.dm b/code/game/objects/items/cigs_lighters.dm index 220b44ab6fb..e965b5809d2 100644 --- a/code/game/objects/items/cigs_lighters.dm +++ b/code/game/objects/items/cigs_lighters.dm @@ -585,6 +585,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM smoketime = 0 chem_volume = 200 // So we can fit densified chemicals plants list_reagents = null + w_class = WEIGHT_CLASS_SMALL ///name of the stuff packed inside this pipe var/packeditem diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm index 2adb64c4b79..50588e959e8 100644 --- a/code/game/objects/items/crayons.dm +++ b/code/game/objects/items/crayons.dm @@ -662,6 +662,7 @@ lefthand_file = 'icons/mob/inhands/equipment/hydroponics_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/hydroponics_righthand.dmi' desc = "A metallic container containing tasty paint." + w_class = WEIGHT_CLASS_SMALL instant = TRUE edible = FALSE diff --git a/code/modules/modular_computers/computers/item/tablet.dm b/code/modules/modular_computers/computers/item/tablet.dm index ced85bfd63c..938a64aaead 100644 --- a/code/modules/modular_computers/computers/item/tablet.dm +++ b/code/modules/modular_computers/computers/item/tablet.dm @@ -52,6 +52,8 @@ . = ..() if(is_type_in_list(W, contained_item)) + if(W.w_class >= WEIGHT_CLASS_SMALL) // Anything equal to or larger than small won't work + return if(inserted_item) to_chat(user, span_warning("There is already \a [inserted_item] in \the [src]!")) else